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

ignore IP7 (timer interrupt?) for now

Browse source
This commit is contained in:
Connor Olding 2018-09-28 10:43:20 +02:00
parent 8f113587dd
commit bcc219de11
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inc/n64_cp0.inc
View file

@ -44,6 +44,7 @@ constant CP0_STATUS_IM5($2000) // Interrupt Mask 5 (External)
constant CP0_STATUS_IM6($4000) // Interrupt Mask 6 (External) constant CP0_STATUS_IM6($4000) // Interrupt Mask 6 (External)
constant CP0_STATUS_IM7($8000) // Interrupt Mask 7 (External) constant CP0_STATUS_IM7($8000) // Interrupt Mask 7 (External)
constant CP0_STATUS_IM_ALL($FF00) // all interrupt masks constant CP0_STATUS_IM_ALL($FF00) // all interrupt masks
constant CP0_STATUS_IM_WANTED($7F00) // FIXME: just the interrupts we can deal with
// note that these are all masks. // note that these are all masks.
constant CP0_CAUSE_CODE($007C) // actually supposed to be called ExcCode constant CP0_CAUSE_CODE($007C) // actually supposed to be called ExcCode

2
inc/n64_util.inc
View file

@ -20,7 +20,7 @@ macro SetIntMask() {
sw t0, MI_INTR_MASK(a0) sw t0, MI_INTR_MASK(a0)
// careful not to touch unrelated flags here // careful not to touch unrelated flags here
mfc0 t1, CP0_Status mfc0 t1, CP0_Status
lli t0, CP0_STATUS_IM_ALL lli t0, CP0_STATUS_IM_WANTED
or t1, t0 or t1, t0
mtc0 t1, CP0_Status mtc0 t1, CP0_Status
} }

2
kernel.asm
View file

@ -40,7 +40,7 @@ Start:
// enable CPU interrupts. // enable CPU interrupts.
mfc0 t1, CP0_Status mfc0 t1, CP0_Status
ori t1, CP0_STATUS_IM_ALL | CP0_STATUS_IE ori t1, CP0_STATUS_IM_WANTED | CP0_STATUS_IE
mtc0 t1, CP0_Status mtc0 t1, CP0_Status
// enable even more interrupts. // enable even more interrupts.