rework the way effectual NOPs are enabled/disabled to make they delay

things in the default case.
This commit is contained in:
cgd 1993-07-18 13:08:41 +00:00
parent 9b3a51f2d8
commit 8fa2ba491b
4 changed files with 11 additions and 9 deletions

View File

@ -1,7 +1,7 @@
#
# BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing
#
# $Id: BOAT_ANCHOR,v 1.19 1993/07/11 10:29:55 cgd Exp $
# $Id: BOAT_ANCHOR,v 1.20 1993/07/18 13:09:19 cgd Exp $
#
machine "i386"
cpu "I386_CPU"
@ -13,6 +13,7 @@ options "COMPAT_43"
options "TCP_COMPAT_42"
options "i387"
options XSERVER,UCONSOLE
options "DUMMY_NOPS"
options KERNFS,FDESC,PCFS
options KTRACE
options FIFO

View File

@ -1,7 +1,7 @@
#
# PAIN -- kernel for another of cgd's 486/50 EISA boxes...
#
# $Id: PAIN,v 1.8 1993/07/11 10:29:56 cgd Exp $
# $Id: PAIN,v 1.9 1993/07/18 13:09:26 cgd Exp $
#
machine "i386"
cpu "I486_CPU"
@ -12,6 +12,7 @@ options INET,NFSSERVER,NFSCLIENT,MFS
options "COMPAT_43"
options "TCP_COMPAT_42"
options UCONSOLE, XSERVER
options "DUMMY_NOPS"
options FDESC,KERNFS
options KTRACE
options SCSI

View File

@ -1,7 +1,7 @@
#
# SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes...
#
# $Id: SUN_LAMP,v 1.22 1993/07/11 10:29:57 cgd Exp $
# $Id: SUN_LAMP,v 1.23 1993/07/18 13:09:31 cgd Exp $
#
machine "i386"
cpu "I486_CPU"
@ -12,7 +12,7 @@ options INET,NFSSERVER,NFSCLIENT,MFS,ISOFS
options "COMPAT_43"
options "TCP_COMPAT_42"
options UCONSOLE, XSERVER
#options "WD8013"
options "DUMMY_NOPS"
options FDESC,KERNFS
options KTRACE
options SCSI

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.23 1993/07/18 08:22:59 andrew Exp $
* $Id: locore.s,v 1.24 1993/07/18 13:08:41 cgd Exp $
*/
@ -78,12 +78,12 @@
/* NB: NOP now preserves registers so NOPs can be inserted anywhere */
/* XXX: NOP and FASTER_NOP are misleadingly named */
#ifdef BROKEN_HARDWARE_AND_OR_SOFTWARE /* XXX - rarely necessary */
#define FASTER_NOP pushl %eax ; inb $0x84,%al ; popl %eax
#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax
#else
#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
/*