summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author angelosa <salese_corp_ltd@email.it>2016-09-28 11:34:02 +0200
committer angelosa <salese_corp_ltd@email.it>2016-09-28 11:34:02 +0200
commitb7ab2813f7c5feb0dafc14c359356e86c06d7e4c (patch)
tree123bd877c72045d7a7ff4261a09bd292abc00cff /src/emu
parent4f7b580216d041d5735bc16dbee90e1136a61c15 (diff)
parent87c993dc7407c167aa9536683b6d9e5531fe7d57 (diff)
Merging machine_flags and master
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/debug/debugcmd.cpp2
-rw-r--r--src/emu/debug/debugcpu.cpp8
-rw-r--r--src/emu/debug/dvdisasm.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 99cdefb3b36..9fd4d1a860b 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -2628,7 +2628,7 @@ void debugger_commands::execute_trackpc(int ref, int params, const char *param[]
// Insert current pc
if (m_cpu.get_visible_cpu() == cpu)
{
- const offs_t pc = cpu->safe_pc();
+ const offs_t pc = cpu->safe_pcbase();
cpu->debug()->set_track_pc_visited(pc);
}
m_console.printf("PC tracking enabled\n");
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index 7832a03fa46..5e6535a9fb4 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -1939,7 +1939,7 @@ void device_debug::instruction_hook(offs_t curpc)
// handle step out/over on the instruction we are about to execute
if ((m_flags & (DEBUG_FLAG_STEPPING_OVER | DEBUG_FLAG_STEPPING_OUT)) != 0 && m_stepaddr == ~0)
- prepare_for_step_overout(m_device.safe_pc());
+ prepare_for_step_overout(m_device.safe_pcbase());
// no longer in debugger code
debugcpu.set_within_instruction(false);
@@ -2955,7 +2955,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre
{
"0bytes", "byte", "word", "3bytes", "dword", "5bytes", "6bytes", "7bytes", "qword"
};
- offs_t pc = space.device().safe_pc();
+ offs_t pc = space.device().safe_pcbase();
std::string buffer;
if (type & WATCHPOINT_WRITE)
@@ -2985,7 +2985,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre
void device_debug::hotspot_check(address_space &space, offs_t address)
{
- offs_t curpc = m_device.safe_pc();
+ offs_t curpc = m_device.safe_pcbase();
// see if we have a match in our list
unsigned int hotindex;
@@ -3064,7 +3064,7 @@ UINT32 device_debug::dasm_wrapped(std::string &buffer, offs_t pc)
UINT64 device_debug::get_current_pc(symbol_table &table, void *ref)
{
device_t *device = reinterpret_cast<device_t *>(table.globalref());
- return device->safe_pc();
+ return device->safe_pcbase();
}
diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp
index e49010e2ef6..b793a7a553e 100644
--- a/src/emu/debug/dvdisasm.cpp
+++ b/src/emu/debug/dvdisasm.cpp
@@ -167,7 +167,7 @@ void debug_view_disasm::view_char(int chval)
case DCH_HOME: // set the active column to the PC
{
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
- offs_t pc = source.m_space.address_to_byte(source.device()->safe_pc()) & source.m_space.logbytemask();
+ offs_t pc = source.m_space.address_to_byte(source.device()->safe_pcbase()) & source.m_space.logbytemask();
// figure out which row the pc is on
for (unsigned int curline = 0; curline < m_byteaddress.size(); curline++)
@@ -458,7 +458,7 @@ void debug_view_disasm::view_update()
{
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
- offs_t pc = source.device()->safe_pc();
+ offs_t pc = source.device()->safe_pcbase();
offs_t pcbyte = source.m_space.address_to_byte(pc) & source.m_space.logbytemask();
// update our context; if the expression is dirty, recompute