[src/netbsd-1-5]: src/sys/arch/vax Pullup approved by thorpej:

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2984d27495b
branches:  netbsd-1-5
changeset: 489276:c2984d27495b
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Aug 26 05:26:44 2000 +0000

description:
Pullup approved by thorpej:
  GENERIC 1.79, files.vax 1.76, intvec.s 1.56
>Reverse polarity on INSN_EMULATION to NO_INSN_EMULATION.  Thus by default
>all kernels will have instruction emulation.

diffstat:

 sys/arch/vax/conf/GENERIC   |  6 +++---
 sys/arch/vax/conf/files.vax |  8 ++++----
 sys/arch/vax/vax/intvec.s   |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (91 lines):

diff -r c43d5752c70d -r c2984d27495b sys/arch/vax/conf/GENERIC
--- a/sys/arch/vax/conf/GENERIC Sat Aug 26 02:18:14 2000 +0000
+++ b/sys/arch/vax/conf/GENERIC Sat Aug 26 05:26:44 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.71.2.4 2000/08/14 21:11:00 ragge Exp $
+#      $NetBSD: GENERIC,v 1.71.2.5 2000/08/26 05:26:44 matt Exp $
 #
 # GENERIC VAX configuration file; all supported devices.
 #
 
 include                "arch/vax/conf/std.vax"
 
-#ident                 "GENERIC-$Revision: 1.71.2.4 $"
+#ident                 "GENERIC-$Revision: 1.71.2.5 $"
 
 # Here are all different supported CPU types listed.
 options        "VAX8600"
@@ -91,7 +91,7 @@
 options        COMPAT_14
 #options       COMPAT_ULTRIX
 options        COMPAT_IBCS2    # DEC SVR.3 compatilibity
-options        INSN_EMULATE    # CPU lacks some hardware instructions.
+#options       NO_INSN_EMULATE # CPU does not lack some hardware instructions.
 
 options        LKM
 
diff -r c43d5752c70d -r c2984d27495b sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Sat Aug 26 02:18:14 2000 +0000
+++ b/sys/arch/vax/conf/files.vax       Sat Aug 26 05:26:44 2000 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.71.2.2 2000/08/14 21:11:01 ragge Exp $
+#       $NetBSD: files.vax,v 1.71.2.3 2000/08/26 05:26:44 matt Exp $
 #
 # new style config file for vax architecture
 #
@@ -22,7 +22,7 @@
        VAX410 VAX43 VAX46 VAX48 VAX49 VAX53
        VAX630 VAX640 VAX650 VAX660 VAX670 VAX680
 
-defopt opt_emulate.h   INSN_EMULATE
+defopt opt_emulate.h   NO_INSN_EMULATE
 
 # NBI on KA88
 device nmi { slot=-1 }
@@ -340,8 +340,8 @@
 file   arch/vax/vax/ka660.c            vax660
 file   arch/vax/vax/ka670.c            vax670
 file   arch/vax/vax/ka680.c            vax680
-file   arch/vax/vax/emulate.s          insn_emulate
-file   arch/vax/vax/unimpl_emul.s      insn_emulate
+file   arch/vax/vax/emulate.s          !no_insn_emulate
+file   arch/vax/vax/unimpl_emul.s      !no_insn_emulate
 file   arch/vax/vax/scb.c
 file   arch/vax/vax/conf.c
 file   arch/vax/vax/urem.s
diff -r c43d5752c70d -r c2984d27495b sys/arch/vax/vax/intvec.s
--- a/sys/arch/vax/vax/intvec.s Sat Aug 26 02:18:14 2000 +0000
+++ b/sys/arch/vax/vax/intvec.s Sat Aug 26 05:26:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intvec.s,v 1.49.2.2 2000/08/14 21:11:02 ragge Exp $   */
+/*     $NetBSD: intvec.s,v 1.49.2.3 2000/08/26 05:26:46 matt Exp $   */
 
 /*
  * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@@ -205,7 +205,7 @@
        .align  2
        .globl  privinflt
 privinflt:
-#ifdef INSN_EMULATE
+#ifndef NO_INSN_EMULATE
        jsb     unimemu # do not return if insn emulated
 #endif
        pushl $0
@@ -389,7 +389,7 @@
 sbifltmsg:
        .asciz  "SBI fault"
 
-#if INSN_EMULATE
+#ifndef NO_INSN_EMULATE
 /*
  * Table of emulated Microvax instructions supported by emulate.s.
  * Use noemulate to convert unimplemented ones to reserved instruction faults.
@@ -454,7 +454,7 @@
        .align  2
        .globl  emulate
 emulate:
-#if INSN_EMULATE
+#ifndef NO_INSN_EMULATE
        movl    r11,32(sp)              # save register r11 in unused operand
        movl    r10,36(sp)              # save register r10 in unused operand
        cvtbl   (sp),r10                # get opcode