From 6c81c25c700962983d53269424f5b33ec8fa6a34 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 15 Sep 2008 18:13:38 +0000 Subject: [PATCH] back when i templateized cpu core things I forgot to switch over some stuff --- desmume/src/arm_instructions.cpp | 8 ++++---- desmume/src/thumb_instructions.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/desmume/src/arm_instructions.cpp b/desmume/src/arm_instructions.cpp index 4b167904f..385d27c2f 100644 --- a/desmume/src/arm_instructions.cpp +++ b/desmume/src/arm_instructions.cpp @@ -48,10 +48,10 @@ extern volatile BOOL execute; #else #define READ32(a,b) MMU_read32(PROCNUM, b) #define WRITE32(a,b,c) MMU_write32(PROCNUM,b,c) - #define READ16(a,b) MMU_read16(cpu->proc_ID, b) - #define WRITE16(a,b,c) MMU_write16(cpu->proc_ID,b,c) - #define READ8(a,b) MMU_read8(cpu->proc_ID, b) - #define WRITE8(a,b,c) MMU_write8(cpu->proc_ID,b,c) + #define READ16(a,b) MMU_read16(PROCNUM, b) + #define WRITE16(a,b,c) MMU_write16(PROCNUM,b,c) + #define READ8(a,b) MMU_read8(PROCNUM, b) + #define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c) #endif diff --git a/desmume/src/thumb_instructions.cpp b/desmume/src/thumb_instructions.cpp index 7d91d6b00..665975078 100644 --- a/desmume/src/thumb_instructions.cpp +++ b/desmume/src/thumb_instructions.cpp @@ -49,12 +49,12 @@ extern volatile BOOL execute; #define READ8(a,b) cpu->mem_if->read8(a,b) #define WRITE8(a,b,c) cpu->mem_if->write8(a,b,c) #else - #define READ32(a,b) MMU_read32(cpu->proc_ID, b) - #define WRITE32(a,b,c) MMU_write32(cpu->proc_ID,b,c) - #define READ16(a,b) MMU_read16(cpu->proc_ID, b) - #define WRITE16(a,b,c) MMU_write16(cpu->proc_ID,b,c) - #define READ8(a,b) MMU_read8(cpu->proc_ID, b) - #define WRITE8(a,b,c) MMU_write8(cpu->proc_ID,b,c) + #define READ32(a,b) MMU_read32(PROCNUM, b) + #define WRITE32(a,b,c) MMU_write32(PROCNUM,b,c) + #define READ16(a,b) MMU_read16(PROCNUM, b) + #define WRITE16(a,b,c) MMU_write16(PROCNUM,b,c) + #define READ8(a,b) MMU_read8(PROCNUM, b) + #define WRITE8(a,b,c) MMU_write8(PROCNUM,b,c) #endif TEMPLATE static u32 FASTCALL OP_UND_THUMB()