From bb524ec858e142a497767fd3f1605f43bea7cca9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 13 Dec 2017 17:24:57 +1100 Subject: [PATCH] protect trampoline constructors (nw) --- src/devices/cpu/arm7/arm7.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index a0711fed9ec..23df9469073 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/src/devices/cpu/arm7/arm7.h @@ -614,7 +614,6 @@ class arm946es_cpu_device : public arm9_cpu_device public: // construction/destruction arm946es_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // 946E-S has Protection Unit instead of ARM MMU so CP15 is quite different virtual DECLARE_READ32_MEMBER( arm7_rt_r_callback ) override; @@ -627,6 +626,9 @@ public: virtual uint32_t arm7_cpu_read16(uint32_t addr) override; virtual uint8_t arm7_cpu_read8(uint32_t addr) override; +protected: + arm946es_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + private: uint32_t cp15_control, cp15_itcm_base, cp15_dtcm_base, cp15_itcm_size, cp15_dtcm_size; uint32_t cp15_itcm_end, cp15_dtcm_end, cp15_itcm_reg, cp15_dtcm_reg;