From 6821dad01d400f1a7b37e12a23f15ee4cbad87c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Tue, 22 Apr 2014 14:14:51 +0000 Subject: [PATCH] fixed Visual Studio compilation (nw) --- src/emu/cpu/alto2/alto2cpu.c | 36 ++++++++++++++++++++---------------- src/emu/machine/diablo_hd.c | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/emu/cpu/alto2/alto2cpu.c b/src/emu/cpu/alto2/alto2cpu.c index 81f15630af5..5a3c6c634fd 100644 --- a/src/emu/cpu/alto2/alto2cpu.c +++ b/src/emu/cpu/alto2/alto2cpu.c @@ -147,8 +147,6 @@ alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* ta m_ucode_crom(0), m_const_data(0), m_icount(0), - m_task_mpc(), - m_task_next2(), m_task(0), m_next_task(0), m_next2_task(0), @@ -164,8 +162,6 @@ alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* ta m_d_loadl(0), m_next(0), m_next2(0), - m_r(), - m_s(), m_bus(0), m_t(0), m_alu(0), @@ -176,12 +172,9 @@ alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* ta m_m(0), m_cram_addr(0), m_task_wakeup(0), - m_active_callback(), m_reset_mode(0xffff), m_rdram_flag(false), m_wrtram_flag(false), - m_s_reg_bank(), - m_bank_reg(), m_ether_enable(false), m_ewfct(false), m_dsp_time(0), @@ -197,20 +190,11 @@ alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* ta m_madr_a65(0), m_madr_a90(0), m_madr_a91(0), - m_bs(), - m_f1(), - m_f2(), - m_ram_related(), m_cycle(0), m_ether_id(0), m_hw(), m_mouse(), - m_drive(), m_dsk(), - m_sysclka0(), - m_sysclka1(), - m_sysclkb0(), - m_sysclkb1(), m_dsp(), m_disp_a38(0), m_disp_a63(0), @@ -223,6 +207,22 @@ alto2_cpu_device::alto2_cpu_device(const machine_config& mconfig, const char* ta m_eth() { m_is_octal = true; + memset(m_task_mpc, 0x00, sizeof(m_task_mpc)); + memset(m_task_next2, 0x00, sizeof(m_task_next2)); + memset(m_r, 0x00, sizeof(m_r)); + memset(m_s, 0x00, sizeof(m_s)); + memset(m_active_callback, 0x00, sizeof(m_active_callback)); + memset(m_s_reg_bank, 0x00, sizeof(m_s_reg_bank)); + memset(m_bank_reg, 0x00, sizeof(m_bank_reg)); + memset(m_bs, 0x00, sizeof(m_bs)); + memset(m_f1, 0x00, sizeof(m_f1)); + memset(m_f2, 0x00, sizeof(m_f2)); + memset(m_ram_related, 0x00, sizeof(m_ram_related)); + memset(m_drive, 0x00, sizeof(m_drive)); + memset(m_sysclka0, 0x00, sizeof(m_sysclka0)); + memset(m_sysclka1, 0x00, sizeof(m_sysclka1)); + memset(m_sysclkb0, 0x00, sizeof(m_sysclkb0)); + memset(m_sysclkb1, 0x00, sizeof(m_sysclkb1)); } alto2_cpu_device::~alto2_cpu_device() @@ -2237,6 +2237,10 @@ UINT32 alto2_cpu_device::alu_74181(UINT32 a, UINT32 b, UINT8 smc) case SMC(1,1,1,1, 1, 1): f = (a) | cout; break; + + default: + f = 0; + break; } return f; } diff --git a/src/emu/machine/diablo_hd.c b/src/emu/machine/diablo_hd.c index a9caa6d2cc9..ea5e084791a 100644 --- a/src/emu/machine/diablo_hd.c +++ b/src/emu/machine/diablo_hd.c @@ -66,7 +66,6 @@ diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *ta #endif m_diablo31(true), m_unit(0), - m_description(), m_packs(1), m_rotation_time(), m_sector_time(), @@ -103,6 +102,7 @@ diablo_hd_device::diablo_hd_device(const machine_config &mconfig, const char *ta m_handle(0), m_disk(0) { + memset(m_description, 0x00, ARRAY_LENGTH(m_description)); } /**