Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverse polarity on INSN_EMULATION to NO_INSN_EMULATION. Thus by default 

all kernels will have instruction emulation.
This commit is contained in:
matt 2000-08-26 02:30:59 +00:00
parent 36afbd61af
commit 3fec8167d3
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/vax/conf/GENERIC
View File

@ -1,11 +1,11 @@
# $NetBSD: GENERIC,v 1.78 2000/08/13 01:31:21 itojun Exp $ # $NetBSD: GENERIC,v 1.79 2000/08/26 02:30:59 matt Exp $
# #
# GENERIC VAX configuration file; all supported devices. # GENERIC VAX configuration file; all supported devices.
# #
include "arch/vax/conf/std.vax" include "arch/vax/conf/std.vax"
#ident "GENERIC-$Revision: 1.78 $" #ident "GENERIC-$Revision: 1.79 $"
# Here are all different supported CPU types listed. # Here are all different supported CPU types listed.
#options "VAX8800" # VAX 8500, 8530, 8550, 8700, 8800 #options "VAX8800" # VAX 8500, 8530, 8550, 8700, 8800
@ -92,7 +92,7 @@ options COMPAT_13
options COMPAT_14 options COMPAT_14
#options COMPAT_ULTRIX #options COMPAT_ULTRIX
options COMPAT_IBCS2 # DEC SVR.3 compatilibity 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 options LKM

8
sys/arch/vax/conf/files.vax
View File

@ -1,4 +1,4 @@
# $NetBSD: files.vax,v 1.75 2000/08/08 16:48:13 ragge Exp $ # $NetBSD: files.vax,v 1.76 2000/08/26 02:31:00 matt Exp $
# #
# new style config file for vax architecture # new style config file for vax architecture
# #
@ -22,7 +22,7 @@ defopt opt_cputype.h VAX780 VAX750 VAX730
VAX410 VAX43 VAX46 VAX48 VAX49 VAX53 VAX410 VAX43 VAX46 VAX48 VAX49 VAX53
VAX630 VAX640 VAX650 VAX660 VAX670 VAX680 VAX630 VAX640 VAX650 VAX660 VAX670 VAX680
defopt opt_emulate.h INSN_EMULATE defopt opt_emulate.h NO_INSN_EMULATE
# NBI on KA88 # NBI on KA88
device nmi { slot=-1 } device nmi { slot=-1 }
@ -344,8 +344,8 @@ file arch/vax/vax/ka650.c vax650
file arch/vax/vax/ka660.c vax660 file arch/vax/vax/ka660.c vax660
file arch/vax/vax/ka670.c vax670 file arch/vax/vax/ka670.c vax670
file arch/vax/vax/ka680.c vax680 file arch/vax/vax/ka680.c vax680
file arch/vax/vax/emulate.s insn_emulate file arch/vax/vax/emulate.s !no_insn_emulate
file arch/vax/vax/unimpl_emul.s insn_emulate file arch/vax/vax/unimpl_emul.s !no_insn_emulate
file arch/vax/vax/scb.c file arch/vax/vax/scb.c
file arch/vax/vax/conf.c file arch/vax/vax/conf.c
file arch/vax/vax/urem.s file arch/vax/vax/urem.s

10
sys/arch/vax/vax/intvec.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: intvec.s,v 1.55 2000/08/08 16:48:12 ragge Exp $ */ /* $NetBSD: intvec.s,v 1.56 2000/08/26 02:31:01 matt Exp $ */
/* /*
* Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden. * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@ -208,8 +208,8 @@ L4: addl2 (sp)+,sp # remove info pushed on stack
TRAPCALL(invkstk, T_KSPNOTVAL) TRAPCALL(invkstk, T_KSPNOTVAL)
SCBENTRY(privinflt) # Privileged/unimplemented instruction SCBENTRY(privinflt) # Privileged/unimplemented instruction
#ifdef INSN_EMULATE #ifndef NO_INSN_EMULATE
jsb unimemu # do not return if insn emulated jsb _C_LABEL(unimemu) # do not return if insn emulated
#endif #endif
pushl $0 pushl $0
pushl $T_PRIVINFLT pushl $T_PRIVINFLT
@ -387,7 +387,7 @@ _C_LABEL(sret):
sbifltmsg: sbifltmsg:
.asciz "SBI fault" .asciz "SBI fault"
#if INSN_EMULATE #ifndef NO_INSN_EMULATE
/* /*
* Table of emulated Microvax instructions supported by emulate.s. * Table of emulated Microvax instructions supported by emulate.s.
* Use noemulate to convert unimplemented ones to reserved instruction faults. * Use noemulate to convert unimplemented ones to reserved instruction faults.
@ -467,7 +467,7 @@ _C_LABEL(emtable):
*/ */
SCBENTRY(emulate) SCBENTRY(emulate)
#if INSN_EMULATE #ifndef NO_INSN_EMULATE
movl r11,32(sp) # save register r11 in unused operand movl r11,32(sp) # save register r11 in unused operand
movl r10,36(sp) # save register r10 in unused operand movl r10,36(sp) # save register r10 in unused operand
cvtbl (sp),r10 # get opcode cvtbl (sp),r10 # get opcode

4
sys/arch/vax/vax/unimpl_emul.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: unimpl_emul.s,v 1.2 2000/08/14 11:16:52 ragge Exp $ */ /* $NetBSD: unimpl_emul.s,v 1.3 2000/08/26 02:31:02 matt Exp $ */
/* /*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -59,7 +59,7 @@
# #
# Emulation of instruction trapped via SCB vector 0x18. (reserved op) # Emulation of instruction trapped via SCB vector 0x18. (reserved op)
# #
unimemu:.globl unimemu ALTENTRY(unimemu)
pushl r0 pushl r0
movl 8(sp),r0 # get trap address movl 8(sp),r0 # get trap address
movzbl (r0),r0 # fetch insn generating trap movzbl (r0),r0 # fetch insn generating trap