summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/tlcs90/tlcs90.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-12-06 16:56:22 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-12-06 16:56:22 +0000
commit282c1db11081839a532aa147f7809789bd5ac107 (patch)
tree72bf31c30193edb3247cf548621ef3a7efd2641d /src/emu/cpu/tlcs90/tlcs90.c
parent8c09fe8b03f9479de15e4f489cfbc8c4c19a7f95 (diff)
activecpu_count -= 133
Removed mostly silly uses of activecpu from the CPU cores.
Diffstat (limited to 'src/emu/cpu/tlcs90/tlcs90.c')
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 2520a1e5b69..75da1b4c1a9 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -986,7 +986,7 @@ static int sprint_arg(char *buffer, UINT32 pc, const char *pre, const e_mode mod
case MODE_R16D8: return sprintf( buffer, "%s%s%c$%02X", pre, r16_names[r], (rb&0x80)?'-':'+', (rb&0x80)?((rb^0xff)+1):rb );
default:
- fatalerror("%04x: unimplemented addr mode = %d\n",cpu_get_pc(Machine->activecpu),mode);
+ fatalerror("%04x: unimplemented addr mode = %d\n",pc,mode);
}
return 0;
@@ -1023,7 +1023,7 @@ INLINE UINT16 r8( const e_r r )
case L: return T90.hl.b.l;
default:
- fatalerror("%04x: unimplemented r8 register index = %d\n",cpu_get_pc(Machine->activecpu),r);
+ fatalerror("%04x: unimplemented r8 register index = %d\n",T90.pc,r);
}
}
@@ -1040,7 +1040,7 @@ INLINE void w8( const e_r r, UINT16 value )
case L: T90.hl.b.l = value; return;
default:
- fatalerror("%04x: unimplemented w8 register index = %d\n",cpu_get_pc(Machine->activecpu),r);
+ fatalerror("%04x: unimplemented w8 register index = %d\n",T90.pc,r);
}
}
@@ -1061,7 +1061,7 @@ case AF2: return (T90.af2.w.l & (~IF)) | (T90.af.w.l & IF);
case PC: return T90.pc.w.l;
default:
- fatalerror("%04x: unimplemented r16 register index = %d\n",cpu_get_pc(Machine->activecpu),r);
+ fatalerror("%04x: unimplemented r16 register index = %d\n",T90.pc,r);
}
}
@@ -1080,7 +1080,7 @@ INLINE void w16( const e_r r, UINT16 value )
case PC: T90.pc.d = value; return;
default:
- fatalerror("%04x: unimplemented w16 register index = %d\n",cpu_get_pc(Machine->activecpu),r);
+ fatalerror("%04x: unimplemented w16 register index = %d\n",T90.pc,r);
}
}
@@ -1108,7 +1108,7 @@ INLINE UINT8 Read##N##_8(void) { \
} \
return RM8((UINT16)(r16(r##N) + (INT8)r##N##b)); \
default: \
- fatalerror("%04x: unimplemented Read%d_8 mode = %d\n",cpu_get_pc(Machine->activecpu),N,mode##N); \
+ fatalerror("%04x: unimplemented Read%d_8 mode = %d\n",T90.pc,N,mode##N); \
} \
return 0; \
} \
@@ -1133,7 +1133,7 @@ INLINE UINT16 Read##N##_16(void) { \
} \
return RM16((UINT16)(r16(r##N) + (INT8)r##N##b)); \
default: \
- fatalerror("%04x: unimplemented Read%d_16 modes = %d\n",cpu_get_pc(Machine->activecpu),N,mode##N); \
+ fatalerror("%04x: unimplemented Read%d_16 modes = %d\n",T90.pc,N,mode##N); \
} \
return 0; \
}
@@ -1159,7 +1159,7 @@ INLINE void Write##N##_8( UINT8 value ) { \
} \
WM8((UINT16)(r16(r##N) + (INT8)r##N##b), value); return; \
default: \
- fatalerror("%04x: unimplemented Write%d_8 mode = %d\n",cpu_get_pc(Machine->activecpu),N,mode##N); \
+ fatalerror("%04x: unimplemented Write%d_8 mode = %d\n",T90.pc,N,mode##N); \
} \
} \
INLINE void Write##N##_16( UINT16 value ) \
@@ -1181,7 +1181,7 @@ INLINE void Write##N##_16( UINT16 value ) \
} \
WM16((UINT16)(r16(r##N) + (INT8)r##N##b), value); return; \
default: \
- fatalerror("%04x: unimplemented Write%d_16 mode = %d\n",cpu_get_pc(Machine->activecpu),N,mode##N); \
+ fatalerror("%04x: unimplemented Write%d_16 mode = %d\n",T90.pc,N,mode##N); \
} \
}
@@ -1212,7 +1212,7 @@ INLINE int Test( UINT8 cond )
case NZ: return !(F & ZF);
case NC: return !(F & CF);
default:
- fatalerror("%04x: unimplemented condition = %d\n",cpu_get_pc(Machine->activecpu),cond);
+ fatalerror("%04x: unimplemented condition = %d\n",T90.pc,cond);
}
return 0;
}
@@ -2314,22 +2314,22 @@ static void t90_start_timer(int i)
// 16-bit mode
if (i & 1)
{
- logerror("%04X: CPU Timer %d clocked by Timer %d overflow signal\n", cpu_get_pc(Machine->activecpu), i,i-1);
+ logerror("%04X: CPU Timer %d clocked by Timer %d overflow signal\n", T90.pc, i,i-1);
return;
}
break;
case 2:
- logerror("%04X: CPU Timer %d, unsupported PPG mode\n", cpu_get_pc(Machine->activecpu), i);
+ logerror("%04X: CPU Timer %d, unsupported PPG mode\n", T90.pc, i);
return;
case 3:
- logerror("%04X: CPU Timer %d, unsupported PWM mode\n", cpu_get_pc(Machine->activecpu), i);
+ logerror("%04X: CPU Timer %d, unsupported PWM mode\n", T90.pc, i);
return;
}
switch((T90.internal_registers[ T90_TCLK - T90_IOBASE ] >> (i * 2)) & 0x03)
{
- case 0: if (i & 1) logerror("%04X: CPU Timer %d clocked by Timer %d match signal\n", cpu_get_pc(Machine->activecpu), i,i-1);
- else logerror("%04X: CPU Timer %d, unsupported TCLK = 0\n", cpu_get_pc(Machine->activecpu), i);
+ case 0: if (i & 1) logerror("%04X: CPU Timer %d clocked by Timer %d match signal\n", T90.pc, i,i-1);
+ else logerror("%04X: CPU Timer %d, unsupported TCLK = 0\n", T90.pc, i);
return;
case 2: prescaler = 16; break;
case 3: prescaler = 256; break;
@@ -2342,7 +2342,7 @@ static void t90_start_timer(int i)
timer_adjust_periodic(T90.timer[i], period, i, period);
- logerror("%04X: CPU Timer %d started at %lf Hz\n", cpu_get_pc(Machine->activecpu), i, 1.0 / attotime_to_double(period));
+ logerror("%04X: CPU Timer %d started at %lf Hz\n", T90.pc, i, 1.0 / attotime_to_double(period));
}
static void t90_start_timer4(void)
@@ -2356,7 +2356,7 @@ static void t90_start_timer4(void)
{
case 1: prescaler = 1; break;
case 2: prescaler = 16; break;
- default: logerror("%04X: CPU Timer 4, unsupported T4MOD = %d\n", cpu_get_pc(Machine->activecpu),T90.internal_registers[ T90_T4MOD - T90_IOBASE ] & 0x03);
+ default: logerror("%04X: CPU Timer 4, unsupported T4MOD = %d\n", T90.pc,T90.internal_registers[ T90_T4MOD - T90_IOBASE ] & 0x03);
return;
}
@@ -2364,14 +2364,14 @@ static void t90_start_timer4(void)
timer_adjust_periodic(T90.timer[4], period, 4, period);
- logerror("%04X: CPU Timer 4 started at %lf Hz\n", cpu_get_pc(Machine->activecpu), 1.0 / attotime_to_double(period));
+ logerror("%04X: CPU Timer 4 started at %lf Hz\n", T90.pc, 1.0 / attotime_to_double(period));
}
static void t90_stop_timer(int i)
{
timer_adjust_oneshot(T90.timer[i], attotime_never, i);
- logerror("%04X: CPU Timer %d stopped\n", cpu_get_pc(Machine->activecpu), i);
+ logerror("%04X: CPU Timer %d stopped\n", T90.pc, i);
}
static void t90_stop_timer4(void)
@@ -2651,7 +2651,7 @@ static CPU_INIT( t90 )
T90.program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM);
T90.io = memory_find_address_space(device, ADDRESS_SPACE_IO);
- T90.timer_period = attotime_mul(ATTOTIME_IN_HZ(cpu_get_clock(device->machine->activecpu)), 8);
+ T90.timer_period = attotime_mul(ATTOTIME_IN_HZ(cpu_get_clock(device)), 8);
// Reset registers to their initial values