191b2131e9
Make generate.py resuable outside of open-simh, as suggested and
motivated by Richard Cornwell's simulator repository.
- Make the "experimental" rule optional. Do not generate a Python
"KeyError" if the rule is missing.
- Add documentation on how to use the CMake infrastructure outside
of open-simh: Customize the packaging.py script, season to taste.
- Update the KA10 simulator customization, moving it to its own
Python script, simgen/pdp10_simulator.py. Preparatory move that
anticipates additional frontpanel and display options.
- generate.py option "--skip-orphans": Skip the orphaned simulator
check (i.e., don't cross-reference the simulators in packaging.py
with what was scraped from the makefile.)
- Add "TEST_ARGS" argument to CMake's add_simulator function so that the
IBM 1130 simulator can pass to "-g" on the command line to disable the
GUI when running RegisterSanityCheck, i.e.:
ibm1130 RegisterSanityCheck -g
This fixes an edge case Heisenbug encountered during Github CI/CD
tests where ibm1130 appears to hang indefinitely on the Windows
runners.
The cause is the GUI's Pump() thread function being prematurely
terminated before all GUI resources are acquired. The net result is an
infinite loop in the MS C runtime trying to exit the process with
unstable internal state. (Separate patch: synchronization across main
and Pump() threads to ensure resource acquisition completes.)
This issue never shows up on non-Windows platforms or the SIMH makefile.
- cmake/generator.py, cmake/simgen: Add a "test_args" keyword argument
to the BasicSimulator constructor that holds the tests argument
parameter emitted as the "TEST_ARGS" argument to a simulator's
add_simulator(). Ensure that the IBM 1130 emits 'TEST_ARG "-g"' in its
add_simulator().
- scp.c: reset_all_p() adds 'P' to the existing switches, versus saving
sim_switches and ONLY setting the 'P' power-up reset switch. Net effect
is that the IBM 1130 simulator actually sees the 'G' flag that inhibits
the GUI during the console device reset.
45 lines
1.8 KiB
Python
45 lines
1.8 KiB
Python
## KA10 simulator: Add the PANDA_LIGHTS and the PIDP10 options for frontpanel
|
|
## code.
|
|
|
|
import simgen.basic_simulator as SBS
|
|
|
|
class KA10Simulator(SBS.SIMHBasicSimulator):
|
|
def __init__(self, sim_name, dir_macro, test_name, buildrom):
|
|
super().__init__(sim_name, dir_macro, test_name, buildrom)
|
|
|
|
def write_simulator(self, stream, indent, test_label='ka10'):
|
|
## Keep the CMake options separate, just in case they are needed for more
|
|
## than just the KA10 (and add a class variable so they are only written
|
|
## once.)
|
|
stream.write('''
|
|
option(PANDA_LIGHTS
|
|
"Enable (=1)/disable (=0) KA-10/KI-11 simulator\'s Panda display. (def: disabled)"
|
|
FALSE)
|
|
option(PIDP10
|
|
"Enable (=1)/disable (=0) PIDP10 display options (def: disabled)"
|
|
FALSE)
|
|
|
|
### Ensure that the options are mutually exclusive:
|
|
if (PANDA_LIGHTS AND PIDP10)
|
|
message(FATAL_ERROR "PANDA_LIGHTS and PIDP10 options are mutually exclusive. Choose one.")
|
|
endif ()
|
|
|
|
|
|
''')
|
|
## Emit the simulator:
|
|
super().write_simulator(stream, indent, test_label)
|
|
## Update the display sources for PANDA_LIGHTS or PIDP10:
|
|
stream.write('\n'.join([
|
|
'',
|
|
'if (PANDA_LIGHTS)',
|
|
' target_sources({0} PUBLIC {1}/kx10_lights.c)'.format(self.sim_name, self.dir_macro),
|
|
' target_compile_definitions({0} PUBLIC PANDA_LIGHTS)'.format(self.sim_name),
|
|
' target_link_libraries({0} PUBLIC usb-1.0)'.format(self.sim_name),
|
|
'endif ()',
|
|
'if (PIDP10)',
|
|
' target_sources({0} PUBLIC {1}/ka10_pipanel.c)'.format(self.sim_name, self.dir_macro),
|
|
' target_compile_definitions({0} PUBLIC PIDP10=1)'.format(self.sim_name),
|
|
'endif ()'
|
|
]))
|
|
stream.write('\n')
|
|
|