diff options
| author | 2019-03-25 22:44:58 +0100 | |
|---|---|---|
| committer | 2019-03-25 22:44:58 +0100 | |
| commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
| tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/cpu/sh | |
| parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
| parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) | |
conflict resolution (nw)
Diffstat (limited to 'src/devices/cpu/sh')
| -rw-r--r-- | src/devices/cpu/sh/sh2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/cpu/sh/sh2.cpp b/src/devices/cpu/sh/sh2.cpp index 6eebabea4ac..d3660a52209 100644 --- a/src/devices/cpu/sh/sh2.cpp +++ b/src/devices/cpu/sh/sh2.cpp @@ -402,7 +402,7 @@ void sh2_device::execute_run() { debugger_instruction_hook(m_sh2_state->pc); - const uint16_t opcode = m_program->read_word(m_sh2_state->pc & SH12_AM); + const uint16_t opcode = m_decrypted_program->read_word(m_sh2_state->pc >= 0x40000000 ? m_sh2_state->pc : m_sh2_state->pc & SH12_AM); if (m_sh2_state->m_delay) { |
