From 7d8c0a8d04f219e18d7e4bbd95230d69f6a2eff3 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Fri, 24 Mar 2017 23:58:17 +0100 Subject: Revert "Fixed writes to decrypted opcode memory" (#2185) --- src/emu/debug/debugcpu.cpp | 51 +++++++++------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 342bf9d9461..ecd4996b320 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -987,25 +987,8 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi break; } - case EXPSPACE_RAMWRITE: - { - device_t *device = nullptr; - device_memory_interface *memory; - - if (name != nullptr) - device = expression_get_device(name); - if (device == nullptr || !device->interface(memory)) - { - device = get_visible_cpu(); - memory = &device->memory(); - } - if (!with_se) - auto dis = m_machine.disable_side_effect(); - return expression_read_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size); - break; - } - case EXPSPACE_OPCODE: + case EXPSPACE_RAMWRITE: { device_t *device = nullptr; device_memory_interface *memory; @@ -1017,14 +1000,13 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi device = get_visible_cpu(); memory = &device->memory(); } - if (!with_se) + if (!with_se) { auto dis = m_machine.disable_side_effect(); - if (memory->has_space(AS_DECRYPTED_OPCODES + (spacenum - EXPSPACE_OPCODE))) - return expression_read_program_direct(memory->space(AS_DECRYPTED_OPCODES), (spacenum == EXPSPACE_OPCODE), address, size); - else + return expression_read_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size); + } else return expression_read_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size); break; - } + } case EXPSPACE_REGION: if (name == nullptr) @@ -1197,20 +1179,8 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres } break; - case EXPSPACE_RAMWRITE: - if (name != nullptr) - device = expression_get_device(name); - if (device == nullptr || !device->interface(memory)) - { - device = get_visible_cpu(); - memory = &device->memory(); - } - if (!with_se) - auto dis = m_machine.disable_side_effect(); - expression_write_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data); - break; - case EXPSPACE_OPCODE: + case EXPSPACE_RAMWRITE: if (name != nullptr) device = expression_get_device(name); if (device == nullptr || !device->interface(memory)) @@ -1218,13 +1188,12 @@ void debugger_cpu::expression_write_memory(void *param, const char *name, expres device = get_visible_cpu(); memory = &device->memory(); } - if (!with_se) + if (!with_se) { auto dis = m_machine.disable_side_effect(); - if (memory->has_space(AS_DECRYPTED_OPCODES + (spacenum - EXPSPACE_OPCODE))) - expression_write_program_direct(memory->space(AS_DECRYPTED_OPCODES), (spacenum == EXPSPACE_OPCODE), address, size, data); - else expression_write_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data); - break; + } else + expression_write_program_direct(memory->space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data); + break; case EXPSPACE_REGION: if (name == nullptr) -- cgit v1.2.3