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/mcs48/mcs48.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/mcs48/mcs48.c')
-rw-r--r-- | src/emu/cpu/mcs48/mcs48.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index a735800fb5e..0a8b4125663 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -175,23 +175,23 @@ typedef int (*mcs48_ophandler)(mcs48_state *state); ***************************************************************************/ /* ROM is mapped to ADDRESS_SPACE_PROGRAM */ -#define program_r(a) memory_read_byte_8le(cpustate->program, a) +#define program_r(a) cpustate->program->read_byte(a) /* RAM is mapped to ADDRESS_SPACE_DATA */ -#define ram_r(a) memory_read_byte_8le(cpustate->data, a) -#define ram_w(a,V) memory_write_byte_8le(cpustate->data, a, V) +#define ram_r(a) cpustate->data->read_byte(a) +#define ram_w(a,V) cpustate->data->write_byte(a, V) /* ports are mapped to ADDRESS_SPACE_IO */ -#define ext_r(a) memory_read_byte_8le(cpustate->io, a) -#define ext_w(a,V) memory_write_byte_8le(cpustate->io, a, V) -#define port_r(a) memory_read_byte_8le(cpustate->io, MCS48_PORT_P0 + a) -#define port_w(a,V) memory_write_byte_8le(cpustate->io, MCS48_PORT_P0 + a, V) -#define test_r(a) memory_read_byte_8le(cpustate->io, MCS48_PORT_T0 + a) -#define test_w(a,V) memory_write_byte_8le(cpustate->io, MCS48_PORT_T0 + a, V) -#define bus_r() memory_read_byte_8le(cpustate->io, MCS48_PORT_BUS) -#define bus_w(V) memory_write_byte_8le(cpustate->io, MCS48_PORT_BUS, V) -#define ea_r() memory_read_byte_8le(cpustate->io, MCS48_PORT_EA) -#define prog_w(V) memory_write_byte_8le(cpustate->io, MCS48_PORT_PROG, V) +#define ext_r(a) cpustate->io->read_byte(a) +#define ext_w(a,V) cpustate->io->write_byte(a, V) +#define port_r(a) cpustate->io->read_byte(MCS48_PORT_P0 + a) +#define port_w(a,V) cpustate->io->write_byte(MCS48_PORT_P0 + a, V) +#define test_r(a) cpustate->io->read_byte(MCS48_PORT_T0 + a) +#define test_w(a,V) cpustate->io->write_byte(MCS48_PORT_T0 + a, V) +#define bus_r() cpustate->io->read_byte(MCS48_PORT_BUS) +#define bus_w(V) cpustate->io->write_byte(MCS48_PORT_BUS, V) +#define ea_r() cpustate->io->read_byte(MCS48_PORT_EA) +#define prog_w(V) cpustate->io->write_byte(MCS48_PORT_PROG, V) /* r0-r7 map to memory via the regptr */ #define R0 regptr[0] |