-igs/igs027a.cpp: Started encapsulating IGS 027A onboard peripherals.

cuavas · cuavas · commit 21a89d5bbde5 · 2024-09-13T06:30:17.000+10:00
-igs/igs_m027.cpp: Improved I/O:
* Hooked up inputs, hopper and counters for mgcs3.
* Hooked up mahjong keyboard for lhzb4.
* Added more RAM for extradrw.

-Bumped GitHub CI to three simuataneous jobs for Windows and Linux -
 this should be OK with 16GB RAM.

-Added out-of-line destructors to various device classes that aren't
 templates and aren't in anonymous namespaces.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -58,7 +58,7 @@ jobs:
         ARCHOPTS: ${{ matrix.archopts }}
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }} -validate
     - name: Reconcile driver list
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -56,7 +56,7 @@ jobs:
         ARCHOPTS: "-fuse-ld=lld"
         SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
-      run: make -j2
+      run: make -j3
     - name: Validate
       run: ./${{ matrix.executable }}.exe -validate
     - uses: actions/upload-artifact@master
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
@@ -83,9 +83,17 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, const char *tag,
 {
 }
 
-arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness)
+arm7_cpu_device::arm7_cpu_device(
+		const machine_config &mconfig,
+		device_type type,
+		const char *tag, device_t *owner,
+		uint32_t clock,
+		uint8_t archRev,
+		uint32_t archFlags,
+		endianness_t endianness,
+		address_map_constructor internal_map)
 	: cpu_device(mconfig, type, tag, owner, clock)
-	, m_program_config("program", endianness, 32, 32, 0)
+	, m_program_config("program", endianness, 32, 32, 0, internal_map)
 	, m_prefetch_word0_shift(endianness == ENDIANNESS_LITTLE ? 0 : 16)
 	, m_prefetch_word1_shift(endianness == ENDIANNESS_LITTLE ? 16 : 0)
 	, m_endian(endianness)
@@ -113,6 +121,10 @@ arm7_cpu_device::arm7_cpu_device(const machine_config &mconfig, device_type type
 	m_actual_log = 0;
 }
 
+arm7_cpu_device::~arm7_cpu_device()
+{
+}
+
 
 arm7_be_cpu_device::arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: arm7_cpu_device(mconfig, ARM7_BE, tag, owner, clock, 4, ARCHFLAG_T, ENDIANNESS_BIG)
diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h
@@ -52,6 +52,7 @@ class arm7_cpu_device : public cpu_device, public arm7_disassembler::config
 public:
 	// construction/destruction
 	arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~arm7_cpu_device();
 
 	void set_high_vectors() { m_vectorbase = 0xffff0000; }
 
@@ -113,7 +114,16 @@ class arm7_cpu_device : public cpu_device, public arm7_disassembler::config
 		ARM9_COPRO_ID_MFR_INTEL = 0x69 << 24
 	};
 
-	arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint32_t archFlags, endianness_t endianness);
+	arm7_cpu_device(
+			const machine_config &mconfig,
+			device_type type,
+			const char *tag,
+			device_t *owner,
+			uint32_t clock,
+			uint8_t archRev,
+			uint32_t archFlags,
+			endianness_t endianness,
+			address_map_constructor internal_map = address_map_constructor());
 
 	void postload();
 
diff --git a/src/devices/machine/2812fifo.cpp b/src/devices/machine/2812fifo.cpp
@@ -45,6 +45,10 @@ fifo2812_device::fifo2812_device(machine_config const &mconfig, char const *tag,
 	std::fill(std::begin(m_data), std::end(m_data), 0U);
 }
 
