diff --git a/Visual Studio Projects/VAX.vcproj b/Visual Studio Projects/VAX.vcproj index ecee587d..4adc6c81 100644 --- a/Visual Studio Projects/VAX.vcproj +++ b/Visual Studio Projects/VAX.vcproj @@ -70,7 +70,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX.exe" + OutputFile="$(OutDir)\MicroVAX3900.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" @@ -100,6 +100,8 @@ /> diff --git a/Visual Studio Projects/VAX610.vcproj b/Visual Studio Projects/VAX610.vcproj index 9cc14590..90d5f3f8 100644 --- a/Visual Studio Projects/VAX610.vcproj +++ b/Visual Studio Projects/VAX610.vcproj @@ -70,7 +70,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX610.exe" + OutputFile="$(OutDir)\MicroVAX1.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" @@ -161,7 +161,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX610.exe" + OutputFile="$(OutDir)\MicroVAX1.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" diff --git a/Visual Studio Projects/VAX620.vcproj b/Visual Studio Projects/VAX620.vcproj index 5875a3c8..77efe203 100644 --- a/Visual Studio Projects/VAX620.vcproj +++ b/Visual Studio Projects/VAX620.vcproj @@ -70,7 +70,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX620.exe" + OutputFile="$(OutDir)\rtVAX1000.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" @@ -161,7 +161,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX620.exe" + OutputFile="$(OutDir)\rtVAX1000.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" diff --git a/Visual Studio Projects/VAX630.vcproj b/Visual Studio Projects/VAX630.vcproj index bdbd7797..7e12ff48 100644 --- a/Visual Studio Projects/VAX630.vcproj +++ b/Visual Studio Projects/VAX630.vcproj @@ -70,7 +70,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX630.exe" + OutputFile="$(OutDir)\MicroVAX2.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" @@ -161,7 +161,7 @@ Name="VCLinkerTool" AdditionalOptions="/fixed:no" AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib" - OutputFile="$(OutDir)\VAX630.exe" + OutputFile="$(OutDir)\MicroVAX2.exe" LinkIncremental="1" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/"" GenerateDebugInformation="true" diff --git a/descrip.mms b/descrip.mms index 0618137e..eac85a65 100644 --- a/descrip.mms +++ b/descrip.mms @@ -41,10 +41,11 @@ # SDS Just Build The SDS 940. # SWTP6800MP-A Just Build The SWTP6800MP-A. # SWTP6800MP-A2 Just Build The SWTP6800MP-A2. -# VAX Just Build The DEC VAX. -# VAX610 Just Build The DEC VAX610 (MicroVAX I). -# VAX620 Just Build The DEC VAX610 (rtVAX 1000). -# VAX630 Just Build The DEC VAX610 (MicroVAX II). +# VAX Just Build The DEC MicroVAX3900 (aka VAX). +# MicroVAX3900 Just Build The DEC MicroVAX3900 (aka VAX). +# MicroVAX1 Just Build The DEC MicroVAX1 (MicroVAX I). +# rtVAX1000 Just Build The DEC rtVAX1000 (rtVAX 1000). +# MicroVAX2 Just Build The DEC MicroVAX2 (MicroVAX II). # VAX730 Just Build The DEC VAX730. # VAX750 Just Build The DEC VAX750. # VAX780 Just Build The DEC VAX780. @@ -689,7 +690,7 @@ VAX630_OPTIONS = /INCL=($(SIMH_DIR),$(VAX630_DIR),$(PDP11_DIR)$(PCAP_INC))\ VAX630_SIMH_LIB = $(SIMH_LIB) .ENDIF -# Digital Equipment VAX620 (rtVAX 1000) Simulator Definitions. +# Digital Equipment rtVAX1000 (rtVAX 1000) Simulator Definitions. # VAX620_DIR = SYS$DISK:[.VAX] VAX620_LIB1 = $(LIB_DIR)VAX620L1-$(ARCH).OLB @@ -856,7 +857,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 VAX8600 \ + VAX MICROVAX3900 MICROVAX1 RTVAX1000 MICROVAX2 VAX730 VAX750 VAX780 VAX8600 \ SDS I7094 SWTP6800MP-A SWTP6800MP-A2 $! No further actions necessary .ELSE @@ -865,8 +866,8 @@ 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 VAX8600 SDS \ - SWTP6800MP-A SWTP6800MP-A2 + VAX MICROVAX3900 MICROVAX1 RTVAX1000 MICROVAX2 VAX730 VAX750 VAX780 VAX8600 \ + SDS SWTP6800MP-A SWTP6800MP-A2 $! No further actions necessary .ENDIF @@ -1821,60 +1822,63 @@ $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800M $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -VAX : $(BIN_DIR)VAX-$(ARCH).EXE - $! VAX done +VAX : MICROVAX3900 -$(BIN_DIR)VAX-$(ARCH).EXE : $(SIMH_MAIN) $(VAX_SIMH_LIB) $(PCAP_LIBD) $(VAX_LIB1) $(VAX_LIB2) $(PCAP_EXECLET) +MICROVAX3900 : $(BIN_DIR)MICROVAX3900-$(ARCH).EXE + $! MICROVAX3900 done + +$(BIN_DIR)MICROVAX3900-$(ARCH).EXE : $(SIMH_MAIN) $(VAX_SIMH_LIB) $(PCAP_LIBD) $(VAX_LIB1) $(VAX_LIB2) $(PCAP_EXECLET) $! $! Building The $(BIN_DIR)VAX-$(ARCH).EXE Simulator. $! $ $(CC)$(VAX_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- - /EXE=$(BIN_DIR)VAX-$(ARCH).EXE - + /EXE=$(BIN_DIR)MICROVAX3900-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,$(VAX_LIB1)/LIBRARY,$(VAX_LIB2)/LIBRARY,- $(VAX_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* + $ COPY $(BIN_DIR)MICROVAX3900-$(ARCH).EXE$(BIN_DIR)VAX-$(ARCH).EXE -VAX610 : $(BIN_DIR)VAX610-$(ARCH).EXE - $! VAX610 done +MICROVAX1 : $(BIN_DIR)MICROVAX1-$(ARCH).EXE + $! MICROVAX1 done -$(BIN_DIR)VAX610-$(ARCH).EXE : $(SIMH_MAIN) $(VAX610_SIMH_LIB) $(PCAP_LIBD) $(VAX610_LIB1) $(VAX610_LIB2) $(PCAP_EXECLET) +$(BIN_DIR)MICROVAX1-$(ARCH).EXE : $(SIMH_MAIN) $(VAX610_SIMH_LIB) $(PCAP_LIBD) $(VAX610_LIB1) $(VAX610_LIB2) $(PCAP_EXECLET) $! $! Building The $(BIN_DIR)VAX610-$(ARCH).EXE Simulator. $! $ $(CC)$(VAX610_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- - /EXE=$(BIN_DIR)VAX610-$(ARCH).EXE - + /EXE=$(BIN_DIR)MICROVAX1-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,- $(VAX610_LIB1)/LIBRARY,$(VAX610_LIB2)/LIBRARY,- $(VAX610_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -VAX630 : $(BIN_DIR)VAX630-$(ARCH).EXE - $! VAX630 done +MICROVAX2 : $(BIN_DIR)MICROVAX2-$(ARCH).EXE + $! MICROVAX2 done -$(BIN_DIR)VAX630-$(ARCH).EXE : $(SIMH_MAIN) $(VAX630_SIMH_LIB) $(PCAP_LIBD) $(VAX630_LIB1) $(VAX630_LIB2) $(PCAP_EXECLET) +$(BIN_DIR)MICROVAX2-$(ARCH).EXE : $(SIMH_MAIN) $(VAX630_SIMH_LIB) $(PCAP_LIBD) $(VAX630_LIB1) $(VAX630_LIB2) $(PCAP_EXECLET) $! $! Building The $(BIN_DIR)VAX630-$(ARCH).EXE Simulator. $! $ $(CC)$(VAX630_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- - /EXE=$(BIN_DIR)VAX630-$(ARCH).EXE - + /EXE=$(BIN_DIR)MICROVAX2-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,- $(VAX630_LIB1)/LIBRARY,$(VAX630_LIB2)/LIBRARY,- $(VAX630_SIMH_LIB)/LIBRARY$(PCAP_LIBR) $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;* -VAX620 : $(BIN_DIR)VAX620-$(ARCH).EXE - $! VAX620 done +RTVAX1000 : $(BIN_DIR)RTVAX1000-$(ARCH).EXE + $! RTVAX1000 done -$(BIN_DIR)VAX620-$(ARCH).EXE : $(SIMH_MAIN) $(VAX620_SIMH_LIB) $(PCAP_LIBD) $(VAX620_LIB1) $(VAX620_LIB2) $(PCAP_EXECLET) +$(BIN_DIR)RTVAX1000-$(ARCH).EXE : $(SIMH_MAIN) $(VAX620_SIMH_LIB) $(PCAP_LIBD) $(VAX620_LIB1) $(VAX620_LIB2) $(PCAP_EXECLET) $! $! Building The $(BIN_DIR)VAX620-$(ARCH).EXE Simulator. $! $ $(CC)$(VAX620_OPTIONS)/OBJ=$(BLD_DIR) SCP.C $ LINK $(LINK_DEBUG)$(LINK_SECTION_BINDING)- - /EXE=$(BIN_DIR)VAX620-$(ARCH).EXE - + /EXE=$(BIN_DIR)RTVAX1000-$(ARCH).EXE - $(BLD_DIR)SCP.OBJ,- $(VAX620_LIB1)/LIBRARY,$(VAX620_LIB2)/LIBRARY,- $(VAX620_SIMH_LIB)/LIBRARY$(PCAP_LIBR) diff --git a/makefile b/makefile index d4404838..8c7ee266 100644 --- a/makefile +++ b/makefile @@ -763,7 +763,7 @@ TX0_OPT = -I ${TX0D} $(DISPLAY_OPT) # Build everything # ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp11 pdp10 \ - vax vax610 vax620 vax630 vax730 vax750 vax780 vax8600 \ + vax microvax3900 microvax1 rtvax1000 microvax2 vax730 vax750 vax780 vax8600 \ nova eclipse hp2100 i1401 i1620 s3 altair altairz80 gri \ i7094 ibm1130 id16 id32 sds lgp h316 \ swtp6800mp-a swtp6800mp-a2 tx-0 @@ -847,27 +847,34 @@ ${BIN}pdp11${EXE} : ${PDP11} ${SIM} ${MKDIRBIN} ${CC} ${PDP11} ${SIM} ${PDP11_OPT} $(CC_OUTSPEC) ${LDFLAGS} -vax : ${BIN}vax${EXE} +vax : microvax3900 -${BIN}vax${EXE} : ${VAX} ${SIM} ${BUILD_ROMS} +microvax3900 : ${BIN}microvax3900${EXE} + +${BIN}microvax3900${EXE} : ${VAX} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX} ${SIM} ${VAX_OPT} $(CC_OUTSPEC) ${LDFLAGS} +ifeq ($(WIN32),) + cp ${BIN}microvax3900${EXE} ${BIN}vax${EXE} +else + copy $(@D)\microvax3900${EXE} $(@D)\vax${EXE} +endif -vax610 : ${BIN}vax610${EXE} +microvax1 : ${BIN}microvax1${EXE} -${BIN}vax610${EXE} : ${VAX610} ${SIM} ${BUILD_ROMS} +${BIN}microvax1${EXE} : ${VAX610} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX610} ${SIM} ${VAX610_OPT} -o $@ ${LDFLAGS} -vax620 : ${BIN}vax620${EXE} +rtvax1000 : ${BIN}rtvax1000${EXE} -${BIN}vax620${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS} +${BIN}rtvax1000${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX630} ${SIM} ${VAX620_OPT} -o $@ ${LDFLAGS} -vax630 : ${BIN}vax630${EXE} +microvax2 : ${BIN}microvax2${EXE} -${BIN}vax630${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS} +${BIN}microvax2${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX630} ${SIM} ${VAX630_OPT} -o $@ ${LDFLAGS}