diff options
Diffstat (limited to 'src/devices/cpu/am29000/am29000.cpp')
-rw-r--r-- | src/devices/cpu/am29000/am29000.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp index a3f0c4ca91c..d4039c18916 100644 --- a/src/devices/cpu/am29000/am29000.cpp +++ b/src/devices/cpu/am29000/am29000.cpp @@ -15,7 +15,6 @@ ***************************************************************************/ #include "emu.h" -#include "debugger.h" #include "am29000.h" #include "am29dasm.h" @@ -108,7 +107,7 @@ am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, const char m_fpe = 0; m_inte = 0; m_fps = 0; - memset( m_exception_queue, 0, sizeof( m_exception_queue) );; + memset( m_exception_queue, 0, sizeof( m_exception_queue) ); m_irq_active = 0; m_irq_lines = 0; m_exec_ir = 0; @@ -130,11 +129,12 @@ device_memory_interface::space_config_vector am29000_cpu_device::memory_space_co void am29000_cpu_device::device_start() { - m_program = &space(AS_PROGRAM); - m_cache = m_program->cache<2, 0, ENDIANNESS_BIG>(); - m_data = &space(AS_DATA); - m_datacache = m_data->cache<2, 0, ENDIANNESS_BIG>(); - m_io = &space(AS_IO); + space(AS_PROGRAM).cache(m_cache); + space(AS_PROGRAM).specific(m_program); + space(AS_DATA).cache(m_datacache); + space(AS_DATA).specific(m_data); + space(AS_IO).specific(m_io); + m_cfg = (PRL_AM29000 | PRL_REV_D) << CFG_PRL_SHIFT; /* Register state for saving */ @@ -511,7 +511,7 @@ uint32_t am29000_cpu_device::read_program_word(uint32_t address) { /* TODO: ROM enable? */ if (m_cps & CPS_PI || m_cps & CPS_RE) - return m_cache->read_dword(address); + return m_cache.read_dword(address); else { fatalerror("Am29000 instruction MMU translation enabled!\n"); @@ -628,7 +628,7 @@ void am29000_cpu_device::fetch_decode() void am29000_cpu_device::execute_run() { - uint32_t call_debugger = (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0; + const bool call_debugger = debugger_enabled(); external_irq_check(); @@ -658,7 +658,7 @@ void am29000_cpu_device::execute_run() if (m_cfg & CFG_VF) { uint32_t vaddr = m_vab | m_exception_queue[0] * 4; - uint32_t vect = m_datacache->read_dword(vaddr); + uint32_t vect = m_datacache.read_dword(vaddr); m_pc = vect & ~3; m_next_pc = m_pc; |