summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/mips
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-06-08 17:35:49 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-06-08 17:35:49 +0000
commit5e04468569256d7b9cc1b6069f9c46c90e2455be (patch)
tree6e00da715aa56ac59d107f6c3f7b8058362da5b0 /src/emu/cpu/mips
parentd1e9200589119fa135ffd5801dd018ead4865c23 (diff)
Changed CPU callbacks to use cpu_device, eliminating a bunch of casting.
Diffstat (limited to 'src/emu/cpu/mips')
-rw-r--r--src/emu/cpu/mips/mips3com.c6
-rw-r--r--src/emu/cpu/mips/mips3com.h4
-rw-r--r--src/emu/cpu/mips/mips3drc.c6
-rw-r--r--src/emu/cpu/mips/psx.c8
-rw-r--r--src/emu/cpu/mips/r3000.c6
5 files changed, 15 insertions, 15 deletions
diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c
index 221f8318791..73cc775078a 100644
--- a/src/emu/cpu/mips/mips3com.c
+++ b/src/emu/cpu/mips/mips3com.c
@@ -69,7 +69,7 @@ INLINE int tlb_entry_is_global(const mips3_tlb_entry *entry)
structure based on the configured type
-------------------------------------------------*/
-void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, running_device *device, device_irq_callback irqcallback)
+void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, cpu_device *device, device_irq_callback irqcallback)
{
const mips3_config *config = (const mips3_config *)device->baseconfig().static_config();
int tlbindex;
@@ -81,7 +81,7 @@ void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, runnin
mips->cpu_clock = device->clock();
mips->irq_callback = irqcallback;
mips->device = device;
- mips->program = device_memory(device)->space(AS_PROGRAM);
+ mips->program = device->space(AS_PROGRAM);
mips->icache_size = config->icache;
mips->dcache_size = config->dcache;
mips->system_clock = config->system_clock;
@@ -751,7 +751,7 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info)
static TIMER_CALLBACK( compare_int_callback )
{
- running_device *device = (running_device *)ptr;
+ cpu_device *device = (cpu_device *)ptr;
cpu_set_input_line(device, MIPS3_IRQ5, ASSERT_LINE);
}
diff --git a/src/emu/cpu/mips/mips3com.h b/src/emu/cpu/mips/mips3com.h
index 282d208d002..40affea6712 100644
--- a/src/emu/cpu/mips/mips3com.h
+++ b/src/emu/cpu/mips/mips3com.h
@@ -195,7 +195,7 @@ struct _mips3_state
/* internal stuff */
mips3_flavor flavor;
device_irq_callback irq_callback;
- running_device *device;
+ cpu_device * device;
const address_space *program;
UINT32 system_clock;
UINT32 cpu_clock;
@@ -229,7 +229,7 @@ struct _mips3_state
FUNCTION PROTOTYPES
***************************************************************************/
-void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, running_device *device, device_irq_callback irqcallback);
+void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, cpu_device *device, device_irq_callback irqcallback);
void mips3com_exit(mips3_state *mips);
void mips3com_reset(mips3_state *mips);
diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c
index 0b2a72df334..8ac134630a5 100644
--- a/src/emu/cpu/mips/mips3drc.c
+++ b/src/emu/cpu/mips/mips3drc.c
@@ -359,7 +359,7 @@ INLINE void save_fast_iregs(mips3_state *mips3, drcuml_block *block)
mips3_init - initialize the processor
-------------------------------------------------*/
-static void mips3_init(mips3_flavor flavor, int bigendian, running_device *device, device_irq_callback irqcallback)
+static void mips3_init(mips3_flavor flavor, int bigendian, cpu_device *device, device_irq_callback irqcallback)
{
drcfe_config feconfig =
{
@@ -380,7 +380,7 @@ static void mips3_init(mips3_flavor flavor, int bigendian, running_device *devic
fatalerror("Unable to allocate cache of size %d", (UINT32)(CACHE_SIZE + sizeof(*mips3)));
/* allocate the core memory */
- *(mips3_state **)downcast<cpu_device *>(device)->token() = mips3 = (mips3_state *)drccache_memory_alloc_near(cache, sizeof(*mips3));
+ *(mips3_state **)device->token() = mips3 = (mips3_state *)drccache_memory_alloc_near(cache, sizeof(*mips3));
memset(mips3, 0, sizeof(*mips3));
/* initialize the core */
@@ -601,7 +601,7 @@ static CPU_SET_INFO( mips3 )
static CPU_GET_INFO( mips3 )
{
- mips3_state *mips3 = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL;
+ mips3_state *mips3 = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL;
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index e4ce31d14e0..5bd20f45f6d 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -185,7 +185,7 @@ struct _psxcpu_state
UINT32 multiplier_operand1;
UINT32 multiplier_operand2;
device_irq_callback irq_callback;
- running_device *device;
+ cpu_device *device;
const address_space *program;
int bus_attached;
UINT32 bad_byte_address_mask;
@@ -1605,7 +1605,7 @@ static STATE_POSTLOAD( mips_postload )
mips_update_scratchpad( psxcpu->program );
}
-static void mips_state_register( const char *type, running_device *device )
+static void mips_state_register( const char *type, cpu_device *device )
{
psxcpu_state *psxcpu = get_safe_token(device);
@@ -1636,7 +1636,7 @@ static CPU_INIT( psxcpu )
psxcpu->irq_callback = irqcallback;
psxcpu->device = device;
- psxcpu->program = device_memory(device)->space(AS_PROGRAM);
+ psxcpu->program = device->space(AS_PROGRAM);
mips_state_register( "psxcpu", device );
}
@@ -6110,7 +6110,7 @@ static CPU_SET_INFO( psxcpu )
CPU_GET_INFO( psxcpu )
{
- psxcpu_state *psxcpu = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL;
+ psxcpu_state *psxcpu = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL;
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 94a08d52af3..d3536a4e9d1 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -138,7 +138,7 @@ struct _r3000_state
int interrupt_cycles;
int hasfpu;
device_irq_callback irq_callback;
- running_device *device;
+ cpu_device *device;
const address_space *program;
/* endian-dependent load/store */
@@ -312,7 +312,7 @@ static CPU_INIT( r3000 )
r3000->irq_callback = irqcallback;
r3000->device = device;
- r3000->program = device_memory(device)->space(AS_PROGRAM);
+ r3000->program = device->space(AS_PROGRAM);
}
@@ -1163,7 +1163,7 @@ static CPU_SET_INFO( r3000 )
static CPU_GET_INFO( r3000 )
{
- r3000_state *r3000 = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL;
+ r3000_state *r3000 = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL;
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */