alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 08:41:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

change to array for efficient lookup table

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-24 19:50:33 +01:00
parent a959e8e06b
commit d607f892e3
1 changed files with 21 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
agb/src/interrupt.rs
View file

@ -75,57 +75,33 @@ impl InterruptRoot {
} }
} }
static mut INTERRUPT_TABLE: Interrupts = Interrupts::new(); static mut INTERRUPT_TABLE: [InterruptRoot; 14] = [
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
InterruptRoot::new(),
];
#[no_mangle] #[no_mangle]
pub extern "C" fn __RUST_INTERRUPT_HANDLER(interrupt: u16) { pub extern "C" fn __RUST_INTERRUPT_HANDLER(interrupt: u16) {
for i in 0..=13_u8 { for i in 0..=13_u16 {
if (1 << (i as u16)) & interrupt != 0 { if (1 << i) & interrupt != 0 {
let interrupt = unsafe { core::mem::transmute(i) }; let root = unsafe { &INTERRUPT_TABLE[i as usize] };
let root = interrupt_to_root(interrupt);
root.trigger_interrupts(); root.trigger_interrupts();
} }
} }
} }
struct Interrupts {
vblank: InterruptRoot,
hblank: InterruptRoot,
vcounter: InterruptRoot,
timer0: InterruptRoot,
timer1: InterruptRoot,
timer2: InterruptRoot,
timer3: InterruptRoot,
serial: InterruptRoot,
dma0: InterruptRoot,
dma1: InterruptRoot,
dma2: InterruptRoot,
dma3: InterruptRoot,
keypad: InterruptRoot,
gamepak: InterruptRoot,
}
impl Interrupts {
const fn new() -> Self {
Interrupts {
vblank: InterruptRoot::new(),
hblank: InterruptRoot::new(),
vcounter: InterruptRoot::new(),
timer0: InterruptRoot::new(),
timer1: InterruptRoot::new(),
timer2: InterruptRoot::new(),
timer3: InterruptRoot::new(),
serial: InterruptRoot::new(),
dma0: InterruptRoot::new(),
dma1: InterruptRoot::new(),
dma2: InterruptRoot::new(),
dma3: InterruptRoot::new(),
keypad: InterruptRoot::new(),
gamepak: InterruptRoot::new(),
}
}
}
pub struct InterruptClosureBounded<'a> { pub struct InterruptClosureBounded<'a> {
c: InterruptClosure, c: InterruptClosure,
_phantom: PhantomData<&'a ()>, _phantom: PhantomData<&'a ()>,
@ -170,22 +146,7 @@ impl Drop for InterruptClosure {
} }
fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot {
match interrupt { unsafe { &INTERRUPT_TABLE[interrupt as usize] }
Interrupt::VBlank => unsafe { &INTERRUPT_TABLE.vblank },
Interrupt::HBlank => unsafe { &INTERRUPT_TABLE.hblank },
Interrupt::VCounter => unsafe { &INTERRUPT_TABLE.vcounter },
Interrupt::Timer0 => unsafe { &INTERRUPT_TABLE.timer0 },
Interrupt::Timer1 => unsafe { &INTERRUPT_TABLE.timer1 },
Interrupt::Timer2 => unsafe { &INTERRUPT_TABLE.timer2 },
Interrupt::Timer3 => unsafe { &INTERRUPT_TABLE.timer3 },
Interrupt::Serial => unsafe { &INTERRUPT_TABLE.serial },
Interrupt::Dma0 => unsafe { &INTERRUPT_TABLE.dma0 },
Interrupt::Dma1 => unsafe { &INTERRUPT_TABLE.dma1 },
Interrupt::Dma2 => unsafe { &INTERRUPT_TABLE.dma2 },
Interrupt::Dma3 => unsafe { &INTERRUPT_TABLE.dma3 },
Interrupt::Keypad => unsafe { &INTERRUPT_TABLE.keypad },
Interrupt::Gamepak => unsafe { &INTERRUPT_TABLE.gamepak },
}
} }
fn get_interrupt_handle_root<'a>( fn get_interrupt_handle_root<'a>(
@ -255,7 +216,7 @@ fn test_vblank_interrupt_handler(gba: &mut crate::Gba) {
} }
assert_eq!( assert_eq!(
unsafe { INTERRUPT_TABLE.vblank.next.get() }, interrupt_to_root(Interrupt::VBlank).next.get(),
core::ptr::null(), core::ptr::null(),
"expected the interrupt table for vblank to be empty" "expected the interrupt table for vblank to be empty"
); );