diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-03-24 06:52:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-24 10:52:10 -0300 |
| commit | 9ca02c79b531f39b2adc92581ea9c846d8f6936a (patch) | |
| tree | 901bb98ecf24c0fdf2cd6c5b782ee6892c19ee7f /src/boot | |
| parent | 9213dc7a5ef887866d19c369feba89bce35d4db0 (diff) | |
Misc fixes (#1800)
* disasm_fix
* dtor
* Fault_LogThreadContext
* rearrange microcode
* sGfxPrintFont size of 0x800
* Move (null) to stackcheck
* vimgr bss
* sfx
* Remove code_801D1E80
* z_en_hy_code
* Fix assembler messages with endlabels and dlabels
* xlitob data
* Move skin unused bss pad to rumble
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/fault.c | 4 | ||||
| -rw-r--r-- | src/boot/fault_drawer.c | 2 | ||||
| -rw-r--r-- | src/boot/libu64/stackcheck.c | 2 | ||||
| -rw-r--r-- | src/boot/rspboot.s | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/boot/fault.c b/src/boot/fault.c index 15a77f03b..7d167e41c 100644 --- a/src/boot/fault.c +++ b/src/boot/fault.c @@ -468,7 +468,7 @@ void Fault_PrintThreadContext(OSThread* thread) { } } -void osSyncPrintfThreadContext(OSThread* thread) { +void Fault_LogThreadContext(OSThread* thread) { __OSThreadContext* threadCtx; s16 causeStrIndex = _SHIFTR((u32)thread->context.cause, 2, 5); @@ -1035,7 +1035,7 @@ void Fault_ThreadEntry(void* arg) { do { // Thread context page Fault_PrintThreadContext(faultedThread); - osSyncPrintfThreadContext(faultedThread); + Fault_LogThreadContext(faultedThread); Fault_WaitForInput(); // Stack trace page diff --git a/src/boot/fault_drawer.c b/src/boot/fault_drawer.c index fa2dd3d4d..1465c2c7e 100644 --- a/src/boot/fault_drawer.c +++ b/src/boot/fault_drawer.c @@ -266,8 +266,6 @@ void* FaultDrawer_FormatStringFunc(void* arg, const char* str, size_t count) { return arg; } -const char D_80099080[] = "(null)"; - s32 FaultDrawer_VPrintf(const char* fmt, va_list ap) { return _Printf(FaultDrawer_FormatStringFunc, sFaultDrawerInstance, fmt, ap); } diff --git a/src/boot/libu64/stackcheck.c b/src/boot/libu64/stackcheck.c index de321bddd..905495221 100644 --- a/src/boot/libu64/stackcheck.c +++ b/src/boot/libu64/stackcheck.c @@ -94,6 +94,8 @@ StackStatus StackCheck_GetState(StackEntry* entry) { status = STACK_STATUS_OK; } + (void)"(null)"; + return status; } diff --git a/src/boot/rspboot.s b/src/boot/rspboot.s index bc1d5d4f5..96f204b65 100644 --- a/src/boot/rspboot.s +++ b/src/boot/rspboot.s @@ -1,7 +1,10 @@ .include "macro.inc" -.section .data +.section .text -dlabel rspbootTextStart +.balign 16 + +glabel rspbootTextStart .incbin "incbin/rspbootText" +endlabel rspbootTextStart dlabel rspbootTextEnd |