notwa/homebrew
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

clean up strings with macros

Browse source
This commit is contained in:
Connor Olding 2018-08-18 19:15:30 +02:00
parent cf24dcecb2
commit 540001d9a7
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
kernel.asm
View file

@ -1,6 +1,31 @@
// not really a kernel, // not really a kernel,
// just handling some low-level stuff like interrupts. // just handling some low-level stuff like interrupts.
macro KDumpString(name) {
// does not include error/console-checking!
// note: this first instruction must be okay to be in a delay slot.
la a2, {name}
jal Drive64WriteDirect
lli a3, {name}X - {name}
}
macro KMaybeDumpString(str) {
lw t1, K_CONSOLE_AVAILABLE(k0)
beqz t1,+
KDumpString({str})
+
}
macro KString(name, str) {
// appends trailing newline and null-termination.
// must be shorter than 0x10000 after padding.
align(16)
{name}:
db {str}, 10, 0
align(16)
{name}X:
}
Start: Start:
mtc0 r0, CP0_Cause // clear cause mtc0 r0, CP0_Cause // clear cause
lui k0, K_BASE lui k0, K_BASE
@ -86,9 +111,7 @@ Drive64CheckConsole:
// NOTE: we only check at boot, so disconnecting the console // NOTE: we only check at boot, so disconnecting the console
// while running will cause a ton of lag (timeouts) until reset. // while running will cause a ton of lag (timeouts) until reset.
sw r0, K_CONSOLE_AVAILABLE(k0) sw r0, K_CONSOLE_AVAILABLE(k0)
la a2, KConsoleConfirmed KDumpString(KConsoleConfirmed)
jal Drive64WriteDirect
lli a3, KConsoleConfirmedX - KConsoleConfirmed
lli t0, 1 lli t0, 1
beqzl v0, Drive64Done beqzl v0, Drive64Done
sw t0, K_CONSOLE_AVAILABLE(k0) sw t0, K_CONSOLE_AVAILABLE(k0)
@ -268,17 +291,8 @@ if K_DEBUG {
ori sp, k0, K_STACK ori sp, k0, K_STACK
IHMain: // free to modify any GPR from here to IHExit IHMain: // free to modify any GPR from here to IHExit
macro KDumpString(str) { KMaybeDumpString(KNewline)
lw t1, K_CONSOLE_AVAILABLE(k0) KMaybeDumpString(KString0)
beqz t1,+
la a2, {str}
jal Drive64WriteDirect
lli a3, 0x20 // str.size
+
}
KDumpString(KNewline)
KDumpString(KString0)
ori a0, k0, K_DUMP + 0x80 * 0 ori a0, k0, K_DUMP + 0x80 * 0
lli a1, 0x80 lli a1, 0x80
@ -286,7 +300,7 @@ macro KDumpString(str) {
jal DumpAndWrite jal DumpAndWrite
lli a3, 0x80 * 4 lli a3, 0x80 * 4
KDumpString(KNewline) KMaybeDumpString(KNewline)
ori a0, k0, K_DUMP + 0x80 * 1 ori a0, k0, K_DUMP + 0x80 * 1
lli a1, 0x80 lli a1, 0x80
@ -294,7 +308,7 @@ macro KDumpString(str) {
jal DumpAndWrite jal DumpAndWrite
lli a3, 0x80 * 4 lli a3, 0x80 * 4
KDumpString(KNewline) KMaybeDumpString(KNewline)
// currently just 0x10 in size: LO and HI registers. // currently just 0x10 in size: LO and HI registers.
ori a0, k0, K_DUMP + 0x80 * 2 ori a0, k0, K_DUMP + 0x80 * 2
@ -303,8 +317,8 @@ macro KDumpString(str) {
jal DumpAndWrite jal DumpAndWrite
lli a3, 0x10 * 4 lli a3, 0x10 * 4
KDumpString(KNewline) KMaybeDumpString(KNewline)
KDumpString(KString1) KMaybeDumpString(KString1)
ori a0, k0, K_DUMP + 0x80 * 4 ori a0, k0, K_DUMP + 0x80 * 4
lli a1, 0x80 lli a1, 0x80
@ -383,24 +397,10 @@ ReturnFromInterrupt:
include "debug.asm" include "debug.asm"
align(8) KString(KString0, " ~~ Interrupt Handled ~~")
KString0: KString(KString1, " Interrupt States:")
db " ~~ Interrupt Handled ~~", 10, 0 KString(KNewline, 10)
KString(KConsoleConfirmed, "USB debug console detected")
align(8)
KString1:
db " Interrupt States:", 10, 0
align(8)
KNewline:
db 10, 0, 0, 0
dw 0, 0, 0
align(8)
KConsoleConfirmed:
db "USB debug console detected", 10, 0
align(16)
KConsoleConfirmedX:
align(4) align(4)
nops((K_BASE << 16) + 0x10000) nops((K_BASE << 16) + 0x10000)