From 048cd610adea8aad6b12e3abd19404df0f2fcd10 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 31 Mar 1996 04:17:25 +0000 Subject: [PATCH] Finished removing NOP macros. --- sys/amd64/include/asmacros.h | 11 +---------- sys/i386/include/asmacros.h | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h index 8776ccfe763d..98633543ded3 100644 --- a/sys/amd64/include/asmacros.h +++ b/sys/amd64/include/asmacros.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asmacros.h,v 1.5 1994/09/08 12:25:18 bde Exp $ + * $Id: asmacros.h,v 1.6 1995/12/29 15:28:53 bde Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -114,15 +114,6 @@ #define MEXITCOUNT #endif /* GPROF */ -/* XXX NOP and FASTER_NOP are misleadingly named */ -#ifdef DUMMY_NOPS /* this will break some older machines */ -#define FASTER_NOP -#define NOP -#else -#define FASTER_NOP pushl %eax ; inb $0x84,%al ; popl %eax -#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax -#endif - #else /* !KERNEL */ #include "/usr/src/lib/libc/i386/DEFS.h" /* XXX blech */ diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index 8776ccfe763d..98633543ded3 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asmacros.h,v 1.5 1994/09/08 12:25:18 bde Exp $ + * $Id: asmacros.h,v 1.6 1995/12/29 15:28:53 bde Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -114,15 +114,6 @@ #define MEXITCOUNT #endif /* GPROF */ -/* XXX NOP and FASTER_NOP are misleadingly named */ -#ifdef DUMMY_NOPS /* this will break some older machines */ -#define FASTER_NOP -#define NOP -#else -#define FASTER_NOP pushl %eax ; inb $0x84,%al ; popl %eax -#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax -#endif - #else /* !KERNEL */ #include "/usr/src/lib/libc/i386/DEFS.h" /* XXX blech */