From 7031c31c00eb947993fa2b7a6157b6778812a9dd Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 25 Aug 2019 13:39:06 +1000 Subject: srcclean (nw) I'm assuming atronic.cpp was supposed to be Windows-1252 with Euro currency symbol encoding. Everyone please use UTF-8 for source files. --- hash/pentagon_cass.xml | 2 +- hash/specpls3_flop.xml | 2 +- hash/spectrum_betadisc_flop.xml | 60 +- hash/spectrum_cass.xml | 2 +- hash/spectrum_microdrive.xml | 6 +- hash/spectrum_wafadrive.xml | 6 +- hash/vsmile_cart.xml | 2 +- src/devices/bus/cpc/musicmachine.cpp | 10 +- src/devices/bus/cpc/musicmachine.h | 6 +- src/devices/bus/isa/s3virge.cpp | 4 +- src/devices/bus/isa/s3virge.h | 8 +- src/devices/bus/pce/pce_rom.cpp | 6 +- src/devices/bus/pce/pce_rom.h | 2 +- src/devices/bus/pce/pce_slot.cpp | 2 +- src/devices/bus/spectrum/wafa.cpp | 20 +- src/devices/bus/ss50/dc5.cpp | 14 +- src/devices/cpu/arcompact/arcompact_execute.cpp | 1472 +++++++++++------------ src/devices/cpu/mcs51/axc51-core.cpp | 10 +- src/devices/cpu/mcs51/axc51-core_dasm.h | 2 +- src/devices/imagedev/microdrv.cpp | 4 +- src/devices/imagedev/wafadrive.cpp | 2 +- src/devices/imagedev/wafadrive.h | 2 +- src/devices/machine/vrender0.cpp | 46 +- src/devices/machine/vrender0.h | 14 +- src/devices/video/virge_pci.cpp | 14 +- src/devices/video/virge_pci.h | 20 +- src/emu/input.cpp | 2 +- src/frontend/mame/info.cpp | 12 +- src/frontend/mame/info.h | 2 +- src/frontend/mame/ui/ui.cpp | 4 +- src/lib/formats/ap2_dsk.cpp | 2 +- src/lib/formats/flex_dsk.cpp | 12 +- src/mame/drivers/at.cpp | 20 +- src/mame/drivers/atronic.cpp | 54 +- src/mame/drivers/bionicc.cpp | 92 +- src/mame/drivers/crospuzl.cpp | 32 +- src/mame/drivers/crystal.cpp | 22 +- src/mame/drivers/ddz.cpp | 32 +- src/mame/drivers/goldart.cpp | 20 +- src/mame/drivers/goldnpkr.cpp | 6 +- src/mame/drivers/goldstar.cpp | 6 +- src/mame/drivers/hh_sm510.cpp | 2 +- src/mame/drivers/juku.cpp | 52 +- src/mame/drivers/lvcards.cpp | 2 +- src/mame/drivers/m72.cpp | 8 +- src/mame/drivers/magicard.cpp | 2 +- src/mame/drivers/menghong.cpp | 34 +- src/mame/drivers/mindset.cpp | 2 +- src/mame/drivers/ml20.cpp | 2 +- src/mame/drivers/neptunp2.cpp | 2 +- src/mame/drivers/nexus3d.cpp | 30 +- src/mame/drivers/pc9801.cpp | 14 +- src/mame/drivers/pcipc.cpp | 6 +- src/mame/drivers/pokerout.cpp | 26 +- src/mame/drivers/policetr.cpp | 2 +- src/mame/drivers/psattack.cpp | 26 +- src/mame/drivers/riscpc.cpp | 74 +- src/mame/drivers/segas16b.cpp | 20 +- src/mame/drivers/seta.cpp | 16 +- src/mame/drivers/snesb51.cpp | 38 +- src/mame/drivers/subsino.cpp | 2 +- src/mame/drivers/trivrus.cpp | 28 +- src/mame/drivers/vii.cpp | 24 +- src/mame/includes/pc9801.h | 2 +- src/mame/layout/saitek_risc2500.lay | 6 +- src/mame/machine/awboard.cpp | 2 +- src/mame/machine/pc9801_memsw.cpp | 150 +-- src/mame/machine/pce_cd.cpp | 14 +- src/mame/machine/pce_cd.h | 6 +- src/mame/machine/sec.h | 38 +- src/mame/machine/seibucop/seibucop_cmd.hxx | 2 +- src/mame/machine/swtpc09.cpp | 14 +- src/mame/video/galaxold.cpp | 2 +- src/mame/video/legionna.cpp | 4 +- src/mame/video/vrender0.cpp | 22 +- src/mame/video/vrender0.h | 12 +- src/osd/modules/debugger/debuggdbstub.cpp | 46 +- src/osd/windows/window.h | 8 +- 78 files changed, 1398 insertions(+), 1398 deletions(-) diff --git a/hash/pentagon_cass.xml b/hash/pentagon_cass.xml index 82532e39bac..3e50d2b5163 100644 --- a/hash/pentagon_cass.xml +++ b/hash/pentagon_cass.xml @@ -23,7 +23,7 @@ - + Old Tower 2018 RetroSouls diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml index e1cb17cf7ec..3e35c4ad3fd 100644 --- a/hash/specpls3_flop.xml +++ b/hash/specpls3_flop.xml @@ -20424,7 +20424,7 @@ - + Redshift 2018 World XXI Soft Inc diff --git a/hash/spectrum_betadisc_flop.xml b/hash/spectrum_betadisc_flop.xml index 780b3f47754..ddcfce52fb7 100644 --- a/hash/spectrum_betadisc_flop.xml +++ b/hash/spectrum_betadisc_flop.xml @@ -3,11 +3,11 @@ @@ -44,7 +44,7 @@ - + Mighty Final Fight (v1.2, Wally music hack) 2018 @@ -56,7 +56,7 @@ - + Log Cabin Dizzy (v1.04, English) 2018 Verm-V @@ -67,7 +67,7 @@ - + Log Cabin Dizzy (v1.04, Russian) 2018 Verm-V @@ -78,7 +78,7 @@ - + DreamWalker: Alter Ego 2 (Pentagon) 2014 RetroSouls @@ -89,7 +89,7 @@ - + Gravibots 2014 RetroSouls @@ -100,7 +100,7 @@ - + Lirus 2016 RetroSouls @@ -111,7 +111,7 @@ - + MultiDude (Pengaton) 2014 RetroSouls @@ -122,7 +122,7 @@ - + Sector: Invasion 2014 RetroSouls @@ -133,7 +133,7 @@ - + Twinlight 2017 RetroSouls @@ -143,8 +143,8 @@ - - + + Bobby Carrot 2018 Aleksey Golubtsov @@ -154,7 +154,7 @@ - + Aliens Neoplasma (set 1, v1.2, English) 2019 @@ -164,9 +164,9 @@ - - - + + + Aliens Neoplasma (set 2, v1.2, English, Turbo Sound) 2019 Sanchez crew @@ -177,7 +177,7 @@ - + Aliens Neoplasma (set 3, v1.2, Spanish) 2019 Sanchez crew @@ -188,7 +188,7 @@ - + Aliens Neoplasma (set 4, v1.2, Spanish, Turbo Sound) 2019 Sanchez crew @@ -199,7 +199,7 @@ - + Aliens Neoplasma (set 5, v1.2, Russian) 2019 Sanchez crew @@ -208,9 +208,9 @@ - - - + + + Aliens Neoplasma (set 6, v1.2, Russian, Turbo Sound) 2019 Sanchez crew @@ -219,9 +219,9 @@ - - - + + + Redshift 19?? <unknown> @@ -231,5 +231,5 @@ - + diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 233d85629ee..56b99aeb642 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -109088,7 +109088,7 @@ - + Hunchy (1983, Mr. Micro) 1983 Mr. Micro Ltd diff --git a/hash/spectrum_microdrive.xml b/hash/spectrum_microdrive.xml index 3cb6ba5a6c8..1a4e9f9117c 100644 --- a/hash/spectrum_microdrive.xml +++ b/hash/spectrum_microdrive.xml @@ -2,12 +2,12 @@ - + Outlet (Issue 001) 1987 Outlet diff --git a/hash/spectrum_wafadrive.xml b/hash/spectrum_wafadrive.xml index 22004dd0015..d1977d91d42 100644 --- a/hash/spectrum_wafadrive.xml +++ b/hash/spectrum_wafadrive.xml @@ -2,12 +2,12 @@ - + Spectral Writer 1984 Softek International Ltd diff --git a/hash/vsmile_cart.xml b/hash/vsmile_cart.xml index 81b0e3bb2b9..97dc2ec19e7 100644 --- a/hash/vsmile_cart.xml +++ b/hash/vsmile_cart.xml @@ -3629,7 +3629,7 @@ V.Smile Smartbook Smartidges (need a Smartbook touch tablet connected to a regul - + Scooby-Doo! - A Night Of Fright Is No Delight (Smartbook) (USA) diff --git a/src/devices/bus/cpc/musicmachine.cpp b/src/devices/bus/cpc/musicmachine.cpp index 5874b08fa0a..4d43f20c1fe 100644 --- a/src/devices/bus/cpc/musicmachine.cpp +++ b/src/devices/bus/cpc/musicmachine.cpp @@ -27,8 +27,8 @@ void cpc_musicmachine_device::device_add_mconfig(machine_config &config) MIDI_PORT(config, "mdin", midiin_slot, "midiin").rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd)); MIDI_PORT(config, "mdout", midiout_slot, "midiout"); clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); - acia_clock.signal_handler().set(FUNC(cpc_musicmachine_device::write_acia_clock)); - + acia_clock.signal_handler().set(FUNC(cpc_musicmachine_device::write_acia_clock)); + SPEAKER(config, "speaker").front_center(); ZN429E(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.2); voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); @@ -60,7 +60,7 @@ void cpc_musicmachine_device::device_start() { m_slot = dynamic_cast(owner()); address_space &space = m_slot->cpu().space(AS_IO); - + space.install_write_handler(0xf8e8,0xf8e8,write8_delegate(FUNC(cpc_musicmachine_device::irqsel_w),this)); space.install_readwrite_handler(0xf8ec,0xf8ef,read8_delegate(FUNC(cpc_musicmachine_device::acia_r), this),write8_delegate(FUNC(cpc_musicmachine_device::acia_w),this)); space.install_write_handler(0xf8f0,0xf8f0,write8_delegate(FUNC(cpc_musicmachine_device::dac_w),this)); @@ -85,7 +85,7 @@ WRITE8_MEMBER(cpc_musicmachine_device::dac_w) READ8_MEMBER(cpc_musicmachine_device::acia_r) { uint8_t ret = 0; - + switch(offset) { case 2: @@ -95,7 +95,7 @@ READ8_MEMBER(cpc_musicmachine_device::acia_r) ret = m_acia->data_r(); break; } - + return ret; } diff --git a/src/devices/bus/cpc/musicmachine.h b/src/devices/bus/cpc/musicmachine.h index 185882814e1..511eb19aa02 100644 --- a/src/devices/bus/cpc/musicmachine.h +++ b/src/devices/bus/cpc/musicmachine.h @@ -3,7 +3,7 @@ /* * The Music Machine - MIDI and sampling expansion * by Ram Electronics - * + * * Contains a 6850 AICA, Ferranti ZN429E8 DAC and ZN449 ADC */ @@ -28,7 +28,7 @@ public: DECLARE_WRITE8_MEMBER(acia_w); DECLARE_WRITE8_MEMBER(irqsel_w); DECLARE_WRITE_LINE_MEMBER(irq_w); - + void write_acia_clock(u8 data) { m_acia->write_txc(data); m_acia->write_rxc(data); } protected: @@ -44,7 +44,7 @@ private: required_device m_acia; required_device m_dac; - + bool m_irq_select; }; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 46a35ff752d..5dae6c8afa2 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -899,7 +899,7 @@ READ32_MEMBER(s3virge_vga_device::s3d_register_r) { uint32_t res = 0; int op_type = (((offset*4) & 0x0f00) / 4) - 1; - + switch(offset) { case 0x4d4/4: @@ -933,7 +933,7 @@ READ32_MEMBER(s3virge_vga_device::s3d_register_r) res = 0xffffffff; LOGMMIO("MMIO unknown/unused register read MM%04X\n", (offset*4)+0xa000); } - + return res; } diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index d8cf59bdb3e..649910dcce8 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -38,14 +38,14 @@ public: DECLARE_READ32_MEMBER(s3d_register_r); DECLARE_WRITE32_MEMBER(s3d_register_w); - + uint16_t get_crtc_port() { return (vga.miscellaneous_output&1)?0x3d0:0x3b0; } uint32_t get_linear_address() { return s3virge.linear_address; } void set_linear_address(uint32_t addr) { s3virge.linear_address = addr; } uint8_t get_linear_address_size() { return s3virge.linear_address_size; } bool is_linear_address_active() { return s3virge.linear_address_enable; } bool is_new_mmio_active() { return s3.cr53 & 0x08; } - + ibm8514a_device* get_8514() { fatalerror("s3virge requested non-existant 8514/A device\n"); return nullptr; } protected: @@ -54,7 +54,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - + enum { LAW_64K = 0, @@ -62,7 +62,7 @@ protected: LAW_2MB, LAW_4MB }; - + enum { OP_BITBLT = 0, diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 0af70e60388..cb4070d14a1 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -84,13 +84,13 @@ void pce_tennokoe_device::device_reset() } // Tennokoe Bank is a special HuCard containing x4 Backup RAM banks, -// the software can transfer +// the software can transfer void pce_tennokoe_device::nvram_default() { memset(m_bram, 0xff, m_bram_size); // easter egg: load copy of a BRAM (debug leftover?) inside bank 4. // Contains 14 save blocks, mostly at the end of the various games. - // Not entirely correct but not incorrect as well to just unlock these saves for public use, + // Not entirely correct but not incorrect as well to just unlock these saves for public use, // for testing reasons and for a slim chance of actually be supposed as default data in the bank(s) // File list: // 001 NEUTOPIA1 @@ -197,7 +197,7 @@ READ8_MEMBER(pce_tennokoe_device::read_cart) else return m_bram[offset & (m_bram_size-1)]; } - + logerror("tennokoe: ROM reading at %06x\n",offset); return 0xff; } diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 82122462d03..7521e764d03 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -98,7 +98,7 @@ protected: virtual void nvram_default() override; virtual void nvram_read(emu_file &file) override; virtual void nvram_write(emu_file &file) override; - + private: const uint32_t m_bram_size = 0x800*4; uint8_t m_bram[0x800*4]; diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 2a238d0eb15..ea49389206b 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -307,7 +307,7 @@ int pce_cart_slot_device::get_cart_type(const uint8_t *ROM, uint32_t len) if (!memcmp(ROM + 0x29d1, "VER. 3.", 7)) { type = PCE_CDSYS3J; } // JP version else if (!memcmp(ROM + 0x29c4, "VER. 3.", 7 )) { type = PCE_CDSYS3U; } // US version } - + // TODO: type for TENNOKOE, "Kei's" string at bottom? return type; diff --git a/src/devices/bus/spectrum/wafa.cpp b/src/devices/bus/spectrum/wafa.cpp index c2e747584a1..79d89eebe4c 100644 --- a/src/devices/bus/spectrum/wafa.cpp +++ b/src/devices/bus/spectrum/wafa.cpp @@ -4,19 +4,19 @@ Rotronics Wafadrive - Provides 2 built-in 'infinite loop' tape based drives that act like - discs (similar to Microdrive), a Centronics port, a RS232 port, and - the standard pass-thru connector. + Provides 2 built-in 'infinite loop' tape based drives that act like + discs (similar to Microdrive), a Centronics port, a RS232 port, and + the standard pass-thru connector. - Tapes could hold 128k, 64k or 16k (approximate sizes) with longer - seek times on the higher capacity media. Loading was significantly - slower than the Microdrive (but faster than cassette) + Tapes could hold 128k, 64k or 16k (approximate sizes) with longer + seek times on the higher capacity media. Loading was significantly + slower than the Microdrive (but faster than cassette) - Media was highly unreliable and prone to snapping. + Media was highly unreliable and prone to snapping. - use - NEW * - to initialize + use + NEW * + to initialize **********************************************************************/ diff --git a/src/devices/bus/ss50/dc5.cpp b/src/devices/bus/ss50/dc5.cpp index 2522733d4e4..52bf89a9976 100644 --- a/src/devices/bus/ss50/dc5.cpp +++ b/src/devices/bus/ss50/dc5.cpp @@ -76,7 +76,7 @@ private: emu_timer *m_floppy_motor_timer; floppy_image_device *m_fdc_selected_floppy; // Current selected floppy. uint8_t m_fdc_side; // Current floppy side. - uint32_t m_fdc_clock; // Current clock frequency. + uint32_t m_fdc_clock; // Current clock frequency. TIMER_CALLBACK_MEMBER(floppy_motor_callback); @@ -295,8 +295,8 @@ TIMER_CALLBACK_MEMBER(ss50_dc5_device::floppy_motor_callback) void ss50_dc5_device::validate_floppy_side(uint8_t cmd) { if ((cmd & 0xe1) == 0x80 || (cmd & 0xe0) == 0xa0 || - (cmd & 0xf9) == 0xc0 || (cmd & 0xf9) == 0xe0 || - (cmd & 0xf9) == 0xf0) + (cmd & 0xf9) == 0xc0 || (cmd & 0xf9) == 0xe0 || + (cmd & 0xf9) == 0xf0) { uint32_t expected_sectors = m_expected_sectors->read(); uint32_t track_zero_expected_sectors = m_track_zero_expected_sectors->read(); @@ -393,10 +393,10 @@ uint8_t ss50_dc5_device::validate_fdc_sso(uint8_t cmd) // The SSO is only loaded for type II and III commands. if ((cmd & 0xe1) == 0x80 || - (cmd & 0xe0) == 0xa0 || - (cmd & 0xf9) == 0xc0 || - (cmd & 0xf9) == 0xe0 || - (cmd & 0xf9) == 0xf0) + (cmd & 0xe0) == 0xa0 || + (cmd & 0xf9) == 0xc0 || + (cmd & 0xf9) == 0xe0 || + (cmd & 0xf9) == 0xf0) { // The SSO output is inverted and input to DDEN. uint8_t dden = !BIT(cmd, 1); diff --git a/src/devices/cpu/arcompact/arcompact_execute.cpp b/src/devices/cpu/arcompact/arcompact_execute.cpp index ebf48240e98..7d5d9383708 100644 --- a/src/devices/cpu/arcompact/arcompact_execute.cpp +++ b/src/devices/cpu/arcompact/arcompact_execute.cpp @@ -1851,15 +1851,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -1871,7 +1871,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -1889,7 +1889,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + c; m_regs[areg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -1924,35 +1924,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + c; m_regs[areg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -1987,34 +1987,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2057,31 +2057,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -2089,7 +2089,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_00_p11_m1(OPS_32) uint32_t result = b + c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2125,15 +2125,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -2145,7 +2145,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -2163,7 +2163,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_02 (SUB) (F set)\n"); // not yet supported @@ -2176,35 +2176,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_02 (SUB) (F set)\n"); // not yet supported @@ -2217,34 +2217,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_02 (SUB) (F set)\n"); // not yet supported @@ -2265,31 +2265,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -2297,7 +2297,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_02_p11_m1(OPS_32) uint32_t result = b - c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_02 (SUB) (F set)\n"); // not yet supported @@ -2311,15 +2311,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -2331,7 +2331,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -2349,7 +2349,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & c; if (areg != LIMM_REG) { m_regs[areg] = result; } - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2365,35 +2365,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & c; if (areg != LIMM_REG) { m_regs[areg] = result; } - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2409,34 +2409,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & c; if (breg != LIMM_REG) { m_regs[breg] = result; } - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2460,31 +2460,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -2492,7 +2492,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_04_p11_m1(OPS_32) uint32_t result = b & c; if (breg != LIMM_REG) { m_regs[breg] = result; } - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -2509,15 +2509,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -2529,7 +2529,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -2547,7 +2547,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_05 (OR) (F set)\n"); // not yet supported @@ -2560,35 +2560,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_05 (OR) (F set)\n"); // not yet supported @@ -2601,34 +2601,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_05 (OR) (F set)\n"); // not yet supported @@ -2649,31 +2649,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -2681,7 +2681,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_05_p11_m1(OPS_32) uint32_t result = b | c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_05 (OR) (F set)\n"); // not yet supported @@ -2695,15 +2695,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -2715,7 +2715,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -2733,7 +2733,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & (~c); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_06 (BIC) (F set)\n"); // not yet supported @@ -2746,35 +2746,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & (~c); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_06 (BIC) (F set)\n"); // not yet supported @@ -2787,34 +2787,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & (~c); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_06 (BIC) (F set)\n"); // not yet supported @@ -2835,31 +2835,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -2867,7 +2867,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_06_p11_m1(OPS_32) uint32_t result = b & (~c); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_06 (BIC) (F set)\n"); // not yet supported @@ -2881,15 +2881,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -2901,7 +2901,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -2919,7 +2919,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b ^ c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_07 (XOR) (F set)\n"); // not yet supported @@ -2932,35 +2932,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b ^ c; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_07 (XOR) (F set)\n"); // not yet supported @@ -2973,34 +2973,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b ^ c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_07 (XOR) (F set)\n"); // not yet supported @@ -3021,31 +3021,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3053,7 +3053,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_07_p11_m1(OPS_32) uint32_t result = b ^ c; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_07 (XOR) (F set)\n"); // not yet supported @@ -3067,14 +3067,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -3092,7 +3092,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -3107,21 +3107,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -3136,20 +3136,20 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p01(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p10(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -3172,17 +3172,17 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p11_m0(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p11_m1(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3190,7 +3190,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0a_p11_m1(OPS_32) uint32_t result = c; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -3207,15 +3207,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -3227,7 +3227,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -3245,7 +3245,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c - b; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0e (RSUB) (F set)\n"); // not yet supported @@ -3258,35 +3258,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c - b; m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0e (RSUB) (F set)\n"); // not yet supported @@ -3299,34 +3299,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c - b; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0e (RSUB) (F set)\n"); // not yet supported @@ -3347,31 +3347,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3379,7 +3379,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0e_p11_m1(OPS_32) uint32_t result = c - b; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0e (RSUB) (F set)\n"); // not yet supported @@ -3393,15 +3393,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -3413,7 +3413,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -3431,7 +3431,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | (1 << (c & 0x1f)); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0f (BSET) (F set)\n"); // not yet supported @@ -3444,35 +3444,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | (1 << (c & 0x1f)); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0f (BSET) (F set)\n"); // not yet supported @@ -3485,34 +3485,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b | (1 << (c & 0x1f)); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0f (BSET) (F set)\n"); // not yet supported @@ -3533,31 +3533,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3565,7 +3565,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_0f_p11_m1(OPS_32) uint32_t result = b | (1 << (c & 0x1f)); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_0f (BSET) (F set)\n"); // not yet supported @@ -3579,15 +3579,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -3599,7 +3599,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -3617,7 +3617,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & ((1<<(c+1))-1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_13 (BMSK) (F set)\n"); // not yet supported @@ -3630,35 +3630,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & ((1<<(c+1))-1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_13 (BMSK) (F set)\n"); // not yet supported @@ -3671,34 +3671,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b & ((1<<(c+1))-1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_13 (BMSK) (F set)\n"); // not yet supported @@ -3719,31 +3719,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3751,7 +3751,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_13_p11_m1(OPS_32) uint32_t result = b & ((1<<(c+1))-1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_13 (BMSK) (F set)\n"); // not yet supported @@ -3765,15 +3765,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -3785,7 +3785,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -3803,7 +3803,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_14 (ADD1) (F set)\n"); // not yet supported @@ -3816,35 +3816,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_14 (ADD1) (F set)\n"); // not yet supported @@ -3857,34 +3857,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_14 (ADD1) (F set)\n"); // not yet supported @@ -3905,31 +3905,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -3937,7 +3937,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_14_p11_m1(OPS_32) uint32_t result = b + (c << 1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_14 (ADD1) (F set)\n"); // not yet supported @@ -3951,15 +3951,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -3971,7 +3971,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -3989,7 +3989,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 2); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_15 (ADD2) (F set)\n"); // not yet supported @@ -4002,35 +4002,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 2); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_15 (ADD2) (F set)\n"); // not yet supported @@ -4043,34 +4043,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 2); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_15 (ADD2) (F set)\n"); // not yet supported @@ -4091,31 +4091,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -4123,7 +4123,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_15_p11_m1(OPS_32) uint32_t result = b + (c << 2); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_15 (ADD2) (F set)\n"); // not yet supported @@ -4137,15 +4137,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -4157,7 +4157,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -4175,7 +4175,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 3); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_16 (ADD3) (F set)\n"); // not yet supported @@ -4188,35 +4188,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 3); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_16 (ADD3) (F set)\n"); // not yet supported @@ -4229,34 +4229,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b + (c << 3); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_16 (ADD3) (F set)\n"); // not yet supported @@ -4277,31 +4277,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -4309,7 +4309,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_16_p11_m1(OPS_32) uint32_t result = b + (c << 3); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_16 (ADD3) (F set)\n"); // not yet supported @@ -4323,15 +4323,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -4343,7 +4343,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -4361,7 +4361,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_17 (SUB1) (F set)\n"); // not yet supported @@ -4374,35 +4374,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 1); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_17 (SUB1) (F set)\n"); // not yet supported @@ -4415,34 +4415,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_17 (SUB1) (F set)\n"); // not yet supported @@ -4463,31 +4463,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -4495,7 +4495,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_17_p11_m1(OPS_32) uint32_t result = b - (c << 1); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_17 (SUB1) (F set)\n"); // not yet supported @@ -4509,15 +4509,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -4529,7 +4529,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -4547,7 +4547,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 2); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_18 (SUB2) (F set)\n"); // not yet supported @@ -4560,35 +4560,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 2); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_18 (SUB2) (F set)\n"); // not yet supported @@ -4601,34 +4601,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 2); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_18 (SUB2) (F set)\n"); // not yet supported @@ -4649,31 +4649,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -4681,7 +4681,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_18_p11_m1(OPS_32) uint32_t result = b - (c << 2); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_18 (SUB2) (F set)\n"); // not yet supported @@ -4695,15 +4695,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -4715,7 +4715,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -4733,7 +4733,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 3); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_19 (SUB3) (F set)\n"); // not yet supported @@ -4746,35 +4746,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 3); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_19 (SUB3) (F set)\n"); // not yet supported @@ -4787,34 +4787,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b - (c << 3); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_19 (SUB3) (F set)\n"); // not yet supported @@ -4835,31 +4835,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -4867,7 +4867,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_19_p11_m1(OPS_32) uint32_t result = b - (c << 3); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_19 (SUB3) (F set)\n"); // not yet supported @@ -4881,14 +4881,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -4905,8 +4905,8 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p00(OPS_32) /* todo: is the limm, limm syntax valid? (it's pointless.) */ /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ m_regs[breg] = READAUX(c); - - + + if (F) { // no flag changes @@ -4918,21 +4918,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ m_regs[breg] = READAUX(c); - - + + if (F) { // no flag changes @@ -4944,20 +4944,20 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p01(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p10(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ m_regs[breg] = READAUX(c); - - + + if (F) { // no flag changes @@ -4977,25 +4977,25 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p11_m0(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2a_p11_m1(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) return m_pc + (size>>0); m_regs[breg] = READAUX(c); - - + + if (F) { // no flag changes @@ -5009,15 +5009,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -5029,7 +5029,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -5046,8 +5046,8 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p00(OPS_32) /* todo: is the limm, limm syntax valid? (it's pointless.) */ /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ WRITEAUX(c,b); - - + + if (F) { // no flag changes @@ -5060,35 +5060,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg is reserved / not used - + //COMMON32_GET_areg; // areg is reserved / not used + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ WRITEAUX(c,b); - - + + if (F) { // no flag changes @@ -5101,34 +5101,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ WRITEAUX(c,b); - - + + if (F) { // no flag changes @@ -5149,39 +5149,39 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2b_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) return m_pc + (size>>0); WRITEAUX(c,b); - - + + if (F) { // no flag changes @@ -5195,15 +5195,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -5215,7 +5215,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -5233,7 +5233,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b << (c&0x1f); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_00 (ASL) (F set)\n"); // not yet supported @@ -5246,35 +5246,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b << (c&0x1f); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_00 (ASL) (F set)\n"); // not yet supported @@ -5287,34 +5287,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b << (c&0x1f); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_00 (ASL) (F set)\n"); // not yet supported @@ -5335,31 +5335,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -5367,7 +5367,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_00_p11_m1(OPS_32) uint32_t result = b << (c&0x1f); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_00 (ASL) (F set)\n"); // not yet supported @@ -5381,15 +5381,15 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + if (breg == LIMM_REG) { GET_LIMM_32; @@ -5401,7 +5401,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p00(OPS_32) { b = m_regs[breg]; } - + if (creg == LIMM_REG) { if (!got_limm) @@ -5419,7 +5419,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b >> (c&0x1f); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_01 (LSR) (F set)\n"); // not yet supported @@ -5432,35 +5432,35 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p01(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; COMMON32_GET_areg; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b >> (c&0x1f); m_regs[areg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_01 (LSR) (F set)\n"); // not yet supported @@ -5473,34 +5473,34 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p10(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_s12; - + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = (uint32_t)S; - + + c = (uint32_t)S; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = b >> (c&0x1f); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_01 (LSR) (F set)\n"); // not yet supported @@ -5521,31 +5521,31 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p11_m1(OPS_32) { int size = 4; uint32_t limm = 0; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as condition code select - + //COMMON32_GET_areg; // areg bits already used as condition code select + uint32_t c; uint32_t b; - + /* is having b as LIMM valid here? LIMM vs. fixed u6 value makes no sense */ if (breg == LIMM_REG) { GET_LIMM_32; size = 8; -/* got_limm = 1; */ +/* got_limm = 1; */ b = limm; } else { b = m_regs[breg]; } - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ COMMON32_GET_CONDITION; if (!check_condition(condition)) @@ -5553,7 +5553,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle05_01_p11_m1(OPS_32) uint32_t result = b >> (c&0x1f); m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle05_01 (LSR) (F set)\n"); // not yet supported @@ -5567,14 +5567,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_02_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -5592,7 +5592,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_02_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c >> 1; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -5609,21 +5609,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_02_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_02_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c >> 1; m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -5664,14 +5664,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_03_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -5689,7 +5689,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_03_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ int shift = 1; uint32_t mask = (1 << (shift)) - 1; mask <<= (32-shift); uint32_t result = ((c >> shift) & ~mask) | ((c << (32-shift)) & mask); m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -5706,21 +5706,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_03_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_03_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ int shift = 1; uint32_t mask = (1 << (shift)) - 1; mask <<= (32-shift); uint32_t result = ((c >> shift) & ~mask) | ((c << (32-shift)) & mask); m_regs[breg] = result; - + if (F) { if (result & 0x80000000) { STATUS32_SET_N; } @@ -5761,14 +5761,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_07_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -5786,7 +5786,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_07_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c & 0x000000ff; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_2f_07 (EXTB) (F set)\n"); // not yet supported @@ -5798,21 +5798,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_07_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_07_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c & 0x000000ff; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_2f_07 (EXTB) (F set)\n"); // not yet supported @@ -5848,14 +5848,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_08_p00(OPS_32) int size = 4; uint32_t limm = 0; int got_limm = 0; - + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_creg; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - + if (creg == LIMM_REG) { if (!got_limm) @@ -5873,7 +5873,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_08_p00(OPS_32) /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c & 0x0000ffff; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_2f_08 (EXTW) (F set)\n"); // not yet supported @@ -5885,21 +5885,21 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_08_p00(OPS_32) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_2f_08_p01(OPS_32) { int size = 4; -/* int got_limm = 0; */ - +/* int got_limm = 0; */ + COMMON32_GET_breg; COMMON32_GET_F; COMMON32_GET_u6; - //COMMON32_GET_areg; // areg bits already used as opcode select - + //COMMON32_GET_areg; // areg bits already used as opcode select + uint32_t c; - - c = u; - + + c = u; + /* todo: if areg = LIMM then there is no result (but since that register can never be read, I guess it doesn't matter if we store it there anyway?) */ uint32_t result = c & 0x0000ffff; m_regs[breg] = result; - + if (F) { arcompact_fatal("arcompact_handle04_2f_08 (EXTW) (F set)\n"); // not yet supported @@ -6191,14 +6191,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle0f_1b(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_00(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + m_regs[breg] = m_regs[breg] << (u&0x1f); - + return m_pc + (2 >> 0); } @@ -6206,14 +6206,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_00(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_01(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + m_regs[breg] = m_regs[breg] >> (u&0x1f); - + return m_pc + (2 >> 0); } @@ -6221,14 +6221,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_01(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_02(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + int32_t temp = (int32_t)m_regs[breg]; m_regs[breg] = temp >> (u&0x1f); // treat it as a signed value, so sign extension occurs during shift - + return m_pc + (2 >> 0); } @@ -6236,14 +6236,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_02(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_03(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + m_regs[breg] = m_regs[breg] - u; - + return m_pc + (2 >> 0); } @@ -6251,14 +6251,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_03(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_04(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + m_regs[breg] = m_regs[breg] | (1 << (u & 0x1f)); - + return m_pc + (2 >> 0); } @@ -6266,14 +6266,14 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_04(OPS_16) ARCOMPACT_RETTYPE arcompact_device::arcompact_handle17_06(OPS_16) { int breg, u; - + COMMON16_GET_breg; COMMON16_GET_u5; - + REG_16BIT_RANGE(breg); - + m_regs[breg] = m_regs[breg] | ((1 << (u + 1)) - 1); - + return m_pc + (2 >> 0); } diff --git a/src/devices/cpu/mcs51/axc51-core.cpp b/src/devices/cpu/mcs51/axc51-core.cpp index 7dc8272d29e..104f3bb07bd 100644 --- a/src/devices/cpu/mcs51/axc51-core.cpp +++ b/src/devices/cpu/mcs51/axc51-core.cpp @@ -10,14 +10,14 @@ Notes: - AXC51CORE: - somes sources indicate that the extended opcode encoding may change - on some CPU models despite all being 'AXC51CORE' however we lack solid - information on this at present. + AXC51CORE: + somes sources indicate that the extended opcode encoding may change + on some CPU models despite all being 'AXC51CORE' however we lack solid + information on this at present. AX208: The CPU has 0x2000 bytes of internal ROM mapped at 0x8000-0x9fff providing - bootcode, operating kernel and many standard library functions + bootcode, operating kernel and many standard library functions *****************************************************************************/ diff --git a/src/devices/cpu/mcs51/axc51-core_dasm.h b/src/devices/cpu/mcs51/axc51-core_dasm.h index 83292e7783b..0e9bd5c3ed2 100644 --- a/src/devices/cpu/mcs51/axc51-core_dasm.h +++ b/src/devices/cpu/mcs51/axc51-core_dasm.h @@ -23,7 +23,7 @@ public: axc51core_disassembler(); axc51core_disassembler(const mem_info* names) : mcs51_disassembler(names) {}; - + virtual ~axc51core_disassembler() = default; static const mem_info axc51core_names[]; diff --git a/src/devices/imagedev/microdrv.cpp b/src/devices/imagedev/microdrv.cpp index 3ff92471e47..854b8d55197 100644 --- a/src/devices/imagedev/microdrv.cpp +++ b/src/devices/imagedev/microdrv.cpp @@ -5,8 +5,8 @@ microdrv.cpp MAME interface to the Sinclair Microdrive image abstraction code - (this seems to be QL format specific and hardcoded to a specific - size, Spectrum might need a different implementation?) + (this seems to be QL format specific and hardcoded to a specific + size, Spectrum might need a different implementation?) *********************************************************************/ diff --git a/src/devices/imagedev/wafadrive.cpp b/src/devices/imagedev/wafadrive.cpp index 86ad5280bde..658e845cb74 100644 --- a/src/devices/imagedev/wafadrive.cpp +++ b/src/devices/imagedev/wafadrive.cpp @@ -5,7 +5,7 @@ wafadrive.cpp Emulation of an individual drive within the Wafadrive unit - (preliminary, no actual emulation yet) + (preliminary, no actual emulation yet) *********************************************************************/ diff --git a/src/devices/imagedev/wafadrive.h b/src/devices/imagedev/wafadrive.h index 7d8daa5d98e..72dcb99b089 100644 --- a/src/devices/imagedev/wafadrive.h +++ b/src/devices/imagedev/wafadrive.h @@ -5,7 +5,7 @@ wafadrive.h Emulation of an individual drive within the Wafadrive unit - (preliminary, no actual emulation yet) + (preliminary, no actual emulation yet) *********************************************************************/ diff --git a/src/devices/machine/vrender0.cpp b/src/devices/machine/vrender0.cpp index daf3a7f3f64..e78ea14cf75 100644 --- a/src/devices/machine/vrender0.cpp +++ b/src/devices/machine/vrender0.cpp @@ -2,16 +2,16 @@ // copyright-holders:Angelo Salese, ElSemi /*************************************************************************** - MagicEyes VRender0 SoC peripherals - - Device by Angelo Salese - Based off original crystal.cpp by ElSemi + MagicEyes VRender0 SoC peripherals - TODO: - - Improve encapsulation, still needs a few trampolines from host driver; - - Proper PIO emulation; - - Output CRTC border color; - - Add VCLK select; + Device by Angelo Salese + Based off original crystal.cpp by ElSemi + + TODO: + - Improve encapsulation, still needs a few trampolines from host driver; + - Proper PIO emulation; + - Output CRTC border color; + - Add VCLK select; ***************************************************************************/ @@ -76,7 +76,7 @@ void vrender0soc_device::regs_map(address_map &map) map(0x01414, 0x01417).rw(FUNC(vrender0soc_device::tmcnt_r<2>), FUNC(vrender0soc_device::tmcnt_w<2>)).umask32(0x0000ffff); map(0x01418, 0x0141b).rw(FUNC(vrender0soc_device::tmcon_r<3>), FUNC(vrender0soc_device::tmcon_w<3>)); map(0x0141c, 0x0141f).rw(FUNC(vrender0soc_device::tmcnt_r<3>), FUNC(vrender0soc_device::tmcnt_w<3>)).umask32(0x0000ffff); - + // map(0x01800, 0x01bff) // Pulse Width Modulation // map(0x02000, 0x023ff) // PIO (Port) // map(0x02004, 0x02007).rw(FUNC(vrender0soc_device::PIO_r), FUNC(vrender0soc_device::PIO_w)); // PIOLDAT @@ -207,7 +207,7 @@ WRITE32_MEMBER( vrender0soc_device::intst_w ) } void vrender0soc_device::IntReq( int num ) -{ +{ if (m_inten & (1 << num)) { m_intst |= (1 << num); @@ -308,7 +308,7 @@ WRITE16_MEMBER(vrender0soc_device::tmcnt_w) // helper // bit 5 and bit 3 of the DMA control don't increment source/destination addresses if enabled. -// At the time of writing P's Attack is the only SW that uses this feature, +// At the time of writing P's Attack is the only SW that uses this feature, // in a work RAM to area $4500000 transfer, probably to extend something ... inline int vrender0soc_device::dma_setup_hold(uint8_t setting, uint8_t bitmask) { @@ -479,7 +479,7 @@ bool vrender0soc_device::crt_active_vblank_irq() { if (crt_is_interlaced() == false) return true; - + // bit 3 of CRTC reg -> select display start return (m_host_screen->frame_number() & 1) ^ ((m_crtcregs[0] & 8) >> 3); } @@ -490,16 +490,16 @@ void vrender0soc_device::crtc_update() uint32_t vdisp = m_crtcregs[0x1c / 4]; if (hdisp == 0 || vdisp == 0) return; - + bool interlace_mode = crt_is_interlaced(); - + if (interlace_mode) vdisp <<= 1; uint32_t htot = (m_crtcregs[0x20 / 4] & 0x3ff) + 1; - uint32_t vtot = (m_crtcregs[0x24 / 4] & 0x7ff); - - // adjust htotal in case it's not setup by the game + uint32_t vtot = (m_crtcregs[0x24 / 4] & 0x7ff); + + // adjust htotal in case it's not setup by the game // (datasheet mentions that it can be done automatically shrug): // - the two Sealy games do that // - Cross Puzzle sets up an HTotal of 400 with 640x480 display @@ -512,22 +512,22 @@ void vrender0soc_device::crtc_update() uint32_t hsfp = m_crtcregs[0x10 / 4] & 0xff; if (hbp == 0 && hsw == 0 && hsfp == 0) return; - + htot = hdisp + (hbp+1) + (hsw+1) + (hsfp+1); m_crtcregs[0x20 / 4] = ((htot & 0x3ff) - 1); } - + // urachamu if (vtot == 0) { uint32_t vbp = (m_crtcregs[0x08 / 4] & 0xff); if (vbp == 0) return; - + vtot = vdisp + (vbp + 1); m_crtcregs[0x24 / 4] = ((vtot & 0x7ff) - 1); } - + // TODO: the two Sealy games doesn't set this, eventually need to parametrize this one up uint32_t pixel_clock = (BIT(m_crtcregs[0x04 / 4], 3)) ? 14318180 : 14318180*2; if (BIT(m_crtcregs[0x04 / 4], 7)) @@ -546,7 +546,7 @@ void vrender0soc_device::crtc_update() vtot += 1; } //else - // pixel_clock >>= 1; + // pixel_clock >>= 1; vtot += 9; diff --git a/src/devices/machine/vrender0.h b/src/devices/machine/vrender0.h index 46795ca6900..570d1aaa606 100644 --- a/src/devices/machine/vrender0.h +++ b/src/devices/machine/vrender0.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese, ElSemi /*************************************************************************** - MagicEyes VRender0 SoC + MagicEyes VRender0 SoC ***************************************************************************/ @@ -48,7 +48,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; - + private: required_device m_host_cpu; required_device m_host_screen; @@ -64,12 +64,12 @@ private: DECLARE_READ32_MEMBER(intvec_r); DECLARE_WRITE32_MEMBER(intvec_w); - + uint8_t m_IntHigh; uint32_t m_intst; DECLARE_READ32_MEMBER(intst_r); DECLARE_WRITE32_MEMBER(intst_w); - + // Timer template DECLARE_WRITE32_MEMBER(tmcon_w); template DECLARE_READ32_MEMBER(tmcon_r); @@ -81,7 +81,7 @@ private: uint16_t m_timer_count[4]; emu_timer *m_Timer[4]; void TimerStart(int which); - + // DMAC template DECLARE_READ32_MEMBER(dmac_r); template DECLARE_WRITE32_MEMBER(dmac_w); @@ -98,13 +98,13 @@ private: uint32_t size; uint32_t ctrl; }m_dma[2]; - + // CRTC DECLARE_READ32_MEMBER(crtc_r); DECLARE_WRITE32_MEMBER(crtc_w); void crtc_update(); inline bool crt_is_interlaced(); - + // Misc DECLARE_READ32_MEMBER( sysid_r ); DECLARE_READ32_MEMBER( cfgr_r ); diff --git a/src/devices/video/virge_pci.cpp b/src/devices/video/virge_pci.cpp index 26badeccd6a..bc5755d3550 100644 --- a/src/devices/video/virge_pci.cpp +++ b/src/devices/video/virge_pci.cpp @@ -220,10 +220,10 @@ void virge_pci_device::device_start() { set_ids(0x53335631, 0x00, 0x030000, 0x000000); pci_device::device_start(); - + add_rom(m_bios->base(),0x8000); expansion_rom_base = 0xc0000; - + add_map(32 * 1024 * 1024, M_MEM | M_DISABLED, FUNC(virge_pci_device::lfb_map)); set_map_address(0, 0x70000000); set_map_size(0, 0x01100000); // Linear addressing maps to a 32MB address space @@ -236,10 +236,10 @@ void virgedx_pci_device::device_start() { set_ids(0x53338a01, 0x00, 0x030000, 0x000000); pci_device::device_start(); - + add_rom(m_bios->base(),0x8000); expansion_rom_base = 0xc0000; - + add_map(4 * 1024 * 1024, M_MEM | M_DISABLED, FUNC(virge_pci_device::lfb_map)); set_map_address(0, 0x70000000); set_map_size(0, 0x01100000); // Linear addressing maps to a 32MB address space @@ -253,9 +253,9 @@ void virge_pci_device::map_extra(uint64_t memory_window_start, uint64_t memory_w { memory_space->install_readwrite_handler(0xa0000, 0xbffff, read8_delegate(FUNC(virge_pci_device::vram_r),this), write8_delegate(FUNC(virge_pci_device::vram_w),this)); - io_space->install_readwrite_handler(0x3b0, 0x3bf, read32_delegate(FUNC(virge_pci_device::vga_3b0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3b0_w), this)); - io_space->install_readwrite_handler(0x3c0, 0x3cf, read32_delegate(FUNC(virge_pci_device::vga_3c0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3c0_w), this)); - io_space->install_readwrite_handler(0x3d0, 0x3df, read32_delegate(FUNC(virge_pci_device::vga_3d0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3d0_w), this)); + io_space->install_readwrite_handler(0x3b0, 0x3bf, read32_delegate(FUNC(virge_pci_device::vga_3b0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3b0_w), this)); + io_space->install_readwrite_handler(0x3c0, 0x3cf, read32_delegate(FUNC(virge_pci_device::vga_3c0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3c0_w), this)); + io_space->install_readwrite_handler(0x3d0, 0x3df, read32_delegate(FUNC(virge_pci_device::vga_3d0_r), this), write32_delegate(FUNC(virge_pci_device::vga_3d0_w), this)); } void virge_pci_device::device_add_mconfig(machine_config &config) diff --git a/src/devices/video/virge_pci.h b/src/devices/video/virge_pci.h index e049ced8323..a672fb03b08 100644 --- a/src/devices/video/virge_pci.h +++ b/src/devices/video/virge_pci.h @@ -30,13 +30,13 @@ public: LAW_2MB, LAW_4MB }; - + virge_pci_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virge_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - + void lfb_map(address_map &map); void mmio_map(address_map& map); - + DECLARE_READ32_MEMBER(vga_3b0_r); DECLARE_WRITE32_MEMBER(vga_3b0_w); DECLARE_READ32_MEMBER(vga_3c0_r); @@ -52,20 +52,20 @@ protected: virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - + virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; virtual void config_map(address_map &map) override; - + void postload(void); - + required_device m_vga; required_memory_region m_bios; optional_device m_screen; private: void refresh_linear_window(); - + uint8_t m_current_crtc_reg; }; @@ -85,9 +85,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; -// required_device m_vga; -// required_memory_region m_bios; -// optional_device m_screen; +// required_device m_vga; +// required_memory_region m_bios; +// optional_device m_screen; }; DECLARE_DEVICE_TYPE(VIRGE_PCI, virge_pci_device) diff --git a/src/emu/input.cpp b/src/emu/input.cpp index 05e9dfb4637..0265b021e9a 100644 --- a/src/emu/input.cpp +++ b/src/emu/input.cpp @@ -1465,7 +1465,7 @@ bool input_manager::seq_poll() //------------------------------------------------- // seq_clean - clean the sequence, removing -// any invalid bits +// any invalid bits //------------------------------------------------- input_seq input_manager::seq_clean(const input_seq &seq) const diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp index f98bea8b3e2..5be974239d9 100644 --- a/src/frontend/mame/info.cpp +++ b/src/frontend/mame/info.cpp @@ -264,7 +264,7 @@ info_xml_creator::info_xml_creator(emu_options const &options, bool dtd) //------------------------------------------------- // output - print the XML information for all -// known machines matching a pattern +// known machines matching a pattern //------------------------------------------------- void info_xml_creator::output(std::ostream &out, const std::vector &patterns) @@ -323,15 +323,15 @@ void info_xml_creator::output(std::ostream &out, const std::vector //------------------------------------------------- // output - print the XML information for all -// known (and filtered) machines +// known (and filtered) machines //------------------------------------------------- void info_xml_creator::output(std::ostream &out, const std::function &filter, bool include_devices) { struct prepared_info { - std::string m_xml_snippet; - device_type_set m_dev_set; + std::string m_xml_snippet; + device_type_set m_dev_set; }; // prepare a driver enumerator and the queue @@ -395,7 +395,7 @@ void info_xml_creator::output(std::ostream &out, const std::function &lhs, return strcmp(lhs->shortname(), rhs->shortname()) < 0; } -} \ No newline at end of file +} diff --git a/src/frontend/mame/info.h b/src/frontend/mame/info.h index 31dfbf88098..2867391267c 100644 --- a/src/frontend/mame/info.h +++ b/src/frontend/mame/info.h @@ -39,7 +39,7 @@ public: private: // internal state emu_options m_lookup_options; - bool m_dtd; + bool m_dtd; }; #endif // MAME_FRONTEND_MAME_INFO_H diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp index 446c848939f..4269e674f84 100644 --- a/src/frontend/mame/ui/ui.cpp +++ b/src/frontend/mame/ui/ui.cpp @@ -353,8 +353,8 @@ void mame_ui_manager::display_startup_screens(bool first_time) warning << _("This driver requires images to be loaded in the following device(s): "); output_joined_collection(mandatory_images, - [&warning](const std::reference_wrapper &img) { warning << "\"" << img.get() << "\""; }, - [&warning]() { warning << ","; }); + [&warning](const std::reference_wrapper &img) { warning << "\"" << img.get() << "\""; }, + [&warning]() { warning << ","; }); ui::menu_file_manager::force_file_manager(*this, machine().render().ui_container(), warning.str().c_str()); } diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp index af141906ef4..41e1f6e6fd0 100644 --- a/src/lib/formats/ap2_dsk.cpp +++ b/src/lib/formats/ap2_dsk.cpp @@ -673,7 +673,7 @@ bool a2_16sect_format::load(io_generic *io, uint32_t form_factor, floppy_image * else if (!memcmp(subnod_block1, §or_data[0x100], 8)) { m_prodos_order = true; - } // check for ProDOS 2.5's new boot block + } // check for ProDOS 2.5's new boot block else if (!memcmp("PRODOS", §or_data[0x3a], 6)) { m_prodos_order = true; diff --git a/src/lib/formats/flex_dsk.cpp b/src/lib/formats/flex_dsk.cpp index 30ff15dcf74..cb2dbb33b12 100644 --- a/src/lib/formats/flex_dsk.cpp +++ b/src/lib/formats/flex_dsk.cpp @@ -92,12 +92,12 @@ int flex_format::find_size(io_generic *io, uint32_t form_factor) if (info.disk_ext[0] || info.disk_ext[1] || info.disk_ext[2]) { LOG_FORMATS("."); for (int i = 0; i < sizeof(info.disk_name); i++) { - uint8_t ch = info.disk_name[i]; - if (ch < 0x20 || ch > 0x7f) { - LOG_FORMATS("[%02x]", ch); - } else { - LOG_FORMATS("%c", ch); - } + uint8_t ch = info.disk_name[i]; + if (ch < 0x20 || ch > 0x7f) { + LOG_FORMATS("[%02x]", ch); + } else { + LOG_FORMATS("%c", ch); + } } } LOG_FORMATS("\"\n"); diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index 9b0d55be11d..e98f9279c7e 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -11,7 +11,7 @@ Info: The PC 30-III and PC 40-III share the same mainboard. On a PC 30-III the o Form factor: Desktop PC CPU: Siemens SAB 80286-12 (PC 30-III), Intel 80286-12 (PC 40-III) RAM: 1MB on board -Chipset: Faraday FE3020, MOS 5720 1788 41, Faraday FE3000, FE3010B, +Chipset: Faraday FE3020, MOS 5720 1788 41, Faraday FE3000, FE3010B, Bus: 3x16 bit ISA, 1x8 bit ISA Video: PC 30-III: ATI EGA Wonder 800+, PC 40-III: Onboard Paradise VGA, 256KB Mass storage: One HD disk drive standard, second drive optional; PC 30-III: 20MB, PC 40-III: 40MB AT-IDE HD standard, 80MB or 100MB optional @@ -1322,7 +1322,7 @@ ROM_START( pc50ii ) // Chipset: Chips P82C211-12 C(16MHz), P82C212B-12 (16MHz), // ROM_LOAD( "m_pc50-ii_54e3_pvgadk_even.bin", 0x00001, 0x8000, CRC(01f6b964) SHA1(799a84ddde8a7672a6df9439bad6198ec3ff98ec)) ROM_END -// Commodore PC-60-III - complaining "time-of-day-clock stopped" - Phoenix P8242 '87 keyboard BIOS +// Commodore PC-60-III - complaining "time-of-day-clock stopped" - Phoenix P8242 '87 keyboard BIOS ROM_START( pc60iii ) // onboard Paradise PVGA1A-JK, 2xRS232, 1xparallel, keyboard ROM_REGION(0x20000, "bios", 0) // Chipset: Chips P82C301C, P82B305, P82A303, P82A304, Chips F82307, 25531/390423-1 COMBO SMC B9016, Commodore CSG, four MOSEL MS82C308-35JC, ISA16: 7, RAM card: 2 (up to 8MB, extended ISA connector) // 0: Commodore PC60-III 80386 BIOS Rev. 1.2 - 390473-01/390474-01 @@ -1396,7 +1396,7 @@ ROM_END ROM_START( at ) ROM_REGION(0x20000,"bios", 0) - // 0: BIOS-String: ENET-1107-040990-K0 + // 0: BIOS-String: ENET-1107-040990-K0 ROM_SYSTEM_BIOS(0, "ami211", "AMI 21.1") /*(Motherboard Manufacturer: Dataexpert Corp. Motherboard) (Neat 286 Bios, 82c21x Chipset ) (BIOS release date:: 09-04-1990)*/ ROMX_LOAD( "ami211.bin", 0x10000, 0x10000,CRC(a0b5d269) SHA1(44db8227d35a09e39b93ed944f85dcddb0dd0d39), ROM_BIOS(0)) // 1: BIOS-String: D286-0011-110387 @@ -1411,7 +1411,7 @@ ROM_START( at ) ROMX_LOAD( "amic21-2.bin", 0x10001, 0x8000, CRC(8ffe7752) SHA1(68215f07a170ee7bdcb3e52b370d470af1741f7e),ROM_SKIP(1) | ROM_BIOS(3) ) ROMX_LOAD( "amic21-1.bin", 0x10000, 0x8000, CRC(a76497f6) SHA1(91b47d86967426945b2916cb40e76a8da2d31d54),ROM_SKIP(1) | ROM_BIOS(3) ) // 4: Quadtel Enhanced 286 BIOS Version 3.04.02 - Headland HT101, HT102 - ROM_SYSTEM_BIOS(4, "ami101", "AMI HT 101.1") /* (Quadtel Enhanced 286 Bios Version 3.04.02) (BIOS release date:: 09/11/1989) */ + ROM_SYSTEM_BIOS(4, "ami101", "AMI HT 101.1") /* (Quadtel Enhanced 286 Bios Version 3.04.02) (BIOS release date:: 09/11/1989) */ ROMX_LOAD( "amiht-h.bin", 0x10001, 0x8000, CRC(8022545f) SHA1(42541d4392ad00b0e064b3a8ccf2786d875c7c19),ROM_SKIP(1) | ROM_BIOS(4) ) ROMX_LOAD( "amiht-l.bin", 0x10000, 0x8000, CRC(285f6b8f) SHA1(2fce4ec53b68c9a7580858e16c926dc907820872),ROM_SKIP(1) | ROM_BIOS(4) ) // 5: BIOS-String: DH12-1211-061390-K0 @@ -1456,7 +1456,7 @@ ROM_START( at ) ROM_SYSTEM_BIOS(15, "ev1815303", "Everex EV-1815 V3.03") /* (BIOS release date:: 15-11-1985) */ ROMX_LOAD( "award_v3.03_ev1815_even.bin", 0x18000, 0x4000, CRC(dd64bdd6) SHA1(b3108b692d2aa03701ac894602e9418ae0779702), ROM_SKIP(1) | ROM_BIOS(15) ) ROMX_LOAD( "award_v3.03_ev1815_odd.bin", 0x18001, 0x4000, CRC(29f023fb) SHA1(873561bb7087483c0c763ef9cd32c1adf0f7cb5e), ROM_SKIP(1) | ROM_BIOS(15) ) - // 16: Award 286 Modular BIOS Version 3.03GS + // 16: Award 286 Modular BIOS Version 3.03GS ROM_SYSTEM_BIOS(16, "ev1815303gs", "Everex EV-1815 V3.03GS") /* (BIOS release date:: 15-11-1985) */ ROMX_LOAD( "award_v3.03gs_ev1815_even.bin", 0x10000, 0x8000, CRC(59489ec2) SHA1(b3c13ba53d4c4ee75a15703236a748121102ce84), ROM_SKIP(1) | ROM_BIOS(16) ) ROMX_LOAD( "award_v3.03gs_ev1815_odd.bin", 0x10001, 0x8000, CRC(5bcd9421) SHA1(f32e5a39da593c6982f964fb05b0802d54c3de45), ROM_SKIP(1) | ROM_BIOS(16) ) @@ -1483,7 +1483,7 @@ ROM_START( at ) ROMX_LOAD( "awd286lo.rom", 0x18000, 0x4000, CRC(d1a9c01f) SHA1(9123c6f76d85725036a0f8b9c6480142abea478f), ROM_SKIP(1) | ROM_BIOS(22) ) ROMX_LOAD( "awd286hi.rom", 0x18001, 0x4000, CRC(b0bde4cc) SHA1(9c3fd2c0f69dde905d4e8f3be421374ef99682df), ROM_SKIP(1) | ROM_BIOS(22) ) // 23: DTK 286 BIOS Ver. 3.01 07/24/87 - no screen display - ROM_SYSTEM_BIOS(23, "dtk286", "dtk286") /* (BIOS release date:: 11-03-1986) */ + ROM_SYSTEM_BIOS(23, "dtk286", "dtk286") /* (BIOS release date:: 11-03-1986) */ ROMX_LOAD( "dtk286lo.rom", 0x18000, 0x4000, CRC(dfc70856) SHA1(39158e6ed50236d371277631e77d06f77fb0531e), ROM_SKIP(1) | ROM_BIOS(23) ) ROMX_LOAD( "dtk286hi.rom", 0x18001, 0x4000, CRC(a98fc743) SHA1(fb9e330148cb5584f61c1febea71c53b6f9d61b7), ROM_SKIP(1) | ROM_BIOS(23) ) // 24: Phoenix 80286 ROM BIOS Version 3.07 (R04) @@ -1513,7 +1513,7 @@ ROM_START( at ) ROM_SYSTEM_BIOS(29, "head_ph_2", "Headland/Phoenix #2") // Phoenix BIOS A286 Version 1.01 - BIOS ID JLI01101 - IT9109 - Reference ID 01 - (BIOS release date:: 19-04-1990) ROMX_LOAD( "286-headland-iqs-lo_32k.bin", 0x10000, 0x8000, CRC(60424e9d) SHA1(aa813bf48939fe7fcbbfec3133e702bfdff6234e), ROM_SKIP(1) | ROM_BIOS(29) ) ROMX_LOAD( "286-headland-iqs-hi_32k.bin", 0x10001, 0x8000, CRC(e56212e0) SHA1(2441845d632d19adc0592e094beb5ec1fbe074f6), ROM_SKIP(1) | ROM_BIOS(29) ) - // 30: MS-0010-2 - Phoenix ROM BIOS Version 3.06 + // 30: MS-0010-2 - Phoenix ROM BIOS Version 3.06 ROM_SYSTEM_BIOS(30, "ms-0010-2", "MS-0010-2") /* (BIOS release date:: 19-01-1987) (ISA8: 3, ISA16: 5) */ ROMX_LOAD( "286-ms0010-2-lo_32k.bin", 0x10000, 0x8000, CRC(2c381474) SHA1(94b9825d412ea39d67857102a0375852b349fcd6), ROM_SKIP(1) | ROM_BIOS(30) ) ROMX_LOAD( "286-ms0010-2-hi_32k.bin", 0x10001, 0x8000, CRC(4fdb8c64) SHA1(c2e7f88f0ac97ee5eed0c97864b7f1810e99ea26), ROM_SKIP(1) | ROM_BIOS(30) ) @@ -1523,13 +1523,13 @@ ROM_START( at ) ROMX_LOAD( "286-vlsi_japan-2-even_32k.bin", 0x10000, 0x8000, CRC(e3e64cbc) SHA1(5259e3c8686f2239a5fb0dc38aa80380ef9ec5fa), ROM_SKIP(1) | ROM_BIOS(31) ) ROMX_LOAD( "286-vlsi_japan-2-odd_32k.bin", 0x10001, 0x8000, CRC(aa533f39) SHA1(d88c7d4029a283b94b99e2017d29fbf9eb9105b1), ROM_SKIP(1) | ROM_BIOS(31) ) // 32: CMP enterprise CO.LTD. Phoenix 80286 ROM BIOS Version 3.00 - ROM_SYSTEM_BIOS(32, "cmpa286", "CPM A286") /* (Chipset Acer (ALi) M1207-12) (BIOS release date:: 01-09-1986) (ISA8: 2, ISA16: 6) */ + ROM_SYSTEM_BIOS(32, "cmpa286", "CPM A286") /* (Chipset Acer (ALi) M1207-12) (BIOS release date:: 01-09-1986) (ISA8: 2, ISA16: 6) */ ROMX_LOAD( "286-a286-even_16k.bin", 0x18000, 0x4000, CRC(30809487) SHA1(413de43ca7e1930cdf3c006718d8baf743a9ff1e), ROM_SKIP(1) | ROM_BIOS(32) ) ROMX_LOAD( "286-a286-odd_16k.bin", 0x18001, 0x4000, CRC(3a11aacf) SHA1(23185531ae10912b974048d3607b563e55d3fa96), ROM_SKIP(1) | ROM_BIOS(32) ) // 33: AL-6410 (found online, no markings on the board itself), Chipset: Chips P82A204, P82A203, P82A205, P82C201, P82C202 - ROM_SYSTEM_BIOS(33, "al6410", "AL-6410") /* (BIOS-String: D286-1103-110387-K0) (BIOS release date:: 03-11-1987) (ISA8: 2, ISA16: 6) */ + ROM_SYSTEM_BIOS(33, "al6410", "AL-6410") /* (BIOS-String: D286-1103-110387-K0) (BIOS release date:: 03-11-1987) (ISA8: 2, ISA16: 6) */ ROMX_LOAD( "al-6410_ami_bios_low.bin", 0x10000, 0x8000, CRC(50c4e121) SHA1(5f9c27aabdc6bb810e90bced2053b7c21c4994dd), ROM_SKIP(1) | ROM_BIOS(33) ) - ROMX_LOAD( "al-6410_ami_bios_high.bin", 0x10001, 0x8000, CRC(a44be083) SHA1(99f73d7ceb315eb3770c94d90228f8859cadc610), ROM_SKIP(1) | ROM_BIOS(33) ) + ROMX_LOAD( "al-6410_ami_bios_high.bin", 0x10001, 0x8000, CRC(a44be083) SHA1(99f73d7ceb315eb3770c94d90228f8859cadc610), ROM_SKIP(1) | ROM_BIOS(33) ) // 34: AT SYSTEM 6M/8M/10M - Chipset: Chips P82A205; P82C201; P82A203; P82A204 ROM_SYSTEM_BIOS(34, "at6m8m10m", "AT SYSTEM 6M/8M/10M") /* (BIOS release date:: 04-02-1987) */ ROMX_LOAD( "286-at system 6m8m10m-l_32k.bin", 0x10000, 0x8000, CRC(37e0e1c1) SHA1(f5cd17658554a73bb86c5c8e630dac3e34b38e51), ROM_SKIP(1) | ROM_BIOS(34) ) diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp index 61ab1769991..35ad71cb8cf 100644 --- a/src/mame/drivers/atronic.cpp +++ b/src/mame/drivers/atronic.cpp @@ -15,7 +15,7 @@ see parts list with IC Money description below - some of these fill up the log with + some of these fill up the log with 'BLMOVE with unaligned src and aligned dst' from the 34020 which softlocks MAME as the PC no longer advances, see "void tms340x0_device::blmove(uint16_t op)" in 34010ops.hxx this appears to be valid code, just unsupported in the 34020 core @@ -24,7 +24,7 @@ /*--------------------------------------------------------------------------------------------------------------------------------------- - I C Money + I C Money ----------------------------------------------------------------------------------------------------------------------------------------- -- CPU board --- @@ -95,11 +95,11 @@ Dumpable stuff: * U2: Altera EPM7032S ; U2-A ; cannot dump, connected J2 10pin header? :( * U3: Altera EPM7032S ; U3-A ; cannot dump, connected J3 10pin header? :( -U8: M27C801 ; I.C.Money \n IM5_A-03-B ; cannot dump +U8: M27C801 ; I.C.Money \n IM5_A-03-B ; cannot dump U9: M27C801 ; 65998223 GB U09 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n A391 4U3F ; ok U10: M27C801 ; I.C.Money \n IM5_A-03-B \n GB-U10 (2FC4) ; ok -U11: M27C801 ; 65998223 GB U11 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n D12D 3795 ; ok -U12: M27C801 ; 65998223 GB U12 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n 377D 3453 ; ok +U11: M27C801 ; 65998223 GB U11 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n D12D 3795 ; ok +U12: M27C801 ; 65998223 GB U12 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n 377D 3453 ; ok U13: M27C801 ; I.C.Money \n IM5_A-03-B \n GB-U13 (F044) ; ok U14: M27C801 ; 65998223 GB U14 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n 2F4B CP9U ; ok U15: M27C801 ; 65998223 GB U15 8M MX27C8000PC-10 \n I.C.MONEY \n IM5_-A-03-B \n 4A50 2076 ; ok @@ -113,14 +113,14 @@ U5: AHCT574 U6: TL16C550CFN U7: Bt481AKPJ110 (palette RAMDAC) . -U16: TMS55160DGH-60 +U16: TMS55160DGH-60 U17: TMS55160DGH-60 U18: 74HCT04D U19: DS1488M U20: DS1489M U21: unpopulated -U22: MC74F373N -U23: MC74F373N +U22: MC74F373N +U23: MC74F373N U24: SN74F374N U25: SN74F374N U26: 74F244PC @@ -140,13 +140,13 @@ Markings bottom: 6 470.5020 00.21 /*--------------------------------------------------------------------------------------------------------------------------------------- - Wild Thing + Wild Thing ----------------------------------------------------------------------------------------------------------------------------------------- -- CPU board -- -U2: MB-U2 ; M27C4001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) -U6: MB-U6 ; M27C1001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) +U2: MB-U2 ; M27C4001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) +U6: MB-U6 ; M27C1001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) U22: MB-U22D ; GAL16V8D ; ?? U32: MB-U32I ; GAL22V10D ; ?? U35: POKE-S6368 ; GAL22V10D ; ?? @@ -155,8 +155,8 @@ Red PCB / Mainboard -- alt CPU board --- -U2: M27C4001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) -U6: M27C1001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) +U2: M27C4001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) +U6: M27C1001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) U22: GAL16V8B ; [no markings] ; ?? cannot dump yet U32: GAL16V8B ; [no markings] ; ?? cannot dump yet U35: PALCE22V10H; POKE-S-6598 ; ?? cannot dump yet @@ -165,8 +165,8 @@ PCB markings bottom: 6 470.5028 00.01 -- another alt CPU board --- -U2: M27C4001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) ; (same as mb-1 ; mb-2) -U6: M27C1001@DIP32 ; Wild Thing (EE) \n 200 / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) ; (didn't dump anymore) +U2: M27C4001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n POKE-E-A-WV (EE) \n MB-U2 (5694) ; (same as mb-1 ; mb-2) +U6: M27C1001@DIP32 ; Wild Thing (EE) \n 200€ / 1000S \n WILD-A-A3-D (EE) \n MB-U6 (19CA) ; (didn't dump anymore) U22: GAL16V8D ; MB-U22-D U32: GAL16V8D ; MB-U32-B U35: PALCE22V10H; POKE-S-7266 ; ?? cannot dump yet @@ -201,15 +201,15 @@ Markings bottom: 6 470.5020 00.05 */ /*--------------------------------------------------------------------------------------------------------------------------------------- - Bonus Poker + Bonus Poker ----------------------------------------------------------------------------------------------------------------------------------------- -- CPU Board --- Chips with data: -* U2: M27C4001@DIP32 ; Bonus Poker (EE) \n 200 / 1000S \n POKE-I-B-WJ (EE) \n MB-U2 (6A73) ; dumped -* U6: M27C4001@DIP32 ; Bonus Poker (EE) \n 200 / 1000S \n BOPO-B-A1-C (EE) \n MB-U6 (EAA2) ; dumped +* U2: M27C4001@DIP32 ; Bonus Poker (EE) \n 200€ / 1000S \n POKE-I-B-WJ (EE) \n MB-U2 (6A73) ; dumped +* U6: M27C4001@DIP32 ; Bonus Poker (EE) \n 200€ / 1000S \n BOPO-B-A1-C (EE) \n MB-U6 (EAA2) ; dumped * U22: GAL16V8D ; MB-U22D ; dumped * U32: GAL22V10D ; MB-U32I ; dumped * U35: GAL22V10D ; POKE-S6366 ; dumped @@ -289,7 +289,7 @@ General chips: * U1: TMS34020AGBL-32 -* U16: TMS55160DGH-60 +* U16: TMS55160DGH-60 * U17: TMS55160DGH-60 * U24: 74F374N * U25: 74F374N @@ -439,7 +439,7 @@ TMS340X0_SCANLINE_RGB32_CB_MEMBER(atronic_state::scanline_update) void atronic_state::video_map(address_map &map) { map(0x00000000, 0x01ffffff).ram().share("vidram"); - + map(0xa0000010, 0xa000001f).w(m_ramdac, FUNC(ramdac_device::index_w)).umask16(0x00ff); map(0xa0000020, 0xa000002f).w(m_ramdac, FUNC(ramdac_device::pal_w)).umask16(0x00ff); map(0xa0000030, 0xa000003f).w(m_ramdac, FUNC(ramdac_device::mask_w)).umask16(0x00ff); @@ -851,7 +851,7 @@ ROM_START( beetleup ) ROM_LOAD32_BYTE( "u09_7b88.bin", 0x000000, 0x100000, CRC(8443972b) SHA1(5f2eea84ba18a83502f36eeaa52cff49a1631668) ) ROM_LOAD32_BYTE( "u11_1957.bin", 0x000001, 0x100000, CRC(36c7e5c5) SHA1(2bad0bb6b363af6a37f5b11c7ca8b3b674df4072) ) ROM_LOAD32_BYTE( "u13_b661.bin", 0x000002, 0x100000, CRC(0e74726c) SHA1(3103d801a622315877fc09d9c99290b54b266885) ) - ROM_LOAD32_BYTE( "u15_fd57.bin", 0x000003, 0x100000, CRC(9eabc514) SHA1(ed89b068b381ad4e007352bddf3aebe10ebebf4a) ) + ROM_LOAD32_BYTE( "u15_fd57.bin", 0x000003, 0x100000, CRC(9eabc514) SHA1(ed89b068b381ad4e007352bddf3aebe10ebebf4a) ) ROM_LOAD32_BYTE( "u08_5804.bin", 0x400000, 0x100000, CRC(65a020e3) SHA1(2bb781905338e2d444222095d8430137632fae3d) ) ROM_LOAD32_BYTE( "u10_647c.bin", 0x400001, 0x100000, CRC(c46c064d) SHA1(6181cf0e1d53f0a79c266b4f87d3b0c32313c593) ) ROM_LOAD32_BYTE( "u12_07f3.bin", 0x400002, 0x100000, CRC(cefdfdad) SHA1(2032e0942f52d025f8da225c31ca7f7121c7b7f8) ) @@ -1008,7 +1008,7 @@ ROM_START( jumpjkpt ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u09.bin", 0x000000, 0x100000, CRC(7d3cb293) SHA1(e9f102620f01309327678e115e206fd29dcffde6) ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u11.bin", 0x000001, 0x100000, CRC(d92c0c7e) SHA1(680032b81e76c74539ff56f8c5fc7d4d16fd4793) ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u13.bin", 0x000002, 0x100000, CRC(555ced70) SHA1(1ec115a2e2a1c171070775913a3eb831efc81dab) ) - ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u15.bin", 0x000003, 0x100000, CRC(78d603e5) SHA1(eee3953acedcfedb0118328c37d8a13c72a222f3) ) + ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u15.bin", 0x000003, 0x100000, CRC(78d603e5) SHA1(eee3953acedcfedb0118328c37d8a13c72a222f3) ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u08.bin", 0x400000, 0x100000, CRC(3c96ccd3) SHA1(b3a05b5cd1200b177f2f9e5f0d0a4870efb9ce29) ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u10.bin", 0x400001, 0x100000, CRC(ae8f94ea) SHA1(bf747b63847bd60c3a387e723b4253e546d1eb80) ) ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u12.bin", 0x400002, 0x100000, CRC(cbc70102) SHA1(6079afafeea35a5d2b3a1b32076ebcd0c2ad4625) ) @@ -1106,7 +1106,7 @@ ROM_START( tajmah ) // sound (missing or not needed here? there is an OKI M6585 on the mainboard) /* - ROM_REGION( 0x400000, "u18u21", 0 ) + ROM_REGION( 0x400000, "u18u21", 0 ) ROM_LOAD( "u18", 0x0000, 0x100000, NO_DUMP ) ROM_LOAD( "u19", 0x0000, 0x100000, NO_DUMP ) ROM_LOAD( "u20", 0x0000, 0x100000, NO_DUMP ) @@ -1130,7 +1130,7 @@ ROM_START( 3wishrd ) ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */ ROM_LOAD32_BYTE( "tw5b01a.8u9", 0x000000, 0x100000, CRC(2410659a) SHA1(2bcd2539c0e3e7389c27c21e58d9199b9c7c742e) ) ROM_LOAD32_BYTE( "tw5b01a.u11", 0x000001, 0x100000, CRC(44ca9ce1) SHA1(b1c6d83f749202c072c6ce99c0470a31cfab8986) ) - ROM_LOAD32_BYTE( "tw5b01a.u13", 0x000002, 0x100000, CRC(6c60097b) SHA1(f5ddb86b481b7b95d6ec151b37d662b583817813) ) + ROM_LOAD32_BYTE( "tw5b01a.u13", 0x000002, 0x100000, CRC(6c60097b) SHA1(f5ddb86b481b7b95d6ec151b37d662b583817813) ) ROM_LOAD32_BYTE( "tw5b01a.u15", 0x000003, 0x100000, CRC(07f813c3) SHA1(02447ae735aa34451538abd6625061cea91672e9) ) ROM_LOAD32_BYTE( "tw5b01a.8u8", 0x400000, 0x100000, CRC(0c58220a) SHA1(840e411b6baee6518df23920448ecde76102a9dd) ) ROM_LOAD32_BYTE( "tw5b01a.u10", 0x400001, 0x100000, CRC(c4d871cc) SHA1(0a89f19401e3b14473db42d995e0879b9ffc973c) ) @@ -1181,7 +1181,7 @@ ROM_START( atricmon ) ROM_LOAD32_BYTE( "gb-u9.bin", 0x000000, 0x100000, CRC(eff83f95) SHA1(743f2fb0dd84a83387919db70175aa62f5f6f858) ) ROM_LOAD32_BYTE( "gb-u11.bin", 0x000001, 0x100000, CRC(3fc27ae9) SHA1(896da175c11b48fb28dbb0678849b8f167cf5f6e) ) ROM_LOAD32_BYTE( "gb-u13.bin", 0x000002, 0x100000, CRC(6ad50f67) SHA1(b32781f06acc3e9929467d6d1212cf0dc757e5b3) ) - ROM_LOAD32_BYTE( "gb-u15.bin", 0x000003, 0x100000, CRC(6ae46bb3) SHA1(edc51f9a885c483283edb9b0873b980727205a91) ) + ROM_LOAD32_BYTE( "gb-u15.bin", 0x000003, 0x100000, CRC(6ae46bb3) SHA1(edc51f9a885c483283edb9b0873b980727205a91) ) ROM_LOAD32_BYTE( "gb-u8.bin", 0x400000, 0x100000, CRC(7dee3392) SHA1(718333ad5552351702e95a76cc2b61f7c3bf14ac) ) ROM_LOAD32_BYTE( "gb-u10.bin", 0x400001, 0x100000, CRC(db88f900) SHA1(83638b46fd7b6e4229fa5295479c9763c2f690c0) ) ROM_LOAD32_BYTE( "gb-u12.bin", 0x400002, 0x100000, CRC(fcbada90) SHA1(3206409c9a689e196694831ff5e6ba0fd32d676a) ) @@ -1214,7 +1214,7 @@ ROM_START( atrbonpk ) ROM_LOAD32_BYTE( "u9.bin", 0x400000, 0x080000, CRC(5b8450f1) SHA1(27fc771c3fb824cdb845237324984778fcd0a737) ) ROM_LOAD32_BYTE( "u11.bin", 0x400001, 0x080000, CRC(c8c52bd1) SHA1(081b8b4c46f18d030329bf519a8ed50385f7c062) ) ROM_LOAD32_BYTE( "u13.bin", 0x400002, 0x080000, CRC(23164a85) SHA1(e6de6aac28f1dac9ea908aaab9760b56ded1bb91) ) - ROM_LOAD32_BYTE( "u15.bin", 0x400003, 0x080000, CRC(aabbb4ff) SHA1(4a13475929141a4824b15347873cf330f7f7b0d0) ) + ROM_LOAD32_BYTE( "u15.bin", 0x400003, 0x080000, CRC(aabbb4ff) SHA1(4a13475929141a4824b15347873cf330f7f7b0d0) ) ROM_LOAD32_BYTE( "u8.bin", 0x600000, 0x080000, CRC(d6dfde87) SHA1(f3221adecb67ee593d52a1bbbdcee78dde497dbd) ) ROM_LOAD32_BYTE( "u10.bin", 0x600001, 0x080000, CRC(d81a1f77) SHA1(c3ec3a06dacc3f528c9bcfa7a18e25e0126b1d85) ) ROM_LOAD32_BYTE( "u12.bin", 0x600002, 0x080000, CRC(4b24dc03) SHA1(f875f09c6d44821b169e111cb1ea3d9716746d5f) ) @@ -1314,7 +1314,7 @@ ROM_START( santam ) ROM_LOAD( "gb_u09_8m_m27c801-100f1_9df6h.bin", 0x000000, 0x100000, CRC(470ccae5) SHA1(0521af7830cc59102edcc658df4d21a3d669d6db) ) ROM_LOAD( "gb_u11_8m_m27c801-100f1_7621h.bin", 0x100000, 0x100000, CRC(8f9a1031) SHA1(1aca654b62e73f3005e627625bea2b4198c04a99) ) ROM_LOAD( "gb_u13_8m_m27c801-100f1_be61h.bin", 0x200000, 0x100000, CRC(8b65f945) SHA1(40077a7d7ab13945df96f2483cb4f11ad8ae525c) ) - ROM_LOAD( "gb_u15_8m_m27c801-100f1_2857h.bin", 0x300000, 0x100000, CRC(8b688a66) SHA1(a343d8039b1c1c8edc717f3bf8a101a8d3069d23) ) + ROM_LOAD( "gb_u15_8m_m27c801-100f1_2857h.bin", 0x300000, 0x100000, CRC(8b688a66) SHA1(a343d8039b1c1c8edc717f3bf8a101a8d3069d23) ) ROM_LOAD( "gb_u08_8m_m27c801-100f1_ac13h.bin", 0x400000, 0x100000, CRC(84a6f213) SHA1(296b8b8d97b0bc543b9e747c751a6e9f4a6dc26f) ) ROM_LOAD( "gb_u10_8m_m27c801-100f1_03abh.bin", 0x500000, 0x100000, CRC(736acaa0) SHA1(1b2a4da15deba54dab76bf1fe88f0f4986217a31) ) ROM_LOAD( "gb_u12_8m_m27c801-100f1_5953h.bin", 0x600000, 0x100000, CRC(cc0b9bce) SHA1(30e0594c6890deddb665b6169c47e640508c6b7f) ) diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp index 700e494bec5..22e9bc9681a 100644 --- a/src/mame/drivers/bionicc.cpp +++ b/src/mame/drivers/bionicc.cpp @@ -45,37 +45,37 @@ using an Agilent DSO9404A scope and two N2873A 500MHz probes BTANB [MT00209] (verified on real PCB): - - misplaced sprites (see beginning of level 1 or 2 for example) - - sprite / sprite priority (see level 2 the reflectors) - - sprite / background priority (see level 1: birds walk through - branches of different trees) - - see the beginning of level 3: background screwed - - gray tiles around the title in Top Secret + - misplaced sprites (see beginning of level 1 or 2 for example) + - sprite / sprite priority (see level 2 the reflectors) + - sprite / background priority (see level 1: birds walk through + branches of different trees) + - see the beginning of level 3: background screwed + - gray tiles around the title in Top Secret Notes: - - Protection MCU is labelled "TS" without a number and without a coloured. - Maybe its code is not region dependant. - - The MCU rom contains the string - "" - which indicates it could be from an earlier version, especially with it - coming from a 'Top Secret' bootleg with identical program but unprotected - MCU, however f1dream has a similar string, and is verified as being from - a production board. - - Euro rom labels (IE: "TSE") had a blue stripe, while those labeled - as USA (TSU) had an red stripe on the sticker. The intermixing - of TSE and TSU roms in the parent set is correct and verified. - - Euro set simply states the game cannot be operated in Japan. - - IRQ 4 is control related. On each interrupt, it reads 0xFE4000 - (coin/start), shift the bits around and move the resulting byte into a - dword RAM location. The dword RAM location is rotated by 8 bits each time - this happens. This is probably done to be pedantic about coin insertions - (might be protection related). - - TODO: - - Firing IRQ4 at line 16 causes the game to often miss coin inserts. Set - to 128 currently to compensate. - - The game doesn't set the coin lockout in service mode, so the coin inputs - can't be tested there if you uncomment and enable it. + - Protection MCU is labelled "TS" without a number and without a coloured. + Maybe its code is not region dependant. + - The MCU rom contains the string + "" + which indicates it could be from an earlier version, especially with it + coming from a 'Top Secret' bootleg with identical program but unprotected + MCU, however f1dream has a similar string, and is verified as being from + a production board. + - Euro rom labels (IE: "TSE") had a blue stripe, while those labeled + as USA (TSU) had an red stripe on the sticker. The intermixing + of TSE and TSU roms in the parent set is correct and verified. + - Euro set simply states the game cannot be operated in Japan. + - IRQ 4 is control related. On each interrupt, it reads 0xFE4000 + (coin/start), shift the bits around and move the resulting byte into a + dword RAM location. The dword RAM location is rotated by 8 bits each time + this happens. This is probably done to be pedantic about coin insertions + (might be protection related). + + TODO: + - Firing IRQ4 at line 16 causes the game to often miss coin inserts. Set + to 128 currently to compensate. + - The game doesn't set the coin lockout in service mode, so the coin inputs + can't be tested there if you uncomment and enable it. ***************************************************************************/ @@ -315,24 +315,24 @@ rgb_t bionicc_state::RRRRGGGGBBBBIIII(uint32_t raw) /* - This board handles tile/tile and tile/sprite priority with a PROM. Its - working is complicated and hardcoded in the driver. + This board handles tile/tile and tile/sprite priority with a PROM. Its + working is complicated and hardcoded in the driver. - The PROM is a 256x4 chip, with address inputs wired as follows: + The PROM is a 256x4 chip, with address inputs wired as follows: - A0 bg opaque - A1 \ - A2 | fg pen - A3 | - A4 / - A5 fg has priority over sprites (bit 5 of tile attribute) - A6 fg has not priority over bg (bits 6 & 7 of tile attribute both set) - A7 sprite opaque + A0 bg opaque + A1 \ + A2 | fg pen + A3 | + A4 / + A5 fg has priority over sprites (bit 5 of tile attribute) + A6 fg has not priority over bg (bits 6 & 7 of tile attribute both set) + A7 sprite opaque - The output selects the active layer, it can be: - 0 bg - 1 fg - 2 sprite + The output selects the active layer, it can be: + 0 bg + 1 fg + 2 sprite */ @@ -588,8 +588,8 @@ void bionicc_state::output_w(u8 data) flip_screen_set(BIT(data, 0)); // commented out, else you can't test the coin inputs in service mode -// machine().bookkeeping().coin_lockout_w(1, BIT(~data, 4)); -// machine().bookkeeping().coin_lockout_w(0, BIT(~data, 5)); +// machine().bookkeeping().coin_lockout_w(1, BIT(~data, 4)); +// machine().bookkeeping().coin_lockout_w(0, BIT(~data, 5)); machine().bookkeeping().coin_counter_w(1, BIT(data, 6)); machine().bookkeeping().coin_counter_w(0, BIT(data, 7)); } diff --git a/src/mame/drivers/crospuzl.cpp b/src/mame/drivers/crospuzl.cpp index 9523e4fb143..29b7dabb9f8 100644 --- a/src/mame/drivers/crospuzl.cpp +++ b/src/mame/drivers/crospuzl.cpp @@ -1,21 +1,21 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese /**************************************************************************** - - Cross Puzzle - - driver by Angelo Salese, based off original crystal.cpp by ElSemi - TODO: - - Dies at POST with a SPU error and no Flash memory available; - - RTC isn't DS1302 + Cross Puzzle + + driver by Angelo Salese, based off original crystal.cpp by ElSemi + + TODO: + - Dies at POST with a SPU error and no Flash memory available; + - RTC isn't DS1302 + - ============================================================================= - This PCB uses ADC 'Amazon-LF' SoC, EISC CPU core - However PCBs have been see + This PCB uses ADC 'Amazon-LF' SoC, EISC CPU core - However PCBs have been see with a standard VRenderZERO+ MagicEyes EISC chip - + ****************************************************************************/ #include "emu.h" @@ -79,7 +79,7 @@ private: uint32_t m_FlashCmd; uint32_t m_crospuzl_addr; -// DECLARE_WRITE32_MEMBER(Banksw_w); +// DECLARE_WRITE32_MEMBER(Banksw_w); DECLARE_READ8_MEMBER(FlashCmd_r); DECLARE_WRITE32_MEMBER(FlashCmd_w); DECLARE_WRITE32_MEMBER(flash_addr_w); @@ -91,7 +91,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void crospuzl_mem(address_map &map); - + // PIO DECLARE_READ32_MEMBER(PIOldat_r); uint32_t m_PIO; @@ -215,8 +215,8 @@ void crospuzl_state::crospuzl_mem(address_map &map) map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw(m_vr0snd, FUNC(vr0sound_device::vr0_snd_read), FUNC(vr0sound_device::vr0_snd_write)); -// map(0x05000000, 0x05ffffff).bankr("mainbank"); -// map(0x05000000, 0x05000003).rw(FUNC(crospuzl_state::FlashCmd_r), FUNC(crospuzl_state::FlashCmd_w)); +// map(0x05000000, 0x05ffffff).bankr("mainbank"); +// map(0x05000000, 0x05000003).rw(FUNC(crospuzl_state::FlashCmd_r), FUNC(crospuzl_state::FlashCmd_w)); } #ifdef IDLE_LOOP_SPEEDUP @@ -245,7 +245,7 @@ void crospuzl_state::machine_start() save_item(NAME(m_FlipCntRead)); #endif -// save_item(NAME(m_Bank)); +// save_item(NAME(m_Bank)); save_item(NAME(m_FlashCmd)); save_item(NAME(m_PIO)); } @@ -428,7 +428,7 @@ void crospuzl_state::crospuzl(machine_config &config) m_vr0snd->add_route(1, "rspeaker", 1.0); } -ROM_START( crospuzl ) +ROM_START( crospuzl ) ROM_REGION( 0x80010, "maincpu", 0 ) ROM_LOAD("en29lv040a.u5", 0x000000, 0x80010, CRC(d50e8500) SHA1(d681cd18cd0e48854c24291d417d2d6d28fe35c1) ) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 58fc5c8e9a7..f1a16bccb72 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -210,7 +210,7 @@ private: DECLARE_WRITE_LINE_MEMBER(screen_vblank); void PatchReset(); void crystal_mem(address_map &map); - + // PIO DECLARE_READ32_MEMBER(PIOldat_r); DECLARE_WRITE32_MEMBER(PIOldat_w); @@ -359,7 +359,7 @@ void crystal_state::crystal_mem(address_map &map) map(0x03800000, 0x03ffffff).ram().share("textureram"); map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw(m_vr0snd, FUNC(vr0sound_device::vr0_snd_read), FUNC(vr0sound_device::vr0_snd_write)); - + map(0x05000000, 0x05ffffff).bankr("mainbank"); map(0x05000000, 0x05000003).rw(FUNC(crystal_state::FlashCmd_r), FUNC(crystal_state::FlashCmd_w)); @@ -568,7 +568,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( urachamu ) PORT_INCLUDE( crystal ) - + // TODO: player 2 start doesn't work ingame, it only skip attract mode items, // or be valid in test mode when prompted to press start // lamps test also gives only p1 and p3, and after crediting up only p1 and p3 starts are lighted on ($01320000 address writes) @@ -706,33 +706,33 @@ ROM_END #ifdef ROGUE_CARTS ROM_START( wulybuly ) CRYSBIOS - + ROM_REGION( 0x4280, "pic", ROMREGION_ERASEFF ) // empty socket - + ROM_REGION32_LE( 0x1000000, "flash", 0 ) // Flash ROM_LOAD( "u1", 0x0000000, 0x1000000, CRC(7406f5db) SHA1(dd53afb08d0567241d08d2422c672d429ef9b78f) ) ROM_END ROM_START( urachamu ) CRYSBIOS - + ROM_REGION( 0x4280, "pic", ROMREGION_ERASEFF ) // empty socket - + ROM_REGION32_LE( 0x4000000, "flash", 0 ) // Flash ROM_LOAD( "u1", 0x0000000, 0x1000000, CRC(f341d6fc) SHA1(23ecd9f3e5e20fc2a293cc735c8c4d60d01b68c0) ) ROM_LOAD( "u2", 0x1000000, 0x1000000, CRC(ad81d61f) SHA1(5872c1d96e25d1b2a1b8a35c8ff163d67cfdabe4) ) ROM_LOAD( "u3", 0x2000000, 0x1000000, CRC(3c7e32a4) SHA1(8a26e745eccc00a2c622062c8ad027781dfc1969) ) ROM_LOAD( "u4", 0x3000000, 0x1000000, CRC(c5505627) SHA1(5229f435b4cf218d50ae4a4ae65a6ae13d7b7080) ) - - // without this game defaults in free play mode, with no demo sound and 0 lives count. + + // without this game defaults in free play mode, with no demo sound and 0 lives count. ROM_REGION( 0x10000, "nvram", 0 ) ROM_LOAD( "nvram", 0x00000, 0x10000, CRC(66df826d) SHA1(09260b76cb17082c841e7e37b89cb076e54ffb8d) ) ROM_END ROM_START( maldaiza ) CRYSBIOS - - ROM_REGION( 0x4280, "pic", ROMREGION_ERASEFF ) + + ROM_REGION( 0x4280, "pic", ROMREGION_ERASEFF ) ROM_LOAD("maldaliza_pic16f84a.bin", 0x000000, 0x4280, NO_DUMP ) ROM_REGION32_LE( 0x4000000, "flash", 0 ) // Flash diff --git a/src/mame/drivers/ddz.cpp b/src/mame/drivers/ddz.cpp index 65ad5c5299a..26af8b6ea3e 100644 --- a/src/mame/drivers/ddz.cpp +++ b/src/mame/drivers/ddz.cpp @@ -1,14 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese /**************************************************************************** - - 招级疯斗 - "Zhaoji Fengdou" - "Crazy Class" HW - - driver by Angelo Salese, based off original ddz.cpp by ElSemi - - TODO: - - Decryption; - + + 招级疯斗 - "Zhaoji Fengdou" - "Crazy Class" HW + + driver by Angelo Salese, based off original ddz.cpp by ElSemi + + TODO: + - Decryption; + ============================================================================= Haze's notes: @@ -35,7 +35,7 @@ Offset 0 1 2 3 4 5 6 7 8 9 A B C D E F if you reverse the letters you get 'bug in vfprintf : bad base' so I suspect the data is in reverse order and maybe some blocks scrambled about. - + ****************************************************************************/ #include "emu.h" @@ -73,7 +73,7 @@ public: void init_ddz(); void ddz(machine_config &config); - + private: /* memory pointers */ @@ -154,10 +154,10 @@ void ddz_state::ddz_mem(address_map &map) { map(0x00000000, 0x00ffffff).rom().nopw().region("ipl", 0); -// map(0x01500000, 0x01500003).portr("IN0"); -// map(0x01500004, 0x01500007).portr("IN1"); -// map(0x01500008, 0x0150000b).portr("IN2"); - +// map(0x01500000, 0x01500003).portr("IN0"); +// map(0x01500004, 0x01500007).portr("IN1"); +// map(0x01500008, 0x0150000b).portr("IN2"); + map(0x01800000, 0x01ffffff).m(m_vr0soc, FUNC(vrender0soc_device::regs_map)); map(0x02000000, 0x027fffff).ram().share("workram"); @@ -250,13 +250,13 @@ ROM_START( crzclass ) // PCB marked MAH-JONG ROM_END void ddz_state::init_ddz() -{ +{ for(uint32_t x=0;xread(); } @@ -247,9 +247,9 @@ WRITE8_MEMBER(goldart_state::hostmem_w) // fffb : code to write 01/02/04/08 // fffc : oki? - // fffd : oki? + // fffd : oki? - // fffe : xxxx ---- x = pen value to be copied to other ram area on pixel wirtes + // fffe : xxxx ---- x = pen value to be copied to other ram area on pixel wirtes } diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 9d67f890f71..8dd7b2d4e3c 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1546,7 +1546,7 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::super21p_get_bg_tile_info) In test mode, the DIP switches status are assigned with code 00, so you can't see them since they are black on black background. -*/ +*/ } void goldnpkr_state::video_start() @@ -6431,7 +6431,7 @@ ROM_END Joker Card (witch game) PCB with daugtherboard c/6502 and rom. - Program tries to show jokers in the attract, + Program tries to show jokers in the attract, but these aren't in the graphics set. Maybe the PCB was filled with different eproms @@ -6451,7 +6451,7 @@ ROM_START( jokercar ) ROM_LOAD( "7.4a", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) ) // cards deck gfx, bitplane 1 ROM_LOAD( "6.6a", 0x1000, 0x1000, CRC(712f7fbc) SHA1(dcb73c45f58117b4206bc259d9386c4e16650325) ) // cards deck gfx, bitplane 2 ROM_LOAD( "5.7a", 0x2000, 0x1000, CRC(7351706a) SHA1(cde3fefe721ac5d3a725afc53fa609b5cc0c01da) ) // cards deck gfx, bitplane 3 - + ROM_REGION( 0x0100, "proms", 0 ) ROM_LOAD( "82s129.9c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) ROM_END diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index f4740863b4c..684c32c3c9a 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -11830,7 +11830,7 @@ ROM_START( lucky8i ) ROM_LOAD( "4.h6", 0x6000, 0x2000, CRC(9e939979) SHA1(c6e93df6465c076557ff5dccf650aff3a9064e0d) ) ROM_IGNORE( 0x6000) // identical quarters.... discarding three. - // neeed proper bipolar proms dumps... + // neeed proper bipolar proms dumps... ROM_REGION( 0x200, "proms", 0 ) ROM_LOAD( "n82s129an.g13", 0x0000, 0x0100, BAD_DUMP CRC(23e81049) SHA1(78071dae70fad870e972d944642fb3a2374be5e4) ) ROM_LOAD( "n82s129an.g14", 0x0100, 0x0100, BAD_DUMP CRC(526cf9d3) SHA1(eb779d70f2507d0f26d225ac8f5de8f2243599ca) ) @@ -11903,7 +11903,7 @@ ROM_END The custom CPU performs XOR masks and bitswaps relative to addressing and involves M1 line for different encryption betweeen opcodes and data. - + */ ROM_START( lucky8k ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -11921,7 +11921,7 @@ ROM_START( lucky8k ) ROM_LOAD( "3.h4", 0x4000, 0x2000, CRC(898b9ed5) SHA1(11b7d1cfcf425d00d086c74e0dbcb72068dda9fe) ) ROM_LOAD( "4.h5", 0x6000, 0x2000, CRC(4f7cfb35) SHA1(0617cf4419be00d9bacc78724089cb8af4104d68) ) - // neeed proper bipolar proms dumps... + // neeed proper bipolar proms dumps... ROM_REGION( 0x200, "proms", 0 ) ROM_LOAD( "tbp24s10n.g13", 0x0000, 0x0100, BAD_DUMP CRC(23e81049) SHA1(78071dae70fad870e972d944642fb3a2374be5e4) ) ROM_LOAD( "tbp24s10n.g14", 0x0100, 0x0100, BAD_DUMP CRC(526cf9d3) SHA1(eb779d70f2507d0f26d225ac8f5de8f2243599ca) ) diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index 87915df172b..b6ae3631753 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -1837,7 +1837,7 @@ ROM_END * lcd screen with custom segments, 1-bit sound This is the wide screen version, there's also a silver version. - + In 1989 Elektronika(USSR) release a clone: Space Bridge. This game shares the same ROM, though the graphics are slightly different. diff --git a/src/mame/drivers/juku.cpp b/src/mame/drivers/juku.cpp index fd0d6ff748a..0da5ae5672a 100644 --- a/src/mame/drivers/juku.cpp +++ b/src/mame/drivers/juku.cpp @@ -2,28 +2,28 @@ // copyright-holders: Dirk Best /*************************************************************************** - Juku E5101 - - Hardware: - - КР580ВМ80A - - КР580ИР82 - - КР580ВА86 - - КР580ВА87 - - КР580ВИ53 x3 - - КР580ВК38 - - КР580ВН59 - - КР580ВВ51A x2 - - КР580ВВ55A x2 - - Note: - - In the monitor, enter A to start BASIC and T to boot from disk/network - - TODO: - - Display mode 384x200 - - Work out how the floppy interface really works - - Sound - - Tape? - - Network? + Juku E5101 + + Hardware: + - КР580ВМ80A + - КР580ИР82 + - КР580ВА86 + - КР580ВА87 + - КР580ВИ53 x3 + - КР580ВК38 + - КР580ВН59 + - КР580ВВ51A x2 + - КР580ВВ55A x2 + + Note: + - In the monitor, enter A to start BASIC and T to boot from disk/network + + TODO: + - Display mode 384x200 + - Work out how the floppy interface really works + - Sound + - Tape? + - Network? ***************************************************************************/ @@ -141,7 +141,7 @@ void juku_state::io_map(address_map &map) map(0x1c, 0x1f).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write)); map(0x1c, 0x1c).w(FUNC(juku_state::fdc_cmd_w)); map(0x1f, 0x1f).rw(FUNC(juku_state::fdc_data_r), FUNC(juku_state::fdc_data_w)); -// map(0x1c, 0x1d).rw(m_sio[1], FUNC(i8251_device::read), FUNC(i8251_device::write)); +// map(0x1c, 0x1d).rw(m_sio[1], FUNC(i8251_device::read), FUNC(i8251_device::write)); } @@ -375,7 +375,7 @@ void juku_state::pio0_porta_w(uint8_t data) m_key_encoder->update(); -// logerror("porta_w %02x\n", data); +// logerror("porta_w %02x\n", data); } uint8_t juku_state::pio0_portb_r() @@ -416,7 +416,7 @@ void juku_state::pio0_portc_w(uint8_t data) // the motor is always running for now floppy->mon_w(0); -// m_floppy[0]->get_device()->ss_w(BIT(data, 6)); +// m_floppy[0]->get_device()->ss_w(BIT(data, 6)); m_bank->set_bank(data & 0x03); @@ -517,7 +517,7 @@ void juku_state::juku(machine_config &config) TTL74148(config, m_key_encoder, 0); KR1818VG93(config, m_fdc, 1000000); -// m_fdc->intrq_wr_callback().set(FUNC(juku_state::fdc_intrq_w)); +// m_fdc->intrq_wr_callback().set(FUNC(juku_state::fdc_intrq_w)); m_fdc->drq_wr_callback().set(FUNC(juku_state::fdc_drq_w)); FLOPPY_CONNECTOR(config, "fdc:0", juku_floppies, "525qd", juku_state::floppy_formats); FLOPPY_CONNECTOR(config, "fdc:1", juku_floppies, "525qd", juku_state::floppy_formats); diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp index d1d7fd0d3bb..f24aa5ef24d 100644 --- a/src/mame/drivers/lvcards.cpp +++ b/src/mame/drivers/lvcards.cpp @@ -605,7 +605,7 @@ ROM_START( lvcardsa ) ROM_LOAD( "7052.b7", 0x0100, 0x0100, CRC(a7f37cb0) SHA1(236145e93af244a50ed66b9875ed019b1dde9027) ) ROM_LOAD( "7052.a7", 0x0200, 0x0100, CRC(dcb970fd) SHA1(ce88f5f49dbcf187ac9344235b035f742c820336) ) ROM_END - + ROM_START( ponttehk ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "ponttehk.001", 0x0000, 0x4000, CRC(1f8c1b38) SHA1(3776ddd695741223bd9ad41f74187bff31f2cd3b) ) diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index 1ba86bb5f7f..e2005f2ac7d 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -3186,7 +3186,7 @@ ROM_END | _____________________________ _______ _________________________________ | |__| |____74LS138N_| |__| |____________________________| |________________________________| - + CPU Board (6) Board 21/1 _____________________________________________ ______________________________________________ | _______________ __|_ | | @@ -3211,7 +3211,7 @@ ROM_END | GAL16V8 |______________| | | 28.00000 MHz | | 686 ________________ | | | | _______ | | _______ | | ________ _______ ________ | - | 74LS174AN | LG 603 | 74LS374P | | 74LS732B1 74LS368AN AM2148-55DC __|_ + | 74LS174AN | LG 603 | 74LS374P | | 74LS732B1 74LS368AN AM2148-55DC __|_ | |_______________| | | | | | _______ ________________ | | | | | GAL16V8 | | | | ________ _______ ________ | | @@ -3277,13 +3277,13 @@ IC64->PAL16R6A 74LS393N 74LS368AN 74LS377N |U|| | | PRE-JAMMA Board (6) __________________________________________________________ - | _________ _________ __________ _________ _________ __|_ + | _________ _________ __________ _________ _________ __|_ | 74LS163AP| 74LS163AP||_GAL20V8_| |74S174N_| |74S189N_|| | | 7636 | | | _________ _________ _________ _________ _________ | | | |74LS157N| |74LS288N| |74LS273P| 74LS290B1| |74S189N_|| | | | | - | _________ _________ _________ _________ _________ | | + | _________ _________ _________ _________ _________ | | | |74LS393N| 74LS283N_|74HCTLS373N 74LS298B1| |74S189N_|| | | | | | _________ __________ _____________ _________ | | diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp index 66fb64628d4..1fc9cdabd72 100644 --- a/src/mame/drivers/magicard.cpp +++ b/src/mame/drivers/magicard.cpp @@ -943,7 +943,7 @@ ROM_START( magicarde ) ROM_END /* - Magic Export. + Magic Export. Ver 211A. 1x Philips SCC66470CAB. diff --git a/src/mame/drivers/menghong.cpp b/src/mame/drivers/menghong.cpp index 20c061740fc..98e40986eb6 100644 --- a/src/mame/drivers/menghong.cpp +++ b/src/mame/drivers/menghong.cpp @@ -1,18 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese /**************************************************************************** - - Sealy HW running on VRender0+ SoC - - driver by Angelo Salese, based off original crystal.cpp by ElSemi - - TODO: - - HY04 protection (controls tile RNG at very least) - - 8bpp colors are washed, data from flash ROMs is XORed with contents + + Sealy HW running on VRender0+ SoC + + driver by Angelo Salese, based off original crystal.cpp by ElSemi + + TODO: + - HY04 protection (controls tile RNG at very least) + - 8bpp colors are washed, data from flash ROMs is XORed with contents of NVRAM area 0x14000700-80f, might be shared with HY04 as well. - - EEPROM hookup; - - extract password code when entering test mode in-game; - + - EEPROM hookup; + - extract password code when entering test mode in-game; + ============================================================================= Crazy Dou Di Zhu II @@ -62,7 +62,7 @@ Meng Hong Lou (Dream of the Red Chamber) Sealy, 2004? Red PCB, very similar to crzyddz2 - + ****************************************************************************/ #include "emu.h" @@ -143,7 +143,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void crzyddz2_mem(address_map &map); - + // PIO DECLARE_READ32_MEMBER(PIOldat_r); DECLARE_WRITE32_MEMBER(PIOldat_w); @@ -235,9 +235,9 @@ WRITE32_MEMBER(menghong_state::crzyddz2_PIOldat_w) //uint32_t CLK = data & 0x02000000; //uint32_t DAT = data & 0x10000000; -// m_eeprom->cs_write(RST ? 1 : 0); -// m_eeprom->di_write(DAT ? 1 : 0); -// m_eeprom->clk_write(CLK ? 1 : 0); +// m_eeprom->cs_write(RST ? 1 : 0); +// m_eeprom->di_write(DAT ? 1 : 0); +// m_eeprom->clk_write(CLK ? 1 : 0); if (ACCESSING_BITS_8_15) { @@ -424,7 +424,7 @@ static INPUT_PORTS_START(crzyddz2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // big PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // small + D -INPUT_PORTS_END +INPUT_PORTS_END void menghong_state::crzyddz2(machine_config &config) { diff --git a/src/mame/drivers/mindset.cpp b/src/mame/drivers/mindset.cpp index e7c02dc8034..56be8c4ad32 100644 --- a/src/mame/drivers/mindset.cpp +++ b/src/mame/drivers/mindset.cpp @@ -551,7 +551,7 @@ void mindset_state::sys_p2_w(u8 data) if((m_sys_p2 ^ old) & 0x40) map_modules(); m_maincpu->int3_w(!(data & 0x80)); - // logerror("SYS: write p2 %02x\n", data); + // logerror("SYS: write p2 %02x\n", data); } void mindset_state::kbd_p1_w(u8 data) diff --git a/src/mame/drivers/ml20.cpp b/src/mame/drivers/ml20.cpp index a51b21645e5..bd46607fdfe 100644 --- a/src/mame/drivers/ml20.cpp +++ b/src/mame/drivers/ml20.cpp @@ -4,7 +4,7 @@ Digitek Micrologic 20 - Access control device with dot-matrix display + Access control device with dot-matrix display ML20/232 ____________________________________________________ diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp index 5a96db1836f..fc973760b1f 100644 --- a/src/mame/drivers/neptunp2.cpp +++ b/src/mame/drivers/neptunp2.cpp @@ -85,7 +85,7 @@ Unidesa Cirsa Multi Points | |___P14___| |ULN2064 |_ARRAY__| <- NOT POPULATED | NOT POPULATED ______ | |_________________________________________________________P19____| - + P4, P8, P13, P15, P16 and P19 are unused. Some service manuals contains the complete PCB schematics (e.g., see the "Manual Técnico Cirsa Vulcano" PDF). diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp index 8462eb5f2f2..3b7486d28aa 100644 --- a/src/mame/drivers/nexus3d.cpp +++ b/src/mame/drivers/nexus3d.cpp @@ -62,7 +62,7 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void nexus3d_map(address_map &map); - + uint32_t m_intpend, m_intmask, m_intlevel; DECLARE_READ32_MEMBER(int_pending_r); DECLARE_WRITE32_MEMBER(int_ack_w); @@ -70,12 +70,12 @@ private: DECLARE_READ32_MEMBER(int_mask_r); DECLARE_WRITE32_MEMBER(int_mask_w); void IntReq(int level); - + DECLARE_READ32_MEMBER(vrender3d_status_r); DECLARE_WRITE32_MEMBER(rop_data_w); DECLARE_WRITE16_MEMBER(rop_register_w); DECLARE_READ16_MEMBER(rop_status_r); - + DECLARE_READ32_MEMBER(timer_status_r); DECLARE_WRITE32_MEMBER(timer_status_w); DECLARE_READ32_MEMBER(timer_count_r); @@ -122,7 +122,7 @@ void nexus3d_state::IntReq(int level) m_intpend |= 1 << level; } uint32_t inten = m_intmask ^ 0xffffffff; - + if (m_intpend & inten) m_maincpu->set_input_line(ARM7_IRQ_LINE, ASSERT_LINE); else @@ -181,10 +181,10 @@ WRITE32_MEMBER(nexus3d_state::timer_status_w) { COMBINE_DATA(&m_timer_status); //printf("%08x %08x\n",m_timer_status, m_timer_count); - + if (m_timer_status & 0x20) m_timer_irq = false; - + if (m_timer_status & 8) { m_timer_result = false; @@ -221,8 +221,8 @@ TIMER_CALLBACK_MEMBER(nexus3d_state::timercb) READ32_MEMBER(nexus3d_state::crtc_vblank_r) { - uint16_t res = (m_screen->vblank()<<1) | (m_screen->hblank()<<0); - + uint16_t res = (m_screen->vblank()<<1) | (m_screen->hblank()<<0); + return (res<<16); } @@ -230,12 +230,12 @@ void nexus3d_state::nexus3d_map(address_map &map) { map(0x00000000, 0x01ffffff).ram().share("mainram"); map(0x02000000, 0x023fffff).ram().share("fbram"); // boundary tbd - + map(0x03720000, 0x0373ffff).ram(); // 3d fifo, boundary tbd map(0x046c0000, 0x046fffff).ram(); // """ - + map(0x60000000, 0x67ffffff).ram(); // color tables? - + // actually USB hubs (prints "USB STRAGE" if 0) map(0x8c000000, 0x8c000003).portr("IN0"); map(0x8c800000, 0x8c800003).portr("IN1"); @@ -266,14 +266,14 @@ void nexus3d_state::nexus3d_map(address_map &map) map(0xc0001844, 0xc0001847).r(FUNC(nexus3d_state::crtc_vblank_r)); -// map(0xc0000f40, 0xc0000f4f).ram(); +// map(0xc0000f40, 0xc0000f4f).ram(); // map(0xC0000F44, 0xC0000F47) (nexus3d_unk2_r, nexus3d_unk2_w ) // often, status for something. map(0xc0000f4c, 0xc0000f4f).r(FUNC(nexus3d_state::rop_status_r)).umask32(0xffff0000); - + map(0xe0000014, 0xe0000017).r(FUNC(nexus3d_state::vrender3d_status_r)); -// map(0xe0000000, 0xe00000ff) General / Control registers -// map(0xe0000300, 0xe00003ff) GTE constant vector registers +// map(0xe0000000, 0xe00000ff) General / Control registers +// map(0xe0000300, 0xe00003ff) GTE constant vector registers } diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 2062916680d..282285d0a3c 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -31,8 +31,8 @@ - undumped IDE ROM, kludged to work - Compatibility is untested; - TODO (PC-9821AS) - - IPL ROM banking contradicts greatly from the other machines; + TODO (PC-9821AS) + - IPL ROM banking contradicts greatly from the other machines; TODO: (PC-486MU) - Tries to read port C of i8255_sys (-> 0x35) at boot without setting up the control @@ -1511,7 +1511,7 @@ READ8_MEMBER(pc9801_state::as_unkdev_data_r) { if (offset == 0) return m_unkdev0468[m_unkdev0468_addr]; - + return 0xff; } @@ -1519,7 +1519,7 @@ WRITE8_MEMBER(pc9801_state::as_unkdev_data_w) { if (offset == 0) m_unkdev0468[m_unkdev0468_addr] = data; - + // offset == 0: access bit? } @@ -2779,15 +2779,15 @@ As - 80486DX 33 ROM_START( pc9821as ) ROM_REGION( 0x80000, "biosrom", ROMREGION_ERASEFF ) -// ROM_LOAD( "itf.rom", 0x10000, 0x08000, BAD_DUMP CRC(dd4c7bb8) SHA1(cf3aa193df2722899066246bccbed03f2e79a74a) ) -// ROM_LOAD( "bios_as.rom", 0x18000, 0x18000, BAD_DUMP CRC(0a682b93) SHA1(76a7360502fa0296ea93b4c537174610a834d367) ) +// ROM_LOAD( "itf.rom", 0x10000, 0x08000, BAD_DUMP CRC(dd4c7bb8) SHA1(cf3aa193df2722899066246bccbed03f2e79a74a) ) +// ROM_LOAD( "bios_as.rom", 0x18000, 0x18000, BAD_DUMP CRC(0a682b93) SHA1(76a7360502fa0296ea93b4c537174610a834d367) ) ROM_LOAD( "mvs0100-1.bin", 0x00000, 0x80000, CRC(ca37b631) SHA1(8c481dd0608d6c27235bc88bd77e345628dc28a1) ) ROM_REGION( 0x30000, "ipl", ROMREGION_ERASEFF ) // TODO: not quite right yet, needs actual itf rom loaded ROM_COPY( "biosrom", 0x20000, 0x10000, 0x08000 ) ROM_COPY( "biosrom", 0x30000, 0x18000, 0x18000 ) - + ROM_REGION( 0x80000, "chargen", 0 ) ROM_LOAD( "font_as.rom", 0x000000, 0x046800, BAD_DUMP CRC(456d9fc7) SHA1(78ba9960f135372825ab7244b5e4e73a810002ff) ) diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp index 8108366f3b1..ec763435de8 100644 --- a/src/mame/drivers/pcipc.cpp +++ b/src/mame/drivers/pcipc.cpp @@ -460,7 +460,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_phoenix_ver40_rev6_w) break; } logerror("Boot state %02x - %s\n", data, desc); -// printf("[%02X]",data); +// printf("[%02X]",data); } @@ -586,8 +586,8 @@ ROM_START(pcipc) ROMX_LOAD("crisis.rom", 0x00000, 0x40000, CRC(38a1458a) SHA1(8881ac336392cca79a772b4168f63efc31f953dd), ROM_BIOS(2) ) ROM_SYSTEM_BIOS(3, "5hx29", "5hx29") ROMX_LOAD("5hx29.bin", 0x20000, 0x20000, CRC(07719a55) SHA1(b63993fd5186cdb4f28c117428a507cd069e1f68), ROM_BIOS(3) ) -// ROM_REGION(0x8000,"ibm_vga", 0) -// ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) +// ROM_REGION(0x8000,"ibm_vga", 0) +// ROM_LOAD("ibm-vga.bin", 0x00000, 0x8000, BAD_DUMP CRC(74e3fadb) SHA1(dce6491424f1726203776dfae9a967a98a4ba7b5) ) ROM_END ROM_START(pcipctx) diff --git a/src/mame/drivers/pokerout.cpp b/src/mame/drivers/pokerout.cpp index ffc97a26158..72ede521bc5 100644 --- a/src/mame/drivers/pokerout.cpp +++ b/src/mame/drivers/pokerout.cpp @@ -64,7 +64,7 @@ | '---------' 2 ====| | 2 ====| | .---------. ====| - | | SN7407N | .-------------. .------------. .-----------. E ====| + | | SN7407N | .-------------. .------------. .-----------. E ====| | '---------' |TMS27128JL-20| |TMS4416-15NL| | EP-310 DC | .------------. D ====| | | "BRK 01" | '------------' '-++++++++--' | T74LS244B1 | G ====| | .---------. '-------------' .-++++++++-----. '------------' E ====| @@ -101,7 +101,7 @@ CTC connection... .-----v-----. - | CLK/TRG0 |--------. + | CLK/TRG0 |--------. | ZC/TO0 |--(NC) | | | | | CLK/TRG1 |--------+---(74LS74,CLK/2)---> CLK AY8910. @@ -112,7 +112,7 @@ | | | | CLK/TRG3 |------------+------> Z80 /NMI. | | - | IEI |--------(1K RES)---> Z80 /BUSRQ. + | IEI |--------(1K RES)---> Z80 /BUSRQ. | IEO |--(NC) | /INT |-------------------> Z80 /INT. '-----------' @@ -153,10 +153,10 @@ The double-up feature will allow you to choose one between BIG/SMALL, on the next card to draw. Use LEFT for BIG or RIGHT for SMALL, then press START 1 to - draw the card. + draw the card. DIP switches could set the coinage and maximum bet. - + As soon as you get out of credits or payout, the game will go to breakout mode. You can payout only amounts of credits multiples of 10. @@ -168,10 +168,10 @@ TEST 1 (key 9) will show you a sort of percentage screen, and using RIGHT, you can see the bookkeeping and statistics. Press payout (key W) to exit. Using LEFT you're entering in the TEST MODE (also TEST 2 key does the same). - + TEST 2 (key 0) will enter the TEST MODE, where you can test the game buttons and DIP switches. There are some inputs used by the code for unknown purposes - that are not present in this mode. Press START 2 (key 2) + UP to exit the mode. + that are not present in this mode. Press START 2 (key 2) + UP to exit the mode. ******************************************************************************** @@ -267,8 +267,8 @@ other writes found... static INPUT_PORTS_START(pokerout) PORT_START("IN0") // 80h - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_NAME("Right / Small") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_NAME("Down / Hold / Take") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_NAME("Right / Small") + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_NAME("Down / Hold / Take") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Spare C / Poker Credits") PORT_CODE(KEYCODE_Q) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserved") PORT_CODE(KEYCODE_R) @@ -281,13 +281,13 @@ static INPUT_PORTS_START(pokerout) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("IN1-02") PORT_CODE(KEYCODE_S) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("IN1-04") PORT_CODE(KEYCODE_D) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("IN1-08") PORT_CODE(KEYCODE_F) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_NAME("Up / Cancel / Double-Up") - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_NAME("Left / Big") + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_NAME("Up / Cancel / Double-Up") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_NAME("Left / Big") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Start 2 / Bet") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test 1") PORT_CODE(KEYCODE_9) PORT_START("IN2") // A0h -// Program does complex operations with this pull-up/down mask to boot the game. +// Program does complex operations with this pull-up/down mask to boot the game. PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -367,7 +367,7 @@ void pokerout_state::pokerout(machine_config &config) tms9129_device &vdp(TMS9129(config, "vdp", VDP_CLOCK)); vdp.set_screen("screen"); vdp.set_vram_size(VDP_MEM); -// int line no connected, so no callback. +// int line no connected, so no callback. SCREEN(config, "screen", SCREEN_TYPE_RASTER); /* sound hardware */ diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp index 6a67624e38c..9cd806129f3 100644 --- a/src/mame/drivers/policetr.cpp +++ b/src/mame/drivers/policetr.cpp @@ -431,7 +431,7 @@ void policetr_state::policetr(machine_config &config) m_screen->screen_vblank().set(FUNC(policetr_state::vblank)); PALETTE(config, m_palette).set_entries(256); - + RAMDAC(config, m_ramdac, 0, m_palette); // BT481A Palette RAMDAC m_ramdac->set_addrmap(0, &policetr_state::ramdac_map); diff --git a/src/mame/drivers/psattack.cpp b/src/mame/drivers/psattack.cpp index 751ad1b0e08..27923923c78 100644 --- a/src/mame/drivers/psattack.cpp +++ b/src/mame/drivers/psattack.cpp @@ -1,17 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese /**************************************************************************** - - P's Attack (c) 2004 Uniana - - driver by Angelo Salese, based off original crystal.cpp by ElSemi - - TODO: - - Compact Flash hookup; - - Enables wavetable IRQ; - + + P's Attack (c) 2004 Uniana + + driver by Angelo Salese, based off original crystal.cpp by ElSemi + + TODO: + - Compact Flash hookup; + - Enables wavetable IRQ; + ============================================================================= - + P's Attack (c) 2004 Uniana Co., Ltd +----------54321---654321--654321---------------------------+ @@ -119,7 +119,7 @@ GUN_xP are 6 pin gun connectors (pins 3-6 match the UNICO sytle guns): 4| +5V 5| Switch (Trigger) 6| GND - + ****************************************************************************/ #include "emu.h" @@ -155,7 +155,7 @@ public: void init_psattack(); void psattack(machine_config &config); - + private: /* memory pointers */ @@ -241,7 +241,7 @@ void psattack_state::psattack_mem(address_map &map) map(0x01500004, 0x01500007).portr("IN1"); map(0x01500008, 0x0150000b).portr("IN2"); //0x0150000c is prolly eeprom - + map(0x01800000, 0x01ffffff).m(m_vr0soc, FUNC(vrender0soc_device::regs_map)); map(0x02000000, 0x027fffff).ram().share("workram"); diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp index 3ecf5eb42bf..9bece06ee4d 100644 --- a/src/mame/drivers/riscpc.cpp +++ b/src/mame/drivers/riscpc.cpp @@ -8,13 +8,13 @@ based on work by Tomasz Slanina and Tom Walker TODO: - - Move device implementations into specific files; - - PS/2 keyboard doesn't work properly; - - i2c device should actually be a pcf8583 RTC with i2c as slave - (and indeed CMOS settings doesn't work); - - Fix pendingUnd fatalerror from ARM7 core - - Fix per-machine configurations; - + - Move device implementations into specific files; + - PS/2 keyboard doesn't work properly; + - i2c device should actually be a pcf8583 RTC with i2c as slave + (and indeed CMOS settings doesn't work); + - Fix pendingUnd fatalerror from ARM7 core + - Fix per-machine configurations; + ??? bp (0382827C) (second trigger) do R13 = SR13 @@ -711,14 +711,14 @@ READ32_MEMBER( riscpc_state::a7000_iomd_r ) case IOMD_KBDCR: return m_kbdc->status_r(); /* - 1--- ---- always high (force) - -x-- ---- Timer 1 - --x- ---- Timer 0 - ---x ---- Power On Reset - ---- x--- Flyback - ---- -x-- nINT1 - ---- --0- always low - ---- ---x INT2 + 1--- ---- always high (force) + -x-- ---- Timer 1 + --x- ---- Timer 0 + ---x ---- Power On Reset + ---- x--- Flyback + ---- -x-- nINT1 + ---- --0- always low + ---- ---x INT2 */ case IOMD_IRQSTA: return (m_IRQ_status_A & 0x7d) | 0x80; case IOMD_IRQRQA: return (m_IRQ_status_A & m_IRQ_mask_A); @@ -755,7 +755,7 @@ WRITE32_MEMBER( riscpc_state::a7000_iomd_w ) switch(offset) { - case IOMD_IOCR: + case IOMD_IOCR: m_IOMD_IO_ctrl = data & 0x7c; m_i2cmem->write_sda(data & 0x01); m_i2c_clk = (data & 2) >> 1; @@ -763,20 +763,20 @@ WRITE32_MEMBER( riscpc_state::a7000_iomd_w ) break; case IOMD_KBDDAT: m_kbdc->data_w(data); break; - case IOMD_KBDCR: m_kbdc->command_w(data); + case IOMD_KBDCR: m_kbdc->command_w(data); //m_IRQ_status_B |= 0x40; //machine().debug_break(); //update_irq(); break; - case IOMD_IRQRQA: + case IOMD_IRQRQA: m_IRQ_status_A &= ~data; m_IRQ_status_A |= 0x80; update_irq(); break; - - case IOMD_IRQMSKA: - m_IRQ_mask_A = data; + + case IOMD_IRQMSKA: + m_IRQ_mask_A = data; update_irq(); break; @@ -784,9 +784,9 @@ WRITE32_MEMBER( riscpc_state::a7000_iomd_w ) m_IRQ_status_B &= ~data; update_irq(); break; - - case IOMD_IRQMSKB: - m_IRQ_mask_B = data; + + case IOMD_IRQMSKB: + m_IRQ_mask_B = data; update_irq(); break; @@ -847,8 +847,8 @@ void riscpc_state::a7000_map(address_map &map) { map(0x00000000, 0x003fffff).mirror(0x00800000).rom().region("user1", 0); // AM_RANGE(0x01000000, 0x01ffffff) AM_NOP //expansion ROM - // -// map(0x02000000, 0x027fffff).mirror(0x00800000).ram(); // VRAM, not installed on A7000 models + // +// map(0x02000000, 0x027fffff).mirror(0x00800000).ram(); // VRAM, not installed on A7000 models // I/O 03000000 - 033fffff // AM_RANGE(0x03010000, 0x03011fff) //Super IO // AM_RANGE(0x03012000, 0x03029fff) //FDC @@ -875,7 +875,7 @@ void riscpc_state::riscpc_map(address_map &map) /* Input ports */ static INPUT_PORTS_START( a7000 ) -// PORT_INCLUDE( at_keyboard ) +// PORT_INCLUDE( at_keyboard ) PORT_START("MOUSE") // for debugging we leave video and sound HWs as options, eventually slotify them @@ -929,8 +929,8 @@ WRITE_LINE_MEMBER(riscpc_state::keyboard_interrupt) printf("IRQ %d\n",state); if (!state) return; - -// machine().debug_break(); + +// machine().debug_break(); m_IRQ_status_B|=0x80; update_irq(); } @@ -949,22 +949,22 @@ void riscpc_state::base_config(machine_config &config) kbd.set_pc_kbdc_slot(&kbd_con); // auxiliary connector -// pc_kbdc_device &aux_con(PC_KBDC(config, "aux_con", 0)); -// aux_con.out_clock_cb().set(m_kbdc, FUNC(ps2_keyboard_controller_device::aux_clk_w)); -// aux_con.out_data_cb().set(m_kbdc, FUNC(ps2_keyboard_controller_device::aux_data_w)); +// pc_kbdc_device &aux_con(PC_KBDC(config, "aux_con", 0)); +// aux_con.out_clock_cb().set(m_kbdc, FUNC(ps2_keyboard_controller_device::aux_clk_w)); +// aux_con.out_data_cb().set(m_kbdc, FUNC(ps2_keyboard_controller_device::aux_data_w)); // auxiliary port -// pc_kbdc_slot_device &aux(PC_KBDC_SLOT(config, "aux", ps2_mice, STR_HLE_PS2_MOUSE)); -// aux.set_pc_kbdc_slot(&aux_con); +// pc_kbdc_slot_device &aux(PC_KBDC_SLOT(config, "aux", ps2_mice, STR_HLE_PS2_MOUSE)); +// aux.set_pc_kbdc_slot(&aux_con); PS2_KEYBOARD_CONTROLLER(config, m_kbdc, 12_MHz_XTAL); m_kbdc->hot_res().set(FUNC(riscpc_state::keyboard_reset)); m_kbdc->kbd_clk().set(kbd_con, FUNC(pc_kbdc_device::clock_write_from_mb)); m_kbdc->kbd_data().set(kbd_con, FUNC(pc_kbdc_device::data_write_from_mb)); m_kbdc->kbd_irq().set(FUNC(riscpc_state::keyboard_interrupt)); -// m_kbdc->aux_clk().set(aux_con, FUNC(pc_kbdc_device::clock_write_from_mb)); -// m_kbdc->aux_data().set(aux_con, FUNC(pc_kbdc_device::data_write_from_mb)); -// m_kbdc->aux_irq().set(FUNC(riscpc_state::keyboard_interrupt)); +// m_kbdc->aux_clk().set(aux_con, FUNC(pc_kbdc_device::clock_write_from_mb)); +// m_kbdc->aux_data().set(aux_con, FUNC(pc_kbdc_device::data_write_from_mb)); +// m_kbdc->aux_irq().set(FUNC(riscpc_state::keyboard_interrupt)); /* video hardware */ SCREEN(config, m_screen, SCREEN_TYPE_RASTER); diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 4bb7fc77de4..17a0bcb7be9 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1924,7 +1924,7 @@ WRITE8_MEMBER(segas16b_state::dfjail_dac_data_w) #if 0 switch(offset) { - case 0: + case 0: m_dfjail_dac_data = (data & 0xf) << 0; break; case 1: @@ -3838,18 +3838,18 @@ INPUT_PORTS_END static INPUT_PORTS_START( dfjail ) PORT_INCLUDE( lockonph ) - + PORT_MODIFY("P1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_MODIFY("P2") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL - + PORT_MODIFY("SERVICE") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - + PORT_MODIFY("DSW1") PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x01, DEF_STR( 8C_1C ) ) @@ -3878,7 +3878,7 @@ static INPUT_PORTS_START( dfjail ) PORT_DIPSETTING( 0x10, "7" ) PORT_DIPSETTING( 0x00, "8" ) PORT_SERVICE_DIPLOC( 0x80, 0x80, "SW1:8" ) - + PORT_MODIFY("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -4203,7 +4203,7 @@ void segas16b_state::dfjail(machine_config &config) M68000(config.replace(), m_maincpu, XTAL(16'000'000)/2); // ? m_maincpu->set_addrmap(AS_PROGRAM, &segas16b_state::dfjail_map); m_maincpu->set_vblank_int("screen", FUNC(segas16b_state::irq4_line_hold)); - + Z80(config.replace(), m_soundcpu, XTAL(16'000'000)/4); // ? m_soundcpu->set_addrmap(AS_PROGRAM, &segas16b_state::bootleg_sound_map); m_soundcpu->set_addrmap(AS_IO, &segas16b_state::dfjail_sound_iomap); @@ -4212,7 +4212,7 @@ void segas16b_state::dfjail(machine_config &config) //config.device_remove("ym2151"); config.device_remove("upd"); - + AD7533(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.25); // AD7533KN voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); @@ -5085,11 +5085,11 @@ ROM_START( dfjail ) ROM_LOAD16_BYTE( "13.g14", 0x080001, 0x020000, CRC(f125b5b0) SHA1(52497e27b4cd8d7fd52f1f786d1f394a8e4c4e55) ) ROM_LOAD16_BYTE( "22.h15", 0x0c0000, 0x020000, CRC(7329f038) SHA1(794cc571a3efba7f0f87cf8b552a8e6fc1f3e669) ) ROM_LOAD16_BYTE( "14.g15", 0x0c0001, 0x020000, CRC(ca831a54) SHA1(ce4926a7713bfcf6191dafeb7684da21d0ee8f73) ) - ROM_LOAD16_BYTE( "23.h16", 0x100000, 0x020000, CRC(94ca23e8) SHA1(16b98ec952ea89cc52d798bab715efb1d5dcb5dc) ) - ROM_LOAD16_BYTE( "15.g16", 0x100001, 0x020000, CRC(db426709) SHA1(48c01388fc1c6c5fd2b2a1d6fc67bd6e79272053) ) + ROM_LOAD16_BYTE( "23.h16", 0x100000, 0x020000, CRC(94ca23e8) SHA1(16b98ec952ea89cc52d798bab715efb1d5dcb5dc) ) + ROM_LOAD16_BYTE( "15.g16", 0x100001, 0x020000, CRC(db426709) SHA1(48c01388fc1c6c5fd2b2a1d6fc67bd6e79272053) ) ROM_LOAD16_BYTE( "24.h17", 0x140000, 0x020000, CRC(6628becc) SHA1(499b77cfaed861cdb2ec94160143cbb0baa7d5ad) ) ROM_LOAD16_BYTE( "16.g17", 0x140001, 0x020000, CRC(f7b2aad6) SHA1(595f5db13ca6e6bb7b000b8cf13654f92bff3d01) ) - ROM_LOAD16_BYTE( "25.h19", 0x180000, 0x020000, CRC(26ca591f) SHA1(2dfc9be451df633e114b86961b304b0d9eaffec3) ) + ROM_LOAD16_BYTE( "25.h19", 0x180000, 0x020000, CRC(26ca591f) SHA1(2dfc9be451df633e114b86961b304b0d9eaffec3) ) ROM_LOAD16_BYTE( "17.g19", 0x180001, 0x020000, CRC(9302cfc3) SHA1(6a63df5e4dbc11404b46a0a7ea90298adba56c14) ) ROM_LOAD16_BYTE( "26.h20", 0x1c0000, 0x020000, CRC(5828e0af) SHA1(41d3118eae0c43ad25ef96d1c526a52dc46703d8) ) ROM_LOAD16_BYTE( "18.g20", 0x1c0001, 0x020000, CRC(fc8aced0) SHA1(12ffd552228893f2093c2d5617fc00cae262e2ed) ) diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 3c782d09c67..1cc31cfafd6 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -3823,14 +3823,14 @@ INPUT_PORTS_END Athena no Hatena? ***************************************************************************/ /* - Athena no Hatena is a quiz game that uses only four buttons for inputs. - However, the hidden "Test Program" menu makes use of the standard - stick/3-button input layout. With the default input mapping, the menus - are unusable as the three SHOT buttons are unmapped. So we have two - input configurations to allow the debug menu to be usable. - - More information about the Test Program menu: - http://sudden-desu.net/entry/athena-no-hatena-debug-menu-and-functions + Athena no Hatena is a quiz game that uses only four buttons for inputs. + However, the hidden "Test Program" menu makes use of the standard + stick/3-button input layout. With the default input mapping, the menus + are unusable as the three SHOT buttons are unmapped. So we have two + input configurations to allow the debug menu to be usable. + + More information about the Test Program menu: + http://sudden-desu.net/entry/athena-no-hatena-debug-menu-and-functions */ static INPUT_PORTS_START( atehate ) diff --git a/src/mame/drivers/snesb51.cpp b/src/mame/drivers/snesb51.cpp index cb9f054f26d..14e700ecee5 100644 --- a/src/mame/drivers/snesb51.cpp +++ b/src/mame/drivers/snesb51.cpp @@ -4,20 +4,20 @@ SNES bootlegs controlled by an MCS-51 core - Skeleton driver + Skeleton driver - Currently there are dumps for a Mortal Kombat 3 board and a board with - 4 slots that supports various games directly and also has a generic - timer based mode. + Currently there are dumps for a Mortal Kombat 3 board and a board with + 4 slots that supports various games directly and also has a generic + timer based mode. - Hardware (for the 4 slot switcher): - - MCS-51 based CPU 44-pin (markings removed) - - WD1016D-PL (?) - - TC5565PL-15 (8k SRAM) - - 12 MHz XTAL - - 4 Position Dipswitch + Hardware (for the 4 slot switcher): + - MCS-51 based CPU 44-pin (markings removed) + - WD1016D-PL (?) + - TC5565PL-15 (8k SRAM) + - 12 MHz XTAL + - 4 Position Dipswitch - Connector pinout: + Connector pinout: JAMMA P1 (from SNES) GND A | 1 GND 1 - GND @@ -96,17 +96,17 @@ void snesb51_state::mem_map(address_map &map) void snesb51_state::io_map(address_map &map) { -// map(0x8000, 0x8000).r -// map(0x8200, 0x8200).r -// map(0x8401, 0x8401).w +// map(0x8000, 0x8000).r +// map(0x8200, 0x8200).r +// map(0x8401, 0x8401).w map(0x8c00, 0x8c00).w(FUNC(snesb51_state::ram_address_high_w)); map(0x8e00, 0x8e00).w(FUNC(snesb51_state::ram_address_low_w)); -// map(0x9000, 0xafff).ram(); +// map(0x9000, 0xafff).ram(); map(0xa000, 0xa000).w(FUNC(snesb51_state::ram_w)); -// map(0xb000, 0xb000).w -// map(0xd000, 0xd000).w -// map(0xd400, 0xd400).w -// map(0xd800, 0xd800).r +// map(0xb000, 0xb000).w +// map(0xd000, 0xd000).w +// map(0xd400, 0xd400).w +// map(0xd800, 0xd800).r } static INPUT_PORTS_START( mk3snes ) diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index ee303d94b25..49d526e75bf 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -2925,7 +2925,7 @@ void subsino_state::mtrainnv(machine_config &config) with CPU brick. Dumped by Team Europe. - + ***************************************************************************/ ROM_START( victor5 ) diff --git a/src/mame/drivers/trivrus.cpp b/src/mame/drivers/trivrus.cpp index 6f99eab4b14..6761eee8994 100644 --- a/src/mame/drivers/trivrus.cpp +++ b/src/mame/drivers/trivrus.cpp @@ -1,17 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese /**************************************************************************** - - Trivia R Us (c) 2009 AGT - - driver by Angelo Salese, based off original crystal.cpp by ElSemi - - TODO: - - touch panel; - - RTC; - + + Trivia R Us (c) 2009 AGT + + driver by Angelo Salese, based off original crystal.cpp by ElSemi + + TODO: + - touch panel; + - RTC; + ============================================================================= - + ****************************************************************************/ #include "emu.h" @@ -89,13 +89,13 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); void trivrus_mem(address_map &map); - + // PIO DECLARE_READ32_MEMBER(PIOldat_r); uint32_t m_PIO; DECLARE_WRITE32_MEMBER(PIOldat_w); DECLARE_READ32_MEMBER(PIOedat_r); - + DECLARE_READ8_MEMBER(trivrus_input_r); DECLARE_WRITE8_MEMBER(trivrus_input_w); uint8_t m_trivrus_input; @@ -214,7 +214,7 @@ void trivrus_state::trivrus_mem(address_map &map) { map(0x00000000, 0x0007ffff).rom().nopw(); -// map(0x01280000, 0x01280003).w(FUNC(trivrus_state::Banksw_w)); +// map(0x01280000, 0x01280003).w(FUNC(trivrus_state::Banksw_w)); // 0x01280000 & 0x0000ffff (written at boot) map(0x01500000, 0x01500000).rw(FUNC(trivrus_state::trivrus_input_r), FUNC(trivrus_state::trivrus_input_w)); @@ -236,7 +236,7 @@ void trivrus_state::trivrus_mem(address_map &map) map(0x03800000, 0x03ffffff).ram().share("textureram"); map(0x04000000, 0x047fffff).ram().share("frameram"); map(0x04800000, 0x04800fff).rw(m_vr0snd, FUNC(vr0sound_device::vr0_snd_read), FUNC(vr0sound_device::vr0_snd_write)); - + map(0x05000000, 0x05ffffff).bankr("mainbank"); map(0x05000000, 0x05000003).rw(FUNC(trivrus_state::FlashCmd_r), FUNC(trivrus_state::FlashCmd_w)); } diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp index c2c465816d2..6dc3ee6c4a4 100644 --- a/src/mame/drivers/vii.cpp +++ b/src/mame/drivers/vii.cpp @@ -348,7 +348,7 @@ class icanpian_state : public icanguit_state public: icanpian_state(const machine_config &mconfig, device_type type, const char *tag) : icanguit_state(mconfig, type, tag) - // , m_eeprom(*this, "eeprom") + // , m_eeprom(*this, "eeprom") { } void icanpian(machine_config &config); @@ -1749,10 +1749,10 @@ WRITE16_MEMBER(icanpian_state::porta_w) READ16_MEMBER(icanpian_state::portb_r) { /* - uint16_t ret = 0x0000; - logerror("%s: portbxx_r\n", machine().describe_context()); - ret |= m_eeprom->do_read() ? 0xffff : 0x0000; - return ret; + uint16_t ret = 0x0000; + logerror("%s: portbxx_r\n", machine().describe_context()); + ret |= m_eeprom->do_read() ? 0xffff : 0x0000; + return ret; */ return 0x0000; } @@ -1760,10 +1760,10 @@ READ16_MEMBER(icanpian_state::portb_r) WRITE16_MEMBER(icanpian_state::portb_w) { /* - logerror("%s: portbxx_w (%04x)\n", machine().describe_context(), data); - m_eeprom->di_write(BIT(data, 2)); - m_eeprom->cs_write(BIT(data, 0) ? ASSERT_LINE : CLEAR_LINE); - m_eeprom->clk_write(BIT(data, 1) ? ASSERT_LINE : CLEAR_LINE); + logerror("%s: portbxx_w (%04x)\n", machine().describe_context(), data); + m_eeprom->di_write(BIT(data, 2)); + m_eeprom->cs_write(BIT(data, 0) ? ASSERT_LINE : CLEAR_LINE); + m_eeprom->clk_write(BIT(data, 1) ? ASSERT_LINE : CLEAR_LINE); */ } @@ -2029,9 +2029,9 @@ void icanpian_state::icanpian(machine_config &config) m_maincpu->portc_in().set(FUNC(icanpian_state::portc_r)); m_maincpu->portc_out().set(FUNC(icanpian_state::portc_w)); -// EEPROM_93C66_16BIT(config, m_eeprom); // unknown part -// m_eeprom->erase_time(attotime::from_usec(1)); -// m_eeprom->write_time(attotime::from_usec(1)); +// EEPROM_93C66_16BIT(config, m_eeprom); // unknown part +// m_eeprom->erase_time(attotime::from_usec(1)); +// m_eeprom->write_time(attotime::from_usec(1)); GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "icanpian_cart"); m_cart->set_width(GENERIC_ROM16_WIDTH); diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h index 5ffd9430979..dfe2961f3a1 100644 --- a/src/mame/includes/pc9801.h +++ b/src/mame/includes/pc9801.h @@ -260,7 +260,7 @@ private: DECLARE_WRITE8_MEMBER(sdip_9_w); DECLARE_WRITE8_MEMBER(sdip_a_w); DECLARE_WRITE8_MEMBER(sdip_b_w); - + DECLARE_READ8_MEMBER(as_unkdev_data_r); DECLARE_WRITE8_MEMBER(as_unkdev_data_w); DECLARE_WRITE8_MEMBER(as_unkdev_addr_w); diff --git a/src/mame/layout/saitek_risc2500.lay b/src/mame/layout/saitek_risc2500.lay index aa026d5338e..1a211c97698 100644 --- a/src/mame/layout/saitek_risc2500.lay +++ b/src/mame/layout/saitek_risc2500.lay @@ -63,10 +63,10 @@ - + - - + + diff --git a/src/mame/machine/awboard.cpp b/src/mame/machine/awboard.cpp index 840b15ffc7c..3ff85c137de 100644 --- a/src/mame/machine/awboard.cpp +++ b/src/mame/machine/awboard.cpp @@ -229,7 +229,7 @@ const aw_rom_board::sbox_set aw_rom_board::sboxes_table[4] = const int aw_rom_board::xor_table[16] = // -1 = unknown/unused { - 0x0000, -1, 0x97CF, 0x4BE3, 0x2255, 0x8DD6, -1, 0xC6A2, 0xA1E8, 0xB3BF, 0x3B1A, 0x547A, -1, 0x935F, -1, -1 + 0x0000, -1, 0x97CF, 0x4BE3, 0x2255, 0x8DD6, -1, 0xC6A2, 0xA1E8, 0xB3BF, 0x3B1A, 0x547A, -1, 0x935F, -1, -1 }; uint16_t aw_rom_board::decrypt(uint16_t cipherText, uint32_t address, const uint8_t key) diff --git a/src/mame/machine/pc9801_memsw.cpp b/src/mame/machine/pc9801_memsw.cpp index 33fb382fd08..93392aefc0f 100644 --- a/src/mame/machine/pc9801_memsw.cpp +++ b/src/mame/machine/pc9801_memsw.cpp @@ -2,77 +2,77 @@ // copyright-holders:Angelo Salese /*************************************************************************** - PC-9801 MEMSW interface - - A CMOS-like interface that maps in the TVRAM area - - Reference URL: - http://ohta.music.coocan.jp/packen/board/memsw.htm - Running the MON command under BASIC allows the user to change these - settings. - ssw -> for displaying current settings on screen; - ssw# -> to change the given # - - List of settings, parenthesis for default if not zero - SW1 $A3FE2 - xx-- ---- stop bit length (01) - --x- ---- parity specification - ---x ---- parity check - ---- xx-- data bit length (10) - ---- --x- communication method - ---- ---x X parameter - - SW2 $A3FE6 - x--- ---- S parameter - -x-- ---- line feed code when sending - --x- ---- line feed code when receiving - ---x ---- Japanese shift code - ---- xxxx transfer speed (0101) - - SW3 $A3FEA - x--- ---- Operation when DEL code is received (input / output mode) - x--- ---- Operation when DEL code is received (terminal mode) - -x-- ---- Text screen color - --x- ---- Maximum operating frequency for V30 coprocessor - ---x ---- With or without V30 coprocessor - ---- x--- Coprocessor for 80286,386 - ---- -xxx Conventional memory size (100) - - SW4 $A3FEE - x--- ---- Expansion ROM CE000-CFFFF - -x-- ---- Expansion ROM CA000-CBFFF - --x- ---- Expansion ROM D4000-D5FFF - ---x ---- Expansion ROM D0000-D3FFF - ---- x--- Expansion ROM CC000-CFFFF - ---- -x-- Expansion ROM C8000-C9FFF - ---- --xx (Unused) - - SW5 $A3FF2 - xxxx ---- Select boot device (0000) - 1100 ---- SCSI HDD #1 - 1011 ---- HDD #2 - 1010 ---- HDD #1 - 1000 ---- ROM BASIC - 0110 ---- MO disk - 0100 ---- 1MB FDD - 0010 ---- 640K FDD - 0000 ---- standard - ???? ---- ROM BASIC - ---- x--- Screen Hard copy color - ---- -x-- Use HDD user ID - ---- --x- Prioritize HDD with device name - ---- ---x PC-PR201 series used (1) - - SW5 $A3FF6 - --x- ---- Use modem-NCU control function - ---x ---- Extended screen hard copy function - ---- x--- Use monitor mode (Use extended monitor mode) - xx-- -xxx (Unused) - - - TODO: - - Is the mapping truly aligned to 2 bytes? Looks more like 4, needs real - HW verification. + PC-9801 MEMSW interface + + A CMOS-like interface that maps in the TVRAM area + + Reference URL: + http://ohta.music.coocan.jp/packen/board/memsw.htm + Running the MON command under BASIC allows the user to change these + settings. + ssw -> for displaying current settings on screen; + ssw# -> to change the given # + + List of settings, parenthesis for default if not zero + SW1 $A3FE2 + xx-- ---- stop bit length (01) + --x- ---- parity specification + ---x ---- parity check + ---- xx-- data bit length (10) + ---- --x- communication method + ---- ---x X parameter + + SW2 $A3FE6 + x--- ---- S parameter + -x-- ---- line feed code when sending + --x- ---- line feed code when receiving + ---x ---- Japanese shift code + ---- xxxx transfer speed (0101) + + SW3 $A3FEA + x--- ---- Operation when DEL code is received (input / output mode) + x--- ---- Operation when DEL code is received (terminal mode) + -x-- ---- Text screen color + --x- ---- Maximum operating frequency for V30 coprocessor + ---x ---- With or without V30 coprocessor + ---- x--- Coprocessor for 80286,386 + ---- -xxx Conventional memory size (100) + + SW4 $A3FEE + x--- ---- Expansion ROM CE000-CFFFF + -x-- ---- Expansion ROM CA000-CBFFF + --x- ---- Expansion ROM D4000-D5FFF + ---x ---- Expansion ROM D0000-D3FFF + ---- x--- Expansion ROM CC000-CFFFF + ---- -x-- Expansion ROM C8000-C9FFF + ---- --xx (Unused) + + SW5 $A3FF2 + xxxx ---- Select boot device (0000) + 1100 ---- SCSI HDD #1 + 1011 ---- HDD #2 + 1010 ---- HDD #1 + 1000 ---- ROM BASIC + 0110 ---- MO disk + 0100 ---- 1MB FDD + 0010 ---- 640K FDD + 0000 ---- standard + ???? ---- ROM BASIC + ---- x--- Screen Hard copy color + ---- -x-- Use HDD user ID + ---- --x- Prioritize HDD with device name + ---- ---x PC-PR201 series used (1) + + SW5 $A3FF6 + --x- ---- Use modem-NCU control function + ---x ---- Extended screen hard copy function + ---- x--- Use monitor mode (Use extended monitor mode) + xx-- -xxx (Unused) + + + TODO: + - Is the mapping truly aligned to 2 bytes? Looks more like 4, needs real + HW verification. ***************************************************************************/ @@ -129,10 +129,10 @@ void pc9801_memsw_device::nvram_default() const uint8_t default_memsw_data[0x10] = { - 0xe1, 0x48, 0xe1, 0x05, - 0xe1, 0x04, 0xe1, 0x00, - 0xe1, 0x01, 0xe1, 0x00, - 0xe1, 0x00, 0xe1, 0x00 + 0xe1, 0x48, 0xe1, 0x05, + 0xe1, 0x04, 0xe1, 0x00, + 0xe1, 0x01, 0xe1, 0x00, + 0xe1, 0x00, 0xe1, 0x00 }; memcpy(m_bram, default_memsw_data, m_bram_size); diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 644c8864071..50602b4e1cb 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -84,7 +84,7 @@ void pce_cd_device::regs_map(address_map &map) { map(0x00, 0x00).rw(FUNC(pce_cd_device::cdc_status_r), FUNC(pce_cd_device::cdc_status_w)); map(0x01, 0x01).rw(FUNC(pce_cd_device::cdc_data_r), FUNC(pce_cd_device::cdc_data_w)); - map(0x02, 0x02).rw(FUNC(pce_cd_device::irq_mask_r), FUNC(pce_cd_device::irq_mask_w)); + map(0x02, 0x02).rw(FUNC(pce_cd_device::irq_mask_r), FUNC(pce_cd_device::irq_mask_w)); map(0x03, 0x03).r(FUNC(pce_cd_device::irq_status_r)); map(0x04, 0x04).rw(FUNC(pce_cd_device::cdc_reset_r), FUNC(pce_cd_device::cdc_reset_w)); map(0x05, 0x06).r(FUNC(pce_cd_device::cdda_data_r)); @@ -101,7 +101,7 @@ void pce_cd_device::regs_map(address_map &map) pce_cd_device::pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PCE_CD, tag, owner, clock) - , device_memory_interface(mconfig, *this) + , device_memory_interface(mconfig, *this) , m_space_config("io", ENDIANNESS_LITTLE, 8, 4, 0, address_map_constructor(FUNC(pce_cd_device::regs_map), this)) , m_maincpu(*this, ":maincpu") , m_msm(*this, "msm5205") @@ -216,7 +216,7 @@ void pce_cd_device::device_start() save_item(NAME(m_end_mark)); save_item(NAME(m_cdda_volume)); save_item(NAME(m_adpcm_volume)); - + // internal regs save_item(NAME(m_reset_reg)); save_item(NAME(m_irq_mask)); @@ -1111,7 +1111,7 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadein_callback) } /* - * + * * Register section * */ @@ -1212,7 +1212,7 @@ WRITE8_MEMBER(pce_cd_device::cdc_reset_w) READ8_MEMBER(pce_cd_device::cdda_data_r) { uint8_t port_shift = offset ? 0 : 8; - + return ((m_cdda->get_channel_volume(m_irq_status & 2) ? 0 : 1) >> port_shift) & 0xff; } @@ -1292,7 +1292,7 @@ READ8_MEMBER(pce_cd_device::adpcm_status_r) // ---x ---- ADPCM set length // ---- x--- ADPCM set read address // ---- --xx ADPCM set write address -// TODO: some games reads bit 5 and wants it to be low otherwise they hangs, +// TODO: some games reads bit 5 and wants it to be low otherwise they hangs, // how that can cope with "repeat"? READ8_MEMBER(pce_cd_device::adpcm_address_control_r) { @@ -1493,7 +1493,7 @@ uint8_t pce_cd_device::get_adpcm_ram_byte() * I/O accessors * */ -// TODO: more stuff actually belongs to the whole CD interface, +// TODO: more stuff actually belongs to the whole CD interface, // cfr. pce_cd_intf_r/w in drivers/pce.cpp READ8_MEMBER(pce_cd_device::intf_r) { diff --git a/src/mame/machine/pce_cd.h b/src/mame/machine/pce_cd.h index 36027488361..3ba339fdde6 100644 --- a/src/mame/machine/pce_cd.h +++ b/src/mame/machine/pce_cd.h @@ -41,7 +41,7 @@ enum { // ======================> pce_cd_device class pce_cd_device : public device_t, - public device_memory_interface + public device_memory_interface { public: // construction/destruction @@ -67,7 +67,7 @@ protected: private: const address_space_config m_space_config; - + DECLARE_READ8_MEMBER(cdc_status_r); DECLARE_WRITE8_MEMBER(cdc_status_w); DECLARE_READ8_MEMBER(cdc_reset_r); @@ -92,7 +92,7 @@ private: DECLARE_WRITE8_MEMBER(adpcm_address_control_w); DECLARE_WRITE8_MEMBER(adpcm_playback_rate_w); DECLARE_WRITE8_MEMBER(fade_register_w); - + uint8_t m_reset_reg; uint8_t m_irq_mask; uint8_t m_irq_status; diff --git a/src/mame/machine/sec.h b/src/mame/machine/sec.h index 27542643b5d..393dc94810d 100644 --- a/src/mame/machine/sec.h +++ b/src/mame/machine/sec.h @@ -63,31 +63,31 @@ private: static const size_t MAX_COUNTERS = 32; // stuff the SEC stores - int m_counters[MAX_COUNTERS]; - char m_strings[MAX_COUNTERS][8]; - uint8_t m_market; - uint8_t m_nocnt; - uint8_t m_last; + int m_counters[MAX_COUNTERS]; + char m_strings[MAX_COUNTERS][8]; + uint8_t m_market; + uint8_t m_nocnt; + uint8_t m_last; // serial comms - uint8_t m_curbyte; - uint8_t m_data; + uint8_t m_curbyte; + uint8_t m_data; - uint8_t m_clk; - uint8_t m_clks; - uint8_t m_rxpos; - uint8_t m_rxclk; - uint8_t m_rxdat; - uint8_t m_rxlen; - uint8_t m_chars_left; + uint8_t m_clk; + uint8_t m_clks; + uint8_t m_rxpos; + uint8_t m_rxclk; + uint8_t m_rxdat; + uint8_t m_rxlen; + uint8_t m_chars_left; - uint8_t m_reqpos; + uint8_t m_reqpos; // communication buffer - uint8_t m_request[12]; - uint8_t m_reply[8]; + uint8_t m_request[12]; + uint8_t m_reply[8]; - bool m_enabled; + bool m_enabled; // execute command void do_command(void); @@ -112,4 +112,4 @@ private: DECLARE_DEVICE_TYPE(SEC, sec_device) -#endif // MAME_MACHINE_SEC_H \ No newline at end of file +#endif // MAME_MACHINE_SEC_H diff --git a/src/mame/machine/seibucop/seibucop_cmd.hxx b/src/mame/machine/seibucop/seibucop_cmd.hxx index f1c96aadd1d..f51bfcb7450 100644 --- a/src/mame/machine/seibucop/seibucop_cmd.hxx +++ b/src/mame/machine/seibucop/seibucop_cmd.hxx @@ -574,7 +574,7 @@ void raiden2cop_device::LEGACY_execute_c480(int offset, uint16_t data) else sprite_y = (m_sprite_dma_rel_y & 0x78) + (abs_y)-((m_sprite_dma_rel_y & 0x80) ? 0x80 : 0); - // 3rd midboss enables this bit for the sections that should be covered by the ground layers, + // 3rd midboss enables this bit for the sections that should be covered by the ground layers, // effectively changing the priority value to 2 if (m_cop_sprite_dma_param & 0x00020000) { diff --git a/src/mame/machine/swtpc09.cpp b/src/mame/machine/swtpc09.cpp index 2f6643e4878..bbf8c34e9d2 100644 --- a/src/mame/machine/swtpc09.cpp +++ b/src/mame/machine/swtpc09.cpp @@ -116,8 +116,8 @@ TIMER_CALLBACK_MEMBER(swtpc09_state::floppy_motor_callback) void swtpc09_state::validate_floppy_side(uint8_t cmd) { if ((cmd & 0xe1) == 0x80 || (cmd & 0xe0) == 0xa0 || - (cmd & 0xf9) == 0xc0 || (cmd & 0xf9) == 0xe0 || - (cmd & 0xf9) == 0xf0) + (cmd & 0xf9) == 0xc0 || (cmd & 0xf9) == 0xe0 || + (cmd & 0xf9) == 0xf0) { uint32_t expected_sectors = m_floppy_expected_sectors->read(); uint32_t track_zero_expected_sectors = m_floppy_track_zero_expected_sectors->read(); @@ -760,8 +760,8 @@ void swtpc09_state::machine_reset() m_maincpu->set_clock(maincpu_clock * 4); if (m_system_type == FLEX_DMAF2 || - m_system_type == UNIFLEX_DMAF2 || - m_system_type == UNIFLEX_DMAF3) + m_system_type == UNIFLEX_DMAF2 || + m_system_type == UNIFLEX_DMAF3) { uint32_t fdc_clock = m_fdc_clock->read(); m_fdc->set_unscaled_clock(fdc_clock); @@ -778,8 +778,8 @@ void swtpc09_state::machine_reset() // Note UNIBUG has a smarter boot loader in ROM and will toggle the // density on failure so this is not necessary for UniFLEX. if ((m_system_type == FLEX_DMAF2 || - m_system_type == FLEX_DC5_PIAIDE) && - m_sbug_double_density->read()) + m_system_type == FLEX_DC5_PIAIDE) && + m_sbug_double_density->read()) { // Patch the boot ROM to load the boot sector in double density. uint8_t* sbug = memregion("bankdev")->base(); @@ -789,7 +789,7 @@ void swtpc09_state::machine_reset() } if (m_system_type == FLEX_DC5_PIAIDE && - m_piaide_flex_boot_cd00->read()) + m_piaide_flex_boot_cd00->read()) { // Patch the PIA-IDE boot rom to use IO1 uint8_t* rom = memregion("bankdev")->base(); diff --git a/src/mame/video/galaxold.cpp b/src/mame/video/galaxold.cpp index 4cca6a5edf8..1303291335f 100644 --- a/src/mame/video/galaxold.cpp +++ b/src/mame/video/galaxold.cpp @@ -457,7 +457,7 @@ VIDEO_START_MEMBER(galaxold_state,stratgyx) VIDEO_START_CALL_MEMBER(galaxold_plain); m_draw_background = &galaxold_state::stratgyx_draw_background; - + // level 3 tank bullets m_draw_bullets = &galaxold_state::scrambold_draw_bullets; } diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp index a723f92802d..bcbff7fed4b 100644 --- a/src/mame/video/legionna.cpp +++ b/src/mame/video/legionna.cpp @@ -288,7 +288,7 @@ VIDEO_START_MEMBER(legionna_state,denjinmk) VIDEO_START_MEMBER(legionna_state,cupsoc) { common_video_start(false, false, false); - + m_sprite_pri_mask[0] = 0xfff0; // title screen "Seibu Cup Soccer" elements m_sprite_pri_mask[1] = 0xfffc; // ? m_sprite_pri_mask[2] = 0xfffe; // ? @@ -299,7 +299,7 @@ VIDEO_START_MEMBER(legionna_state,grainbow) { common_video_start(false, false, true); m_sprite_xoffs = m_sprite_yoffs = 16; - m_sprite_pri_mask[0] = 0xfff0; // + m_sprite_pri_mask[0] = 0xfff0; // m_sprite_pri_mask[1] = 0xfffc; // level 2 and 3 m_sprite_pri_mask[2] = 0xfffe; // swamp monster mask effect m_sprite_pri_mask[3] = 0x0000; // Insert coin diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp index 979c2996ad8..a3766a5f8bd 100644 --- a/src/mame/video/vrender0.cpp +++ b/src/mame/video/vrender0.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(VIDEO_VRENDER0, vr0video_device, "vr0video", "MagicEyes VRend vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, VIDEO_VRENDER0, tag, owner, clock) - , device_video_interface(mconfig, *this) + , device_video_interface(mconfig, *this) , m_cpu(*this, finder_base::DUMMY_TAG) , m_idleskip_cb(*this) @@ -74,7 +74,7 @@ WRITE16_MEMBER(vr0video_device::render_control_w) m_render_reset = BIT(data, 3); m_render_start = BIT(data, 2); m_dither_mode = data & 3; - + // initialize pipeline // TODO: what happens if reset and start are both 1? Datasheet advises against it. if (m_render_reset == true) @@ -122,7 +122,7 @@ WRITE16_MEMBER(vr0video_device::flip_count_w) void vr0video_device::device_start() { m_idleskip_cb.resolve_safe(); - + save_item(NAME(m_InternalPalette)); save_item(NAME(m_LastPalUpdate)); @@ -146,7 +146,7 @@ void vr0video_device::device_start() save_item(NAME(m_RenderState.PixelFormat)); save_item(NAME(m_RenderState.Width)); save_item(NAME(m_RenderState.Height)); - + save_item(NAME(m_flip_count)); save_item(NAME(m_queue_rear)); save_item(NAME(m_queue_front)); @@ -504,7 +504,7 @@ int vr0video_device::vrender0_ProcessPacket(uint32_t PacketPtr, uint16_t *Dest) // TODO: this need to be removed address_space &space = m_cpu->space(AS_PROGRAM); uint8_t *TEXTURE = m_textureram; - + uint32_t Dx = Packet(1) & 0x3ff; uint32_t Dy = Packet(2) & 0x1ff; uint32_t Endx = Packet(3) & 0x3ff; @@ -662,7 +662,7 @@ void vr0video_device::execute_drawing() { if (m_render_start == false) return; - + uint32_t B0 = 0x000000; uint32_t B1 = (m_bank1_select == true ? 0x400000 : 0x100000)/2; uint16_t *DrawDest; @@ -679,7 +679,7 @@ void vr0video_device::execute_drawing() Front = (m_frameram + B0); Back = (m_frameram + B1); } - + DrawDest = ((m_draw_select == true) ? Front : Back); while ((m_queue_rear & 0x7ff) != (m_queue_front & 0x7ff)) @@ -690,7 +690,7 @@ void vr0video_device::execute_drawing() if (DoFlip) break; } - + if (DoFlip) { if (m_flip_count) @@ -708,15 +708,15 @@ uint32_t vr0video_device::screen_update(screen_device &screen, bitmap_ind16 &bit uint32_t B0 = 0x000000; uint32_t B1 = (m_bank1_select == true ? 0x400000 : 0x100000)/2; - + if (m_display_bank & 1) Visible = (m_frameram + B1); else Visible = (m_frameram + B0); - + uint32_t const dx = cliprect.left(); for (int y = cliprect.top(); y <= cliprect.bottom(); y++) std::copy_n(&Visible[(y * 1024) + dx], width, &bitmap.pix16(y, dx)); - + return 0; } diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h index 5669c74e810..6d986441fd2 100644 --- a/src/mame/video/vrender0.h +++ b/src/mame/video/vrender0.h @@ -11,7 +11,7 @@ ***************************************************************************/ class vr0video_device : public device_t, - public device_video_interface + public device_video_interface { public: template vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag) @@ -71,23 +71,23 @@ private: uint32_t m_LastPalUpdate; RenderStateInfo m_RenderState; - + uint8_t *m_textureram; uint16_t *m_frameram; - + DECLARE_READ16_MEMBER( cmd_queue_front_r ); DECLARE_WRITE16_MEMBER( cmd_queue_front_w ); DECLARE_READ16_MEMBER( cmd_queue_rear_r ); uint16_t m_queue_rear, m_queue_front; - + DECLARE_READ16_MEMBER( bank1_select_r ); DECLARE_WRITE16_MEMBER( bank1_select_w ); bool m_bank1_select; - + DECLARE_READ16_MEMBER( display_bank_r ); uint8_t m_display_bank; - + DECLARE_READ16_MEMBER( render_control_r ); DECLARE_WRITE16_MEMBER( render_control_w ); bool m_draw_select; diff --git a/src/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp index c521bd0d463..1787d3857a6 100644 --- a/src/osd/modules/debugger/debuggdbstub.cpp +++ b/src/osd/modules/debugger/debuggdbstub.cpp @@ -1037,35 +1037,35 @@ void debug_gdbstub::handle_packet(void) //------------------------------------------------------------------------- #define BYTESWAP_64(x) ((((x) << 56) & 0xFF00000000000000) \ - | (((x) << 40) & 0x00FF000000000000) \ - | (((x) << 24) & 0x0000FF0000000000) \ - | (((x) << 8) & 0x000000FF00000000) \ - | (((x) >> 8) & 0x00000000FF000000) \ - | (((x) >> 24) & 0x0000000000FF0000) \ - | (((x) >> 40) & 0x000000000000FF00) \ - | (((x) >> 56) & 0x00000000000000FF)) + | (((x) << 40) & 0x00FF000000000000) \ + | (((x) << 24) & 0x0000FF0000000000) \ + | (((x) << 8) & 0x000000FF00000000) \ + | (((x) >> 8) & 0x00000000FF000000) \ + | (((x) >> 24) & 0x0000000000FF0000) \ + | (((x) >> 40) & 0x000000000000FF00) \ + | (((x) >> 56) & 0x00000000000000FF)) #define BYTESWAP_32(x) ((((x) << 24) & 0xFF000000) \ - | (((x) << 8) & 0x00FF0000) \ - | (((x) >> 8) & 0x0000FF00) \ - | (((x) >> 24) & 0x000000FF)) + | (((x) << 8) & 0x00FF0000) \ + | (((x) >> 8) & 0x0000FF00) \ + | (((x) >> 24) & 0x000000FF)) #define BYTESWAP_16(x) ((((x) << 8) & 0xFF00) \ - | (((x) >> 8) & 0x00FF)) + | (((x) >> 8) & 0x00FF)) //------------------------------------------------------------------------- std::string debug_gdbstub::get_register_string(int gdb_regnum) { const gdb_register ® = m_gdb_registers[gdb_regnum]; const char *fmt = (reg.gdb_bitsize == 64) ? "%016" PRIx64 - : (reg.gdb_bitsize == 32) ? "%08" PRIx64 - : (reg.gdb_bitsize == 16) ? "%04" PRIx64 - : "%02" PRIx64; + : (reg.gdb_bitsize == 32) ? "%08" PRIx64 + : (reg.gdb_bitsize == 16) ? "%04" PRIx64 + : "%02" PRIx64; uint64_t value = m_state->state_int(reg.state_index); if ( !m_is_be ) { value = (reg.gdb_bitsize == 64) ? BYTESWAP_64(value) - : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value) - : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value) - : value; + : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value) + : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value) + : value; } return string_format(fmt, value); } @@ -1075,18 +1075,18 @@ bool debug_gdbstub::parse_register_string(uint64_t *pvalue, const char *buf, int { const gdb_register ® = m_gdb_registers[gdb_regnum]; const char *fmt = (reg.gdb_bitsize == 64) ? "%016" PRIx64 - : (reg.gdb_bitsize == 32) ? "%08" PRIx64 - : (reg.gdb_bitsize == 16) ? "%04" PRIx64 - : "%02" PRIx64; + : (reg.gdb_bitsize == 32) ? "%08" PRIx64 + : (reg.gdb_bitsize == 16) ? "%04" PRIx64 + : "%02" PRIx64; uint64_t value; if ( sscanf(buf, fmt, &value) != 1 ) return false; if ( !m_is_be ) { value = (reg.gdb_bitsize == 64) ? BYTESWAP_64(value) - : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value) - : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value) - : value; + : (reg.gdb_bitsize == 32) ? BYTESWAP_32(value) + : (reg.gdb_bitsize == 16) ? BYTESWAP_16(value) + : value; } *pvalue = value; return true; diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h index 3e9838ba396..b04e35aa110 100644 --- a/src/osd/windows/window.h +++ b/src/osd/windows/window.h @@ -44,9 +44,9 @@ enum class win_window_focus { - NONE, // neither this window nor this thread have focus - THREAD, // a window in this thread has focus - WINDOW // this window has focus directly + NONE, // neither this window nor this thread have focus + THREAD, // a window in this thread has focus + WINDOW // this window has focus directly }; @@ -154,7 +154,7 @@ private: #endif running_machine & m_machine; - bool m_attached_mode; + bool m_attached_mode; }; struct osd_draw_callbacks -- cgit v1.2.3