1
0
mirror of https://github.com/simh/simh.git synced 2026-01-25 19:56:25 +00:00

simh 3.10-RC1a

3.10 is mostly an attempt to get aligned with the current head of the
GitHub 4.0 sources. While the core libraries and SCP have diverged too
far for real forward and backward compatibility, enough 4.0 workalikes
have been added to allow much closer convergence of the two streams.

3.10 will provide the basis for my future simulation work.
This commit is contained in:
Bob Supnik
2018-06-04 07:59:42 -07:00
committed by Mark Pizzolato
parent 140ab5b350
commit 3fada8da5a
75 changed files with 5555 additions and 24986 deletions

View File

@@ -33,6 +33,9 @@
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
@@ -109,6 +112,9 @@
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
@@ -311,6 +317,10 @@
RelativePath="..\sim_fio.c"
>
</File>
<File
RelativePath="..\sim_shmem.c"
>
</File>
<File
RelativePath="..\sim_sock.c"
>
@@ -388,6 +398,10 @@
RelativePath="..\sim_rev.h"
>
</File>
<File
RelativePath="..\sim_shmem.h"
>
</File>
<File
RelativePath="..\sim_sock.h"
>

View File

@@ -189,6 +189,10 @@
RelativePath="..\PDP18B\pdp18b_cpu.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_dr15.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_drm.c"
>
@@ -201,6 +205,10 @@
RelativePath="..\PDP18B\pdp18b_fpp.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_g2tty.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_lp.c"
>
@@ -245,6 +253,10 @@
RelativePath="..\sim_fio.c"
>
</File>
<File
RelativePath="..\sim_shmem.c"
>
</File>
<File
RelativePath="..\sim_sock.c"
>
@@ -294,6 +306,10 @@
RelativePath="..\sim_rev.h"
>
</File>
<File
RelativePath="..\sim_shmem.h"
>
</File>
<File
RelativePath="..\sim_sock.h"
>

View File

@@ -201,6 +201,10 @@
RelativePath="..\PDP18B\pdp18b_fpp.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_g2tty.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_lp.c"
>

View File

@@ -201,6 +201,10 @@
RelativePath="..\PDP18B\pdp18b_fpp.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_g2tty.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_lp.c"
>

View File

@@ -201,6 +201,10 @@
RelativePath="..\PDP18B\pdp18b_fpp.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_g2tty.c"
>
</File>
<File
RelativePath="..\PDP18B\pdp18b_lp.c"
>

View File

