From 82eff3f75cb1657705c30352a170e6f46c4c8f1c Mon Sep 17 00:00:00 2001 From: Couriersud Date: Sun, 3 Aug 2008 19:02:28 +0000 Subject: [PATCH] Revert accidentially commited changes. Sorry! --- src/emu/cpu/s2650/s2650.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index c11a6906c61..204e0d8fc09 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -15,7 +15,6 @@ #include "debugger.h" #include "s2650.h" #include "s2650cpu.h" -#include "deprecat.h" /* define this to have some interrupt information logged */ #define VERBOSE 0 @@ -41,7 +40,6 @@ typedef struct { UINT16 ras[8]; /* 8 return address stack entries */ UINT8 irq_state; int (*irq_callback)(int irqline); - read16_machine_func addr_rewrite; } s2650_Regs; static s2650_Regs S; @@ -172,7 +170,7 @@ static void s2650_set_sense(int state); ***************************************************************/ INLINE UINT8 ROP(void) { - UINT8 result = cpu_readop(S.addr_rewrite(Machine, S.page + S.iar, 0)); + UINT8 result = cpu_readop(S.page + S.iar); S.iar = (S.iar + 1) & PMSK; return result; } @@ -183,7 +181,7 @@ INLINE UINT8 ROP(void) ***************************************************************/ INLINE UINT8 ARG(void) { - UINT8 result = cpu_readop_arg(S.addr_rewrite(Machine, S.page + S.iar, 0)); + UINT8 result = cpu_readop_arg(S.page + S.iar); S.iar = (S.iar + 1) & PMSK; return result; } @@ -192,8 +190,7 @@ INLINE UINT8 ARG(void) * RDMEM * read memory byte from addr ***************************************************************/ -#define RDMEM(addr) program_read_byte_8le(S.addr_rewrite(Machine, addr, 0)) - +#define RDMEM(addr) program_read_byte_8le(addr) /*************************************************************** * handy table to build PC relative offsets @@ -510,7 +507,7 @@ static const int S2650_relative[0x100] = * Store source register to memory addr (CC unchanged) ***************************************************************/ #define M_STR(address,source) \ - program_write_byte_8le(S.addr_rewrite(Machine, address, 0), source) + program_write_byte_8le(address, source) /*************************************************************** * M_AND @@ -768,16 +765,10 @@ static void ABS_EA(void) _ABS_EA() static void BRA_EA(void) _BRA_EA() #endif -static READ16_HANDLER( default_rewrite ) -{ - return offset; -} - static void s2650_init(int index, int clock, const void *config, int (*irqcallback)(int)) { S.irq_callback = irqcallback; - S.addr_rewrite = (config ? config : &default_rewrite ); - + state_save_register_item("s2650", index, S.ppc); state_save_register_item("s2650", index, S.page); state_save_register_item("s2650", index, S.iar); @@ -795,10 +786,8 @@ static void s2650_init(int index, int clock, const void *config, int (*irqcallba static void s2650_reset(void) { int (*save_irqcallback)(int) = S.irq_callback; - read16_machine_func save_addr_rewrite = S.addr_rewrite; memset(&S, 0, sizeof(S)); S.irq_callback = save_irqcallback; - S.addr_rewrite = save_addr_rewrite; S.psl = COM | WC; S.psu = 0; }