summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-08-27 18:01:59 +0200
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-08-27 18:03:12 +0200
commit7df8323c2d6cd291acf5256985c216ee0a9ac8e0 (patch)
tree01ddfef6a4ccd20a0f63eb3bc5147d71110b30dc
parent4434244d3f217eda0669eae1d62a8a86964a194a (diff)
Fix -debug -cheat crash, nw
-rw-r--r--src/emu/debug/debugcpu.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index b631e094d23..7832a03fa46 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -1056,7 +1056,7 @@ UINT64 debugger_cpu::expression_read_memory(void *param, const char *name, expre
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
@@ -1079,7 +1079,7 @@ UINT64 debugger_cpu::expression_read_memory(void *param, const char *name, expre
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL)))
@@ -1100,7 +1100,7 @@ UINT64 debugger_cpu::expression_read_memory(void *param, const char *name, expre
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
return expression_read_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size);
@@ -1242,7 +1242,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
@@ -1260,7 +1260,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
if (memory->has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL)))
@@ -1276,7 +1276,7 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres
device = expression_get_device(name);
if (device == nullptr || !device->interface(memory))
{
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
memory = &device->memory();
}
expression_write_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data);
@@ -1433,7 +1433,7 @@ expression_error::error_code debugger_cpu::expression_validate(void *param, cons
return expression_error::INVALID_MEMORY_NAME;
}
if (!device)
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
if (!device->interface(memory) || !memory->has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL)))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1449,7 +1449,7 @@ expression_error::error_code debugger_cpu::expression_validate(void *param, cons
return expression_error::INVALID_MEMORY_NAME;
}
if (!device)
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
if (!device->interface(memory) || !memory->has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL)))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1463,7 +1463,7 @@ expression_error::error_code debugger_cpu::expression_validate(void *param, cons
return expression_error::INVALID_MEMORY_NAME;
}
if (!device)
- device = m_machine.debugger().cpu().get_visible_cpu();
+ device = get_visible_cpu();
if (!device->interface(memory) || !memory->has_space(AS_PROGRAM))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;