diff options
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r-- | src/emu/cpu/m6502/ill02.h | 4 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m4510.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/m6502/minc4510.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/m6502/mincce02.h | 6 | ||||
-rw-r--r-- | src/emu/cpu/m6502/ops02.h | 6 | ||||
-rw-r--r-- | src/emu/cpu/m6502/ops09.h | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/emu/cpu/m6502/ill02.h b/src/emu/cpu/m6502/ill02.h index 8b1e52741e8..b8dc90ac7d9 100644 --- a/src/emu/cpu/m6502/ill02.h +++ b/src/emu/cpu/m6502/ill02.h @@ -235,7 +235,7 @@ #if 0 #define SSH \ tmp = S = A & X; \ - tmp &= (UINT8)(cpu_readop_arg((PCW + 1) & 0xffff) + 1) + tmp &= (UINT8)(program_raw_read_byte((PCW + 1) & 0xffff) + 1) #endif /* 6510 ******************************************************** @@ -264,7 +264,7 @@ #define KIL \ PCW--; \ logerror("M6510 KILL opcode %04x: %02x\n", \ - PCW, cpu_readop(PCW)) + PCW, program_decrypted_read_byte(PCW)) /* N2A03 ******************************************************* * ARR logical and, rotate right - no decimal mode diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index d6022ce32e4..5274d97c580 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -164,13 +164,13 @@ static void *token; INLINE int m4510_cpu_readop(m4510_Regs *m4510) { register UINT16 t=m4510->pc.w.l++; - return cpu_readop(M4510_MEM(t)); + return program_decrypted_read_byte(M4510_MEM(t)); } INLINE int m4510_cpu_readop_arg(m4510_Regs *m4510) { register UINT16 t=m4510->pc.w.l++; - return cpu_readop_arg(M4510_MEM(t)); + return program_raw_read_byte(M4510_MEM(t)); } #define M4510 diff --git a/src/emu/cpu/m6502/minc4510.h b/src/emu/cpu/m6502/minc4510.h index 30c63636300..a0929bd4187 100644 --- a/src/emu/cpu/m6502/minc4510.h +++ b/src/emu/cpu/m6502/minc4510.h @@ -54,7 +54,7 @@ #define CHANGE_PC change_pc(M4510_MEM(PCD)) -#define PEEK_OP() cpu_readop(M4510_MEM(PCW)) +#define PEEK_OP() program_decrypted_read_byte(M4510_MEM(PCW)) #define RDMEM(addr) program_read_byte_8le(M4510_MEM(addr)); m4510->icount -= 1 #define WRMEM(addr,data) program_write_byte_8le(M4510_MEM(addr),data); m4510->icount -= 1 diff --git a/src/emu/cpu/m6502/mincce02.h b/src/emu/cpu/m6502/mincce02.h index 314252663a0..a401f489dba 100644 --- a/src/emu/cpu/m6502/mincce02.h +++ b/src/emu/cpu/m6502/mincce02.h @@ -58,14 +58,14 @@ /*************************************************************** * RDOP read an opcode ***************************************************************/ -#define RDOP() cpu_readop(PCW++); m65ce02->icount -= 1 +#define RDOP() program_decrypted_read_byte(PCW++); m65ce02->icount -= 1 /*************************************************************** * RDOPARG read an opcode argument ***************************************************************/ -#define RDOPARG() cpu_readop_arg(PCW++); m65ce02->icount -= 1 +#define RDOPARG() program_raw_read_byte(PCW++); m65ce02->icount -= 1 -#define PEEK_OP() cpu_readop(PCW) +#define PEEK_OP() program_decrypted_read_byte(PCW) #define RDMEM(addr) program_read_byte_8le(addr); m65ce02->icount -= 1 #define WRMEM(addr,data) program_write_byte_8le(addr,data); m65ce02->icount -= 1 diff --git a/src/emu/cpu/m6502/ops02.h b/src/emu/cpu/m6502/ops02.h index bd1d7d437d9..e3572c50a4b 100644 --- a/src/emu/cpu/m6502/ops02.h +++ b/src/emu/cpu/m6502/ops02.h @@ -72,12 +72,12 @@ /*************************************************************** * RDOP read an opcode ***************************************************************/ -#define RDOP() cpu_readop(PCW++); m6502->icount -= 1 +#define RDOP() program_decrypted_read_byte(PCW++); m6502->icount -= 1 /*************************************************************** * RDOPARG read an opcode argument ***************************************************************/ -#define RDOPARG() cpu_readop_arg(PCW++); m6502->icount -= 1 +#define RDOPARG() program_raw_read_byte(PCW++); m6502->icount -= 1 /*************************************************************** * RDMEM read memory @@ -508,7 +508,7 @@ * ILL Illegal opcode ***************************************************************/ #define ILL \ - logerror("M6502 illegal opcode %04x: %02x\n",(PCW-1)&0xffff, cpu_readop((PCW-1)&0xffff)) + logerror("M6502 illegal opcode %04x: %02x\n",(PCW-1)&0xffff, program_decrypted_read_byte((PCW-1)&0xffff)) /* 6502 ******************************************************** * INC Increment memory diff --git a/src/emu/cpu/m6502/ops09.h b/src/emu/cpu/m6502/ops09.h index 2f2a7d7e44d..0832875bf94 100644 --- a/src/emu/cpu/m6502/ops09.h +++ b/src/emu/cpu/m6502/ops09.h @@ -37,13 +37,13 @@ * RDOP read an opcode ***************************************************************/ #undef RDOP -#define RDOP() cpu_readop((PCW++)|PB); m6502->icount -= 1 +#define RDOP() program_decrypted_read_byte((PCW++)|PB); m6502->icount -= 1 /*************************************************************** * RDOPARG read an opcode argument ***************************************************************/ #undef RDOPARG -#define RDOPARG() cpu_readop_arg((PCW++)|PB); m6502->icount -= 1 +#define RDOPARG() program_raw_read_byte((PCW++)|PB); m6502->icount -= 1 /*************************************************************** * RDMEM read memory @@ -208,4 +208,4 @@ #undef KIL #define KIL \ PCW--; \ - logerror("M6509 KILL opcode %05x: %02x\n", PCD, cpu_readop(PCD)) + logerror("M6509 KILL opcode %05x: %02x\n", PCD, program_decrypted_read_byte(PCD)) |