diff options
author | jake <jake@FreeBSD.org> | 2000-12-01 02:09:45 +0000 |
---|---|---|
committer | jake <jake@FreeBSD.org> | 2000-12-01 02:09:45 +0000 |
commit | 198c36b485e44b0ed782f2fbc1109622dec8a13c (patch) | |
tree | bf900fac75d504c9a33119300798441fd1278c70 /sys/i386/isa | |
parent | 4b5687e270a11b427d9638ec4ec24e6b00c42807 (diff) | |
download | FreeBSD-src-198c36b485e44b0ed782f2fbc1109622dec8a13c.zip FreeBSD-src-198c36b485e44b0ed782f2fbc1109622dec8a13c.tar.gz |
Change doreti to take a trapframe instead of an intrframe.
Remove associated pushes of dummy units to convert frame.
Reviewed by: jhb
Diffstat (limited to 'sys/i386/isa')
-rw-r--r-- | sys/i386/isa/apic_vector.s | 6 | ||||
-rw-r--r-- | sys/i386/isa/atpic_vector.s | 4 | ||||
-rw-r--r-- | sys/i386/isa/icu_vector.s | 4 | ||||
-rw-r--r-- | sys/i386/isa/ipl.s | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s index 1f80224..adf4c36 100644 --- a/sys/i386/isa/apic_vector.s +++ b/sys/i386/isa/apic_vector.s @@ -59,7 +59,7 @@ IDTVEC(vec_name) ; \ lock ; \ incl (%eax) ; \ MEXITCOUNT ; \ - jmp doreti_next + jmp _doreti #define IOAPICADDR(irq_num) CNAME(int_to_apicintpin) + 16 * (irq_num) + 8 #define REDIRIDX(irq_num) CNAME(int_to_apicintpin) + 16 * (irq_num) + 12 @@ -231,7 +231,7 @@ __CONCAT(Xresume,irq_num): ; \ APIC_ITRACE(apic_itrace_leave, irq_num, APIC_ITRACE_LEAVE) ; \ ; \ MEXITCOUNT ; \ - jmp doreti_next + jmp _doreti /* * Handle "spurious INTerrupts". @@ -386,7 +386,7 @@ _Xcpuast: lock incl CNAME(cpuast_cnt) MEXITCOUNT - jmp doreti_next + jmp _doreti 1: /* We are already in the process of delivering an ast for this CPU */ POP_FRAME diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s index 7644c03..51b9493 100644 --- a/sys/i386/isa/atpic_vector.s +++ b/sys/i386/isa/atpic_vector.s @@ -69,7 +69,7 @@ IDTVEC(vec_name) ; \ movl _intr_countp + (irq_num) * 4,%eax ; \ incl (%eax) ; \ MEXITCOUNT ; \ - jmp doreti_next + jmp _doreti #if 0 ; \ @@ -141,7 +141,7 @@ __CONCAT(Xresume,irq_num): ; \ MEXITCOUNT ; \ /* We could usually avoid the following jmp by inlining some of */ \ /* _doreti, but it's probably better to use less cache. */ \ - jmp doreti_next /* and catch up inside doreti */ + jmp _doreti /* and catch up inside doreti */ MCOUNT_LABEL(bintr) FAST_INTR(0,fastintr0, ENABLE_ICU1) diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s index 7644c03..51b9493 100644 --- a/sys/i386/isa/icu_vector.s +++ b/sys/i386/isa/icu_vector.s @@ -69,7 +69,7 @@ IDTVEC(vec_name) ; \ movl _intr_countp + (irq_num) * 4,%eax ; \ incl (%eax) ; \ MEXITCOUNT ; \ - jmp doreti_next + jmp _doreti #if 0 ; \ @@ -141,7 +141,7 @@ __CONCAT(Xresume,irq_num): ; \ MEXITCOUNT ; \ /* We could usually avoid the following jmp by inlining some of */ \ /* _doreti, but it's probably better to use less cache. */ \ - jmp doreti_next /* and catch up inside doreti */ + jmp _doreti /* and catch up inside doreti */ MCOUNT_LABEL(bintr) FAST_INTR(0,fastintr0, ENABLE_ICU1) diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s index 8b2380b..f5d4926 100644 --- a/sys/i386/isa/ipl.s +++ b/sys/i386/isa/ipl.s @@ -90,13 +90,14 @@ _netisrs: .text /* + * void doreti(struct trapframe) + * * Handle return from interrupts, traps and syscalls. */ SUPERALIGN_TEXT .type _doreti,@function _doreti: FAKE_MCOUNT(_bintr) /* init "from" _bintr -> _doreti */ - addl $4,%esp /* discard unit number */ doreti_next: decb _intr_nesting_level |