diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86_64/asm/vectors.s | 8 | ||||
| -rw-r--r-- | src/arch/x86_64/interrupt/mod.rs | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/arch/x86_64/asm/vectors.s b/src/arch/x86_64/asm/vectors.s index 56aabf4..4267369 100644 --- a/src/arch/x86_64/asm/vectors.s +++ b/src/arch/x86_64/asm/vectors.s @@ -7,24 +7,22 @@ [EXTERN interrupt_gate] [SECTION .reserved_0.idt] -; ; Interrupt descriptor table with 256 entries ; TODO: use a interrupt stack instead of the current stack. - idt: ; reserve space for 256x idt entries (16 bytes each) resb 16 * 256 -[SECTION .reserved] +[SECTION .data32] idt_descr: - dw 256*8 - 1 ; 256 entries + dw 256*8 - 1 ; 256 entries dq idt ; NOTE: vectors MUST have fixed instruction length currently aligned to 16 ; bytes. DO NOT modify the wrapper, instead change the wrapper_body if needed. ; if the vector has to be modified into more than 16 bytes, ; arch::x86_64:: interrupt::_idt_init() must be modified accordingly -[SECTION .reserved.vectors] +[SECTION .data32.vectors] %macro vector 1 align 16 vector_%1: diff --git a/src/arch/x86_64/interrupt/mod.rs b/src/arch/x86_64/interrupt/mod.rs index 7e0cbb8..ae2847a 100644 --- a/src/arch/x86_64/interrupt/mod.rs +++ b/src/arch/x86_64/interrupt/mod.rs @@ -64,7 +64,7 @@ extern "C" fn interrupt_gate(_slot: u16) { // able to release the lock if the interrupt handler blocks on it. Try // spamming the keyboard with the following line of code uncommented: it // will deadlock! - // println!("interrupt received 0x{:x}", slot); + // println!("interrupt received 0x{:x}", _slot); interrupt_enable(); } |