1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00

Fix some retail boot data (#1668)

* Fix is_debug.c bss

* Fix stackcheck.c rodata

* Poke jenkins

* Don't introduce new variable
This commit is contained in:
cadmic 2024-02-26 22:53:10 -08:00 committed by GitHub
parent 7f64ace8f0
commit c3faefc061
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions

View File

@ -1,11 +1,11 @@
#include "global.h" #include "global.h"
OSPiHandle* sISVHandle; // official name : is_Handle
#define gISVDbgPrnAdrs ((ISVDbg*)0xB3FF0000) #define gISVDbgPrnAdrs ((ISVDbg*)0xB3FF0000)
#define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0)))
#if OOT_DEBUG #if OOT_DEBUG
OSPiHandle* sISVHandle; // official name : is_Handle
void isPrintfInit(void) { void isPrintfInit(void) {
sISVHandle = osCartRomInit(); sISVHandle = osCartRomInit();
osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, 0); osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, 0);

View File

@ -98,6 +98,11 @@ u32 StackCheck_GetState(StackEntry* entry) {
ret = STACK_STATUS_OK; ret = STACK_STATUS_OK;
} }
#if !OOT_DEBUG
// This string is still in .rodata for retail builds
(void)"(null)";
#endif
PRINTF("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free, PRINTF("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free,
entry->name != NULL ? entry->name : "(null)"); entry->name != NULL ? entry->name : "(null)");
PRINTF(VT_RST); PRINTF(VT_RST);