Fix compile errors.

This commit is contained in:
Aaron Giles 2008-12-06 17:15:23 +00:00
parent 7cf1bffaa5
commit fbdff39c21
2 changed files with 18 additions and 21 deletions

View File

@ -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",T90.pc,r);
fatalerror("%04x: unimplemented r8 register index = %d\n",T90.pc.w.l,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",T90.pc,r);
fatalerror("%04x: unimplemented w8 register index = %d\n",T90.pc.w.l,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",T90.pc,r);
fatalerror("%04x: unimplemented r16 register index = %d\n",T90.pc.w.l,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",T90.pc,r);
fatalerror("%04x: unimplemented w16 register index = %d\n",T90.pc.w.l,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",T90.pc,N,mode##N); \
fatalerror("%04x: unimplemented Read%d_8 mode = %d\n",T90.pc.w.l,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",T90.pc,N,mode##N); \
fatalerror("%04x: unimplemented Read%d_16 modes = %d\n",T90.pc.w.l,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",T90.pc,N,mode##N); \
fatalerror("%04x: unimplemented Write%d_8 mode = %d\n",T90.pc.w.l,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",T90.pc,N,mode##N); \
fatalerror("%04x: unimplemented Write%d_16 mode = %d\n",T90.pc.w.l,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",T90.pc,cond);
fatalerror("%04x: unimplemented condition = %d\n",T90.pc.w.l,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", T90.pc, i,i-1);
logerror("%04X: CPU Timer %d clocked by Timer %d overflow signal\n", T90.pc.w.l, i,i-1);
return;
}
break;
case 2:
logerror("%04X: CPU Timer %d, unsupported PPG mode\n", T90.pc, i);
logerror("%04X: CPU Timer %d, unsupported PPG mode\n", T90.pc.w.l, i);
return;
case 3:
logerror("%04X: CPU Timer %d, unsupported PWM mode\n", T90.pc, i);
logerror("%04X: CPU Timer %d, unsupported PWM mode\n", T90.pc.w.l, 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", T90.pc, i,i-1);
else logerror("%04X: CPU Timer %d, unsupported TCLK = 0\n", T90.pc, i);
case 0: if (i & 1) logerror("%04X: CPU Timer %d clocked by Timer %d match signal\n", T90.pc.w.l, i,i-1);
else logerror("%04X: CPU Timer %d, unsupported TCLK = 0\n", T90.pc.w.l, 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", T90.pc, i, 1.0 / attotime_to_double(period));
logerror("%04X: CPU Timer %d started at %lf Hz\n", T90.pc.w.l, 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", T90.pc,T90.internal_registers[ T90_T4MOD - T90_IOBASE ] & 0x03);
default: logerror("%04X: CPU Timer 4, unsupported T4MOD = %d\n", T90.pc.w.l,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", T90.pc, 1.0 / attotime_to_double(period));
logerror("%04X: CPU Timer 4 started at %lf Hz\n", T90.pc.w.l, 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", T90.pc, i);
logerror("%04X: CPU Timer %d stopped\n", T90.pc.w.l, i);
}
static void t90_stop_timer4(void)

View File

@ -1722,7 +1722,6 @@ static DRIVER_INIT( robby )
static DRIVER_INIT( profpac )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
const address_space *iospace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO);
astrocade_video_config = AC_SOUND_PRESENT;
@ -1737,7 +1736,6 @@ static DRIVER_INIT( profpac )
static DRIVER_INIT( demndrgn )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
const address_space *iospace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO);
astrocade_video_config = 0x00;
@ -1754,7 +1752,6 @@ static DRIVER_INIT( demndrgn )
static DRIVER_INIT( tenpindx )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
const address_space *iospace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO);
astrocade_video_config = 0x00;