+fifo2812_device::~fifo2812_device()
+{
+}
+
 
 void fifo2812_device::mr_w(int state)
 {
diff --git a/src/devices/machine/2812fifo.h b/src/devices/machine/2812fifo.h
@@ -33,6 +33,7 @@ class fifo2812_device : public device_t
 public:
 	// standard constructor
 	fifo2812_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
+	virtual ~fifo2812_device();
 
 	// callbacks
 	auto q_cb() { return m_q_cb.bind(); }
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
@@ -291,6 +291,10 @@ at_kbc_device_base::at_kbc_device_base(machine_config const &mconfig, device_typ
 {
 }
 
+at_kbc_device_base::~at_kbc_device_base()
+{
+}
+
 void at_kbc_device_base::device_start()
 {
 	save_item(NAME(m_hot_res));
@@ -376,6 +380,10 @@ at_keyboard_controller_device::at_keyboard_controller_device(machine_config cons
 {
 }
 
+at_keyboard_controller_device::~at_keyboard_controller_device()
+{
+}
+
 tiny_rom_entry const *at_keyboard_controller_device::device_rom_region() const
 {
 	return ROM_NAME(at_kbc);
@@ -452,6 +460,10 @@ ps2_keyboard_controller_device::ps2_keyboard_controller_device(machine_config co
 {
 }
 
+ps2_keyboard_controller_device::~ps2_keyboard_controller_device()
+{
+}
+
 tiny_rom_entry const *ps2_keyboard_controller_device::device_rom_region() const
 {
 	return ROM_NAME(ps2_kbc);
diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h
@@ -20,6 +20,8 @@
 class at_kbc_device_base : public device_t
 {
 public:
+	virtual ~at_kbc_device_base();
+
 	// outputs to host
 	auto hot_res() { return m_hot_res_cb.bind(); }
 	auto gate_a20() { return m_gate_a20_cb.bind(); }
@@ -83,6 +85,7 @@ class at_keyboard_controller_device : public at_kbc_device_base
 public:
 	// standard constructor
 	at_keyboard_controller_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+	virtual ~at_keyboard_controller_device();
 
 protected:
 	// device_t implementation
@@ -120,6 +123,7 @@ class ps2_keyboard_controller_device : public at_kbc_device_base
 
 	// standard constructor
 	ps2_keyboard_controller_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+	virtual ~ps2_keyboard_controller_device();
 
 protected:
 	// device_t implementation
diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h
@@ -19,6 +19,8 @@
 class input_merger_device : public device_t
 {
 public:
+	virtual ~input_merger_device() override;
+
 	// configuration
 	auto output_handler() { return m_output_handler.bind(); }
 
@@ -38,7 +40,6 @@ class input_merger_device : public device_t
 			u32 initval,
 			u32 xorval,
 			int active);
-	virtual ~input_merger_device() override;
 
 	// device-level overrides
 	virtual void device_start() override;
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
@@ -261,6 +261,10 @@ generic_keyboard_device::generic_keyboard_device(
 {
 }
 
+generic_keyboard_device::~generic_keyboard_device()
+{
+}
+
 
 generic_keyboard_device::generic_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
 	: generic_keyboard_device(mconfig, GENERIC_KEYBOARD, tag, owner, clock)
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
@@ -78,6 +78,7 @@ class generic_keyboard_device : public device_t, protected device_matrix_keyboar
 			const char *tag,
 			device_t *owner,
 			u32 clock);
+	virtual ~generic_keyboard_device();
 
 	template <typename... T>
 	void set_keyboard_callback(T &&... args)
diff --git a/src/devices/machine/micomxe1a.cpp b/src/devices/machine/micomxe1a.cpp
@@ -168,6 +168,10 @@ micom_xe_1a_device::micom_xe_1a_device(
 {
 }
 
+micom_xe_1a_device::~micom_xe_1a_device()
+{
+}
+
 
 u8 micom_xe_1a_device::out_r()
 {
diff --git a/src/devices/machine/micomxe1a.h b/src/devices/machine/micomxe1a.h
@@ -15,6 +15,7 @@ class micom_xe_1a_device : public device_t
 {
 public:
 	micom_xe_1a_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0) ATTR_COLD;
+	virtual ~micom_xe_1a_device();
 
 	auto buttons_handler() { return m_buttons_callback.bind(); }
 	auto analog_handler() { return m_analog_callback.bind(); }
diff --git a/src/devices/machine/s2350.cpp b/src/devices/machine/s2350.cpp
@@ -145,6 +145,10 @@ s2350_device::s2350_device(const machine_config &mconfig, const char *tag, devic
 {
 }
 
+s2350_device::~s2350_device()
+{
+}
+
 void s2350_device::device_start()
 {
 	save_item(NAME(m_transmit_buffer_empty));
diff --git a/src/devices/machine/s2350.h b/src/devices/machine/s2350.h
@@ -21,6 +21,7 @@ class s2350_device : public device_t
 {
 public:
 	s2350_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+	virtual ~s2350_device();
 
 	// transmit bits
 	auto tx_handler()                    { return m_tx_cb.bind(); }
diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp
@@ -180,6 +180,10 @@ s2636_device::s2636_device(const machine_config &mconfig, const char *tag, devic
 	for (auto &elem : m_obj_dup) elem = false;
 }
 
+s2636_device::~s2636_device()
+{
+}
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
diff --git a/src/devices/machine/s2636.h b/src/devices/machine/s2636.h
@@ -28,6 +28,7 @@ class s2636_device : public device_t,
 {
 public:
 	s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~s2636_device();
 
 	void set_offsets(int y_offset, int x_offset) { m_x_offset = x_offset; m_y_offset = y_offset; }
 
diff --git a/src/devices/machine/sdlc.cpp b/src/devices/machine/sdlc.cpp
@@ -37,6 +37,10 @@ device_sdlc_consumer_interface::device_sdlc_consumer_interface(machine_config co
 {
 }
 
+device_sdlc_consumer_interface::~device_sdlc_consumer_interface()
+{
+}
+
 void device_sdlc_consumer_interface::interface_post_start()
 {
 	device().save_item(NAME(m_line_active));
@@ -139,6 +143,10 @@ sdlc_logger_device::sdlc_logger_device(machine_config const &mconfig, char const
 {
 }
 
+sdlc_logger_device::~sdlc_logger_device()
+{
+}
+
 void sdlc_logger_device::clock_w(int state)
 {
 	if (bool(state) != bool(m_current_clock))
diff --git a/src/devices/machine/sdlc.h b/src/devices/machine/sdlc.h
@@ -23,6 +23,7 @@ class device_sdlc_consumer_interface : public device_interface
 
 protected:
 	device_sdlc_consumer_interface(machine_config const &mconfig, device_t &device);
+	virtual ~device_sdlc_consumer_interface();
 
 	virtual void interface_post_start() override;
 
@@ -55,6 +56,7 @@ class sdlc_logger_device : public device_t, public device_sdlc_consumer_interfac
 {
 public:
 	sdlc_logger_device(machine_config const &mconfig, char const *tag, device_t *owner, std::uint32_t clock);
+	virtual ~sdlc_logger_device();
 
 	// input signals
 	void data_w(int state) { m_current_data = state ? 1U : 0U; }
diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp
@@ -139,6 +139,10 @@ qsound_device::qsound_device(machine_config const &mconfig, char const *tag, dev
 {
 }
 
+qsound_device::~qsound_device()
+{
+}
+
 
 void qsound_device::qsound_w(offs_t offset, u8 data)
 {
diff --git a/src/devices/sound/qsound.h b/src/devices/sound/qsound.h
@@ -19,6 +19,7 @@ class qsound_device : public device_t, public device_sound_interface, public dev
 public:
 	// default 60MHz clock (divided by 2 for DSP core clock, and then by 1248 for sample rate)
 	qsound_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 60'000'000);
+	virtual ~qsound_device();
 
 	void qsound_w(offs_t offset, u8 data);
 	u8 qsound_r();
diff --git a/src/devices/video/dl1416.cpp b/src/devices/video/dl1416.cpp
@@ -194,6 +194,10 @@ dl1414_device::dl1414_device(
 {
 }
 
+dl1414_device::~dl1414_device()
+{
+}
+
 dl1416_device::dl1416_device(
 		machine_config const &mconfig,
 		device_type type,
@@ -208,6 +212,10 @@ dl1416_device::dl1416_device(
 {
 }
 
+dl1416_device::~dl1416_device()
+{
+}
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
diff --git a/src/devices/video/dl1416.h b/src/devices/video/dl1416.h
@@ -33,6 +33,8 @@ DECLARE_DEVICE_TYPE(DL1416T, dl1416_device)
 class dl1414_device : public device_t
 {
 public:
+	virtual ~dl1414_device();
+
 	auto update() { return m_update_cb.bind(); }
 
 	// signal-level interface
@@ -51,7 +53,7 @@ class dl1414_device : public device_t
 			device_t *owner,
 			u32 clock);
 
-	// device-level overrides
+	// device_t implementation
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
@@ -76,6 +78,8 @@ class dl1414_device : public device_t
 class dl1416_device : public dl1414_device
 {
 public:
+	virtual ~dl1416_device();
+
 	virtual void wr_w(int state) override;
 	void ce_w(int state); // chip enable (active low)
 	void cu_w(int state); // cursor enable (active low)
diff --git a/src/mame/igs/igs027a.cpp b/src/mame/igs/igs027a.cpp
diff --git a/src/mame/igs/igs027a.h b/src/mame/igs/igs027a.h
diff --git a/src/mame/igs/igs_fear.cpp b/src/mame/igs/igs_fear.cpp
diff --git a/src/mame/igs/igs_m027.cpp b/src/mame/igs/igs_m027.cpp
diff --git a/src/mame/igs/igs_m027xa.cpp b/src/mame/igs/igs_m027xa.cpp
diff --git a/src/mame/igs/pgmprot_igs027a_type2.cpp b/src/mame/igs/pgmprot_igs027a_type2.cpp

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ fifo2812_device::fifo2812_device(machine_config const &mconfig, char const *tag,`
`45`	`45`	`std::fill(std::begin(m_data), std::end(m_data), 0U);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+fifo2812_device::~fifo2812_device()`
	`49`	`+{`
	`50`	`+}`
	`51`	`+`
`48`	`52`
`49`	`53`	`void fifo2812_device::mr_w(int state)`
`50`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,10 @@ at_kbc_device_base::at_kbc_device_base(machine_config const &mconfig, device_typ`
`291`	`291`	`{`
`292`	`292`	`}`
`293`	`293`
	`294`	`+at_kbc_device_base::~at_kbc_device_base()`
	`295`	`+{`
	`296`	`+}`
	`297`	`+`
`294`	`298`	`void at_kbc_device_base::device_start()`
`295`	`299`	`{`
`296`	`300`	`save_item(NAME(m_hot_res));`
`@@ -376,6 +380,10 @@ at_keyboard_controller_device::at_keyboard_controller_device(machine_config cons`
`376`	`380`	`{`
`377`	`381`	`}`
`378`	`382`
	`383`	`+at_keyboard_controller_device::~at_keyboard_controller_device()`
	`384`	`+{`
	`385`	`+}`
	`386`	`+`
`379`	`387`	`tiny_rom_entry const *at_keyboard_controller_device::device_rom_region() const`
`380`	`388`	`{`
`381`	`389`	`return ROM_NAME(at_kbc);`
`@@ -452,6 +460,10 @@ ps2_keyboard_controller_device::ps2_keyboard_controller_device(machine_config co`
`452`	`460`	`{`
`453`	`461`	`}`
`454`	`462`
	`463`	`+ps2_keyboard_controller_device::~ps2_keyboard_controller_device()`
	`464`	`+{`
	`465`	`+}`
	`466`	`+`
`455`	`467`	`tiny_rom_entry const *ps2_keyboard_controller_device::device_rom_region() const`
`456`	`468`	`{`
`457`	`469`	`return ROM_NAME(ps2_kbc);`
Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,10 @@ generic_keyboard_device::generic_keyboard_device(`
`261`	`261`	`{`
`262`	`262`	`}`
`263`	`263`
	`264`	`+generic_keyboard_device::~generic_keyboard_device()`
	`265`	`+{`
	`266`	`+}`
	`267`	`+`
`264`	`268`
`265`	`269`	`generic_keyboard_device::generic_keyboard_device(machine_config const &mconfig, char const tag, device_t owner, u32 clock)`
`266`	`270`	`: generic_keyboard_device(mconfig, GENERIC_KEYBOARD, tag, owner, clock)`