diff options
author | 2017-12-14 22:09:38 -0500 | |
---|---|---|
committer | 2017-12-14 22:09:38 -0500 | |
commit | 72ba280d7dd9614ed01ac0cbf7dff2f1c8b51e78 (patch) | |
tree | acd28e0d78e6c7916cf4b06c252867756dcefe53 | |
parent | cc03217ca084a65ca898281b7219fb0b0505f826 (diff) |
Eliminate remaining uses of address_space::machine() outside of emumem (nw)
-rw-r--r-- | src/emu/debug/debugbuf.cpp | 14 | ||||
-rw-r--r-- | src/emu/debug/debugcmd.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/seibucop/seibucop_cmd.hxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/debug/debugbuf.cpp b/src/emu/debug/debugbuf.cpp index bd24f475340..7153c92b773 100644 --- a/src/emu/debug/debugbuf.cpp +++ b/src/emu/debug/debugbuf.cpp @@ -204,7 +204,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() switch(shift) { case -1: m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u16 *dest = get_ptr<u16>(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = m_intf->pc_linear_to_real(lpc); @@ -217,7 +217,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() break; case 0: m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u8 *dest = get_ptr<u8>(lstart); u32 steps = 0; for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { @@ -236,7 +236,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() switch(shift) { case -3: // bus granularity 64 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u64 *dest = get_ptr<u64>(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -250,7 +250,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case -2: // bus granularity 32 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u32 *dest = get_ptr<u32>(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -264,7 +264,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case -1: // bus granularity 16 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u16 *dest = get_ptr<u16>(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -278,7 +278,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case 0: // bus granularity 8 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u8 *dest = get_ptr<u8>(lstart); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 1) & m_pc_mask) { offs_t tpc = lpc; @@ -292,7 +292,7 @@ void debug_disasm_buffer::debug_data_buffer::setup_methods() case 3: // bus granularity 1, stored as u16 m_do_fill = [this](offs_t lstart, offs_t lend) { - auto dis = m_space->machine().disable_side_effect(); + auto dis = m_space->device().machine().disable_side_effect(); u16 *dest = reinterpret_cast<u16 *>(&m_buffer[0]) + ((lstart - m_lstart) >> 4); for(offs_t lpc = lstart; lpc != lend; lpc = (lpc + 0x10) & m_pc_mask) { offs_t tpc = lpc; diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index 6c1db21dba6..3c75febe3bc 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -1710,7 +1710,7 @@ void debugger_commands::execute_save(int ref, const std::vector<std::string> &pa } /* now write the data out */ - auto dis = space->machine().disable_side_effect(); + auto dis = space->device().machine().disable_side_effect(); switch (space->addr_shift()) { case -3: @@ -1936,7 +1936,7 @@ void debugger_commands::execute_dump(int ref, const std::vector<std::string> &pa else if(shift < 0) width >>= -shift; - auto dis = space->machine().disable_side_effect(); + auto dis = space->device().machine().disable_side_effect(); bool be = space->endianness() == ENDIANNESS_BIG; for (offs_t i = offset; i <= endoffset; i += rowsize) diff --git a/src/mame/machine/seibucop/seibucop_cmd.hxx b/src/mame/machine/seibucop/seibucop_cmd.hxx index 91ee3ba2bef..c80b0e23f58 100644 --- a/src/mame/machine/seibucop/seibucop_cmd.hxx +++ b/src/mame/machine/seibucop/seibucop_cmd.hxx @@ -548,7 +548,7 @@ void raiden2cop_device::LEGACY_execute_c480(int offset, uint16_t data) */ void raiden2cop_device::LEGACY_execute_d104(int offset, uint16_t data) { - uint16_t *ROM = (uint16_t *)m_host_space->machine().root_device().memregion("maincpu")->base(); + uint16_t *ROM = (uint16_t *)machine().root_device().memregion("maincpu")->base(); uint32_t rom_addr = (m_cop_rom_addr_hi << 16 | m_cop_rom_addr_lo); uint16_t rom_data = ROM[rom_addr / 2]; |