diff --git a/VAX/vax610_syslist.c b/VAX/vax610_syslist.c index c262fad5..09b81f5a 100644 --- a/VAX/vax610_syslist.c +++ b/VAX/vax610_syslist.c @@ -29,7 +29,7 @@ #include "vax_defs.h" -char sim_name[] = "VAX610"; +char sim_name[] = "MicroVAX I (KA610)"; extern DEVICE cpu_dev; extern DEVICE mctl_dev; diff --git a/VAX/vax630_syslist.c b/VAX/vax630_syslist.c index fa0e08bb..dfebea68 100644 --- a/VAX/vax630_syslist.c +++ b/VAX/vax630_syslist.c @@ -30,9 +30,9 @@ #include "vax_defs.h" #if defined(VAX_620) -char sim_name[] = "VAX620"; +char sim_name[] = "rtVAX1000 (KA620)"; #else -char sim_name[] = "VAX630"; +char sim_name[] = "MicroVAX II (KA630)"; #endif extern DEVICE cpu_dev; diff --git a/VAX/vax730_syslist.c b/VAX/vax730_syslist.c index 6fa3946f..41e4e97c 100644 --- a/VAX/vax730_syslist.c +++ b/VAX/vax730_syslist.c @@ -29,7 +29,7 @@ #include "vax_defs.h" -char sim_name[] = "VAX730"; +char sim_name[] = "VAX 11/730"; extern DEVICE cpu_dev; extern DEVICE tlb_dev; diff --git a/VAX/vax750_syslist.c b/VAX/vax750_syslist.c index 634d8523..44ebd5d8 100644 --- a/VAX/vax750_syslist.c +++ b/VAX/vax750_syslist.c @@ -29,7 +29,7 @@ #include "vax_defs.h" -char sim_name[] = "VAX750"; +char sim_name[] = "VAX 11/750"; extern DEVICE cpu_dev; extern DEVICE tlb_dev; diff --git a/VAX/vax780_syslist.c b/VAX/vax780_syslist.c index e86c6900..0b088d80 100644 --- a/VAX/vax780_syslist.c +++ b/VAX/vax780_syslist.c @@ -29,7 +29,7 @@ #include "vax_defs.h" -char sim_name[] = "VAX780"; +char sim_name[] = "VAX 11/780"; extern DEVICE cpu_dev; extern DEVICE tlb_dev; diff --git a/VAX/vax860_syslist.c b/VAX/vax860_syslist.c index b3ecba50..b69050af 100644 --- a/VAX/vax860_syslist.c +++ b/VAX/vax860_syslist.c @@ -29,7 +29,7 @@ #include "vax_defs.h" -char sim_name[] = "VAX860"; +char sim_name[] = "VAX 8600"; extern DEVICE cpu_dev; extern DEVICE tlb_dev; diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c index 03e5a650..7cfbc21d 100644 --- a/VAX/vax_sysdev.c +++ b/VAX/vax_sysdev.c @@ -1628,7 +1628,7 @@ return SCPE_OK; t_stat cpu_print_model (FILE *st) { -fprintf (st, "MicroVAX 3900"); +fprintf (st, "MicroVAX 3900 (KA655)"); return SCPE_OK; } diff --git a/Visual Studio Projects/Simh.sln b/Visual Studio Projects/Simh.sln index 05265482..6a759aa7 100644 --- a/Visual Studio Projects/Simh.sln +++ b/Visual Studio Projects/Simh.sln @@ -92,7 +92,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAX630", "VAX630.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TX-0", "TX-0.vcproj", "{24BC7F75-FB56-44A9-BB7C-78AE6A694D0C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAX860", "VAX860.vcproj", "{F5C22D72-460E-43CD-9AC6-6D6AC517BD1F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAX8600", "VAX8600.vcproj", "{F5C22D72-460E-43CD-9AC6-6D6AC517BD1F}" ProjectSection(ProjectDependencies) = postProject {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection diff --git a/Visual Studio Projects/VAX860.vcproj b/Visual Studio Projects/VAX860.vcproj deleted file mode 100644 index 4fd9acb4..00000000 --- a/Visual Studio Projects/VAX860.vcproj +++ /dev/null @@ -1,479 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/descrip.mms b/descrip.mms index 68282a3f..6931bd9a 100644 --- a/descrip.mms +++ b/descrip.mms @@ -48,7 +48,7 @@ # VAX730 Just Build The DEC VAX730. # VAX750 Just Build The DEC VAX750. # VAX780 Just Build The DEC VAX780. -# VAX860 Just Build The DEC VAX860. +# VAX8600 Just Build The DEC VAX8600. # CLEAN Will Clean Files Back To Base Kit. # # To build with debugging enabled (which will also enable traceback @@ -814,20 +814,20 @@ VAX780_OPTIONS = /INCL=($(SIMH_DIR),$(VAX780_DIR),$(PDP11_DIR)$(PCAP_INC))\ VAX780_SIMH_LIB = $(SIMH_LIB) .ENDIF -# Digital Equipment VAX860 Simulator Definitions. +# Digital Equipment VAX8600 Simulator Definitions. # -VAX860_DIR = SYS$DISK:[.VAX] -VAX860_LIB1 = $(LIB_DIR)VAX860L1-$(ARCH).OLB -VAX860_SOURCE1 = $(VAX860_DIR)VAX_CPU.C,$(VAX860_DIR)VAX_CPU1.C,\ - $(VAX860_DIR)VAX_FPA.C,$(VAX860_DIR)VAX_CIS.C,\ - $(VAX860_DIR)VAX_OCTA.C,$(VAX860_DIR)VAX_CMODE.C,\ - $(VAX860_DIR)VAX_MMU.C,$(VAX860_DIR)VAX_SYS.C,\ - $(VAX860_DIR)VAX_SYSCM.C,$(VAX860_DIR)VAX860_STDDEV.C,\ - $(VAX860_DIR)VAX860_SBIA.C,$(VAX860_DIR)VAX860_ABUS.C,\ - $(VAX860_DIR)VAX780_UBA.C,$(VAX860_DIR)VAX7X0_MBA.C,\ - $(VAX860_DIR)VAX860_SYSLIST.C -VAX860_LIB2 = $(LIB_DIR)VAX860L2-$(ARCH).OLB -VAX860_SOURCE2 = $(PDP11_DIR)PDP11_RL.C,$(PDP11_DIR)PDP11_RQ.C,\ +VAX8600_DIR = SYS$DISK:[.VAX] +VAX8600_LIB1 = $(LIB_DIR)VAX860L1-$(ARCH).OLB +VAX8600_SOURCE1 = $(VAX8600_DIR)VAX_CPU.C,$(VAX8600_DIR)VAX_CPU1.C,\ + $(VAX8600_DIR)VAX_FPA.C,$(VAX8600_DIR)VAX_CIS.C,\ + $(VAX8600_DIR)VAX_OCTA.C,$(VAX8600_DIR)VAX_CMODE.C,\ + $(VAX8600_DIR)VAX_MMU.C,$(VAX8600_DIR)VAX_SYS.C,\ + $(VAX8600_DIR)VAX_SYSCM.C,$(VAX8600_DIR)VAX860_STDDEV.C,\ + $(VAX8600_DIR)VAX860_SBIA.C,$(VAX8600_DIR)VAX860_ABUS.C,\ + $(VAX8600_DIR)VAX780_UBA.C,$(VAX8600_DIR)VAX7X0_MBA.C,\ + $(VAX8600_DIR)VAX860_SYSLIST.C +VAX8600_LIB2 = $(LIB_DIR)VAX860L2-$(ARCH).OLB +VAX8600_SOURCE2 = $(PDP11_DIR)PDP11_RL.C,$(PDP11_DIR)PDP11_RQ.C,\ $(PDP11_DIR)PDP11_TS.C,$(PDP11_DIR)PDP11_DZ.C,\ $(PDP11_DIR)PDP11_LP.C,$(PDP11_DIR)PDP11_TQ.C,\ $(PDP11_DIR)PDP11_XU.C,$(PDP11_DIR)PDP11_RY.C,\ @@ -836,13 +836,13 @@ VAX860_SOURCE2 = $(PDP11_DIR)PDP11_RL.C,$(PDP11_DIR)PDP11_RQ.C,\ $(PDP11_DIR)PDP11_VH.C,$(PDP11_DIR)PDP11_DMC.C,\ $(PDP11_DIR)PDP11_IO_LIB.C .IFDEF ALPHA_OR_IA64 -VAX860_OPTIONS = /INCL=($(SIMH_DIR),$(VAX860_DIR),$(PDP11_DIR)$(PCAP_INC))\ +VAX8600_OPTIONS = /INCL=($(SIMH_DIR),$(VAX8600_DIR),$(PDP11_DIR)$(PCAP_INC))\ /DEF=($(CC_DEFS),"VM_VAX=1","USE_ADDR64=1","USE_INT64=1"$(PCAP_DEFS),"VAX_860=1") -VAX860_SIMH_LIB = $(SIMH_LIB64) +VAX8600_SIMH_LIB = $(SIMH_LIB64) .ELSE -VAX860_OPTIONS = /INCL=($(SIMH_DIR),$(VAX860_DIR),$(PDP11_DIR)$(PCAP_INC))\ +VAX8600_OPTIONS = /INCL=($(SIMH_DIR),$(VAX8600_DIR),$(PDP11_DIR)$(PCAP_INC))\ /DEF=($(CC_DEFS),"VM_VAX=1"$(PCAP_DEFS),"VAX_860=1") -VAX860_SIMH_LIB = $(SIMH_LIB) +VAX8600_SIMH_LIB = $(SIMH_LIB) .ENDIF # IBM 7094 Simulator Definitions. @@ -862,7 +862,7 @@ I7094_OPTIONS = /INCL=($(SIMH_DIR),$(I7094_DIR))/DEF=($(CC_DEFS)) .IFDEF ALPHA_OR_IA64 ALL : ALTAIR ALTAIRZ80 ECLIPSE GRI LGP H316 HP2100 I1401 I1620 IBM1130 ID16 \ ID32 NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP10 PDP11 PDP15 S3 \ - VAX VAX610 VAX620 VAX630 VAX730 VAX750 VAX780 VAX860 \ + VAX VAX610 VAX620 VAX630 VAX730 VAX750 VAX780 VAX8600 \ SDS I7094 SWTP6800MP-A SWTP6800MP-A2 $! No further actions necessary .ELSE @@ -871,7 +871,7 @@ ALL : ALTAIR ALTAIRZ80 ECLIPSE GRI LGP H316 HP2100 I1401 I1620 IBM1130 ID16 \ # ALL : ALTAIR ALTAIRZ80 GRI H316 HP2100 I1401 I1620 IBM1130 ID16 ID32 \ NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP11 PDP15 S3 \ - VAX VAX510 VAX620 VAX630 VAX730 VAX750 VAX780 VAX860 SDS \ + VAX VAX510 VAX620 VAX630 VAX730 VAX750 VAX780 VAX8600 SDS \ SWTP6800MP-A SWTP6800MP-A2 $! No further actions necessary .ENDIF @@ -1438,23 +1438,23 @@ $(VAX780_LIB2) : $(VAX780_SOURCE2) $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -$(VAX860_LIB1) : $(VAX860_SOURCE1) +$(VAX8600_LIB1) : $(VAX8600_SOURCE1) $! - $! Building The $(VAX860_LIB1) Library. + $! Building The $(VAX8600_LIB1) Library. $! $ RUN/NODEBUG $(BIN_DIR)BuildROMs-$(ARCH).EXE - $ $(CC)$(VAX860_OPTIONS)/OBJ=$(VAX860_DIR) - + $ $(CC)$(VAX8600_OPTIONS)/OBJ=$(VAX8600_DIR) - /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST) $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN - LIBRARY/CREATE $(MMS$TARGET) $ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -$(VAX860_LIB2) : $(VAX860_SOURCE2) +$(VAX8600_LIB2) : $(VAX8600_SOURCE2) $! - $! Building The $(VAX860_LIB2) Library. + $! Building The $(VAX8600_LIB2) Library. $! - $ $(CC)$(VAX860_OPTIONS)/OBJ=$(VAX860_DIR) - + $ $(CC)$(VAX8600_OPTIONS)/OBJ=$(VAX8600_DIR) - /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST) $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN - LIBRARY/CREATE $(MMS$TARGET) @@ -1931,19 +1931,19 @@ $(BIN_DIR)VAX780-$(ARCH).EXE : $(SIMH_MAIN) $(VAX780_SIMH_LIB) $(PCAP_LIBD) $(VA $(VAX780_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -VAX860 : $(BIN_DIR)VAX860-$(ARCH).EXE - $! VAX860 done +VAX8600 : $(BIN_DIR)VAX8600-$(ARCH).EXE + $! VAX8600 done -$(BIN_DIR)VAX860-$(ARCH).EXE : $(SIMH_MAIN) $(VAX860_SIMH_LIB) $(PCAP_LIBD) $(VAX860_LIB1) $(VAX860_LIB2) $(PCAP_EXECLET) +$(BIN_DIR)VAX8600-$(ARCH).EXE : $(SIMH_MAIN) $(VAX8600_SIMH_LIB) $(PCAP_LIBD) $(VAX8600_LIB1) $(VAX8600_LIB2) $(PCAP_EXECLET) $! $! Building The $(BIN_DIR)VAX860-$(ARCH).EXE Simulator. $! - $ $(CC)$(VAX860_OPTIONS)/OBJ=$(BLD_DIR) SCP.C + $ $(CC)$(VAX8600_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- /EXE=$(BIN_DIR)VAX860-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,- - $(VAX860_LIB1)/LIBRARY,$(VAX860_LIB2)/LIBRARY,- - $(VAX860_SIMH_LIB)/LIBRARY$(PCAP_LIBR) + $(VAX8600_LIB1)/LIBRARY,$(VAX8600_LIB2)/LIBRARY,- + $(VAX8600_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* # diff --git a/makefile b/makefile index 4a3abbae..2c44b843 100644 --- a/makefile +++ b/makefile @@ -582,7 +582,7 @@ VAX780 = ${VAXD}/vax_cpu.c ${VAXD}/vax_cpu1.c ${VAXD}/vax_fpa.c \ VAX780_OPT = -DVM_VAX -DVAX_780 -DUSE_INT64 -DUSE_ADDR64 -I VAX -I ${PDP11D} ${NETWORK_OPT} -VAX860 = ${VAXD}/vax_cpu.c ${VAXD}/vax_cpu1.c ${VAXD}/vax_fpa.c \ +VAX8600 = ${VAXD}/vax_cpu.c ${VAXD}/vax_cpu1.c ${VAXD}/vax_fpa.c \ ${VAXD}/vax_cis.c ${VAXD}/vax_octa.c ${VAXD}/vax_cmode.c \ ${VAXD}/vax_mmu.c ${VAXD}/vax_sys.c ${VAXD}/vax_syscm.c \ ${VAXD}/vax860_stddev.c ${VAXD}/vax860_sbia.c \ @@ -593,7 +593,7 @@ VAX860 = ${VAXD}/vax_cpu.c ${VAXD}/vax_cpu1.c ${VAXD}/vax_fpa.c \ ${PDP11D}/pdp11_xu.c ${PDP11D}/pdp11_ry.c ${PDP11D}/pdp11_cr.c \ ${PDP11D}/pdp11_rp.c ${PDP11D}/pdp11_tu.c ${PDP11D}/pdp11_hk.c \ ${PDP11D}/pdp11_vh.c ${PDP11D}/pdp11_dmc.c ${PDP11D}/pdp11_io_lib.c -VAX860_OPT = -DVM_VAX -DVAX_860 -DUSE_INT64 -DUSE_ADDR64 -I VAX -I ${PDP11D} ${NETWORK_OPT} +VAX8600_OPT = -DVM_VAX -DVAX_860 -DUSE_INT64 -DUSE_ADDR64 -I VAX -I ${PDP11D} ${NETWORK_OPT} PDP10D = PDP10 @@ -892,11 +892,11 @@ ${BIN}vax780${EXE} : ${VAX780} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX780} ${SIM} ${VAX780_OPT} $(CC_OUTSPEC) ${LDFLAGS} -vax860 : ${BIN}vax860${EXE} +vax8600 : ${BIN}vax8600${EXE} -${BIN}vax860${EXE} : ${VAX860} ${SIM} ${BUILD_ROMS} +${BIN}vax8600${EXE} : ${VAX8600} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} - ${CC} ${VAX860} ${SIM} ${VAX860_OPT} $(CC_OUTSPEC) ${LDFLAGS} + ${CC} ${VAX8600} ${SIM} ${VAX8600_OPT} $(CC_OUTSPEC) ${LDFLAGS} nova : ${BIN}nova${EXE}