change name of interrupt handler

it is no longer simple
This commit is contained in:
Corwin Kuiper 2021-06-27 02:46:32 +01:00
parent 007d4d3ff8
commit 7b05da4783
3 changed files with 5 additions and 5 deletions

View file

@ -1,8 +1,8 @@
fn main() { fn main() {
println!("cargo:rerun-if-changed=crt0.s"); println!("cargo:rerun-if-changed=crt0.s");
println!("cargo:rerun-if-changed=gba_mb.ld"); println!("cargo:rerun-if-changed=gba_mb.ld");
println!("cargo:rerun-if-changed=interrupt_simple.s");
println!("cargo:rerun-if-changed=src/sound/mixer/mixer.s"); println!("cargo:rerun-if-changed=src/sound/mixer/mixer.s");
println!("cargo:rerun-if-changed=interrupt_handler.s");
println!("cargo:rerun-if-changed=gfx/test_logo.png"); println!("cargo:rerun-if-changed=gfx/test_logo.png");
let out_file_name = "crt0.o"; let out_file_name = "crt0.o";

View file

@ -18,7 +18,7 @@ b .Initialise_mb
swi 0x00250000 swi 0x00250000
@ Set interrupt handler @ Set interrupt handler
ldr r0, =InterruptHandlerSimple ldr r0, =InterruptHandler
ldr r1, =0x03007FFC ldr r1, =0x03007FFC
str r0, [r1] str r0, [r1]
@ -62,5 +62,5 @@ b .Initialise_mb
b 1b b 1b
.pool .pool
.include "interrupt_simple.s"
.include "src/sound/mixer/mixer.s" .include "src/sound/mixer/mixer.s"
.include "interrupt_handler.s"

View file

@ -1,9 +1,9 @@
@ An interrupt handler that simply acknowledges all interrupts @ An interrupt handler that simply acknowledges all interrupts
.arm .arm
.global InterruptHandlerSimple .global InterruptHandler
.section .iwram, "ax" .section .iwram, "ax"
.align .align
InterruptHandlerSimple: InterruptHandler:
ldr r2, =0x04000200 @ interrupt enable register location ldr r2, =0x04000200 @ interrupt enable register location
mov r1, #0 mov r1, #0