summaryrefslogtreecommitdiffstats
path: root/src/emu/debug/debugcmd.cpp
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2016-06-18 17:10:26 -0400
committer GitHub <noreply@github.com>2016-06-18 17:10:26 -0400
commit321e593923735c7e8a6b78d736ec7956b957ffa6 (patch)
tree66db5366b819ea22cb587d66f43103a2442d0168 /src/emu/debug/debugcmd.cpp
parentd385b2e08e642561cd3ed5421f51e8de55e1aced (diff)
parent1702c3fc97777ed980a4f72e2f17564f2d5fd679 (diff)
Merge pull request #965 from ajrhacker/debugspace
Suppress 'no matching space' debugger error when disassembling CPUs w…
Diffstat (limited to 'src/emu/debug/debugcmd.cpp')
-rw-r--r--src/emu/debug/debugcmd.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 4959f215caa..97eeb525fe1 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -2332,7 +2332,9 @@ void debugger_commands::execute_dasm(int ref, int params, const char *param[])
return;
if (!validate_cpu_space_parameter((params > 4) ? param[4] : nullptr, AS_PROGRAM, space))
return;
- if (!validate_cpu_space_parameter((params > 4) ? param[4] : nullptr, AS_DECRYPTED_OPCODES, decrypted_space))
+ if (space->device().memory().has_space(AS_DECRYPTED_OPCODES))
+ decrypted_space = &space->device().memory().space(AS_DECRYPTED_OPCODES);
+ else
decrypted_space = space;
/* determine the width of the bytes */
@@ -2520,7 +2522,9 @@ void debugger_commands::execute_history(int ref, int params, const char *param[]
address_space *space, *decrypted_space;
if (!validate_cpu_space_parameter((params > 0) ? param[0] : nullptr, AS_PROGRAM, space))
return;
- if (!validate_cpu_space_parameter((params > 0) ? param[0] : nullptr, AS_DECRYPTED_OPCODES, decrypted_space))
+ if (space->device().memory().has_space(AS_DECRYPTED_OPCODES))
+ decrypted_space = &space->device().memory().space(AS_DECRYPTED_OPCODES);
+ else
decrypted_space = space;
UINT64 count = device_debug::HISTORY_SIZE;