diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-06-18 23:15:05 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-06-18 23:15:05 +0000 |
| commit | fb9d28cb6ce264263f6c1830b72128354226f2e9 (patch) | |
| tree | 1877cabaddb7646170a52b54f21d52db7392df2c | |
| parent | Use shl_out->fd instead of STDOUT_FILENO in the call the setupterm(). (diff) | |
| download | wireguard-openbsd-fb9d28cb6ce264263f6c1830b72128354226f2e9.tar.xz wireguard-openbsd-fb9d28cb6ce264263f6c1830b72128354226f2e9.zip | |
Remove the MAKE_FRAME macro to trace over ioapic interrupts in ddb.
It is no longer needed after the trap frame %ebp cleanup.
OK hshoexer@
| -rw-r--r-- | sys/arch/i386/i386/apicvec.s | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/vector.s | 11 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s index b86527f34c2..ed1ee2a52d0 100644 --- a/sys/arch/i386/i386/apicvec.s +++ b/sys/arch/i386/i386/apicvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvec.s,v 1.34 2018/04/11 15:44:08 bluhm Exp $ */ +/* $OpenBSD: apicvec.s,v 1.35 2018/06/18 23:15:05 bluhm Exp $ */ /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */ /*- @@ -43,7 +43,6 @@ IDTVEC(intripi) subl $8,%esp /* space for tf_{err,trapno} */ INTRENTRY(ipi) - MAKE_FRAME pushl CPL movl _C_LABEL(lapic_ppr),%eax movl %eax,CPL @@ -154,7 +153,6 @@ IDTVEC(intripi_reloadcr3) IDTVEC(intrltimer) subl $8,%esp /* space for tf_{err,trapno} */ INTRENTRY(ltimer) - MAKE_FRAME pushl CPL movl _C_LABEL(lapic_ppr),%eax movl %eax,CPL @@ -171,7 +169,6 @@ IDTVEC(intrltimer) KIDTVEC(intrsoftclock) subl $8,%esp /* space for tf_{err,trapno} */ INTRENTRY(intrsoftclock) - MAKE_FRAME pushl CPL movl $IPL_SOFTCLOCK,CPL andl $~(1<<SIR_CLOCK),CPUVAR(IPENDING) @@ -187,7 +184,6 @@ KIDTVEC(intrsoftclock) KIDTVEC(intrsoftnet) subl $8,%esp /* space for tf_{err,trapno} */ INTRENTRY(intrsoftnet) - MAKE_FRAME pushl CPL movl $IPL_SOFTNET,CPL andl $~(1<<SIR_NET),CPUVAR(IPENDING) @@ -204,7 +200,6 @@ KIDTVEC(intrsoftnet) KIDTVEC(intrsofttty) subl $8,%esp /* space for tf_{err,trapno} */ INTRENTRY(intrsofttty) - MAKE_FRAME pushl CPL movl $IPL_SOFTTTY,CPL andl $~(1<<SIR_TTY),CPUVAR(IPENDING) @@ -233,7 +228,6 @@ KIDTVEC(intrsofttty) IDTVEC(intr_##name##num) \ subl $8,%esp /* space for tf_{err,trapno} */ ;\ INTRENTRY(intr_##name##num) ;\ - MAKE_FRAME ;\ pushl CPL ;\ movl _C_LABEL(lapic_ppr),%eax ;\ orl $num,%eax ;\ diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index 9a7ffa6c5a4..bb9a1fb8f29 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.22 2018/04/11 15:44:08 bluhm Exp $ */ +/* $OpenBSD: vector.s,v 1.23 2018/06/18 23:15:05 bluhm Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -83,14 +83,12 @@ KIDTVEC(recurse_##name##num) ;\ subl $8,%esp /* space for tf_{err,trapno} */ ;\ movl %ebx,%esi ;\ INTRENTRY(recurse_##name##num) ;\ - MAKE_FRAME ;\ push %esi ;\ cli ;\ jmp 1f ;\ IDTVEC(intr_##name##num) ;\ subl $8,%esp /* space for tf_{err,trapno} */ ;\ INTRENTRY(intr_##name##num) ;\ - MAKE_FRAME ;\ mask(num) /* mask it in hardware */ ;\ early_ack(num) /* and allow other intrs */ ;\ incl _C_LABEL(uvmexp)+V_INTR /* statistical info */ ;\ @@ -161,13 +159,6 @@ KIDTVEC(hold_##name##num) ;\ #define STRAY_TEST(name,num) #endif /* DEBUG */ -#ifdef DDB -#define MAKE_FRAME \ - leal -8(%esp),%ebp -#else /* !DDB */ -#define MAKE_FRAME -#endif /* DDB */ - #define ICUADDR IO_ICU1 INTRSTUB(legacy,0, i8259_asm_ack1, voidop, i8259_asm_mask, i8259_asm_unmask, |