diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-08-19 08:27:05 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-08-19 08:27:05 +0000 |
commit | 0edda6dda2011891345f33f0f77c256b059abebf (patch) | |
tree | 90ba2b62ff911ff1bc737a56025e58155e9ce4dc /src/emu/cpu/dsp32/dsp32.c | |
parent | 3598b772bc80b2efb6396c65996462b38eedc593 (diff) |
Remove memory_read/write_byte/word/dword/qword* variants. Again, this is mostly
bulk search & replace:
S: memory_read_([bytewordq]+)_[0-9lbe_maskd]+( *)\(( *)([^,]+)( *),( *)
R: \4->read_\1\2\(\3
S: memory_read_([bytewordq]+)( *)\(( *)([^,]+)( *),( *)
R: \4->read_\1\2\(\3
S: memory_write_([bytewordq]+)_[0-9lbe_maskd]+( *)\(( *)([^,]+)( *),( *)
R: \4->write_\1\2\(\3
S: memory_write_([bytewordq]+)( *)\(( *)([^,]+)( *),( *)
R: \4->write_\1\2\(\3
Gets 99% of the cases.
Diffstat (limited to 'src/emu/cpu/dsp32/dsp32.c')
-rw-r--r-- | src/emu/cpu/dsp32/dsp32.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index 4e60dec66ac..4f04bcb3d0e 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -217,15 +217,15 @@ INLINE dsp32_state *get_safe_token(running_device *device) #define ROPCODE(cs,pc) memory_decrypted_read_dword((cs)->program, pc) -#define RBYTE(cs,addr) memory_read_byte_32le((cs)->program, addr) -#define WBYTE(cs,addr,data) memory_write_byte_32le((cs)->program, (addr), data) +#define RBYTE(cs,addr) (cs)->program->read_byte(addr) +#define WBYTE(cs,addr,data) (cs)->program->write_byte((addr), data) #if (!DETECT_MISALIGNED_MEMORY) -#define RWORD(cs,addr) memory_read_word_32le((cs)->program, addr) -#define WWORD(cs,addr,data) memory_write_word_32le((cs)->program, (addr), data) -#define RLONG(cs,addr) memory_read_dword_32le((cs)->program, addr) -#define WLONG(cs,addr,data) memory_write_dword_32le((cs)->program, (addr), data) +#define RWORD(cs,addr) (cs)->program->read_word(addr) +#define WWORD(cs,addr,data) (cs)->program->write_word((addr), data) +#define RLONG(cs,addr) (cs)->program->read_dword(addr) +#define WLONG(cs,addr,data) (cs)->program->write_dword((addr), data) #else @@ -233,7 +233,7 @@ INLINE UINT16 RWORD(dsp32_state *cpustate, offs_t addr) { UINT16 data; if (addr & 1) fprintf(stderr, "Unaligned word read @ %06X, PC=%06X\n", addr, cpustate->PC); - data = memory_read_word_32le(cpustate->program, addr); + data = cpustate->program->read_word(addr); return data; } @@ -241,20 +241,20 @@ INLINE UINT32 RLONG(dsp32_state *cpustate, offs_t addr) { UINT32 data; if (addr & 3) fprintf(stderr, "Unaligned long read @ %06X, PC=%06X\n", addr, cpustate->PC); - data = memory_write_word_32le(cpustate->program, addr); + data = cpustate->program->write_word(addr); return data; } INLINE void WWORD(dsp32_state *cpustate, offs_t addr, UINT16 data) { if (addr & 1) fprintf(stderr, "Unaligned word write @ %06X, PC=%06X\n", addr, cpustate->PC); - memory_read_dword_32le(cpustate->program, (addr), data); + cpustate->program->read_dword((addr), data); } INLINE void WLONG(dsp32_state *cpustate, offs_t addr, UINT32 data) { if (addr & 3) fprintf(stderr, "Unaligned long write @ %06X, PC=%06X\n", addr, cpustate->PC); - memory_write_dword_32le(cpustate->program, (addr), data); + cpustate->program->write_dword((addr), data); } #endif |