@@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAX", "VAX.vcproj", "{D5D87
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VAX780", "VAX780.vcproj", "{D5D873F7-D286-43E7-958A-3D83DEADBEEF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AltairZ80", "AltairZ80.vcproj", "{BC7F37AD-7414-43C3-829D-214CD1113D67}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Altair", "ALTAIR.vcproj", "{1C602310-C406-4446-85C3-E5AE0E836120}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GRI", "GRI.vcproj", "{611E140C-8403-4FD8-AF53-CE01C8452B34}"
@@ -35,8 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I1401", "I1401.vcproj", "{C
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I1620", "I1620.vcproj", "{089C9C0B-C4F7-4923-86C4-F14BF5D61821}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBM1130", "IBM1130.vcproj", "{D593C954-5115-4D15-ABDB-01B66006FF6F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP15", "PDP15.vcproj", "{44C07AA4-6D56-45ED-8393-18A23E76B758}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP9", "PDP9.vcproj", "{9D589BCA-9E10-4FFA-B43F-DDFA91C1C098}"
@@ -53,16 +49,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lgp", "lgp.vcproj", "{927C3
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I7094", "I7094.vcproj", "{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a", "swtp6800mp-a.vcproj", "{0ABAF350-853E-4A8F-8435-B583E29FB78C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swtp6800mp-a2", "swtp6800mp-a2.vcproj", "{A0BAF350-853E-4A8F-8435-B583E29FFACE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigma", "sigma.vcproj", "{7DDB6DF6-3837-4DE3-80D7-63181195021F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alpha", "alpha.vcproj", "{14C5D369-E4A1-4DA2-B23C-B49367874F7B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HP3000", "HP3000.vcproj", "{B3E35063-CB41-4F77-BFCA-49BB316B0EDB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC15", "UC15.vcproj", "{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -77,10 +71,6 @@ Global
{D5D873F7-D286-43E7-958A-3D83DEADBEEF}.Debug|Win32.Build.0 = Debug|Win32
{D5D873F7-D286-43E7-958A-3D83DEADBEEF}.Release|Win32.ActiveCfg = Release|Win32
{D5D873F7-D286-43E7-958A-3D83DEADBEEF}.Release|Win32.Build.0 = Release|Win32
{BC7F37AD-7414-43C3-829D-214CD1113D67}.Debug|Win32.ActiveCfg = Debug|Win32
{BC7F37AD-7414-43C3-829D-214CD1113D67}.Debug|Win32.Build.0 = Debug|Win32
{BC7F37AD-7414-43C3-829D-214CD1113D67}.Release|Win32.ActiveCfg = Release|Win32
{BC7F37AD-7414-43C3-829D-214CD1113D67}.Release|Win32.Build.0 = Release|Win32
{1C602310-C406-4446-85C3-E5AE0E836120}.Debug|Win32.ActiveCfg = Debug|Win32
{1C602310-C406-4446-85C3-E5AE0E836120}.Debug|Win32.Build.0 = Debug|Win32
{1C602310-C406-4446-85C3-E5AE0E836120}.Release|Win32.ActiveCfg = Release|Win32
@@ -137,10 +127,6 @@ Global
{089C9C0B-C4F7-4923-86C4-F14BF5D61821}.Debug|Win32.Build.0 = Debug|Win32
{089C9C0B-C4F7-4923-86C4-F14BF5D61821}.Release|Win32.ActiveCfg = Release|Win32
{089C9C0B-C4F7-4923-86C4-F14BF5D61821}.Release|Win32.Build.0 = Release|Win32
{D593C954-5115-4D15-ABDB-01B66006FF6F}.Debug|Win32.ActiveCfg = Debug|Win32
{D593C954-5115-4D15-ABDB-01B66006FF6F}.Debug|Win32.Build.0 = Debug|Win32
{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.ActiveCfg = Release|Win32
{D593C954-5115-4D15-ABDB-01B66006FF6F}.Release|Win32.Build.0 = Release|Win32
{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.ActiveCfg = Debug|Win32
{44C07AA4-6D56-45ED-8393-18A23E76B758}.Debug|Win32.Build.0 = Debug|Win32
{44C07AA4-6D56-45ED-8393-18A23E76B758}.Release|Win32.ActiveCfg = Release|Win32
@@ -173,12 +159,6 @@ Global
{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}.Debug|Win32.Build.0 = Debug|Win32
{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}.Release|Win32.ActiveCfg = Release|Win32
{927C3BD9-BD0C-4A23-99F9-DEAD402BEEF9}.Release|Win32.Build.0 = Release|Win32
{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Debug|Win32.ActiveCfg = Debug|Win32
{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Debug|Win32.Build.0 = Debug|Win32
{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Release|Win32.ActiveCfg = Release|Win32
{0ABAF350-853E-4A8F-8435-B583E29FB78C}.Release|Win32.Build.0 = Release|Win32
{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Debug|Win32.ActiveCfg = Debug|Win32
{A0BAF350-853E-4A8F-8435-B583E29FFACE}.Release|Win32.ActiveCfg = Release|Win32
{7DDB6DF6-3837-4DE3-80D7-63181195021F}.Debug|Win32.ActiveCfg = Debug|Win32
{7DDB6DF6-3837-4DE3-80D7-63181195021F}.Debug|Win32.Build.0 = Debug|Win32
{7DDB6DF6-3837-4DE3-80D7-63181195021F}.Release|Win32.ActiveCfg = Release|Win32
@@ -191,6 +171,10 @@ Global
{B3E35063-CB41-4F77-BFCA-49BB316B0EDB}.Debug|Win32.Build.0 = Debug|Win32
{B3E35063-CB41-4F77-BFCA-49BB316B0EDB}.Release|Win32.ActiveCfg = Release|Win32
{B3E35063-CB41-4F77-BFCA-49BB316B0EDB}.Release|Win32.Build.0 = Release|Win32
{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Debug|Win32.ActiveCfg = Debug|Win32
{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Debug|Win32.Build.0 = Debug|Win32
{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Release|Win32.ActiveCfg = Release|Win32
{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="IBM1130"
ProjectGUID="{D593C954-5115-4D15-ABDB-01B66006FF6F}"
RootNamespace="IBM1130"
Name="UC15"
ProjectGUID="{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}"
RootNamespace="UC15"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -19,7 +19,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
IntermediateDirectory="..\BIN\NT\Project\simh\IBM1130\$(PlatformName)-$(ConfigurationName)"
IntermediateDirectory="..\BIN\NT\Project\simh\UC15\$(PlatformName)-$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
@@ -42,8 +42,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./;../;../ibm1130/"
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
AdditionalIncludeDirectories="./;../;../PDP11/;../PDP18B/"
PreprocessorDefinitions="VM_PDP11;UC15;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -64,10 +64,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\IBM1130.exe"
OutputFile="$(OutDir)\UC15.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\IBM1130.pdb"
ProgramDatabaseFile="$(OutDir)\UC15.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -98,7 +98,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
IntermediateDirectory="..\BIN\NT\Project\simh\IBM1130\$(PlatformName)-$(ConfigurationName)"
IntermediateDirectory="..\BIN\NT\Project\simh\UC15\$(PlatformName)-$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
@@ -123,8 +123,8 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="./;../;../ibm1130/"
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
AdditionalIncludeDirectories="./;../;../PDP11/;../PDP18B/"
PreprocessorDefinitions="VM_PDP11;UC15;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -145,7 +145,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\IBM1130.exe"
OutputFile="$(OutDir)\UC15.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
@@ -186,55 +186,55 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\ibm1130\ibm1130_cpu.c"
RelativePath="..\PDP11\pdp11_cis.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_cr.c"
RelativePath="..\PDP11\pdp11_cpu.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_disk.c"
RelativePath="..\PDP11\pdp11_cpumod.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_fmt.c"
RelativePath="..\PDP11\pdp11_cr.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_gdu.c"
RelativePath="..\PDP11\pdp11_fp.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_gui.c"
RelativePath="..\PDP11\pdp11_io.c"
>
</File>
<File
RelativePath="..\Ibm1130\ibm1130_plot.c"
RelativePath="..\PDP11\pdp11_io_lib.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_prt.c"
RelativePath="..\PDP11\pdp11_lp.c"
>
</File>
<File
RelativePath="..\Ibm1130\ibm1130_ptrp.c"
RelativePath="..\PDP11\pdp11_rh.c"
>
</File>
<File
RelativePath="..\Ibm1130\ibm1130_sca.c"
RelativePath="..\PDP11\pdp11_rk.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_stddev.c"
RelativePath="..\PDP11\pdp11_stddev.c"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_sys.c"
RelativePath="..\PDP11\pdp11_sys.c"
>
</File>
<File
RelativePath="..\Ibm1130\ibm1130_t2741.c"
RelativePath="..\PDP11\pdp11_uc15.c"
>
</File>
<File
@@ -253,6 +253,10 @@
RelativePath="..\sim_fio.c"
>
</File>
<File
RelativePath="..\sim_shmem.c"
>
</File>
<File
RelativePath="..\sim_sock.c"
>
@@ -275,31 +279,19 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="..\Ibm1130\dmsr2v12phases.h"
RelativePath="..\PDP11\pdp11_cpumod.h"
>
</File>
<File
RelativePath="..\Ibm1130\dmsr2v12slet.h"
RelativePath="..\PDP11\pdp11_cr_dat.h"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_conin.h"
RelativePath="..\PDP11\pdp11_defs.h"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_conout.h"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_defs.h"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130_prtwheel.h"
>
</File>
<File
RelativePath="..\ibm1130\ibm1130res.h"
RelativePath="..\PDP11\pdp11_io_lib.h"
>
</File>
<File
@@ -326,6 +318,10 @@
RelativePath="..\sim_rev.h"
>
</File>
<File
RelativePath="..\sim_shmem.h"
>
</File>
<File
RelativePath="..\sim_sock.h"
>