diff options
Diffstat (limited to 'sys/arch/i386/i386/vector.s')
| -rw-r--r-- | sys/arch/i386/i386/vector.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index bf38ed5c78f..7af014091c2 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.12 2008/04/26 14:33:27 kettenis Exp $ */ +/* $OpenBSD: vector.s,v 1.13 2009/07/10 13:51:47 jsg Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -86,11 +86,11 @@ * On exit, we jump to Xdoreti(), to process soft interrupts and ASTs. */ #define INTRSTUB(name, num, early_ack, late_ack, mask, unmask, level_mask) \ -IDTVEC(resume_/**/name/**/num) ;\ +IDTVEC(resume_##name##num) ;\ push %ebx ;\ cli ;\ jmp 1f ;\ -IDTVEC(recurse_/**/name/**/num) ;\ +IDTVEC(recurse_##name##num) ;\ pushfl ;\ pushl %cs ;\ pushl %esi ;\ @@ -102,7 +102,7 @@ IDTVEC(recurse_/**/name/**/num) ;\ push %esi ;\ cli ;\ jmp 1f ;\ -_C_LABEL(Xintr_/**/name/**/num): ;\ +_C_LABEL(Xintr_##name##num): ;\ pushl $0 /* dummy error code */ ;\ pushl $T_ASTFLT /* trap # for doing ASTs */ ;\ INTRENTRY ;\ @@ -113,7 +113,7 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ movl _C_LABEL(iminlevel) + (num) * 4, %eax ;\ movl CPL,%ebx ;\ cmpl %eax,%ebx ;\ - jae _C_LABEL(Xhold_/**/name/**/num)/* currently masked; hold it */;\ + jae _C_LABEL(Xhold_##name##num)/* currently masked; hold it */;\ pushl %ebx /* cpl to restore on exit */ ;\ 1: ;\ movl _C_LABEL(imaxlevel) + (num) * 4,%eax ;\ @@ -121,7 +121,7 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ sti /* safe to take intrs now */ ;\ movl _C_LABEL(intrhand) + (num) * 4,%ebx /* head of chain */ ;\ testl %ebx,%ebx ;\ - jz _C_LABEL(Xstray_/**/name/**/num) /* no handlers; we're stray */ ;\ + jz _C_LABEL(Xstray_##name##num) /* no handlers; we're stray */ ;\ STRAY_INITIALIZE /* nobody claimed it yet */ ;\ LOCK_KERNEL(IF_PPL(%esp)) ;\ 7: movl IH_ARG(%ebx),%eax /* get handler arg */ ;\ @@ -144,12 +144,12 @@ _C_LABEL(Xintr_/**/name/**/num): ;\ 6: unmask(num) /* unmask it in hardware */ ;\ late_ack(num) ;\ jmp _C_LABEL(Xdoreti) /* lower spl and do ASTs */ ;\ -IDTVEC(stray_/**/name/**/num) ;\ +IDTVEC(stray_##name##num) ;\ pushl $num ;\ call _C_LABEL(isa_strayintr) ;\ addl $4,%esp ;\ jmp 6b ;\ -IDTVEC(hold_/**/name/**/num) ;\ +IDTVEC(hold_##name##num) ;\ orb $IRQ_BIT(num),CPUVAR(IPENDING) + IRQ_BYTE(num) ;\ INTRFASTEXIT @@ -160,7 +160,7 @@ IDTVEC(hold_/**/name/**/num) ;\ orl %eax,%esi #define STRAY_TEST(name,num) \ testl %esi,%esi ;\ - jz _C_LABEL(Xstray_/**/name/**/num) + jz _C_LABEL(Xstray_##name##num) #else /* !DEBUG */ #define STRAY_INITIALIZE #define STRAY_INTEGRATE |