From 57e41795f53f8d43d67e94f89b1b532e30cf8aec Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Tue, 21 Apr 2026 05:12:46 -0700 Subject: String macros (#1871) * PRINTF * T * fault * yaz0 * __osMalloc * audio_thread_manager * graph * padmgr * sched * z_play * z_arrow_ice * z_arrow_light * z_elf_msg * z_elf_msg3 * z_elf_msg4 * z_elf_msg5 * z_mir_ray * stackcheck * Include versions in macros.h * Fix workaround for permuter --- src/code/audio_thread_manager.c | 2 +- src/code/gamealloc.c | 9 +++----- src/code/graph.c | 3 +-- src/code/padmgr.c | 5 +++-- src/code/sched.c | 50 +++++++++++++++++------------------------ src/code/z_play.c | 3 +-- 6 files changed, 29 insertions(+), 43 deletions(-) (limited to 'src/code') diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 25aa6c11f..c79e94264 100644 --- a/src/code/audio_thread_manager.c +++ b/src/code/audio_thread_manager.c @@ -54,7 +54,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { sRetryCount--; Sched_SendAudioCancelMsg(audioMgr->sched); } else { - osSyncPrintf("audioMgr.c:もうダメ！死ぬ！\n"); + osSyncPrintf(T("audioMgr.c:もうダメ！死ぬ！\n", "audioMgr.c: I can't go on! I'm dying!\n")); osDestroyThread(NULL); break; } diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index e9be6beb0..d36d95da0 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -1,18 +1,15 @@ #include "gamealloc.h" #include "libc64/malloc.h" +#include "macros.h" void GameAlloc_Log(GameAlloc* this) { GameAllocEntry* iter = this->base.next; -#if MM_VERSION <= N64_JP_1_1 - (void)"this = %08x\n"; -#endif + PRINTF("this = %08x\n"); while (iter != &this->base) { -#if MM_VERSION <= N64_JP_1_1 - (void)"ptr = %08x size = %d\n"; -#endif + PRINTF("ptr = %08x size = %d\n"); iter = iter->next; } diff --git a/src/code/graph.c b/src/code/graph.c index d25ec751f..375389fdb 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -161,8 +161,7 @@ retry: Sched_SendGfxCancelMsg(&gScheduler); goto retry; } else { - // graph.c: No more! die! - osSyncPrintf("graph.c:もうダメ！死ぬ！\n"); + osSyncPrintf(T("graph.c:もうダメ！死ぬ！\n", "graph.c: I can't go on! I'm dying!\n")); Fault_AddHungupAndCrashImpl("RCP is HUNG UP!!", "Oh! MY GOD!!"); } } diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 0655bb232..61e352b25 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -583,8 +583,9 @@ void PadMgr_UpdateConnections(void) { // Other/Unrecognized if (sPadMgrInstance->ctrlrType[i] == PADMGR_CONT_NONE) { sPadMgrInstance->ctrlrType[i] = PADMGR_CONT_UNK; - // "Recognized an unknown type of controller (%04x)" - sprintf(msg, "知らない種類のコントローラ(%04x)を認識しました", + sprintf(msg, + T("知らない種類のコントローラ(%04x)を認識しました", + "Recognized an unknown type of controller (%04x)"), sPadMgrInstance->padStatus[i].type); } // Missing break required for matching diff --git a/src/code/sched.c b/src/code/sched.c index 78f589f45..f0f2514b6 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -87,30 +87,26 @@ void Sched_HandleNMI(Scheduler* sched) { void Sched_HandleAudioCancel(Scheduler* sched) { s32 i; - // AUDIO SP Cancel - osSyncPrintf("AUDIO SP キャンセルします\n"); + osSyncPrintf(T("AUDIO SP キャンセルします\n", "I am canceling the AUDIO SP\n")); if ((sched->curRSPTask != NULL) && (sched->curRSPTask->list.t.type == M_AUDTASK)) { if (!(IO_READ(SP_STATUS_REG) & SP_STATUS_HALT)) { - // Attempts to stop AUDIO SP - osSyncPrintf("AUDIO SP止めようとします\n"); + osSyncPrintf(T("AUDIO SP止めようとします\n", "Attempting to stop AUDIO SP\n")); IO_WRITE(SP_STATUS_REG, SP_SET_HALT); i = 0; while (!(IO_READ(SP_STATUS_REG) & SP_STATUS_HALT)) { if (i++ > 100) { - // AUDIO SP did not stop (10ms timeout) - osSyncPrintf("AUDIO SP止まりませんでした(10msタイムアウト)\n"); + osSyncPrintf( + T("AUDIO SP止まりませんでした(10msタイムアウト)\n", "AUDIO SP did not stop (10ms timeout)\n")); goto send_mesg; } usleep(100); } - // AUDIO SP stopped (% d * 100us) - osSyncPrintf("AUDIO SP止まりました(%d * 100us)\n", i); + osSyncPrintf(T("AUDIO SP止まりました(%d * 100us)\n", "AUDIO SP stopped (%d * 100us)\n"), i); } else { - // AUDIO SP seems to be stopped - osSyncPrintf("AUDIO SP止まっているようです\n"); + osSyncPrintf(T("AUDIO SP止まっているようです\n", "AUDIO SP seems to be stopped\n")); } send_mesg: @@ -129,13 +125,12 @@ void Sched_HandleAudioCancel(Scheduler* sched) { if (cur->msgQ != NULL) { osSendMesg(cur->msgQ, cur->msg, OS_MESG_BLOCK); } - // Removed AUDIO SP task from pending list - osSyncPrintf("AUDIO SP タスクを実行待ちリストから削除しました\n"); + osSyncPrintf(T("AUDIO SP タスクを実行待ちリストから削除しました\n", + "The AUDIO SP task has been removed from the pending list\n")); return; } - // There are no AUDIO SP tasks to cancel - osSyncPrintf("キャンセルすべき AUDIO SP タスクがありません\n"); + osSyncPrintf(T("キャンセルすべき AUDIO SP タスクがありません\n", "There are no AUDIO SP tasks to cancel\n")); } /** @@ -150,30 +145,26 @@ void Sched_HandleAudioCancel(Scheduler* sched) { void Sched_HandleGfxCancel(Scheduler* sched) { s32 i; - // GRAPH SP Cancel - osSyncPrintf("GRAPH SP キャンセルします\n"); + osSyncPrintf(T("GRAPH SP キャンセルします\n", "I am canceling the GRAPH SP\n")); if ((sched->curRSPTask != NULL) && (sched->curRSPTask->list.t.type == M_GFXTASK)) { if (!(IO_READ(SP_STATUS_REG) & SP_STATUS_HALT)) { - // GRAPH SP tries to stop - osSyncPrintf("GRAPH SP止めようとします\n"); + osSyncPrintf(T("GRAPH SP止めようとします\n", "Attempting to stop GRAPH SP\n")); IO_WRITE(SP_STATUS_REG, SP_SET_HALT); i = 0; while (!(IO_READ(SP_STATUS_REG) & SP_STATUS_HALT)) { if (i++ > 100) { - // GRAPH SP did not stop (10ms timeout) - osSyncPrintf("GRAPH SP止まりませんでした(10msタイムアウト)\n"); + osSyncPrintf( + T("GRAPH SP止まりませんでした(10msタイムアウト)\n", "GRAPH SP did not stop (10ms timeout)\n")); goto send_mesg; } usleep(100); } - // GRAPH SP stopped (%d * 100us) - osSyncPrintf("GRAPH SP止まりました(%d * 100us)\n", i); + osSyncPrintf(T("GRAPH SP止まりました(%d * 100us)\n", "GRAPH SP stopped (%d * 100us)\n"), i); } else { - // GRAPH SP seems to be stopped - osSyncPrintf("GRAPH SP止まっているようです\n"); + osSyncPrintf(T("GRAPH SP止まっているようです\n", "GRAPH SP seems to be stopped\n")); } send_mesg: @@ -195,16 +186,14 @@ void Sched_HandleGfxCancel(Scheduler* sched) { goto halt_rdp; } - // There are no GRAPH SP tasks to cancel - osSyncPrintf("キャンセルすべき GRAPH SP タスクがありません\n"); + osSyncPrintf(T("キャンセルすべき GRAPH SP タスクがありません\n", "There are no GRAPH SP tasks to cancel\n")); halt_rdp: if (sched->curRDPTask != NULL) { OSTask_t* dpTask = &sched->curRDPTask->list.t; if (dpTask->type == M_GFXTASK) { - // Try to stop DP - osSyncPrintf("DP止めようとします\n"); + osSyncPrintf(T("DP止めようとします\n", "Attempting to stop DP\n")); bzero(dpTask->output_buff, (uintptr_t)dpTask->output_buff_size - (uintptr_t)dpTask->output_buff); osSendMesg(&sched->interruptQueue, (OSMesg)RDP_DONE_MSG, OS_MESG_NOBLOCK); } @@ -239,8 +228,9 @@ void Sched_QueueTask(Scheduler* sched, OSScTask* task) { void Sched_Yield(Scheduler* sched) { // Don't yield audio tasks if (sched->curRSPTask->list.t.type == M_AUDTASK) { - // A new audio task has been entered even though the previous audio task has not been completed yet - osSyncPrintf("まだ前回のオーディオタスクが完了していないのに新たなオーディオタスクがエントリされた\n"); + osSyncPrintf( + T("まだ前回のオーディオタスクが完了していないのに新たなオーディオタスクがエントリされた\n", + "A new audio task has been entered, even though the previous audio task has not yet been completed\n")); } else if (!(sched->curRSPTask->state & OS_SC_YIELD)) { sched->curRSPTask->state |= OS_SC_YIELD; osSpTaskYield(); diff --git a/src/code/z_play.c b/src/code/z_play.c index 8cb5228d0..01f25afaf 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -864,8 +864,7 @@ void Play_UpdateTransition(PlayState* this) { this->envCtx.sandstormPrimA = 255; this->envCtx.sandstormEnvA = 255; - // "It's here!!!!!!!!!" - (void)"来た!!!!!!!!!!!!!!!!!!!!!"; + (void)T("来た!!!!!!!!!!!!!!!!!!!!!", "It's here!!!!!!!!!!!!!!!!!!!!!"); this->transitionMode = TRANS_MODE_SANDSTORM_END; } else { -- cgit v1.2.3