[src/netbsd-1-5]: src/sys/arch/vax files.vax: Pullup revision 1.73

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

details:   https://anonhg.NetBSD.org/src/rev/ad4ba190c592
branches:  netbsd-1-5
changeset: 488781:ad4ba190c592
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jul 27 16:53:16 2000 +0000

description:
files.vax: Pullup revision 1.73
intvec.s: Pullup revision 1.53
  Enable support for instruction emulate on almost all variants

diffstat:

 sys/arch/vax/conf/files.vax |  17 +++++++++++------
 sys/arch/vax/vax/intvec.s   |  10 +++++++---
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r 05eba78e8d9e -r ad4ba190c592 sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Thu Jul 27 16:48:26 2000 +0000
+++ b/sys/arch/vax/conf/files.vax       Thu Jul 27 16:53:16 2000 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.71 2000/06/19 04:22:16 matt Exp $
+#       $NetBSD: files.vax,v 1.71.2.1 2000/07/27 16:53:16 matt Exp $
 #
 # new style config file for vax architecture
 #
@@ -16,9 +16,11 @@
 device mem
 device mba { drive = -1 }
 
-defopt opt_cputype.h   VAX780 VAX750 VAX730 VAX8200 VAX8800 VAX8600
-       VAX6200 VAX6400 VAX6500 VAX6600 VAX410 VAX43 VAX46 VAX48
-       VAX49 VAX53 VAX630 VAX650 VAX660 VAX670 VAX680
+defopt opt_cputype.h   VAX780 VAX750 VAX730
+        VAX8200 VAX8800 VAX8600
+       VAX6200 VAX6300 VAX6400 VAX6500 VAX6600
+       VAX410 VAX43 VAX46 VAX48 VAX49 VAX53
+       VAX630 VAX640 VAX650 VAX660 VAX670 VAX680
 
 # NBI on KA88
 device nmi { slot=-1 }
@@ -325,18 +327,21 @@
 file   arch/vax/vax/crx.c              vax8200
 file   arch/vax/vax/ka88.c             vax8800
 file   arch/vax/vax/ka6400.c           vax6400
-file   arch/vax/vax/ka630.c            vax630
 file   arch/vax/vax/ka410.c            vax410
 file   arch/vax/vax/ka43.c             vax43
 file   arch/vax/vax/ka46.c             vax46
 file   arch/vax/vax/ka48.c             vax48
 file   arch/vax/vax/ka49.c             vax49
 file   arch/vax/vax/ka53.c             vax53
-file   arch/vax/vax/emulate.s          vax630 | vax650 | vax410
+file   arch/vax/vax/ka630.c            vax630
 file   arch/vax/vax/ka650.c            vax650
 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          vax630|vax640|vax650|vax660|vax670|
+                                       vax680|
+                                       vax410|vax43|vax46|vax48|vax49|vax53|
+                                       vax6200|vax6300|vax6400|vax6500|vax6600
 file   arch/vax/vax/scb.c
 file   arch/vax/vax/conf.c
 file   arch/vax/vax/urem.s
diff -r 05eba78e8d9e -r ad4ba190c592 sys/arch/vax/vax/intvec.s
--- a/sys/arch/vax/vax/intvec.s Thu Jul 27 16:48:26 2000 +0000
+++ b/sys/arch/vax/vax/intvec.s Thu Jul 27 16:53:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intvec.s,v 1.49 2000/06/12 11:13:14 ragge Exp $   */
+/*     $NetBSD: intvec.s,v 1.49.2.1 2000/07/27 16:53:18 matt Exp $   */
 
 /*
  * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@@ -379,7 +379,9 @@
 sbifltmsg:
        .asciz  "SBI fault"
 
-#if VAX630 || VAX650 || VAX410
+#if VAX630  || VAX640  || VAX650  || VAX660  || VAX670  || VAX680 || \
+    VAX410  || VAX43   || VAX48   || VAX46   || VAX49   || VAX53  || \
+    VAX6200 || VAX6300 || VAX6400 || VAX6500 || VAX6600
 /*
  * Table of emulated Microvax instructions supported by emulate.s.
  * Use noemulate to convert unimplemented ones to reserved instruction faults.
@@ -444,7 +446,9 @@
        .align  2
        .globl  emulate
 emulate:
-#if VAX630 || VAX650 || VAX410
+#if VAX630  || VAX640  || VAX650  || VAX660  || VAX670  || VAX680 || \
+    VAX410  || VAX43   || VAX48   || VAX46   || VAX49   || VAX53  || \
+    VAX6200 || VAX6300 || VAX6400 || VAX6500 || VAX6600
        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