diff options
| author | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-01 18:20:45 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-01 18:20:45 +0100 |
| commit | c7bcf94b1e70721d0f7bfb5ca383d996559c2559 (patch) | |
| tree | 845f9e6c2193f444c80b1506438e9280a52585e5 /kernel/l0/interrupt.s | |
| parent | 8f936e07ecb5af4053ad7d457a32e69695cb357e (diff) | |
| download | kogata-c7bcf94b1e70721d0f7bfb5ca383d996559c2559.tar.gz kogata-c7bcf94b1e70721d0f7bfb5ca383d996559c2559.zip | |
Small adjustments:
- add missing vim modelines
- idt_set_ex_handler, idt_set_irq_handler
- inline inb,inw,outb,outw
- add defines for exceptions and irqs
Diffstat (limited to 'kernel/l0/interrupt.s')
| -rw-r--r-- | kernel/l0/interrupt.s | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/kernel/l0/interrupt.s b/kernel/l0/interrupt.s index ddd1e76..d40fff0 100644 --- a/kernel/l0/interrupt.s +++ b/kernel/l0/interrupt.s @@ -33,25 +33,25 @@ iret %endmacro -COMMONSTUB isr +COMMONSTUB ex COMMONSTUB irq COMMONSTUB syscall ;************************************************************************************ -%macro ISR_NOERRCODE 1 ; define a macro, taking one parameter +%macro EX_NOERRCODE 1 ; define a macro, taking one parameter [GLOBAL isr%1] ; %1 accesses the first parameter. isr%1: push byte 0 push byte %1 - jmp isr_common_stub + jmp ex_common_stub %endmacro -%macro ISR_ERRCODE 1 +%macro EX_ERRCODE 1 [GLOBAL isr%1] isr%1: push byte %1 - jmp isr_common_stub + jmp ex_common_stub %endmacro %macro IRQ 2 @@ -71,38 +71,38 @@ COMMONSTUB syscall jmp syscall_common_stub %endmacro -ISR_NOERRCODE 0 -ISR_NOERRCODE 1 -ISR_NOERRCODE 2 -ISR_NOERRCODE 3 -ISR_NOERRCODE 4 -ISR_NOERRCODE 5 -ISR_NOERRCODE 6 -ISR_NOERRCODE 7 -ISR_ERRCODE 8 -ISR_NOERRCODE 9 -ISR_ERRCODE 10 -ISR_ERRCODE 11 -ISR_ERRCODE 12 -ISR_ERRCODE 13 -ISR_ERRCODE 14 -ISR_NOERRCODE 15 -ISR_NOERRCODE 16 -ISR_NOERRCODE 17 -ISR_NOERRCODE 18 -ISR_NOERRCODE 19 -ISR_NOERRCODE 20 -ISR_NOERRCODE 21 -ISR_NOERRCODE 22 -ISR_NOERRCODE 23 -ISR_NOERRCODE 24 -ISR_NOERRCODE 25 -ISR_NOERRCODE 26 -ISR_NOERRCODE 27 -ISR_NOERRCODE 28 -ISR_NOERRCODE 29 -ISR_NOERRCODE 30 -ISR_NOERRCODE 31 +EX_NOERRCODE 0 +EX_NOERRCODE 1 +EX_NOERRCODE 2 +EX_NOERRCODE 3 +EX_NOERRCODE 4 +EX_NOERRCODE 5 +EX_NOERRCODE 6 +EX_NOERRCODE 7 +EX_ERRCODE 8 +EX_NOERRCODE 9 +EX_ERRCODE 10 +EX_ERRCODE 11 +EX_ERRCODE 12 +EX_ERRCODE 13 +EX_ERRCODE 14 +EX_NOERRCODE 15 +EX_NOERRCODE 16 +EX_NOERRCODE 17 +EX_NOERRCODE 18 +EX_NOERRCODE 19 +EX_NOERRCODE 20 +EX_NOERRCODE 21 +EX_NOERRCODE 22 +EX_NOERRCODE 23 +EX_NOERRCODE 24 +EX_NOERRCODE 25 +EX_NOERRCODE 26 +EX_NOERRCODE 27 +EX_NOERRCODE 28 +EX_NOERRCODE 29 +EX_NOERRCODE 30 +EX_NOERRCODE 31 IRQ 0, 32 IRQ 1, 33 |