diff options
Diffstat (limited to 'src/devices/cpu/jaguar/jaguar.cpp')
-rw-r--r-- | src/devices/cpu/jaguar/jaguar.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index fbfcc0c8759..8db47937d55 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -17,16 +17,11 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include "jaguar.h" #include "jagdasm.h" #include <algorithm> -#define LOG_GPU_IO 0 -#define LOG_DSP_IO 0 - - /*************************************************************************** CONSTANTS ***************************************************************************/ @@ -358,7 +353,6 @@ void jaguar_cpu_device::device_start() space(AS_PROGRAM).cache(m_cache); space(AS_PROGRAM).specific(m_program); space(AS_IO).specific(m_io); - m_cpu_interrupt.resolve_safe(); save_item(NAME(m_r)); save_item(NAME(m_a)); @@ -1015,7 +1009,7 @@ void jaguar_cpu_device::ror_rn_rn(u16 op) const u8 dreg = op & 31; const u32 r1 = m_r[(op >> 5) & 31] & 31; const u32 r2 = m_r[dreg]; - const u32 res = (r2 >> r1) | (r2 << (32 - r1)); + const u32 res = rotr_32(r2, r1); m_r[dreg] = res; CLR_ZNC(); SET_ZN(res); m_flags |= (r2 >> 30) & 2; } @@ -1025,7 +1019,7 @@ void jaguar_cpu_device::rorq_n_rn(u16 op) const u8 dreg = op & 31; const u32 r1 = convert_zero[(op >> 5) & 31]; const u32 r2 = m_r[dreg]; - const u32 res = (r2 >> r1) | (r2 << (32 - r1)); + const u32 res = rotr_32(r2, r1); m_r[dreg] = res; CLR_ZNC(); SET_ZN(res); m_flags |= (r2 >> 30) & 2; } @@ -1415,7 +1409,7 @@ u32 jaguar_cpu_device::status_r() return result; } -WRITE_LINE_MEMBER(jaguar_cpu_device::go_w) +void jaguar_cpu_device::go_w(int state) { m_go = state; set_input_line(INPUT_LINE_HALT, (m_go == true) ? CLEAR_LINE : ASSERT_LINE); |