summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/saturn
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-08-19 16:10:19 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-08-19 16:10:19 +0000
commit621a2faa2a384ccea46ee3630c57961b92070ed7 (patch)
tree960fd0c5fbc1b8fcc3b07ff2cc538048eaa7b9af /src/emu/cpu/saturn
parent9bbc2e2f00ac611c79969db389043cd035e4215d (diff)
Remove final set of legacy inlines from memory.h. Mostly affects CPU
cores, which all now cache a copy of space->direct() and use it for direct accesses.
Diffstat (limited to 'src/emu/cpu/saturn')
-rw-r--r--src/emu/cpu/saturn/satops.c4
-rw-r--r--src/emu/cpu/saturn/saturn.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/emu/cpu/saturn/satops.c b/src/emu/cpu/saturn/satops.c
index 3d4d98c6b3c..bfc5f00f2b8 100644
--- a/src/emu/cpu/saturn/satops.c
+++ b/src/emu/cpu/saturn/satops.c
@@ -7,7 +7,7 @@ INLINE int READ_OP(saturn_state *cpustate)
{
UINT8 data;
cpustate->icount-=3;
- data=memory_decrypted_read_byte(cpustate->program, cpustate->pc);
+ data=cpustate->direct->read_decrypted_byte(cpustate->pc);
saturn_assert(data<0x10);
cpustate->pc=(cpustate->pc+1)&0xfffff;
return data;
@@ -17,7 +17,7 @@ INLINE int READ_OP_ARG(saturn_state *cpustate)
{
UINT8 data;
cpustate->icount-=3;
- data=memory_raw_read_byte(cpustate->program, cpustate->pc);
+ data=cpustate->direct->read_raw_byte(cpustate->pc);
saturn_assert(data<0x10);
cpustate->pc=(cpustate->pc+1)&0xfffff;
return data;
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index 594d6c1b8ef..0f25352962d 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -84,6 +84,7 @@ struct _saturn_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
address_space *program;
+ direct_read_data *direct;
int icount;
};
@@ -115,6 +116,7 @@ static CPU_INIT( saturn )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
cpustate->program = device->space(AS_PROGRAM);
+ cpustate->direct = &cpustate->program->direct();
state_save_register_device_item_array(device, 0,cpustate->reg[R0]);
state_save_register_device_item_array(device, 0,cpustate->reg[R1]);