From 773a4c8f6486394cd50c8c24b3baabaf17aa4a26 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 7 Mar 2025 00:46:08 +1100 Subject: [PATCH] -seta/rmhaihai.cpp: Added Real Mahjong Haihai DIP switch locations from manual. -cpu/drcbearm64.cpp: Added some glue for supporting memory access optimisations. --- src/devices/cpu/drcbearm64.cpp | 50 ++++++++++------ src/devices/cpu/drcbex64.cpp | 1 - src/mame/seta/rmhaihai.cpp | 101 ++++++++++++++++----------------- 3 files changed, 81 insertions(+), 71 deletions(-) diff --git a/src/devices/cpu/drcbearm64.cpp b/src/devices/cpu/drcbearm64.cpp index 5477343ce57..cdac77ba37a 100644 --- a/src/devices/cpu/drcbearm64.cpp +++ b/src/devices/cpu/drcbearm64.cpp @@ -422,6 +422,29 @@ private: be_parameter_value m_value; }; + struct near_state + { + uint32_t emulated_flags; + }; + + using opcode_generate_func = void (drcbe_arm64::*)(asmjit::a64::Assembler &, const uml::instruction &); + struct opcode_table_entry + { + uml::opcode_t opcode; + opcode_generate_func func; + }; + + struct memory_accessors + { + resolved_memory_accessors resolved; + address_space::specific_access_info specific; + offs_t address_mask; + u8 high_bits; + bool no_mask; + bool mask_simple; + bool mask_high_bits; + }; + void op_handle(asmjit::a64::Assembler &a, const uml::instruction &inst); void op_hash(asmjit::a64::Assembler &a, const uml::instruction &inst); void op_label(asmjit::a64::Assembler &a, const uml::instruction &inst); @@ -556,26 +579,11 @@ private: uint8_t *m_baseptr; - struct near_state - { - uint32_t emulated_flags; - }; near_state &m_near; - using opcode_generate_func = void (drcbe_arm64::*)(asmjit::a64::Assembler &, const uml::instruction &); - struct opcode_table_entry - { - uml::opcode_t opcode; - opcode_generate_func func; - }; static const opcode_table_entry s_opcode_table_source[]; static opcode_generate_func s_opcode_table[uml::OP_MAX]; - struct memory_accessors - { - resolved_memory_accessors resolved; - address_space::specific_access_info specific; - }; resolved_member_function m_debug_cpu_instruction_hook; resolved_member_function m_drcmap_get_value; std::vector m_memory_accessors; @@ -1245,8 +1253,16 @@ drcbe_arm64::drcbe_arm64(drcuml_state &drcuml, device_t &device, drc_cache &cach { if (m_space[space]) { - m_memory_accessors[space].resolved.set(*m_space[space]); - m_memory_accessors[space].specific = m_space[space]->specific_accessors(); + auto &accessors = m_memory_accessors[space]; + accessors.resolved.set(*m_space[space]); + accessors.specific = m_space[space]->specific_accessors(); + accessors.address_mask = m_space[space]->addrmask() & make_bitmask(accessors.specific.address_width) & ~make_bitmask(accessors.specific.native_mask_bits); + offs_t const shiftedmask = accessors.address_mask >> accessors.specific.low_bits; + offs_t const nomask = ~offs_t(0); + accessors.high_bits = 32 - count_leading_zeros_32(shiftedmask); + accessors.no_mask = nomask == accessors.address_mask; + accessors.mask_simple = !accessors.no_mask && is_valid_immediate_mask(accessors.address_mask, 4); + accessors.mask_high_bits = (shiftedmask & (shiftedmask + 1)) != 0; } } } diff --git a/src/devices/cpu/drcbex64.cpp b/src/devices/cpu/drcbex64.cpp index d6dab04f58d..63d57ce6055 100644 --- a/src/devices/cpu/drcbex64.cpp +++ b/src/devices/cpu/drcbex64.cpp @@ -2850,7 +2850,6 @@ void drcbe_x64::op_read(Assembler &a, const instruction &inst) a.mov(Gpq(REG_PARAM1), ptr(rax, Gpd(REG_PARAM2), 3)); // load dispatch table entry if (accessors.specific.low_bits) a.mov(Gpd(REG_PARAM2), r10d); // restore masked address - } else { diff --git a/src/mame/seta/rmhaihai.cpp b/src/mame/seta/rmhaihai.cpp index 073be31b4e6..87920b3198f 100644 --- a/src/mame/seta/rmhaihai.cpp +++ b/src/mame/seta/rmhaihai.cpp @@ -31,10 +31,12 @@ TODO: ***************************************************************************/ #include "emu.h" + #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "sound/ay8910.h" #include "sound/msm5205.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" @@ -56,11 +58,15 @@ public: m_key(*this, "KEY%u", 0) { } - void init_rmhaihai(); - void rmhaihai(machine_config &config); - void rmhaibl(machine_config &config); + void rmhaihai(machine_config &config) ATTR_COLD; + void rmhaisei(machine_config &config); + void rmhaibl(machine_config &config) ATTR_COLD; + + void init_rmhaihai() ATTR_COLD; protected: + virtual void video_start() override ATTR_COLD; + void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); uint8_t keyboard_r(); @@ -69,8 +75,6 @@ protected: void ctrl_w(uint8_t data); void adpcm_w(uint8_t data); - virtual void video_start() override ATTR_COLD; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_bg_tile_info); @@ -94,14 +98,6 @@ protected: }; -class rmhaisei_state : public rmhaihai_state -{ -public: - using rmhaihai_state::rmhaihai_state; - void rmhaisei(machine_config &config); -}; - - class themj_state : public rmhaihai_state { public: @@ -110,18 +106,18 @@ public: m_cpubank(*this, "cpubank%u", 1) { } - void themj(machine_config &config); + void themj(machine_config &config) ATTR_COLD; protected: virtual void machine_start() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD; private: - required_memory_bank_array<2> m_cpubank; - void themj_io_map(address_map &map) ATTR_COLD; void themj_map(address_map &map) ATTR_COLD; void themj_rombank_w(uint8_t data); + + required_memory_bank_array<2> m_cpubank; }; @@ -179,7 +175,7 @@ uint8_t rmhaihai_state::keyboard_r() { for (int i = 0; i < 31; i++) { - if (m_key[i/16]->read() & (1 << (i & 15))) return i+1; + if (BIT(m_key[i >> 4]->read(), i & 0x0f)) return i+1; } if (m_key[1]->read() & 0x8000) return 0x80; // coin return 0; @@ -190,7 +186,6 @@ uint8_t rmhaihai_state::keyboard_r() case 0x5bf3: // themj, but the test is NOPed out! return 0xcc; // keyboard_cmd = 0xcb - case 0x13a: // additional checks done by rmhaijin if (m_keyboard_cmd == 0x3b) return 0xdd; if (m_keyboard_cmd == 0x85) return 0xdc; @@ -418,41 +413,41 @@ INPUT_PORTS_END static INPUT_PORTS_START( rmhaihai ) PORT_START("DSW2") - PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0xfe, 0xfe, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0xfe, "1 (Easy)" ) - PORT_DIPSETTING( 0x7e, "2" ) - PORT_DIPSETTING( 0xbe, "3" ) - PORT_DIPSETTING( 0xde, "4" ) - PORT_DIPSETTING( 0xee, "5" ) - PORT_DIPSETTING( 0xf6, "6" ) - PORT_DIPSETTING( 0xfa, "7" ) - PORT_DIPSETTING( 0xfc, "8 (Difficult)" ) + PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "D. SW2:8" ) // NOT USED + PORT_DIPNAME( 0xfe, 0xfe, "Computer Win Probability" ) PORT_DIPLOCATION("D. SW2:7,6,5,4,3,2,1") // レベル設定コンピュータのあがる確率 + PORT_DIPSETTING( 0xfe, "20% (Weak)" ) // 弱い + PORT_DIPSETTING( 0x7e, "30%" ) + PORT_DIPSETTING( 0xbe, "40%" ) + PORT_DIPSETTING( 0xde, "50%" ) + PORT_DIPSETTING( 0xee, "60%" ) + PORT_DIPSETTING( 0xf6, "70&%" ) + PORT_DIPSETTING( 0xfa, "80%" ) + PORT_DIPSETTING( 0xfc, "90% (Strong)" ) // 強い PORT_START("DSW1") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x02, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x00, "A 2/1 B 1/2" ) - PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x04, "A 1/2 B 2/1" ) - PORT_DIPSETTING( 0x08, "A 1/3 B 3/1" ) - PORT_DIPNAME( 0x10, 0x00, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x80, 0x80, "Medal" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x01, 0x01, DEF_STR(Free_Play) ) PORT_DIPLOCATION("D. SW1:8") // フリープレイ + PORT_DIPSETTING( 0x01, DEF_STR(Off) ) // ノーマル + PORT_DIPSETTING( 0x00, DEF_STR(On) ) // フリープレイ + PORT_DIPNAME( 0x02, 0x02, DEF_STR(Service_Mode) ) PORT_DIPLOCATION("D. SW1:7") // テストモード + PORT_DIPSETTING( 0x02, DEF_STR(Off) ) // 無 + PORT_DIPSETTING( 0x00, DEF_STR(On) ) // 有 + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR(Coinage) ) PORT_DIPLOCATION("D. SW1:6,5") // プレイ料金 + PORT_DIPSETTING( 0x00, "A 2/1 B 1/2" ) // ２コイン１クレジット + PORT_DIPSETTING( 0x0c, DEF_STR(1C_1C) ) // １コイン１クレジット + PORT_DIPSETTING( 0x04, "A 1/2 B 2/1" ) // １コイン２クレジット + PORT_DIPSETTING( 0x08, "A 1/3 B 3/1" ) // １コイン３クレジット + PORT_DIPNAME( 0x10, 0x00, DEF_STR(Demo_Sounds) ) PORT_DIPLOCATION("D. SW1:4") // ＤＥＭＯ音楽 + PORT_DIPSETTING( 0x10, DEF_STR(Off) ) // 無 + PORT_DIPSETTING( 0x00, DEF_STR(On) ) // 有 + PORT_DIPNAME( 0x20, 0x20, DEF_STR(Flip_Screen) ) PORT_DIPLOCATION("D. SW1:3") // 画面反転 + PORT_DIPSETTING( 0x20, DEF_STR(Off) ) // ノーマル + PORT_DIPSETTING( 0x00, DEF_STR(On) ) // 反転 + PORT_DIPNAME( 0x40, 0x00, DEF_STR(Cabinet) ) PORT_DIPLOCATION("D. SW1:2") // スタイル + PORT_DIPSETTING( 0x40, DEF_STR(Cocktail) ) // テーブル + PORT_DIPSETTING( 0x00, DEF_STR(Upright) ) // アップライト + PORT_DIPNAME( 0x80, 0x80, "Medal" ) PORT_DIPLOCATION("D. SW1:1") // NOT USED + PORT_DIPSETTING( 0x80, DEF_STR(Off) ) + PORT_DIPSETTING( 0x00, DEF_STR(On) ) PORT_INCLUDE( mjctrl ) INPUT_PORTS_END @@ -601,7 +596,7 @@ void rmhaihai_state::rmhaibl(machine_config &config) m_maincpu->set_addrmap(AS_IO, &rmhaihai_state::rmhaihaibl_io_map); } -void rmhaisei_state::rmhaisei(machine_config &config) +void rmhaihai_state::rmhaisei(machine_config &config) { rmhaihai(config); @@ -876,6 +871,6 @@ GAME( 1985, rmhaihai2, rmhaihai, rmhaihai, rmhaihai, rmhaihai_state, init_rmhai GAME( 1985, rmhaihaibl, rmhaihai, rmhaibl, rmhaibl, rmhaihai_state, init_rmhaihai, ROT0, "bootleg", "Real Mahjong Haihai (Japan, bootleg)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, rmhaihib, rmhaihai, rmhaihai, rmhaihib, rmhaihai_state, init_rmhaihai, ROT0, "Alba", "Real Mahjong Haihai (Japan, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, rmhaijin, 0, rmhaihai, rmhaihai, rmhaihai_state, init_rmhaihai, ROT0, "Alba", "Real Mahjong Haihai Jinji Idou Hen (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, rmhaisei, 0, rmhaisei, rmhaihai, rmhaisei_state, init_rmhaihai, ROT0, "Visco", "Real Mahjong Haihai Seichouhen (Japan)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, rmhaisei, 0, rmhaisei, rmhaihai, rmhaihai_state, init_rmhaihai, ROT0, "Visco", "Real Mahjong Haihai Seichouhen (Japan)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, themj, 0, themj, rmhaihai, themj_state, init_rmhaihai, ROT0, "Visco", "The Mah-jong (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1987, themj2, themj, themj, rmhaihai, themj_state, init_rmhaihai, ROT0, "Visco", "The Mah-jong (Japan, set 2)", MACHINE_SUPPORTS_SAVE )