diff --git a/src/devices/cpu/m68000/m68000-sdfm.cpp b/src/devices/cpu/m68000/m68000-sdfm.cpp index b05a01f1597..697ea0b0946 100644 --- a/src/devices/cpu/m68000/m68000-sdfm.cpp +++ b/src/devices/cpu/m68000/m68000-sdfm.cpp @@ -325,8 +325,8 @@ void m68000_device::state_bus_error_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x02); + m_da[16] = m_au; m_ftu = 0x0008; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -830,8 +830,8 @@ void m68000_device::state_interrupt_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook((m_int_vector) >> 2); + m_da[16] = m_au; m_ftu = m_int_vector; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1014,8 +1014,8 @@ void m68000_device::state_trace_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x09); + m_da[16] = m_au; m_ftu = 0x0024; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1198,8 +1198,8 @@ void m68000_device::state_illegal_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x04); + m_da[16] = m_au; m_ftu = 0x0010; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1566,8 +1566,8 @@ void m68000_device::state_linea_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x0a); + m_da[16] = m_au; m_ftu = 0x0028; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1750,8 +1750,8 @@ void m68000_device::state_linef_dfm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x0b); + m_da[16] = m_au; m_ftu = 0x002c; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -93974,8 +93974,8 @@ void m68000_device::trap_imm4_dfm() // 4e40 fff0 m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook((0x80 | ((m_ird & 0xf) << 2)) >> 2); + m_da[16] = m_au; m_ftu = 0x80 | ((m_ird & 0xf) << 2); m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 diff --git a/src/devices/cpu/m68000/m68000-sdpm.cpp b/src/devices/cpu/m68000/m68000-sdpm.cpp index 69569cff4e6..1447ca46e89 100644 --- a/src/devices/cpu/m68000/m68000-sdpm.cpp +++ b/src/devices/cpu/m68000/m68000-sdpm.cpp @@ -367,8 +367,8 @@ void m68000_device::state_bus_error_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x02); + m_da[16] = m_au; m_ftu = 0x0008; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -940,8 +940,8 @@ void m68000_device::state_interrupt_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook((m_int_vector) >> 2); + m_da[16] = m_au; m_ftu = m_int_vector; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1149,8 +1149,8 @@ void m68000_device::state_trace_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x09); + m_da[16] = m_au; m_ftu = 0x0024; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1358,8 +1358,8 @@ void m68000_device::state_illegal_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x04); + m_da[16] = m_au; m_ftu = 0x0010; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1776,8 +1776,8 @@ void m68000_device::state_linea_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x0a); + m_da[16] = m_au; m_ftu = 0x0028; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1985,8 +1985,8 @@ void m68000_device::state_linef_dpm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x0b); + m_da[16] = m_au; m_ftu = 0x002c; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -106990,8 +106990,8 @@ void m68000_device::trap_imm4_dpm() // 4e40 fff0 m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook((0x80 | ((m_ird & 0xf) << 2)) >> 2); + m_da[16] = m_au; m_ftu = 0x80 | ((m_ird & 0xf) << 2); m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 diff --git a/src/devices/cpu/m68000/m68000-sifm.cpp b/src/devices/cpu/m68000/m68000-sifm.cpp index 06d94ff7c2f..b11b7caa42e 100644 --- a/src/devices/cpu/m68000/m68000-sifm.cpp +++ b/src/devices/cpu/m68000/m68000-sifm.cpp @@ -325,8 +325,8 @@ void m68000_device::state_bus_error_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x02); + m_da[16] = m_au; m_ftu = 0x0008; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -830,8 +830,8 @@ void m68000_device::state_interrupt_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook((m_int_vector) >> 2); + m_da[16] = m_au; m_ftu = m_int_vector; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1014,8 +1014,8 @@ void m68000_device::state_trace_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x09); + m_da[16] = m_au; m_ftu = 0x0024; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1198,8 +1198,8 @@ void m68000_device::state_illegal_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x04); + m_da[16] = m_au; m_ftu = 0x0010; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1566,8 +1566,8 @@ void m68000_device::state_linea_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x0a); + m_da[16] = m_au; m_ftu = 0x0028; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1750,8 +1750,8 @@ void m68000_device::state_linef_ifm() m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook(0x0b); + m_da[16] = m_au; m_ftu = 0x002c; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -93974,8 +93974,8 @@ void m68000_device::trap_imm4_ifm() // 4e40 fff0 m_inst_state = S_ADDRESS_ERROR; return; } - m_da[16] = m_au; debugger_exception_hook((0x80 | ((m_ird & 0xf) << 2)) >> 2); + m_da[16] = m_au; m_ftu = 0x80 | ((m_ird & 0xf) << 2); m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 diff --git a/src/devices/cpu/m68000/m68000-sipm.cpp b/src/devices/cpu/m68000/m68000-sipm.cpp index 0ca1e27be04..382f49b85a8 100644 --- a/src/devices/cpu/m68000/m68000-sipm.cpp +++ b/src/devices/cpu/m68000/m68000-sipm.cpp @@ -367,8 +367,8 @@ void m68000_device::state_bus_error_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x02); + m_da[16] = m_au; m_ftu = 0x0008; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -940,8 +940,8 @@ void m68000_device::state_interrupt_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook((m_int_vector) >> 2); + m_da[16] = m_au; m_ftu = m_int_vector; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1149,8 +1149,8 @@ void m68000_device::state_trace_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x09); + m_da[16] = m_au; m_ftu = 0x0024; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1358,8 +1358,8 @@ void m68000_device::state_illegal_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x04); + m_da[16] = m_au; m_ftu = 0x0010; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1776,8 +1776,8 @@ void m68000_device::state_linea_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x0a); + m_da[16] = m_au; m_ftu = 0x0028; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -1985,8 +1985,8 @@ void m68000_device::state_linef_ipm() m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook(0x0b); + m_da[16] = m_au; m_ftu = 0x002c; m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1 @@ -106990,8 +106990,8 @@ void m68000_device::trap_imm4_ipm() // 4e40 fff0 m_inst_substate = 0; return; } - m_da[16] = m_au; debugger_exception_hook((0x80 | ((m_ird & 0xf) << 2)) >> 2); + m_da[16] = m_au; m_ftu = 0x80 | ((m_ird & 0xf) << 2); m_au = m_au + 2; // alu r=0 c=1 m=..... i=....... ALU.and_ a=R.pch:m_pc d=-1