#370 more ARM code!

unpackRoom_asm // -53% unpackMesh_asm // -48% projectVertices_asm // -32% faceAddRoomQuads_asm // -46% faceAddRoomTriangles_asm // -30% faceAddMeshQuads_asm // -36% faceAddMeshTriangles_asm // -38% faceAddMeshQuadsFlat_asm // -28% faceAddMeshTrianglesFlat_asm // -35%
XProger · Dec 8, 2021 · 9c540db · 9c540db
1 parent 22307b5
commit 9c540db
Show file tree

Hide file tree

Showing 14 changed files with 1,558 additions and 463 deletions.
diff --git a/src/fixed/common.h b/src/fixed/common.h
@@ -2146,17 +2146,21 @@ X_INLINE Matrix& matrixGet()
     return *matrixPtr;
 }
 
-X_INLINE void matrixPush()
+#ifdef USE_ASM
+    extern "C" void matrixPush_asm();
+    #define matrixPush() matrixPush_asm();
+#else
+    #define matrixPush() matrixPush_c();
+
+X_INLINE void matrixPush_c()
 {
     ASSERT(matrixPtr - matrixStack < MAX_MATRICES);
     memcpy(matrixPtr + 1, matrixPtr, sizeof(Matrix));
     matrixPtr++;
 }
+#endif
 
-X_INLINE void matrixPop()
-{
-    matrixPtr--;
-}
+#define matrixPop() matrixPtr--
 
 X_INLINE void matrixSetBasis(Matrix &dst, const Matrix &src)
 {

diff --git a/src/platform/3do/ccbMap3.s b/src/platform/3do/ccbMap3.s
diff --git a/src/platform/3do/ccbMap4.s b/src/platform/3do/ccbMap4.s
diff --git a/src/platform/3do/common_asm.inc b/src/platform/3do/common_asm.inc
@@ -16,6 +16,7 @@ CCB_ACW         EQU 0x00040000
 CCB_ALSC        EQU 0x00080000
 CCB_ACSC        EQU 0x00100000
 CCB_YOXY        EQU 0x00200000
+CCB_CCBPRE      EQU 0x00400000
 CCB_LDPLUT      EQU 0x00800000
 CCB_LDPPMP      EQU 0x01000000
 CCB_LDPRS       EQU 0x02000000