diff options
Diffstat (limited to 'src/devices/cpu/cubeqcpu')
-rw-r--r-- | src/devices/cpu/cubeqcpu/cubeqcpu.cpp | 18 | ||||
-rw-r--r-- | src/devices/cpu/cubeqcpu/cubeqcpu.h | 13 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp index 85f435a68a1..a33fd877505 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp @@ -182,8 +182,8 @@ void cquestsnd_cpu_device::device_start() assert(m_sound_region_tag != nullptr); m_sound_data = (u16*)machine().root_device().memregion(m_sound_region_tag)->base(); - m_program = &space(AS_PROGRAM); - m_cache = m_program->cache<3, -3, ENDIANNESS_BIG>(); + space(AS_PROGRAM).cache(m_cache); + space(AS_PROGRAM).specific(m_program); memset(m_ram, 0, sizeof(m_ram)); m_q = 0; @@ -261,8 +261,8 @@ void cquestrot_cpu_device::device_start() { m_linedata_w.resolve_safe(); - m_program = &space(AS_PROGRAM); - m_cache = m_program->cache<3, -3, ENDIANNESS_BIG>(); + space(AS_PROGRAM).cache(m_cache); + space(AS_PROGRAM).specific(m_program); memset(m_ram, 0, sizeof(m_ram)); m_q = 0; @@ -392,8 +392,8 @@ void cquestlin_cpu_device::device_start() { m_linedata_r.resolve_safe(0); - m_program = &space(AS_PROGRAM); - m_cache = m_program->cache<3, -3, ENDIANNESS_BIG>(); + space(AS_PROGRAM).cache(m_cache); + space(AS_PROGRAM).specific(m_program); memset(m_ram, 0, sizeof(m_ram)); m_q = 0; @@ -542,7 +542,7 @@ void cquestsnd_cpu_device::execute_run() do { /* Decode the instruction */ - u64 inst = m_cache->read_qword(SND_PC); + u64 inst = m_cache.read_qword(SND_PC); u32 inslow = inst & 0xffffffff; u32 inshig = inst >> 32; @@ -798,7 +798,7 @@ void cquestrot_cpu_device::execute_run() do { /* Decode the instruction */ - u64 inst = m_cache->read_qword(ROT_PC); + u64 inst = m_cache.read_qword(ROT_PC); u32 inslow = inst & 0xffffffff; u32 inshig = inst >> 32; @@ -1218,7 +1218,7 @@ void cquestlin_cpu_device::execute_run() int prog = (m_clkcnt & 3) ? BACKGROUND : FOREGROUND; m_curpc = LINE_PC; - u64 inst = m_cache->read_qword(LINE_PC); + u64 inst = m_cache.read_qword(LINE_PC); u32 inslow = inst & 0xffffffff; u32 inshig = inst >> 32; diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h index 9f3f215566a..54070a1bd48 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.h +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.h @@ -99,8 +99,9 @@ private: const char *m_sound_region_tag; u16 *m_sound_data; - address_space *m_program; - memory_access_cache<3, -3, ENDIANNESS_BIG> *m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::cache m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::specific m_program; + int m_icount; bool do_sndjmp(u8 jmp); @@ -208,8 +209,8 @@ private: u8 m_rc; u8 m_clkcnt; - address_space *m_program; - memory_access_cache<3, -3, ENDIANNESS_BIG> *m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::cache m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::specific m_program; int m_icount; // For the debugger @@ -325,8 +326,8 @@ private: u32 m_e_stack[32768]; /* Stack DRAM: 32kx20 */ u32 m_o_stack[32768]; /* Stack DRAM: 32kx20 */ - address_space *m_program; - memory_access_cache<3, -3, ENDIANNESS_BIG> *m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::cache m_cache; + memory_access<9, 3, -3, ENDIANNESS_BIG>::specific m_program; int m_icount; // For the debugger |