From 4bc98da91c142f66e017fa5d5933794417177914 Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Sat, 18 Apr 2026 14:31:36 -0700
Subject: [PATCH] [n64-jp-1.1] irqmgr

---
 src/boot/irqmgr.c | 69 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/boot/irqmgr.c b/src/boot/irqmgr.c
index f1dec7bc667..e572d67dd37 100644
--- a/src/boot/irqmgr.c
+++ b/src/boot/irqmgr.c
@@ -53,6 +53,30 @@ s32 sIrqMgrRetraceCount = 0;
 #define IRQ_PRENMI480_MSG 672
 #define IRQ_PRENMI500_MSG 673
 
+#if DEBUG_FEATURES
+#define IRQMGR_PRINTF osSyncPrintf
+#elif IDO_PRINTF_WORKAROUND
+#if MM_VERSION < N64_US
+#define IRQMGR_PRINTF(args) \
+    do {                    \
+        if (1)              \
+            (void)args;     \
+    } while (0)
+#else
+#define IRQMGR_PRINTF(args) (void)0
+#endif
+#else
+#if MM_VERSION < N64_US
+#define IRQMGR_PRINTF(format, ...) \
+    do {                           \
+        if (1)                     \
+            (void)format;          \
+    } while (0)
+#else
+#define IRQMGR_PRINTF(format, ...) (void)0
+#endif
+#endif
+
 /**
  * Registers a client and an associated message queue with the IRQ manager. When an
  * interrupt event is received by the IRQ manager, these clients will be notified of
@@ -126,7 +150,11 @@ void IrqMgr_JamMesgToClients(IrqMgr* irqMgr, OSMesg msg) {
     IrqMgrClient* client = irqMgr->clients;
 
     while (client != NULL) {
-        if (!MQ_IS_FULL(client->queue)) {
+        if (MQ_IS_FULL(client->queue)) {
+            IRQMGR_PRINTF(T("irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n",
+                            "irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d"),
+                          client->queue, MQ_GET_COUNT(client->queue));
+        } else {
             //! @bug The function's name suggests this would use osJamMesg rather than osSendMesg, using the
             //! latter makes this function no different than IrqMgr_SendMesgToClients.
             osSendMesg(client->queue, msg, OS_MESG_NOBLOCK);
@@ -153,7 +181,15 @@ void IrqMgr_HandlePreNMI(IrqMgr* irqMgr) {
 }
 
 void IrqMgr_CheckStacks(void) {
-    StackCheck_Check(NULL);
+    IRQMGR_PRINTF(T("irqmgr.c: PRENMIから0.5秒経過\n", "irqmgr.c: 0.5 seconds after PRENMI\n"));
+
+    if (StackCheck_Check(NULL) == STACK_STATUS_OK) {
+        IRQMGR_PRINTF(T("スタックは大丈夫みたいです\n", "The stack looks ok\n"));
+    } else {
+        IRQMGR_PRINTF(T("スタックがオーバーフローしたか危険な状態です\n", "Stack overflow or dangerous\n"));
+        IRQMGR_PRINTF(T("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n",
+                        "Increase stack size early or don't consume stack\n"));
+    }
 }
 
 void IrqMgr_HandlePRENMI450(IrqMgr* irqMgr) {
@@ -167,10 +203,16 @@ void IrqMgr_HandlePRENMI450(IrqMgr* irqMgr) {
 }
 
 void IrqMgr_HandlePRENMI480(IrqMgr* irqMgr) {
+    s32 result;
     // Wait .52 seconds. After this we will have waited an entire second
     osSetTimer(&irqMgr->timer, OS_USEC_TO_CYCLES(520 * 1000), 0, &irqMgr->queue, (OSMesg)IRQ_PRENMI500_MSG);
 
-    osAfterPreNMI();
+    result = osAfterPreNMI();
+    if (result != 0) {
+        IRQMGR_PRINTF(T("osAfterPreNMIが %d を返しました！？\n", "osAfterPreNMI returned %d !?\n"), result);
+    } else {
+        IRQMGR_PRINTF(T("RSPが停止していません\n", "RSP is not stopped\n"));
+    }
 }
 
 void IrqMgr_HandlePRENMI500(IrqMgr* irqMgr) {
@@ -193,7 +235,10 @@ void IrqMgr_HandleRetrace(IrqMgr* irqMgr) {
 void IrqMgr_ThreadEntry(void* arg) {
     s32 msg = 0;
     IrqMgr* irqMgr = (IrqMgr*)arg;
-    s32 exit = false;
+    s32 exit;
+
+    IRQMGR_PRINTF(T("ＩＲＱマネージャスレッド実行開始\n", "Start IRQ manager thread execution\n"));
+    exit = false;
 
     while (!exit) {
         osRecvMesg(&irqMgr->queue, (OSMesg*)&msg, OS_MESG_BLOCK);
@@ -204,25 +249,41 @@ void IrqMgr_ThreadEntry(void* arg) {
                 break;
 
             case IRQ_PRENMI_MSG:
+                IRQMGR_PRINTF("PRE_NMI_MSG\n");
+                IRQMGR_PRINTF(T("スケジューラ：PRE_NMIメッセージを受信\n", "Scheduler: Receives PRE_NMI message\n"));
                 IrqMgr_HandlePreNMI(irqMgr);
                 break;
 
             case IRQ_PRENMI450_MSG:
+                IRQMGR_PRINTF("PRENMI450_MSG\n");
+                IRQMGR_PRINTF(
+                    T("スケジューラ：PRENMI450メッセージを受信\n", "Scheduler: Receives PRENMI450 message\n"));
                 IrqMgr_HandlePRENMI450(irqMgr);
                 break;
 
             case IRQ_PRENMI480_MSG:
+                IRQMGR_PRINTF("PRENMI480_MSG\n");
+                IRQMGR_PRINTF(
+                    T("スケジューラ：PRENMI480メッセージを受信\n", "Scheduler: Receives PRENMI480 message\n"));
                 IrqMgr_HandlePRENMI480(irqMgr);
                 break;
 
             case IRQ_PRENMI500_MSG:
+                IRQMGR_PRINTF("PRENMI500_MSG\n");
+                IRQMGR_PRINTF(
+                    T("スケジューラ：PRENMI500メッセージを受信\n", "Scheduler: Receives PRENMI500 message\n"));
                 IrqMgr_HandlePRENMI500(irqMgr);
                 break;
 
             default:
+                IRQMGR_PRINTF(T("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n",
+                                "irqmgr.c: Unexpected message received (%08x)\n"),
+                              msg);
                 break;
         }
     }
+
+    IRQMGR_PRINTF(T("ＩＲＱマネージャスレッド実行終了\n", "End of IRQ manager thread execution\n"));
 }
 
 void IrqMgr_Init(IrqMgr* irqMgr, void* stack, OSPri pri, u8 retraceCount) {