Review

Makefile

@@ -467,7 +467,7 @@ $(BUILD_DIR)/src/code/jpegdecoder.o: OPTFLAGS := -O2
 $(BUILD_DIR)/src/code/jpegutils.o: CC := $(CC_OLD)
 $(BUILD_DIR)/src/code/jpegutils.o: OPTFLAGS := -O2
 
-$(BUILD_DIR)/src/code/osFlash.o: CC := $(CC_OLD)
+$(BUILD_DIR)/src/code/osFlash.o: CC := ./tools/buildtools/preprocess.sh -v $(VERSION) -i $(ICONV) -- $(CC_OLD)
 $(BUILD_DIR)/src/code/osFlash.o: OPTFLAGS := -g
 $(BUILD_DIR)/src/code/osFlash.o: MIPS_VERSION := -mips1
 

include/PR/ucode.h

@@ -13,6 +13,9 @@
 extern u64 rspbootTextStart[];
 extern u64 rspbootTextEnd[];
 
+extern u64 cic6105TextStart[];
+extern u64 cic6105TextEnd[];
+
 extern u64 aspMainTextStart[];
 extern u64 aspMainTextEnd[];
 extern u64 aspMainDataStart[];

include/regs.h

@@ -68,6 +68,7 @@ extern RegEditor* gRegEditor;
 #define R_RUN_SPEED_LIMIT                 REG(45)
 
 #define R_ENABLE_ARENA_DBG                SREG(0) // Same as OoT
+#define R_AUDIOMGR_DEBUG_LEVEL            SREG(20)
 #define R_ROOM_IMAGE_NODRAW_FLAGS         SREG(25)
 #define R_UPDATE_RATE                     SREG(30)
 #define R_VI_MODE_EDIT_STATE              SREG(48)

src/boot/CIC6105.c

@@ -8,10 +8,6 @@
 
 #pragma increment_block_number "n64-us:188"
 
-// TODO: Consider moving to a header file.
-extern u64 cic6105TextStart[];
-extern u64 cic6105TextEnd[];
-
 s32 gCICAddr1Val;
 s32 gCICAddr2Val;
 FaultClient sRomInfoFaultClient;
@@ -24,13 +20,13 @@ s32 CIC6105_ILoveYou(void);
 
 void CIC6105_Noop1(void) {
 #if MM_VERSION < N64_US
-    SREG(20) = 1;
+    R_AUDIOMGR_DEBUG_LEVEL = 1;
 #endif
 }
 
 void CIC6105_Noop2(void) {
 #if MM_VERSION < N64_US
-    SREG(20) = 0;
+    R_AUDIOMGR_DEBUG_LEVEL = 0;
 #endif
 }
 
@@ -55,11 +51,6 @@ void CIC6105_PrintRomInfo(void) {
     FaultDrawer_Printf("[Date:%s]", gBuildDate);
     FaultDrawer_SetCursor(96, 32);
     FaultDrawer_Printf("I LOVE YOU %08x", CIC6105_ILoveYou());
-
-    {
-        // TODO: where to put this?
-        static const char unused[] = "flag:%08x data:%08x\n";
-    }
 #endif
 }
 
@@ -113,6 +104,8 @@ void CIC6105_ScheduleCICTask(void) {
     gCICValue1 = IO_READ(SP_DMEM_START + 0xFF4);
     gCICValue2 = IO_READ(SP_DMEM_START + 0xFFC);
     CIC6105_ILoveYou();
+
+    (void)"flag:%08x data:%08x\n";
 }
 
 s32 CIC6105_ILoveYou(void) {

src/code/audio_thread_manager.c

@@ -16,7 +16,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
     OSTimer timer;
     s32 msg;
 
-    if (SREG(20) > 0) {
+    if (R_AUDIOMGR_DEBUG_LEVEL > 0) {
         audioMgr->rspTask = NULL;
     }
 
@@ -37,7 +37,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
         Sched_SendNotifyMsg(audioMgr->sched);
     }
 
-    if (SREG(20) >= 2) {
+    if (R_AUDIOMGR_DEBUG_LEVEL >= 2) {
         rspTask = NULL;
     } else {
         rspTask = AudioThread_Update();

src/code/graph.c

@@ -236,7 +236,7 @@ retry:
 void Graph_UpdateGame(GameState* gameState) {
     GameState_GetInput(gameState);
     GameState_IncrementFrameCount(gameState);
-    if (SREG(20) < 3) {
+    if (R_AUDIOMGR_DEBUG_LEVEL < 3) {
         Audio_Update();
     }
 }

src/code/osFlash.c

@@ -3,6 +3,8 @@
 #include "alignment.h"
 #include "macros.h"
 
+#pragma increment_block_number "n64-us:188"
+
 u32 __osFlashID[4] ALIGNED(8);
 OSIoMesg __osFlashMsg ALIGNED(8);
 OSMesgQueue __osFlashMessageQ ALIGNED(8);

src/code/sys_math3d.c

@@ -6,7 +6,7 @@
 
 #include "macros.h"
 
-#pragma increment_block_number "n64-us:124"
+#pragma increment_block_number "n64-us:122"
 
 // The bss index at this point should be 184