summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/saturn
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-11-26 20:07:20 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-11-26 20:07:20 +0000
commit0df0ba2bc4184f336eaa6c8908f94e4259a6c70f (patch)
treefd6f265809b6ccc4e8c98e00256ad734866aa11e /src/emu/cpu/saturn
parentc2ca1ef0cb3d7a9b275528c236515eb15ea67f56 (diff)
Removed more cpunum_get_active().
Diffstat (limited to 'src/emu/cpu/saturn')
-rw-r--r--src/emu/cpu/saturn/satops.c26
-rw-r--r--src/emu/cpu/saturn/sattable.c16
-rw-r--r--src/emu/cpu/saturn/saturn.c8
3 files changed, 25 insertions, 25 deletions
diff --git a/src/emu/cpu/saturn/satops.c b/src/emu/cpu/saturn/satops.c
index 7079c073cf3..05eb99814a5 100644
--- a/src/emu/cpu/saturn/satops.c
+++ b/src/emu/cpu/saturn/satops.c
@@ -1,7 +1,7 @@
#define IRQ_ADDRESS 0xf
#define saturn_assert(x) \
- do { if (!(x)) logerror("SATURN%d assertion failed: %s at %s:%i, pc=%05x\n", cpunum_get_active(), #x, __FILE__, __LINE__, saturn.pc); } while (0)
+ do { if (!(x)) logerror("SATURN '%s' assertion failed: %s at %s:%i, pc=%05x\n", saturn.device->tag, #x, __FILE__, __LINE__, saturn.pc); } while (0)
INLINE int READ_OP(void)
{
@@ -186,24 +186,24 @@ INLINE void saturn_push(SaturnAdr adr)
INLINE void saturn_interrupt_on(void)
{
- LOG(( "SATURN#%d at %05x: INTON\n", cpunum_get_active(), saturn.pc-4 ));
+ LOG(( "SATURN '%s' at %05x: INTON\n", saturn.device->tag, saturn.pc-4 ));
saturn.irq_enable=1;
if (saturn.irq_state)
{
- LOG(( "SATURN#%d set_irq_line(ASSERT)\n", cpunum_get_active()));
+ LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", saturn.device->tag));
saturn.pending_irq=1;
}
}
INLINE void saturn_interrupt_off(void)
{
- LOG(( "SATURN#%d at %05x: INTOFF\n", cpunum_get_active(), saturn.pc-4 ));
+ LOG(( "SATURN '%s' at %05x: INTOFF\n", saturn.device->tag, saturn.pc-4 ));
saturn.irq_enable=0;
}
INLINE void saturn_reset_interrupt(void)
{
- LOG(( "SATURN#%d at %05x: RSI\n", cpunum_get_active(), saturn.pc-5 ));
+ LOG(( "SATURN '%s' at %05x: RSI\n", saturn.device->tag, saturn.pc-5 ));
if (saturn.config&&saturn.config->rsi) saturn.config->rsi(Machine);
}
@@ -236,27 +236,27 @@ INLINE void saturn_shutdown(void)
{
saturn.sleeping=1;
saturn.irq_enable=1;
- LOG(( "SATURN#%d at %05x: SHUTDN\n", cpunum_get_active(), saturn.pc-3 ));
+ LOG(( "SATURN '%s' at %05x: SHUTDN\n", saturn.device->tag, saturn.pc-3 ));
}
INLINE void saturn_bus_command_b(void)
{
- logerror( "SATURN#%d at %05x: BUSCB opcode not handled\n", cpunum_get_active(), saturn.pc-4 );
+ logerror( "SATURN '%s' at %05x: BUSCB opcode not handled\n", saturn.device->tag, saturn.pc-4 );
}
INLINE void saturn_bus_command_c(void)
{
- logerror( "SATURN#%d at %05x: BUSCC opcode not handled\n", cpunum_get_active(), saturn.pc-3 );
+ logerror( "SATURN '%s' at %05x: BUSCC opcode not handled\n", saturn.device->tag, saturn.pc-3 );
}
INLINE void saturn_bus_command_d(void)
{
- logerror( "SATURN#%d at %05x: BUSCD opcode not handled\n", cpunum_get_active(), saturn.pc-4 );
+ logerror( "SATURN '%s' at %05x: BUSCD opcode not handled\n", saturn.device->tag, saturn.pc-4 );
}
INLINE void saturn_serial_request(void)
{
- logerror( "SATURN#%d at %05x: SREQ? opcode not handled\n", cpunum_get_active(), saturn.pc-3 );
+ logerror( "SATURN '%s' at %05x: SREQ? opcode not handled\n", saturn.device->tag, saturn.pc-3 );
}
INLINE void saturn_out_c(void)
@@ -278,8 +278,8 @@ INLINE void saturn_in(int reg)
int in = 0;
saturn_assert(reg>=0 && reg<9);
if (!(saturn.pc&1))
- logerror( "SATURN#%d at %05x: reg=IN opcode at odd addresse\n",
- cpunum_get_active(), saturn.pc-3 );
+ logerror( "SATURN '%s' at %05x: reg=IN opcode at odd addresse\n",
+ saturn.device->tag, saturn.pc-3 );
if (saturn.config&&saturn.config->in) in = saturn.config->in(Machine);
S64_WRITE_WORD(reg,in);
monitor_in = in;
@@ -463,7 +463,7 @@ INLINE void saturn_return_carry_clear(void)
INLINE void saturn_return_interrupt(void)
{
- LOG(( "SATURN#%d at %05x: RTI\n", cpunum_get_active(), saturn.pc-2 ));
+ LOG(( "SATURN '%s' at %05x: RTI\n", saturn.device->tag, saturn.pc-2 ));
saturn.in_irq=0; /* set to 1 when an IRQ is taken */
saturn.pc=saturn_pop();
// saturn_ICount-=10;
diff --git a/src/emu/cpu/saturn/sattable.c b/src/emu/cpu/saturn/sattable.c
index 75485d0db99..de75e2b723f 100644
--- a/src/emu/cpu/saturn/sattable.c
+++ b/src/emu/cpu/saturn/sattable.c
@@ -37,26 +37,26 @@ static const int sub_right[]={B,C,A,C, I,I,I,I, A,B,C,D, B,C,A,C};
static void saturn_invalid3( int op1, int op2, int op3 )
{
- logerror( "SATURN#%d invalid opcode %x%x%x at %05x\n",
- cpunum_get_active(), op1, op2, op3, saturn.pc-3 );
+ logerror( "SATURN '%s' invalid opcode %x%x%x at %05x\n",
+ saturn.device->tag, op1, op2, op3, saturn.pc-3 );
}
static void saturn_invalid4( int op1, int op2, int op3, int op4 )
{
- logerror( "SATURN#%d invalid opcode %x%x%x%x at %05x\n",
- cpunum_get_active(), op1, op2, op3, op4, saturn.pc-4 );
+ logerror( "SATURN '%s' invalid opcode %x%x%x%x at %05x\n",
+ saturn.device->tag, op1, op2, op3, op4, saturn.pc-4 );
}
static void saturn_invalid5( int op1, int op2, int op3, int op4, int op5 )
{
- logerror( "SATURN#%d invalid opcode %x%x%x%x%x at %05x\n",
- cpunum_get_active(), op1, op2, op3, op4, op5, saturn.pc-5 );
+ logerror( "SATURN '%s' invalid opcode %x%x%x%x%x at %05x\n",
+ saturn.device->tag, op1, op2, op3, op4, op5, saturn.pc-5 );
}
static void saturn_invalid6( int op1, int op2, int op3, int op4, int op5, int op6 )
{
- logerror( "SATURN#%d invalid opcode %x%x%x%x%x%x at %05x\n",
- cpunum_get_active(), op1, op2, op3, op4, op5, op6, saturn.pc-6 );
+ logerror( "SATURN '%s' invalid opcode %x%x%x%x%x%x at %05x\n",
+ saturn.device->tag, op1, op2, op3, op4, op5, op6, saturn.pc-6 );
}
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index be54c3b9bb5..e7098f94462 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -164,7 +164,7 @@ INLINE void saturn_take_irq(void)
saturn_push(saturn.pc);
saturn.pc=IRQ_ADDRESS;
- LOG(("Saturn#%d takes IRQ ($%04x)\n", cpunum_get_active(), saturn.pc));
+ LOG(("Saturn '%s' takes IRQ ($%04x)\n", saturn.device->tag, saturn.pc));
if (saturn.irq_callback) (*saturn.irq_callback)(saturn.device, SATURN_IRQ_LINE);
}
@@ -206,7 +206,7 @@ static void saturn_set_nmi_line(int state)
saturn.nmi_state = state;
if ( state != CLEAR_LINE )
{
- LOG(( "SATURN#%d set_nmi_line(ASSERT)\n", cpunum_get_active()));
+ LOG(( "SATURN '%s' set_nmi_line(ASSERT)\n", saturn.device->tag));
saturn.pending_irq = 1;
}
}
@@ -217,7 +217,7 @@ static void saturn_set_irq_line(int state)
saturn.irq_state = state;
if ( state != CLEAR_LINE && saturn.irq_enable )
{
- LOG(( "SATURN#%d set_irq_line(ASSERT)\n", cpunum_get_active()));
+ LOG(( "SATURN '%s' set_irq_line(ASSERT)\n", saturn.device->tag));
saturn.pending_irq = 1;
}
}
@@ -226,7 +226,7 @@ static void saturn_set_wakeup_line(int state)
{
if (saturn.sleeping && state==1)
{
- LOG(( "SATURN#%d set_wakeup_line(ASSERT)\n", cpunum_get_active()));
+ LOG(( "SATURN '%s' set_wakeup_line(ASSERT)\n", saturn.device->tag));
if (saturn.irq_callback) (*saturn.irq_callback)(saturn.device, SATURN_WAKEUP_LINE);
saturn.sleeping = 0;
}