summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/z8000/z8000.c
diff options
context:
space:
mode:
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
commit0edda6dda2011891345f33f0f77c256b059abebf (patch)
tree90ba2b62ff911ff1bc737a56025e58155e9ce4dc /src/emu/cpu/z8000/z8000.c
parent3598b772bc80b2efb6396c65996462b38eedc593 (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/z8000/z8000.c')
-rw-r--r--src/emu/cpu/z8000/z8000.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index 9ccb6e4cd6f..5fe5ce86a76 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -115,46 +115,46 @@ INLINE UINT16 RDOP(z8000_state *cpustate)
INLINE UINT8 RDMEM_B(z8000_state *cpustate, UINT32 addr)
{
- return memory_read_byte_16be(cpustate->program, addr);
+ return cpustate->program->read_byte(addr);
}
INLINE UINT16 RDMEM_W(z8000_state *cpustate, UINT32 addr)
{
addr &= ~1;
- return memory_read_word_16be(cpustate->program, addr);
+ return cpustate->program->read_word(addr);
}
INLINE UINT32 RDMEM_L(z8000_state *cpustate, UINT32 addr)
{
UINT32 result;
addr &= ~1;
- result = memory_read_word_16be(cpustate->program, addr) << 16;
- return result + memory_read_word_16be(cpustate->program, addr + 2);
+ result = cpustate->program->read_word(addr) << 16;
+ return result + cpustate->program->read_word(addr + 2);
}
INLINE void WRMEM_B(z8000_state *cpustate, UINT32 addr, UINT8 value)
{
- memory_write_byte_16be(cpustate->program, addr, value);
+ cpustate->program->write_byte(addr, value);
}
INLINE void WRMEM_W(z8000_state *cpustate, UINT32 addr, UINT16 value)
{
addr &= ~1;
- memory_write_word_16be(cpustate->program, addr, value);
+ cpustate->program->write_word(addr, value);
}
INLINE void WRMEM_L(z8000_state *cpustate, UINT32 addr, UINT32 value)
{
addr &= ~1;
- memory_write_word_16be(cpustate->program, addr, value >> 16);
- memory_write_word_16be(cpustate->program, (UINT16)(addr + 2), value & 0xffff);
+ cpustate->program->write_word(addr, value >> 16);
+ cpustate->program->write_word((UINT16)(addr + 2), value & 0xffff);
}
INLINE UINT8 RDPORT_B(z8000_state *cpustate, int mode, UINT16 addr)
{
if(mode == 0)
{
- return memory_read_byte_8le(cpustate->io, addr);
+ return cpustate->io->read_byte(addr);
}
else
{
@@ -167,8 +167,8 @@ INLINE UINT16 RDPORT_W(z8000_state *cpustate, int mode, UINT16 addr)
{
if(mode == 0)
{
- return memory_read_byte_8le(cpustate->io, (UINT16)(addr)) +
- (memory_read_byte_8le(cpustate->io, (UINT16)(addr+1)) << 8);
+ return cpustate->io->read_byte((UINT16)(addr)) +
+ (cpustate->io->read_byte((UINT16)(addr+1)) << 8);
}
else
{
@@ -181,7 +181,7 @@ INLINE void WRPORT_B(z8000_state *cpustate, int mode, UINT16 addr, UINT8 value)
{
if(mode == 0)
{
- memory_write_byte_8le(cpustate->io, addr,value);
+ cpustate->io->write_byte(addr,value);
}
else
{
@@ -193,8 +193,8 @@ INLINE void WRPORT_W(z8000_state *cpustate, int mode, UINT16 addr, UINT16 value)
{
if(mode == 0)
{
- memory_write_byte_8le(cpustate->io, (UINT16)(addr),value & 0xff);
- memory_write_byte_8le(cpustate->io, (UINT16)(addr+1),(value >> 8) & 0xff);
+ cpustate->io->write_byte((UINT16)(addr),value & 0xff);
+ cpustate->io->write_byte((UINT16)(addr+1),(value >> 8) & 0xff);
}
else
{