From 20ef589c863a5318deea9fcbefdfa88744a4ea4e Mon Sep 17 00:00:00 2001 From: bde Date: Sun, 31 Mar 1996 03:31:29 +0000 Subject: [PATCH] Killed religous FASTER_NOP again. --- sys/amd64/isa/vector.S | 6 +----- sys/amd64/isa/vector.s | 6 +----- sys/i386/isa/vector.s | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S index 009668a8dd81..6410434892f7 100644 --- a/sys/amd64/isa/vector.S +++ b/sys/amd64/isa/vector.S @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.16 1995/12/27 11:22:05 markm Exp $ + * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ */ #include @@ -19,7 +19,6 @@ movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ OUTB_ICU1 /* ... to clear in service bit */ #define OUTB_ICU1 \ - FASTER_NOP ; \ outb %al,$IO_ICU1 #endif @@ -31,7 +30,6 @@ #else #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ - FASTER_NOP ; \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ #endif @@ -168,7 +166,6 @@ IDTVEC(intr/**/irq_num) ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ enable_icus ; \ incl _cnt+V_INTR ; /* tally interrupts */ \ @@ -191,7 +188,6 @@ Xresume/**/irq_num: ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ andb $~IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ sti ; /* XXX _doreti repeats the cli/sti */ \ MEXITCOUNT ; \ diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 009668a8dd81..6410434892f7 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.16 1995/12/27 11:22:05 markm Exp $ + * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ */ #include @@ -19,7 +19,6 @@ movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ OUTB_ICU1 /* ... to clear in service bit */ #define OUTB_ICU1 \ - FASTER_NOP ; \ outb %al,$IO_ICU1 #endif @@ -31,7 +30,6 @@ #else #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ - FASTER_NOP ; \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ #endif @@ -168,7 +166,6 @@ IDTVEC(intr/**/irq_num) ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ enable_icus ; \ incl _cnt+V_INTR ; /* tally interrupts */ \ @@ -191,7 +188,6 @@ Xresume/**/irq_num: ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ andb $~IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ sti ; /* XXX _doreti repeats the cli/sti */ \ MEXITCOUNT ; \ diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 009668a8dd81..6410434892f7 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $Id: vector.s,v 1.16 1995/12/27 11:22:05 markm Exp $ + * $Id: vector.s,v 1.17 1996/01/19 23:38:07 phk Exp $ */ #include @@ -19,7 +19,6 @@ movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ OUTB_ICU1 /* ... to clear in service bit */ #define OUTB_ICU1 \ - FASTER_NOP ; \ outb %al,$IO_ICU1 #endif @@ -31,7 +30,6 @@ #else #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ - FASTER_NOP ; \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ #endif @@ -168,7 +166,6 @@ IDTVEC(intr/**/irq_num) ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ orb $IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ enable_icus ; \ incl _cnt+V_INTR ; /* tally interrupts */ \ @@ -191,7 +188,6 @@ Xresume/**/irq_num: ; \ movb _imen + IRQ_BYTE(irq_num),%al ; \ andb $~IRQ_BIT(irq_num),%al ; \ movb %al,_imen + IRQ_BYTE(irq_num) ; \ - FASTER_NOP ; \ outb %al,$icu+1 ; \ sti ; /* XXX _doreti repeats the cli/sti */ \ MEXITCOUNT ; \