summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/machine/adc083x.c58
-rw-r--r--src/emu/machine/ds2401.c35
-rw-r--r--src/emu/machine/i2cmem.c56
-rw-r--r--src/emu/machine/x76f041.c80
-rw-r--r--src/emu/machine/x76f100.c69
-rw-r--r--src/emu/sound/psx.c116
-rw-r--r--src/mame/drivers/ksys573.c120
-rw-r--r--src/mame/drivers/namcos11.c40
-rw-r--r--src/mame/drivers/namcos12.c43
-rw-r--r--src/mame/drivers/zn.c47
-rw-r--r--src/mame/machine/psx.c166
-rw-r--r--src/mame/machine/zs01.c71
-rw-r--r--src/mame/video/psx.c158
13 files changed, 562 insertions, 497 deletions
diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c
index 8340aadb15f..311396bc9a9 100644
--- a/src/emu/machine/adc083x.c
+++ b/src/emu/machine/adc083x.c
@@ -12,7 +12,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -21,7 +21,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -62,7 +62,7 @@ void adc083x_init( running_machine *machine, int chip, int type, double (*input_
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_init( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_init( %d ) chip out of range\n", chip );
return;
}
@@ -124,11 +124,12 @@ void adc083x_init( running_machine *machine, int chip, int type, double (*input_
void adc083x_cs_write( int chip, int cs )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_cs_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_cs_write( %d ) chip out of range\n", chip );
return;
}
@@ -136,7 +137,7 @@ void adc083x_cs_write( int chip, int cs )
if( c->CS != cs )
{
- verboselog( 2, "adc083x_cs_write( %d, %d )\n", chip, cs );
+ verboselog( machine, 2, "adc083x_cs_write( %d, %d )\n", chip, cs );
}
if( c->CS == 0 && cs != 0 )
@@ -244,11 +245,12 @@ static int adc083x_conversion( int chip )
void adc083x_clk_write( int chip, int clk )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_clk_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_clk_write( %d ) chip out of range\n", chip );
return;
}
@@ -256,7 +258,7 @@ void adc083x_clk_write( int chip, int clk )
if( c->CLK != clk )
{
- verboselog( 2, "adc083x_clk_write( %d, %d )\n", chip, clk );
+ verboselog( machine, 2, "adc083x_clk_write( %d, %d )\n", chip, clk );
}
if( c->CS == 0 )
@@ -268,7 +270,7 @@ void adc083x_clk_write( int chip, int clk )
case STATE_WAIT_FOR_START:
if( c->DI != 0 )
{
- verboselog( 1, "adc083x %d got start bit\n", chip );
+ verboselog( machine, 1, "adc083x %d got start bit\n", chip );
c->state = STATE_SHIFT_MUX;
c->SARS = 0;
c->SGL = 0;
@@ -279,7 +281,7 @@ void adc083x_clk_write( int chip, int clk )
}
else
{
- verboselog( 1, "adc083x %d not start bit\n", chip );
+ verboselog( machine, 1, "adc083x %d not start bit\n", chip );
}
break;
case STATE_SHIFT_MUX:
@@ -290,28 +292,28 @@ void adc083x_clk_write( int chip, int clk )
{
c->SGL = 1;
}
- verboselog( 1, "adc083x %d SGL <- %d\n", chip, c->SGL );
+ verboselog( machine, 1, "adc083x %d SGL <- %d\n", chip, c->SGL );
break;
case 1:
if( c->DI != 0 )
{
c->ODD = 1;
}
- verboselog( 1, "adc083x %d ODD <- %d\n", chip, c->ODD );
+ verboselog( machine, 1, "adc083x %d ODD <- %d\n", chip, c->ODD );
break;
case 2:
if( c->DI != 0 )
{
c->SEL1 = 1;
}
- verboselog( 1, "adc083x %d SEL1 <- %d\n", chip, c->SEL1 );
+ verboselog( machine, 1, "adc083x %d SEL1 <- %d\n", chip, c->SEL1 );
break;
case 3:
if( c->DI != 0 )
{
c->SEL0 = 1;
}
- verboselog( 1, "adc083x %d SEL0 <- %d\n", chip, c->SEL0 );
+ verboselog( machine, 1, "adc083x %d SEL0 <- %d\n", chip, c->SEL0 );
break;
}
c->bit++;
@@ -324,11 +326,11 @@ void adc083x_clk_write( int chip, int clk )
c->SARS = 0;
if( c->type == ADC0838 && c->SE != 0 )
{
- verboselog( 1, "adc083x %d not SE\n", chip );
+ verboselog( machine, 1, "adc083x %d not SE\n", chip );
}
else
{
- verboselog( 1, "adc083x %d got SE\n", chip );
+ verboselog( machine, 1, "adc083x %d got SE\n", chip );
c->state = STATE_OUTPUT_LSB_FIRST;
c->bit = 1;
}
@@ -340,7 +342,7 @@ void adc083x_clk_write( int chip, int clk )
switch( c->state )
{
case STATE_MUX_SETTLE:
- verboselog( 1, "adc083x %d mux settle\n", chip );
+ verboselog( machine, 1, "adc083x %d mux settle\n", chip );
c->output = adc083x_conversion( chip );
c->state = STATE_OUTPUT_MSB_FIRST;
c->bit = 7;
@@ -352,7 +354,7 @@ void adc083x_clk_write( int chip, int clk )
break;
case STATE_OUTPUT_MSB_FIRST:
c->DO = ( c->output >> c->bit ) & 1;
- verboselog( 1, "adc083x %d msb %d -> %d\n", chip, c->bit, c->DO );
+ verboselog( machine, 1, "adc083x %d msb %d -> %d\n", chip, c->bit, c->DO );
c->bit--;
if( c->bit < 0 )
{
@@ -368,7 +370,7 @@ void adc083x_clk_write( int chip, int clk )
break;
case STATE_OUTPUT_LSB_FIRST:
c->DO = ( c->output >> c->bit ) & 1;
- verboselog( 1, "adc083x %d lsb %d -> %d\n", chip, c->bit, c->DO );
+ verboselog( machine, 1, "adc083x %d lsb %d -> %d\n", chip, c->bit, c->DO );
c->bit++;
if( c->bit == 8 )
{
@@ -388,11 +390,12 @@ void adc083x_clk_write( int chip, int clk )
void adc083x_di_write( int chip, int di )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_di_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_di_write( %d ) chip out of range\n", chip );
return;
}
@@ -400,7 +403,7 @@ void adc083x_di_write( int chip, int di )
if( c->DI != di )
{
- verboselog( 2, "adc083x_di_write( %d, %d )\n", chip, di );
+ verboselog( machine, 2, "adc083x_di_write( %d, %d )\n", chip, di );
}
c->DI = di;
@@ -408,11 +411,12 @@ void adc083x_di_write( int chip, int di )
void adc083x_se_write( int chip, int se )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_se_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_se_write( %d ) chip out of range\n", chip );
return;
}
@@ -420,7 +424,7 @@ void adc083x_se_write( int chip, int se )
if( c->SE != se )
{
- verboselog( 2, "adc083x_se_write( %d, %d )\n", chip, se );
+ verboselog( machine, 2, "adc083x_se_write( %d, %d )\n", chip, se );
}
c->SE = se;
@@ -428,32 +432,34 @@ void adc083x_se_write( int chip, int se )
int adc083x_sars_read( int chip )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_sars_read( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_sars_read( %d ) chip out of range\n", chip );
return 0;
}
c = &adc083x[ chip ];
- verboselog( 1, "adc083x_sars_read( %d ) %d\n", chip, c->SARS );
+ verboselog( machine, 1, "adc083x_sars_read( %d ) %d\n", chip, c->SARS );
return c->SARS;
}
int adc083x_do_read( int chip )
{
+ running_machine *machine = Machine;
struct adc083x_chip *c;
if( chip >= MAX_ADC083X_CHIPS )
{
- verboselog( 0, "adc083x_do_read( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "adc083x_do_read( %d ) chip out of range\n", chip );
return 0;
}
c = &adc083x[ chip ];
- verboselog( 1, "adc083x_do_read( %d ) %d\n", chip, c->DO );
+ verboselog( machine, 1, "adc083x_do_read( %d ) %d\n", chip, c->DO );
return c->DO;
}
diff --git a/src/emu/machine/ds2401.c b/src/emu/machine/ds2401.c
index f77162e3a59..f4645742d62 100644
--- a/src/emu/machine/ds2401.c
+++ b/src/emu/machine/ds2401.c
@@ -14,7 +14,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -23,7 +23,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -63,7 +63,7 @@ static TIMER_CALLBACK( ds2401_reset )
int which = param;
struct ds2401_chip *c = &ds2401[ which ];
- verboselog( 1, "ds2401_reset(%d)\n", which );
+ verboselog( machine, 1, "ds2401_reset(%d)\n", which );
c->state = STATE_RESET;
timer_adjust_oneshot( c->timer, attotime_never, which );
@@ -77,20 +77,20 @@ static TIMER_CALLBACK( ds2401_tick )
switch( c->state )
{
case STATE_RESET1:
- verboselog( 2, "ds2401_tick(%d) state_reset1 %d\n", which, c->rx );
+ verboselog( machine, 2, "ds2401_tick(%d) state_reset1 %d\n", which, c->rx );
c->tx = 0;
c->state = STATE_RESET2;
timer_adjust_oneshot( c->timer, c->t_pdl, which );
break;
case STATE_RESET2:
- verboselog( 2, "ds2401_tick(%d) state_reset2 %d\n", which, c->rx );
+ verboselog( machine, 2, "ds2401_tick(%d) state_reset2 %d\n", which, c->rx );
c->tx = 1;
c->bit = 0;
c->shift = 0;
c->state = STATE_COMMAND;
break;
case STATE_COMMAND:
- verboselog( 2, "ds2401_tick(%d) state_command %d\n", which, c->rx );
+ verboselog( machine, 2, "ds2401_tick(%d) state_command %d\n", which, c->rx );
c->shift >>= 1;
if( c->rx != 0 )
{
@@ -102,13 +102,13 @@ static TIMER_CALLBACK( ds2401_tick )
switch( c->shift )
{
case COMMAND_READROM:
- verboselog( 1, "ds2401_tick(%d) readrom\n", which );
+ verboselog( machine, 1, "ds2401_tick(%d) readrom\n", which );
c->bit = 0;
c->byte = 0;
c->state = STATE_READROM;
break;
default:
- verboselog( 0, "ds2401_tick(%d) command not handled %02x\n", which, c->shift );
+ verboselog( machine, 0, "ds2401_tick(%d) command not handled %02x\n", which, c->shift );
c->state = STATE_IDLE;
break;
}
@@ -118,16 +118,16 @@ static TIMER_CALLBACK( ds2401_tick )
c->tx = 1;
if( c->byte == 8 )
{
- verboselog( 1, "ds2401_tick(%d) readrom finished\n", which );
+ verboselog( machine, 1, "ds2401_tick(%d) readrom finished\n", which );
c->state = STATE_IDLE;
}
else
{
- verboselog( 2, "ds2401_tick(%d) readrom window closed\n", which );
+ verboselog( machine, 2, "ds2401_tick(%d) readrom window closed\n", which );
}
break;
default:
- verboselog( 0, "ds2401_tick(%d) state not handled: %d\n", which, c->state );
+ verboselog( machine, 0, "ds2401_tick(%d) state not handled: %d\n", which, c->state );
break;
}
}
@@ -162,9 +162,10 @@ void ds2401_init( running_machine *machine, int which, const UINT8 *data )
void ds2401_write( int which, int data )
{
+ running_machine *machine = Machine;
struct ds2401_chip *c = &ds2401[ which ];
- verboselog( 1, "ds2401_write( %d, %d )\n", which, data );
+ verboselog( machine, 1, "ds2401_write( %d, %d )\n", which, data );
if( data == 0 && c->rx != 0 )
{
@@ -173,14 +174,14 @@ void ds2401_write( int which, int data )
case STATE_IDLE:
break;
case STATE_COMMAND:
- verboselog( 2, "ds2401_write(%d) state_command\n", which );
+ verboselog( machine, 2, "ds2401_write(%d) state_command\n", which );
timer_adjust_oneshot( c->timer, c->t_samp, which );
break;
case STATE_READROM:
if( c->bit == 0 )
{
c->shift = c->data[ 7 - c->byte ];
- verboselog( 1, "ds2401_write(%d) <- data %02x\n", which, c->shift );
+ verboselog( machine, 1, "ds2401_write(%d) <- data %02x\n", which, c->shift );
}
c->tx = c->shift & 1;
c->shift >>= 1;
@@ -190,11 +191,11 @@ void ds2401_write( int which, int data )
c->bit = 0;
c->byte++;
}
- verboselog( 2, "ds2401_write(%d) state_readrom %d\n", which, c->tx );
+ verboselog( machine, 2, "ds2401_write(%d) state_readrom %d\n", which, c->tx );
timer_adjust_oneshot( c->timer, c->t_rdv, which );
break;
default:
- verboselog( 0, "ds2401_write(%d) state not handled: %d\n", which, c->state );
+ verboselog( machine, 0, "ds2401_write(%d) state not handled: %d\n", which, c->state );
break;
}
timer_adjust_oneshot( c->reset_timer, c->t_rstl, which );
@@ -217,7 +218,7 @@ int ds2401_read( int which )
{
struct ds2401_chip *c = &ds2401[ which ];
- verboselog( 2, "ds2401_read( %d ) %d\n", which, c->tx & c->rx );
+ verboselog( Machine, 2, "ds2401_read( %d ) %d\n", which, c->tx & c->rx );
return c->tx & c->rx;
}
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index bd850f9efaa..3ead47480df 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -26,7 +26,7 @@ Up to 4096 bytes can be addressed.
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -35,7 +35,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -79,7 +79,7 @@ void i2cmem_init( running_machine *machine, int chip, int slave_address, int pag
if( chip >= I2CMEM_MAXCHIP )
{
- verboselog( 0, "i2cmem_init( %d ) invalid chip\n", chip );
+ verboselog( machine, 0, "i2cmem_init( %d ) invalid chip\n", chip );
return;
}
@@ -149,11 +149,12 @@ static int data_offset( struct i2cmem_chip *c )
void i2cmem_write( int chip, int line, int data )
{
+ running_machine *machine = Machine;
struct i2cmem_chip *c;
if( chip >= I2CMEM_MAXCHIP )
{
- verboselog( 0, "i2cmem_write( %d, %d, %d ) invalid chip\n", chip, line, data );
+ verboselog( machine, 0, "i2cmem_write( %d, %d, %d ) invalid chip\n", chip, line, data );
return;
}
@@ -167,7 +168,7 @@ void i2cmem_write( int chip, int line, int data )
if( c->e0 != data )
{
c->e0 = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_E0, %d )\n", chip, c->e0 );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_E0, %d )\n", chip, c->e0 );
}
break;
@@ -175,7 +176,7 @@ void i2cmem_write( int chip, int line, int data )
if( c->e1 != data )
{
c->e1 = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_E1, %d )\n", chip, c->e1 );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_E1, %d )\n", chip, c->e1 );
}
break;
@@ -183,7 +184,7 @@ void i2cmem_write( int chip, int line, int data )
if( c->e2 != data )
{
c->e2 = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_E2, %d )\n", chip, c->e2 );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_E2, %d )\n", chip, c->e2 );
}
break;
@@ -191,19 +192,19 @@ void i2cmem_write( int chip, int line, int data )
if( c->sdaw != data )
{
c->sdaw = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_SDA, %d )\n", chip, c->sdaw );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_SDA, %d )\n", chip, c->sdaw );
if( c->scl )
{
if( c->sdaw )
{
- verboselog( 1, "i2cmem(%d) stop\n", chip );
+ verboselog( machine, 1, "i2cmem(%d) stop\n", chip );
c->state = STATE_IDLE;
c->byteaddr = 0;
}
else
{
- verboselog( 2, "i2cmem(%d) start\n", chip );
+ verboselog( machine, 2, "i2cmem(%d) start\n", chip );
c->state = STATE_DEVSEL;
c->bits = 0;
}
@@ -217,7 +218,7 @@ void i2cmem_write( int chip, int line, int data )
if( c->scl != data )
{
c->scl = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_SCL, %d )\n", chip, c->scl );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_SCL, %d )\n", chip, c->scl );
switch( c->state )
{
@@ -243,17 +244,17 @@ void i2cmem_write( int chip, int line, int data )
if( !select_device( c ) )
{
- verboselog( 1, "i2cmem(%d) devsel %02x: not this device\n", chip, c->devsel );
+ verboselog( machine, 1, "i2cmem(%d) devsel %02x: not this device\n", chip, c->devsel );
c->state = STATE_IDLE;
}
else if( ( c->devsel & DEVSEL_RW ) == 0 )
{
- verboselog( 1, "i2cmem(%d) devsel %02x: write\n", chip, c->devsel );
+ verboselog( machine, 1, "i2cmem(%d) devsel %02x: write\n", chip, c->devsel );
c->state = STATE_BYTEADDR;
}
else
{
- verboselog( 1, "i2cmem(%d) devsel %02x: read\n", chip, c->devsel );
+ verboselog( machine, 1, "i2cmem(%d) devsel %02x: read\n", chip, c->devsel );
c->state = STATE_DATAOUT;
}
break;
@@ -262,7 +263,7 @@ void i2cmem_write( int chip, int line, int data )
c->byteaddr = c->shift;
c->page_offset = 0;
- verboselog( 1, "i2cmem(%d) byteaddr %02x\n", chip, c->byteaddr );
+ verboselog( machine, 1, "i2cmem(%d) byteaddr %02x\n", chip, c->byteaddr );
c->state = STATE_DATAIN;
break;
@@ -270,13 +271,13 @@ void i2cmem_write( int chip, int line, int data )
case STATE_DATAIN:
if( c->wc )
{
- verboselog( 0, "i2cmem(%d) write not enabled\n", chip );
+ verboselog( machine, 0, "i2cmem(%d) write not enabled\n", chip );
c->state = STATE_IDLE;
}
else if( c->page_size > 0 )
{
c->page[ c->page_offset ] = c->shift;
- verboselog( 1, "i2cmem(%d) page[ %04x ] <- %02x\n", chip, c->page_offset, c->page[ c->page_offset ] );
+ verboselog( machine, 1, "i2cmem(%d) page[ %04x ] <- %02x\n", chip, c->page_offset, c->page[ c->page_offset ] );
c->page_offset++;
if( c->page_offset == c->page_size )
@@ -284,7 +285,7 @@ void i2cmem_write( int chip, int line, int data )
int offset = data_offset( c ) & ~( c->page_size - 1 );
memcpy( &c->data[ offset ], c->page, c->page_size );
- verboselog( 1, "i2cmem(%d) data[ %04x to %04x ] = page\n", chip, offset, offset + c->page_size - 1 );
+ verboselog( machine, 1, "i2cmem(%d) data[ %04x to %04x ] = page\n", chip, offset, offset + c->page_size - 1 );
c->page_offset = 0;
}
@@ -294,7 +295,7 @@ void i2cmem_write( int chip, int line, int data )
int offset = data_offset( c );
c->data[ offset ] = c->shift;
- verboselog( 1, "i2cmem(%d) data[ %04x ] <- %02x\n", chip, offset, c->data[ offset ] );
+ verboselog( machine, 1, "i2cmem(%d) data[ %04x ] <- %02x\n", chip, offset, c->data[ offset ] );
c->byteaddr++;
}
@@ -328,7 +329,7 @@ void i2cmem_write( int chip, int line, int data )
int offset = data_offset( c );
c->shift = c->data[ offset ];
- verboselog( 1, "i2cmem(%d) data[ %04x ] -> %02x\n", chip, offset, c->data[ offset ] );
+ verboselog( machine, 1, "i2cmem(%d) data[ %04x ] -> %02x\n", chip, offset, c->data[ offset ] );
c->byteaddr++;
}
@@ -344,7 +345,7 @@ void i2cmem_write( int chip, int line, int data )
{
if( c->sdaw )
{
- verboselog( 1, "i2cmem(%d) sleep\n", chip );
+ verboselog( machine, 1, "i2cmem(%d) sleep\n", chip );
c->state = STATE_IDLE;
}
@@ -371,23 +372,24 @@ void i2cmem_write( int chip, int line, int data )
if( c->wc != data )
{
c->wc = data;
- verboselog( 2, "i2cmem_write( %d, I2CMEM_WC, %d )\n", chip, c->wc );
+ verboselog( machine, 2, "i2cmem_write( %d, I2CMEM_WC, %d )\n", chip, c->wc );
}
break;
default:
- verboselog( 0, "i2cmem_write( %d, %d, %d ) invalid line\n", chip, line, data );
+ verboselog( machine, 0, "i2cmem_write( %d, %d, %d ) invalid line\n", chip, line, data );
break;
}
}
int i2cmem_read( int chip, int line )
{
+ running_machine *machine = Machine;
struct i2cmem_chip *c;
if( chip >= I2CMEM_MAXCHIP )
{
- verboselog( 0, "i2cmem_read( %d, %d ) invalid chip\n", chip, line );
+ verboselog( machine, 0, "i2cmem_read( %d, %d ) invalid chip\n", chip, line );
return 0;
}
@@ -396,11 +398,11 @@ int i2cmem_read( int chip, int line )
switch( line )
{
case I2CMEM_SDA:
- verboselog( 2, "i2cmem_read( %d, I2CMEM_SDA ) %d\n", chip, c->sdar & c->sdaw );
+ verboselog( machine, 2, "i2cmem_read( %d, I2CMEM_SDA ) %d\n", chip, c->sdar & c->sdaw );
return c->sdar & c->sdaw;
default:
- verboselog( 0, "i2cmem_read( %d, %d ) invalid line\n", chip, line );
+ verboselog( machine, 0, "i2cmem_read( %d, %d ) invalid line\n", chip, line );
break;
}
@@ -413,7 +415,7 @@ static void nvram_handler_i2cmem( int chip, running_machine *machine, mame_file
if( chip >= I2CMEM_MAXCHIP )
{
- verboselog( 0, "nvram_handler_i2cmem( %d ) invalid chip\n", chip );
+ verboselog( machine, 0, "nvram_handler_i2cmem( %d ) invalid chip\n", chip );
return;
}
diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c
index f36dc2e0fbe..407b0ecceec 100644
--- a/src/emu/machine/x76f041.c
+++ b/src/emu/machine/x76f041.c
@@ -17,7 +17,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -26,7 +26,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -108,7 +108,7 @@ void x76f041_init( running_machine *machine, int chip, UINT8 *data )
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_init( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_init( %d ) chip out of range\n", chip );
return;
}
@@ -168,11 +168,12 @@ void x76f041_init( running_machine *machine, int chip, UINT8 *data )
void x76f041_cs_write( int chip, int cs )
{
+ running_machine *machine = Machine;
struct x76f041_chip *c;
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_cs_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_cs_write( %d ) chip out of range\n", chip );
return;
}
@@ -180,7 +181,7 @@ void x76f041_cs_write( int chip, int cs )
if( c->cs != cs )
{
- verboselog( 2, "x76f041(%d) cs=%d\n", chip, cs );
+ verboselog( machine, 2, "x76f041(%d) cs=%d\n", chip, cs );
}
if( c->cs != 0 && cs == 0 )
{
@@ -199,11 +200,12 @@ void x76f041_cs_write( int chip, int cs )
void x76f041_rst_write( int chip, int rst )
{
+ running_machine *machine = Machine;
struct x76f041_chip *c;
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_rst_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_rst_write( %d ) chip out of range\n", chip );
return;
}
@@ -211,11 +213,11 @@ void x76f041_rst_write( int chip, int rst )
if( c->rst != rst )
{
- verboselog( 2, "x76f041(%d) rst=%d\n", chip, rst );
+ verboselog( machine, 2, "x76f041(%d) rst=%d\n", chip, rst );
}
if( c->rst == 0 && rst != 0 && c->cs == 0 )
{
- verboselog( 1, "x76f041(%d) goto response to reset\n", chip );
+ verboselog( machine, 1, "x76f041(%d) goto response to reset\n", chip );
c->state = STATE_RESPONSE_TO_RESET;
c->bit = 0;
c->byte = 0;
@@ -285,13 +287,14 @@ static void x76f041_password_ok( struct x76f041_chip *c )
static void x76f041_load_address( int chip )
{
+ running_machine *machine = Machine;
/* todo: handle other bcr bits */
struct x76f041_chip *c = &x76f041[ chip ];
int bcr;
c->address = c->shift;
- verboselog( 1, "x76f041(%d) -> address: %02x\n", chip, c->address );
+ verboselog( machine, 1, "x76f041(%d) -> address: %02x\n", chip, c->address );
if( ( c->command & 1 ) == 0 )
{
@@ -310,19 +313,19 @@ static void x76f041_load_address( int chip )
( ( c->command & 0xe0 ) == COMMAND_WRITE && ( bcr & BCR_Z ) != 0 ) )
{
/* todo: find out when this is really checked. */
- verboselog( 1, "x76f041(%d) command not allowed\n", chip );
+ verboselog( machine, 1, "x76f041(%d) command not allowed\n", chip );
c->state = STATE_STOP;
c->sdar = 0;
}
else if( ( ( c->command & 0xe0 ) == COMMAND_WRITE && ( bcr & BCR_X ) == 0 ) ||
( ( c->command & 0xe0 ) == COMMAND_READ && ( bcr & BCR_Y ) == 0 ) )
{
- verboselog( 1, "x76f041(%d) password not required\n", chip );
+ verboselog( machine, 1, "x76f041(%d) password not required\n", chip );
x76f041_password_ok( c );
}
else
{
- verboselog( 1, "x76f041(%d) send password\n", chip );
+ verboselog( machine, 1, "x76f041(%d) send password\n", chip );
c->state = STATE_LOAD_PASSWORD;
c->byte = 0;
}
@@ -339,11 +342,12 @@ static int x76f041_data_offset( struct x76f041_chip *c )
void x76f041_scl_write( int chip, int scl )
{
+ running_machine *machine = Machine;
struct x76f041_chip *c;
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_scl_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_scl_write( %d ) chip out of range\n", chip );
return;
}
@@ -351,7 +355,7 @@ void x76f041_scl_write( int chip, int scl )
if( c->scl != scl )
{
- verboselog( 2, "x76f041(%d) scl=%d\n", chip, scl );
+ verboselog( machine, 2, "x76f041(%d) scl=%d\n", chip, scl );
}
if( c->cs == 0 )
{
@@ -363,7 +367,7 @@ void x76f041_scl_write( int chip, int scl )
if( c->scl != 0 && scl == 0 )
{
c->sdar = ( c->response_to_reset[ c->byte ] >> c->bit ) & 1;
- verboselog( 2, "x76f041(%d) in response to reset %d (%d/%d)\n", chip, c->sdar, c->byte, c->bit );
+ verboselog( machine, 2, "x76f041(%d) in response to reset %d (%d/%d)\n", chip, c->sdar, c->byte, c->bit );
c->bit++;
if( c->bit == 8 )
{
@@ -386,7 +390,7 @@ void x76f041_scl_write( int chip, int scl )
{
if( c->bit < 8 )
{
- verboselog( 2, "x76f041(%d) clock\n", chip );
+ verboselog( machine, 2, "x76f041(%d) clock\n", chip );
c->shift <<= 1;
if( c->sdaw != 0 )
{
@@ -402,7 +406,7 @@ void x76f041_scl_write( int chip, int scl )
{
case STATE_LOAD_COMMAND:
c->command = c->shift;
- verboselog( 1, "x76f041(%d) -> command: %02x\n", chip, c->command );
+ verboselog( machine, 1, "x76f041(%d) -> command: %02x\n", chip, c->command );
/* todo: verify command is valid? */
c->state = STATE_LOAD_ADDRESS;
break;
@@ -410,7 +414,7 @@ void x76f041_scl_write( int chip, int scl )
x76f041_load_address( chip );
break;
case STATE_LOAD_PASSWORD:
- verboselog( 1, "x76f041(%d) -> password: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) -> password: %02x\n", chip, c->shift );
c->write_buffer[ c->byte++ ] = c->shift;
if( c->byte == SIZE_WRITE_BUFFER )
{
@@ -418,7 +422,7 @@ void x76f041_scl_write( int chip, int scl )
}
break;
case STATE_VERIFY_PASSWORD:
- verboselog( 1, "x76f041(%d) -> verify password: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) -> verify password: %02x\n", chip, c->shift );
/* todo: this should probably be handled as a command */
if( c->shift == 0xc0 )
{
@@ -434,7 +438,7 @@ void x76f041_scl_write( int chip, int scl )
}
break;
case STATE_WRITE_DATA:
- verboselog( 1, "x76f041(%d) -> data: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) -> data: %02x\n", chip, c->shift );
c->write_buffer[ c->byte++ ] = c->shift;
if( c->byte == SIZE_WRITE_BUFFER )
{
@@ -444,11 +448,11 @@ void x76f041_scl_write( int chip, int scl )
}
c->byte = 0;
- verboselog( 1, "x76f041(%d) data flushed\n", chip );
+ verboselog( machine, 1, "x76f041(%d) data flushed\n", chip );
}
break;
case STATE_WRITE_CONFIGURATION_REGISTERS:
- verboselog( 1, "x76f041(%d) -> configuration register: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) -> configuration register: %02x\n", chip, c->shift );
/* todo: write after all bytes received? */
c->configuration_registers[ c->byte++ ] = c->shift;
if( c->byte == SIZE_CONFIGURATION_REGISTERS )
@@ -475,11 +479,11 @@ void x76f041_scl_write( int chip, int scl )
{
case STATE_READ_DATA:
c->shift = c->data[ x76f041_data_offset( c ) ];
- verboselog( 1, "x76f041(%d) <- data: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) <- data: %02x\n", chip, c->shift );
break;
case STATE_READ_CONFIGURATION_REGISTERS:
c->shift = c->configuration_registers[ c->byte & 7 ];
- verboselog( 1, "x76f041(%d) <- configuration register: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f041(%d) <- configuration register: %02x\n", chip, c->shift );
break;
}
}
@@ -493,12 +497,12 @@ void x76f041_scl_write( int chip, int scl )
c->sdar = 0;
if( c->sdaw == 0 )
{
- verboselog( 2, "x76f041(%d) ack <-\n", chip );
+ verboselog( machine, 2, "x76f041(%d) ack <-\n", chip );
c->byte++;
}
else
{
- verboselog( 2, "x76f041(%d) nak <-\n", chip );
+ verboselog( machine, 2, "x76f041(%d) nak <-\n", chip );
}
}
}
@@ -510,11 +514,12 @@ void x76f041_scl_write( int chip, int scl )
void x76f041_sda_write( int chip, int sda )
{
+ running_machine *machine = Machine;
struct x76f041_chip *c;
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_sda_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_sda_write( %d ) chip out of range\n", chip );
return;
}
@@ -522,13 +527,13 @@ void x76f041_sda_write( int chip, int sda )
if( c->sdaw != sda )
{
- verboselog( 2, "x76f041(%d) sdaw=%d\n", chip, sda );
+ verboselog( machine, 2, "x76f041(%d) sdaw=%d\n", chip, sda );
}
if( c->cs == 0 && c->scl != 0 )
{
if( c->sdaw == 0 && sda != 0 )
{
- verboselog( 1, "x76f041(%d) goto stop\n", chip );
+ verboselog( machine, 1, "x76f041(%d) goto stop\n", chip );
c->state = STATE_STOP;
c->sdar = 0;
}
@@ -537,19 +542,19 @@ void x76f041_sda_write( int chip, int sda )
switch( c->state )
{
case STATE_STOP:
- verboselog( 1, "x76f041(%d) goto start\n", chip );
+ verboselog( machine, 1, "x76f041(%d) goto start\n", chip );
c->state = STATE_LOAD_COMMAND;
break;
case STATE_LOAD_PASSWORD:
/* todo: this will be the 0xc0 command, but it's not handled as a command yet. */
- verboselog( 1, "x76f041(%d) goto start\n", chip );
+ verboselog( machine, 1, "x76f041(%d) goto start\n", chip );
break;
case STATE_READ_DATA:
- verboselog( 1, "x76f041(%d) goto load address\n", chip );
+ verboselog( machine, 1, "x76f041(%d) goto load address\n", chip );
c->state = STATE_LOAD_ADDRESS;
break;
default:
- verboselog( 1, "x76f041(%d) skipped start (default)\n", chip );
+ verboselog( machine, 1, "x76f041(%d) skipped start (default)\n", chip );
break;
}
@@ -564,11 +569,12 @@ void x76f041_sda_write( int chip, int sda )
int x76f041_sda_read( int chip )
{
+ running_machine *machine = Machine;
struct x76f041_chip *c;
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "x76f041_sda_read( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f041_sda_read( %d ) chip out of range\n", chip );
return 1;
}
@@ -576,10 +582,10 @@ int x76f041_sda_read( int chip )
if( c->cs != 0 )
{
- verboselog( 2, "x76f041(%d) not selected\n", chip );
+ verboselog( machine, 2, "x76f041(%d) not selected\n", chip );
return 1;
}
- verboselog( 2, "x76f041(%d) sdar=%d\n", chip, c->sdar );
+ verboselog( machine, 2, "x76f041(%d) sdar=%d\n", chip, c->sdar );
return c->sdar;
}
@@ -589,7 +595,7 @@ static void nvram_handler_x76f041( int chip, running_machine *machine, mame_file
if( chip >= X76F041_MAXCHIP )
{
- verboselog( 0, "nvram_handler_x76f041( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "nvram_handler_x76f041( %d ) chip out of range\n", chip );
return;
}
diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c
index 6db1f83a8a0..339669c6aa7 100644
--- a/src/emu/machine/x76f100.c
+++ b/src/emu/machine/x76f100.c
@@ -15,7 +15,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -24,7 +24,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -77,7 +77,7 @@ void x76f100_init( running_machine *machine, int chip, UINT8 *data )
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_init( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_init( %d ) chip out of range\n", chip );
return;
}
@@ -129,11 +129,12 @@ void x76f100_init( running_machine *machine, int chip, UINT8 *data )
void x76f100_cs_write( int chip, int cs )
{
+ running_machine *machine = Machine;
struct x76f100_chip *c;
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_cs_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_cs_write( %d ) chip out of range\n", chip );
return;
}
@@ -141,7 +142,7 @@ void x76f100_cs_write( int chip, int cs )
if( c->cs != cs )
{
- verboselog( 2, "x76f100(%d) cs=%d\n", chip, cs );
+ verboselog( machine, 2, "x76f100(%d) cs=%d\n", chip, cs );
}
if( c->cs != 0 && cs == 0 )
{
@@ -160,11 +161,12 @@ void x76f100_cs_write( int chip, int cs )
void x76f100_rst_write( int chip, int rst )
{
+ running_machine *machine = Machine;
struct x76f100_chip *c;
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_rst_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_rst_write( %d ) chip out of range\n", chip );
return;
}
@@ -172,11 +174,11 @@ void x76f100_rst_write( int chip, int rst )
if( c->rst != rst )
{
- verboselog( 2, "x76f100(%d) rst=%d\n", chip, rst );
+ verboselog( machine, 2, "x76f100(%d) rst=%d\n", chip, rst );
}
if( c->rst == 0 && rst != 0 && c->cs == 0 )
{
- verboselog( 1, "x76f100(%d) goto response to reset\n", chip );
+ verboselog( machine, 1, "x76f100(%d) goto response to reset\n", chip );
c->state = STATE_RESPONSE_TO_RESET;
c->bit = 0;
c->byte = 0;
@@ -219,11 +221,12 @@ static int x76f100_data_offset( struct x76f100_chip *c )
void x76f100_scl_write( int chip, int scl )
{
+ running_machine *machine = Machine;
struct x76f100_chip *c;
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_scl_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_scl_write( %d ) chip out of range\n", chip );
return;
}
@@ -231,7 +234,7 @@ void x76f100_scl_write( int chip, int scl )
if( c->scl != scl )
{
- verboselog( 2, "x76f100(%d) scl=%d\n", chip, scl );
+ verboselog( machine, 2, "x76f100(%d) scl=%d\n", chip, scl );
}
if( c->cs == 0 )
{
@@ -246,7 +249,7 @@ void x76f100_scl_write( int chip, int scl )
if( c->bit == 0 )
{
c->shift = c->response_to_reset[ c->byte ];
- verboselog( 1, "x76f100(%d) <- response_to_reset[%d]: %02x\n", chip, c->byte, c->shift );
+ verboselog( machine, 1, "x76f100(%d) <- response_to_reset[%d]: %02x\n", chip, c->byte, c->shift );
}
c->sdar = c->shift & 1;
@@ -273,7 +276,7 @@ void x76f100_scl_write( int chip, int scl )
{
if( c->bit < 8 )
{
- verboselog( 2, "x76f100(%d) clock\n", chip );
+ verboselog( machine, 2, "x76f100(%d) clock\n", chip );
c->shift <<= 1;
if( c->sdaw != 0 )
{
@@ -289,13 +292,13 @@ void x76f100_scl_write( int chip, int scl )
{
case STATE_LOAD_COMMAND:
c->command = c->shift;
- verboselog( 1, "x76f100(%d) -> command: %02x\n", chip, c->command );
+ verboselog( machine, 1, "x76f100(%d) -> command: %02x\n", chip, c->command );
/* todo: verify command is valid? */
c->state = STATE_LOAD_PASSWORD;
break;
case STATE_LOAD_PASSWORD:
- verboselog( 1, "x76f100(%d) -> password: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f100(%d) -> password: %02x\n", chip, c->shift );
c->write_buffer[ c->byte++ ] = c->shift;
if( c->byte == SIZE_WRITE_BUFFER )
{
@@ -304,7 +307,7 @@ void x76f100_scl_write( int chip, int scl )
break;
case STATE_VERIFY_PASSWORD:
- verboselog( 1, "x76f100(%d) -> verify password: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f100(%d) -> verify password: %02x\n", chip, c->shift );
/* todo: this should probably be handled as a command */
if( c->shift == COMMAND_ACK_PASSWORD )
{
@@ -321,7 +324,7 @@ void x76f100_scl_write( int chip, int scl )
break;
case STATE_WRITE_DATA:
- verboselog( 1, "x76f100(%d) -> data: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f100(%d) -> data: %02x\n", chip, c->shift );
c->write_buffer[ c->byte++ ] = c->shift;
if( c->byte == SIZE_WRITE_BUFFER )
{
@@ -331,7 +334,7 @@ void x76f100_scl_write( int chip, int scl )
}
c->byte = 0;
- verboselog( 1, "x76f100(%d) data flushed\n", chip );
+ verboselog( machine, 1, "x76f100(%d) data flushed\n", chip );
}
break;
}
@@ -353,7 +356,7 @@ void x76f100_scl_write( int chip, int scl )
{
case STATE_READ_DATA:
c->shift = c->data[ x76f100_data_offset( c ) ];
- verboselog( 1, "x76f100(%d) <- data: %02x\n", chip, c->shift );
+ verboselog( machine, 1, "x76f100(%d) <- data: %02x\n", chip, c->shift );
break;
}
}
@@ -367,12 +370,12 @@ void x76f100_scl_write( int chip, int scl )
c->sdar = 0;
if( c->sdaw == 0 )
{
- verboselog( 2, "x76f100(%d) ack <-\n", chip );
+ verboselog( machine, 2, "x76f100(%d) ack <-\n", chip );
c->byte++;
}
else
{
- verboselog( 2, "x76f100(%d) nak <-\n", chip );
+ verboselog( machine, 2, "x76f100(%d) nak <-\n", chip );
}
}
}
@@ -384,11 +387,12 @@ void x76f100_scl_write( int chip, int scl )
void x76f100_sda_write( int chip, int sda )
{
+ running_machine *machine = Machine;
struct x76f100_chip *c;
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_sda_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_sda_write( %d ) chip out of range\n", chip );
return;
}
@@ -396,13 +400,13 @@ void x76f100_sda_write( int chip, int sda )
if( c->sdaw != sda )
{
- verboselog( 2, "x76f100(%d) sdaw=%d\n", chip, sda );
+ verboselog( machine, 2, "x76f100(%d) sdaw=%d\n", chip, sda );
}
if( c->cs == 0 && c->scl != 0 )
{
if( c->sdaw == 0 && sda != 0 )
{
- verboselog( 1, "x76f100(%d) goto stop\n", chip );
+ verboselog( machine, 1, "x76f100(%d) goto stop\n", chip );
c->state = STATE_STOP;
c->sdar = 0;
}
@@ -411,23 +415,23 @@ void x76f100_sda_write( int chip, int sda )
switch( c->state )
{
case STATE_STOP:
- verboselog( 1, "x76f100(%d) goto start\n", chip );
+ verboselog( machine, 1, "x76f100(%d) goto start\n", chip );
c->state = STATE_LOAD_COMMAND;
break;
case STATE_LOAD_PASSWORD:
/* todo: this will be the 0xc0 command, but it's not handled as a command yet. */
- verboselog( 1, "x76f100(%d) goto start\n", chip );
+ verboselog( machine, 1, "x76f100(%d) goto start\n", chip );
break;
case STATE_READ_DATA:
- verboselog( 1, "x76f100(%d) continue reading??\n", chip );
-// verboselog( 1, "x76f100(%d) goto load address\n", chip );
+ verboselog( machine, 1, "x76f100(%d) continue reading??\n", chip );
+// verboselog( machine, 1, "x76f100(%d) goto load address\n", chip );
// c->state = STATE_LOAD_ADDRESS;
break;
default:
- verboselog( 1, "x76f100(%d) skipped start (default)\n", chip );
+ verboselog( machine, 1, "x76f100(%d) skipped start (default)\n", chip );
break;
}
@@ -442,11 +446,12 @@ void x76f100_sda_write( int chip, int sda )
int x76f100_sda_read( int chip )
{
+ running_machine *machine = Machine;
struct x76f100_chip *c;
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "x76f100_sda_read( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "x76f100_sda_read( %d ) chip out of range\n", chip );
return 1;
}
@@ -454,10 +459,10 @@ int x76f100_sda_read( int chip )
if( c->cs != 0 )
{
- verboselog( 2, "x76f100(%d) not selected\n", chip );
+ verboselog( machine, 2, "x76f100(%d) not selected\n", chip );
return 1;
}
- verboselog( 2, "x76f100(%d) sdar=%d\n", chip, c->sdar );
+ verboselog( machine, 2, "x76f100(%d) sdar=%d\n", chip, c->sdar );
return c->sdar;
}
@@ -467,7 +472,7 @@ static void nvram_handler_x76f100( int chip, running_machine *machine, mame_file
if( chip >= X76F100_MAXCHIP )
{
- verboselog( 0, "nvram_handler_x76f100( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "nvram_handler_x76f100( %d ) chip out of range\n", chip );
return;
}
diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c
index b70e46adc64..1e54171aacb 100644
--- a/src/emu/sound/psx.c
+++ b/src/emu/sound/psx.c
@@ -18,7 +18,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -27,7 +27,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -215,16 +215,17 @@ static void PSXSPU_update(void *param, stream_sample_t **inputs, stream_sample_t
static void spu_read( UINT32 n_address, INT32 n_size )
{
+ running_machine *machine = Machine;
struct psxinfo *chip = sndti_token(SOUND_PSXSPU, 0);
- verboselog( 1, "spu_read( %08x, %08x )\n", n_address, n_size );
+ verboselog( machine, 1, "spu_read( %08x, %08x )\n", n_address, n_size );
while( n_size > 0 )
{
chip->g_p_n_psxram[ n_address / 4 ] =
( chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] << 0 ) |
( chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] << 16 );
- verboselog( 2, "%08x > %04x\n", chip->m_n_spuoffset + 0, chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] );
- verboselog( 2, "%08x > %04x\n", chip->m_n_spuoffset + 1, chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] );
+ verboselog( machine, 2, "%08x > %04x\n", chip->m_n_spuoffset + 0, chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] );
+ verboselog( machine, 2, "%08x > %04x\n", chip->m_n_spuoffset + 1, chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] );
chip->m_n_spuoffset += 2;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
n_address += 4;
@@ -234,15 +235,16 @@ static void spu_read( UINT32 n_address, INT32 n_size )
static void spu_write( UINT32 n_address, INT32 n_size )
{
+ running_machine *machine = Machine;
struct psxinfo *chip = sndti_token(SOUND_PSXSPU, 0);
- verboselog( 1, "spu_write( %08x, %08x )\n", n_address, n_size );
+ verboselog( machine, 1, "spu_write( %08x, %08x )\n", n_address, n_size );
while( n_size > 0 )
{
chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] = ( chip->g_p_n_psxram[ n_address / 4 ] >> 0 );
chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] = ( chip->g_p_n_psxram[ n_address / 4 ] >> 16 );
- verboselog( 2, "%08x < %04x\n", chip->m_n_spuoffset + 0, chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] );
- verboselog( 2, "%08x < %04x\n", chip->m_n_spuoffset + 1, chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] );
+ verboselog( machine, 2, "%08x < %04x\n", chip->m_n_spuoffset + 0, chip->m_p_n_spuram[ chip->m_n_spuoffset + 0 ] );
+ verboselog( machine, 2, "%08x < %04x\n", chip->m_n_spuoffset + 1, chip->m_p_n_spuram[ chip->m_n_spuoffset + 1 ] );
chip->m_n_spuoffset += 2;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
n_address += 4;
@@ -360,17 +362,18 @@ static UINT32 psx_spu_delay = 0;
WRITE32_HANDLER( psx_spu_delay_w )
{
COMBINE_DATA( &psx_spu_delay );
- verboselog( 1, "psx_spu_delay_w( %08x %08x )\n", data, mem_mask );
+ verboselog( space->machine, 1, "psx_spu_delay_w( %08x %08x )\n", data, mem_mask );
}
READ32_HANDLER( psx_spu_delay_r )
{
- verboselog( 1, "psx_spu_delay_r( %08x )\n", mem_mask );
+ verboselog( space->machine, 1, "psx_spu_delay_r( %08x )\n", mem_mask );
return psx_spu_delay;
}
READ32_HANDLER( psx_spu_r )
{
+ running_machine *machine = space->machine;
struct psxinfo *chip = sndti_token(SOUND_PSXSPU, 0);
int n_channel;
n_channel = offset / 4;
@@ -381,25 +384,25 @@ READ32_HANDLER( psx_spu_r )
case SPU_CHANNEL_REG( 0x8 ):
if( ACCESSING_BITS_0_15 )
{
- verboselog( 1, "psx_spu_r() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_r() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 1, "psx_spu_r() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_r() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
return ( chip->m_p_n_sustainrelease[ n_channel ] << 16 ) | chip->m_p_n_attackdecaysustain[ n_channel ];
case SPU_CHANNEL_REG( 0xc ):
if( ACCESSING_BITS_0_15 )
{
- verboselog( 1, "psx_spu_r() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_r() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 1, "psx_spu_r() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_r() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
}
return ( chip->m_p_n_repeataddress[ n_channel ] << 16 ) | chip->m_p_n_adsrvolume[ n_channel ];
default:
- verboselog( 0, "psx_spu_r( %08x, %08x ) channel %d reg %d\n", offset, mem_mask, n_channel, offset % 4 );
+ verboselog( machine, 0, "psx_spu_r( %08x, %08x ) channel %d reg %d\n", offset, mem_mask, n_channel, offset % 4 );
return 0;
}
}
@@ -408,31 +411,31 @@ READ32_HANDLER( psx_spu_r )
switch( offset )
{
case SPU_REG( 0xd88 ):
- verboselog( 1, "psx_spu_r( %08x ) voice on = %08x\n", mem_mask, chip->m_n_voiceon );
+ verboselog( machine, 1, "psx_spu_r( %08x ) voice on = %08x\n", mem_mask, chip->m_n_voiceon );
return chip->m_n_voiceon;
case SPU_REG( 0xd8c ):
- verboselog( 1, "psx_spu_r( %08x ) voice off = %08x\n", mem_mask, chip->m_n_voiceoff );
+ verboselog( machine, 1, "psx_spu_r( %08x ) voice off = %08x\n", mem_mask, chip->m_n_voiceoff );
return chip->m_n_voiceoff;
case SPU_REG( 0xd90 ):
- verboselog( 1, "psx_spu_r( %08x ) modulation mode = %08x\n", mem_mask, chip->m_n_modulationmode );
+ verboselog( machine, 1, "psx_spu_r( %08x ) modulation mode = %08x\n", mem_mask, chip->m_n_modulationmode );
return chip->m_n_modulationmode;
case SPU_REG( 0xd94 ):
- verboselog( 1, "psx_spu_r( %08x ) noise mode = %08x\n", mem_mask, chip->m_n_noisemode );
+ verboselog( machine, 1, "psx_spu_r( %08x ) noise mode = %08x\n", mem_mask, chip->m_n_noisemode );
return chip->m_n_noisemode;
case SPU_REG( 0xd98 ):
- verboselog( 1, "psx_spu_r( %08x ) reverb mode = %08x\n", mem_mask, chip->m_n_reverbmode );
+ verboselog( machine, 1, "psx_spu_r( %08x ) reverb mode = %08x\n", mem_mask, chip->m_n_reverbmode );
return chip->m_n_reverbmode;
case SPU_REG( 0xda4 ):
- verboselog( 1, "psx_spu_r( %08x ) dma/irq address = %08x\n", mem_mask, ( ( chip->m_n_spuoffset / 4 ) << 16 ) | chip->m_n_irqaddress );
+ verboselog( machine, 1, "psx_spu_r( %08x ) dma/irq address = %08x\n", mem_mask, ( ( chip->m_n_spuoffset / 4 ) << 16 ) | chip->m_n_irqaddress );
return ( ( chip->m_n_spuoffset / 4 ) << 16 ) | chip->m_n_irqaddress;
case SPU_REG( 0xda8 ):
- verboselog( 1, "psx_spu_r( %08x ) spu control/data = %08x\n", mem_mask, ( chip->m_n_spucontrol << 16 ) | chip->m_n_spudata );
+ verboselog( machine, 1, "psx_spu_r( %08x ) spu control/data = %08x\n", mem_mask, ( chip->m_n_spucontrol << 16 ) | chip->m_n_spudata );
return chip->m_n_spudata | ( chip->m_n_spucontrol << 16 );
case SPU_REG( 0xdac ):
- verboselog( 1, "psx_spu_r( %08x ) spu status = %08x\n", mem_mask, chip->m_n_spustatus );
+ verboselog( machine, 1, "psx_spu_r( %08x ) spu status = %08x\n", mem_mask, chip->m_n_spustatus );
return chip->m_n_spustatus;
default:
- verboselog( 0, "psx_spu_r( %08x, %08x ) %08x\n", offset, mem_mask, 0xc00 + ( offset * 4 ) );
+ verboselog( machine, 0, "psx_spu_r( %08x, %08x ) %08x\n", offset, mem_mask, 0xc00 + ( offset * 4 ) );
return 0;
}
}
@@ -440,6 +443,7 @@ READ32_HANDLER( psx_spu_r )
WRITE32_HANDLER( psx_spu_w )
{
+ running_machine *machine = space->machine;
struct psxinfo *chip = sndti_token(SOUND_PSXSPU, 0);
int n_channel;
n_channel = offset / 4;
@@ -451,52 +455,52 @@ WRITE32_HANDLER( psx_spu_w )
if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_volumeleft[ n_channel ] = data & 0xffff;
- verboselog( 1, "psx_spu_w() channel %d volume left = %04x\n", n_channel, chip->m_p_n_volumeleft[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d volume left = %04x\n", n_channel, chip->m_p_n_volumeleft[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_volumeright[ n_channel ] = data >> 16;
- verboselog( 1, "psx_spu_w() channel %d volume right = %04x\n", n_channel, chip->m_p_n_volumeright[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d volume right = %04x\n", n_channel, chip->m_p_n_volumeright[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x4 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_pitch[ n_channel ] = data & 0xffff;
- verboselog( 1, "psx_spu_w() channel %d pitch = %04x\n", n_channel, chip->m_p_n_pitch[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d pitch = %04x\n", n_channel, chip->m_p_n_pitch[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_address[ n_channel ] = data >> 16;
- verboselog( 1, "psx_spu_w() channel %d address = %04x\n", n_channel, chip->m_p_n_address[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d address = %04x\n", n_channel, chip->m_p_n_address[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x8 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_attackdecaysustain[ n_channel ] = data & 0xffff;
- verboselog( 1, "psx_spu_w() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_sustainrelease[ n_channel ] = data >> 16;
- verboselog( 1, "psx_spu_w() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0xc ):
if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_adsrvolume[ n_channel ] = data & 0xffff;
- verboselog( 1, "psx_spu_w() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_repeataddress[ n_channel ] = data >> 16;
- verboselog( 1, "psx_spu_w() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
+ verboselog( machine, 1, "psx_spu_w() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
}
break;
default:
- verboselog( 0, "psx_spu_w( %08x, %08x, %08x ) channel %d reg %d\n", offset, mem_mask, data, n_channel, offset % 4 );
+ verboselog( machine, 0, "psx_spu_w( %08x, %08x, %08x ) channel %d reg %d\n", offset, mem_mask, data, n_channel, offset % 4 );
break;
}
}
@@ -508,30 +512,30 @@ WRITE32_HANDLER( psx_spu_w )
if( ACCESSING_BITS_0_15 )
{
chip->m_n_mainvolumeleft = data & 0xffff;
- verboselog( 1, "psx_spu_w() main volume left = %04x\n", chip->m_n_mainvolumeleft );
+ verboselog( machine, 1, "psx_spu_w() main volume left = %04x\n", chip->m_n_mainvolumeleft );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_mainvolumeright = data >> 16;
- verboselog( 1, "psx_spu_w() main volume right = %04x\n", chip->m_n_mainvolumeright );
+ verboselog( machine, 1, "psx_spu_w() main volume right = %04x\n", chip->m_n_mainvolumeright );
}
break;
case SPU_REG( 0xd84 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_n_reverberationdepthleft = data & 0xffff;
- verboselog( 1, "psx_spu_w() reverberation depth left = %04x\n", chip->m_n_reverberationdepthleft );
+ verboselog( machine, 1, "psx_spu_w() reverberation depth left = %04x\n", chip->m_n_reverberationdepthleft );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_reverberationdepthright = data >> 16;
- verboselog( 1, "psx_spu_w() reverberation depth right = %04x\n", chip->m_n_reverberationdepthright );
+ verboselog( machine, 1, "psx_spu_w() reverberation depth right = %04x\n", chip->m_n_reverberationdepthright );
}
break;
case SPU_REG( 0xd88 ):
chip->m_n_voiceon = 0;
COMBINE_DATA( &chip->m_n_voiceon );
- verboselog( 1, "psx_spu_w() voice on = %08x\n", chip->m_n_voiceon );
+ verboselog( machine, 1, "psx_spu_w() voice on = %08x\n", chip->m_n_voiceon );
for( n_channel = 0; n_channel < 32; n_channel++ )
{
if( ( chip->m_n_voiceon & ( 1 << n_channel ) ) != 0 )
@@ -547,46 +551,46 @@ WRITE32_HANDLER( psx_spu_w )
case SPU_REG( 0xd8c ):
chip->m_n_voiceoff = 0;
COMBINE_DATA( &chip->m_n_voiceoff );
- verboselog( 1, "psx_spu_w() voice off = %08x\n", chip->m_n_voiceoff );
+ verboselog( machine, 1, "psx_spu_w() voice off = %08x\n", chip->m_n_voiceoff );
break;
case SPU_REG( 0xd90 ):
COMBINE_DATA( &chip->m_n_modulationmode );
- verboselog( 1, "psx_spu_w() modulation mode = %08x\n", chip->m_n_modulationmode );
+ verboselog( machine, 1, "psx_spu_w() modulation mode = %08x\n", chip->m_n_modulationmode );
break;
case SPU_REG( 0xd94 ):
COMBINE_DATA( &chip->m_n_noisemode );
- verboselog( 1, "psx_spu_w() noise mode = %08x\n", chip->m_n_noisemode );
+ verboselog( machine, 1, "psx_spu_w() noise mode = %08x\n", chip->m_n_noisemode );
break;
case SPU_REG( 0xd98 ):
COMBINE_DATA( &chip->m_n_reverbmode );
- verboselog( 1, "psx_spu_w() reverb mode = %08x\n", chip->m_n_reverbmode );
+ verboselog( machine, 1, "psx_spu_w() reverb mode = %08x\n", chip->m_n_reverbmode );
break;
case SPU_REG( 0xd9c ):
COMBINE_DATA( &chip->m_n_channelonoff );
- verboselog( 1, "psx_spu_w() channel on/off = %08x\n", chip->m_n_channelonoff );
+ verboselog( machine, 1, "psx_spu_w() channel on/off = %08x\n", chip->m_n_channelonoff );
break;
case SPU_REG( 0xda0 ):
if( ACCESSING_BITS_0_15 )
{
- verboselog( 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
+ verboselog( machine, 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_reverbworkareastart = data >> 16;
- verboselog( 1, "psx_spu_w() reverb work area start = %04x\n", chip->m_n_reverbworkareastart );
+ verboselog( machine, 1, "psx_spu_w() reverb work area start = %04x\n", chip->m_n_reverbworkareastart );
}
break;
case SPU_REG( 0xda4 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_n_irqaddress = data & 0xffff;
- verboselog( 1, "psx_spu_w() irq address = %04x\n", chip->m_n_irqaddress );
+ verboselog( machine, 1, "psx_spu_w() irq address = %04x\n", chip->m_n_irqaddress );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_spuoffset = ( data >> 16 ) * 4;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
- verboselog( 1, "psx_spu_w() spu offset = %04x\n", chip->m_n_spuoffset );
+ verboselog( machine, 1, "psx_spu_w() spu offset = %04x\n", chip->m_n_spuoffset );
}
break;
case SPU_REG( 0xda8 ):
@@ -595,41 +599,41 @@ WRITE32_HANDLER( psx_spu_w )
chip->m_n_spudata = data & 0xffff;
chip->m_p_n_spuram[ chip->m_n_spuoffset++ ] = chip->m_n_spudata;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
- verboselog( 1, "psx_spu_w() spu data = %04x\n", chip->m_n_spudata );
+ verboselog( machine, 1, "psx_spu_w() spu data = %04x\n", chip->m_n_spudata );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_spucontrol = data >> 16;
- verboselog( 1, "psx_spu_w() spu control = %04x\n", chip->m_n_spucontrol );
+ verboselog( machine, 1, "psx_spu_w() spu control = %04x\n", chip->m_n_spucontrol );
}
break;
case SPU_REG( 0xdac ):
COMBINE_DATA( &chip->m_n_spustatus );
chip->m_n_spustatus &= 0xf800ffff;
- verboselog( 1, "psx_spu_w() spu status = %08x\n", chip->m_n_spustatus );
+ verboselog( machine, 1, "psx_spu_w() spu status = %08x\n", chip->m_n_spustatus );
break;
case SPU_REG( 0xdb0 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_n_cdvolumeleft = data & 0xffff;
- verboselog( 1, "psx_spu_w() cd volume left = %04x\n", chip->m_n_cdvolumeleft );
+ verboselog( machine, 1, "psx_spu_w() cd volume left = %04x\n", chip->m_n_cdvolumeleft );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_cdvolumeright = data >> 16;
- verboselog( 1, "psx_spu_w() cd volume right = %04x\n", chip->m_n_cdvolumeright );
+ verboselog( machine, 1, "psx_spu_w() cd volume right = %04x\n", chip->m_n_cdvolumeright );
}
break;
case SPU_REG( 0xdb4 ):
if( ACCESSING_BITS_0_15 )
{
chip->m_n_externalvolumeleft = data & 0xffff;
- verboselog( 1, "psx_spu_w() external volume left = %04x\n", chip->m_n_externalvolumeleft );
+ verboselog( machine, 1, "psx_spu_w() external volume left = %04x\n", chip->m_n_externalvolumeleft );
}
if( ACCESSING_BITS_16_31 )
{
chip->m_n_externalvolumeright = data >> 16;
- verboselog( 1, "psx_spu_w() external volume right = %04x\n", chip->m_n_externalvolumeright );
+ verboselog( machine, 1, "psx_spu_w() external volume right = %04x\n", chip->m_n_externalvolumeright );
}
break;
case SPU_REG( 0xdc0 ):
@@ -649,10 +653,10 @@ WRITE32_HANDLER( psx_spu_w )
case SPU_REG( 0xdf8 ):
case SPU_REG( 0xdfc ):
COMBINE_DATA( &chip->m_p_n_effect[ offset & 0x0f ] );
- verboselog( 1, "psx_spu_w() effect %d = %04x\n", offset & 0x0f, chip->m_p_n_effect[ offset & 0x0f ] );
+ verboselog( machine, 1, "psx_spu_w() effect %d = %04x\n", offset & 0x0f, chip->m_p_n_effect[ offset & 0x0f ] );
break;
default:
- verboselog( 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
+ verboselog( machine, 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
break;
}
}
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 465321d6296..d84f36a4349 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -223,7 +223,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -232,7 +232,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -277,13 +277,13 @@ static NVRAM_HANDLER( konami573 )
static WRITE32_HANDLER( mb89371_w )
{
- verboselog( 2, "mb89371_w %08x %08x %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "mb89371_w %08x %08x %08x\n", offset, mem_mask, data );
}
static READ32_HANDLER( mb89371_r )
{
UINT32 data = 0xffffffff;
- verboselog( 2, "mb89371_r %08x %08x %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "mb89371_r %08x %08x %08x\n", offset, mem_mask, data );
return data;
}
@@ -341,14 +341,14 @@ static READ32_HANDLER( jamma_r )
break;
}
- verboselog( 2, "jamma_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "jamma_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
static WRITE32_HANDLER( jamma_w )
{
- verboselog( 2, "jamma_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "jamma_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
switch( offset )
{
@@ -360,7 +360,7 @@ static WRITE32_HANDLER( jamma_w )
break;
default:
- verboselog( 0, "jamma_w: unhandled offset %08x %08x %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 0, "jamma_w: unhandled offset %08x %08x %08x\n", offset, mem_mask, data );
break;
}
}
@@ -369,7 +369,7 @@ static UINT32 control;
static READ32_HANDLER( control_r )
{
- verboselog( 2, "control_r( %08x, %08x ) %08x\n", offset, mem_mask, control );
+ verboselog( space->machine, 2, "control_r( %08x, %08x ) %08x\n", offset, mem_mask, control );
return control;
}
@@ -379,7 +379,7 @@ static WRITE32_HANDLER( control_w )
// int old_bank = flash_bank;
COMBINE_DATA(&control);
- verboselog( 2, "control_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "control_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
flash_bank = -1;
@@ -459,7 +459,7 @@ static TIMER_CALLBACK( atapi_xfer_end )
timer_adjust_oneshot(atapi_timer, attotime_never, 0);
-// verboselog( 2, "atapi_xfer_end( %d ) atapi_xferlen = %d, atapi_xfermod=%d\n", x, atapi_xfermod, atapi_xferlen );
+// verboselog( machine, 2, "atapi_xfer_end( %d ) atapi_xferlen = %d, atapi_xfermod=%d\n", x, atapi_xfermod, atapi_xferlen );
// mame_printf_debug("ATAPI: xfer_end. xferlen = %d, atapi_xfermod = %d\n", atapi_xferlen, atapi_xfermod);
@@ -513,11 +513,12 @@ static TIMER_CALLBACK( atapi_xfer_end )
psx_irq_set(machine, 0x400);
- verboselog( 2, "atapi_xfer_end: %d %d\n", atapi_xferlen, atapi_xfermod );
+ verboselog( machine, 2, "atapi_xfer_end: %d %d\n", atapi_xferlen, atapi_xfermod );
}
static READ32_HANDLER( atapi_r )
{
+ running_machine *machine = space->machine;
int reg, data;
if (mem_mask == 0x0000ffff) // word-wide command read
@@ -545,7 +546,7 @@ static READ32_HANDLER( atapi_r )
atapi_xfermod = 0;
}
- verboselog( 2, "atapi_r: atapi_xferlen=%d\n", atapi_xferlen );
+ verboselog( machine, 2, "atapi_r: atapi_xferlen=%d\n", atapi_xferlen );
if( atapi_xferlen != 0 )
{
atapi_regs[ATAPI_REG_CMDSTATUS] = ATAPI_STAT_DRQ | ATAPI_STAT_SERVDSC;
@@ -570,7 +571,7 @@ static READ32_HANDLER( atapi_r )
data |= ( atapi_data[atapi_data_ptr++] << 8 );
if( atapi_data_ptr >= atapi_data_len )
{
-// verboselog( 2, "atapi_r: read all bytes\n" );
+// verboselog( machine, 2, "atapi_r: read all bytes\n" );
atapi_data_ptr = 0;
atapi_data_len = 0;
@@ -603,28 +604,28 @@ static READ32_HANDLER( atapi_r )
switch( reg )
{
case ATAPI_REG_DATA:
- verboselog( 1, "atapi_r: data=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: data=%02x\n", data );
break;
case ATAPI_REG_ERRFEAT:
- verboselog( 1, "atapi_r: errfeat=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: errfeat=%02x\n", data );
break;
case ATAPI_REG_INTREASON:
- verboselog( 1, "atapi_r: intreason=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: intreason=%02x\n", data );
break;
case ATAPI_REG_SAMTAG:
- verboselog( 1, "atapi_r: samtag=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: samtag=%02x\n", data );
break;
case ATAPI_REG_COUNTLOW:
- verboselog( 1, "atapi_r: countlow=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: countlow=%02x\n", data );
break;
case ATAPI_REG_COUNTHIGH:
- verboselog( 1, "atapi_r: counthigh=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: counthigh=%02x\n", data );
break;
case ATAPI_REG_DRIVESEL:
- verboselog( 1, "atapi_r: drivesel=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: drivesel=%02x\n", data );
break;
case ATAPI_REG_CMDSTATUS:
- verboselog( 1, "atapi_r: cmdstatus=%02x\n", data );
+ verboselog( machine, 1, "atapi_r: cmdstatus=%02x\n", data );
break;
}
@@ -633,19 +634,20 @@ static READ32_HANDLER( atapi_r )
data <<= shift;
}
- verboselog( 2, "atapi_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( machine, 2, "atapi_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
static WRITE32_HANDLER( atapi_w )
{
+ running_machine *machine = space->machine;
int reg;
- verboselog( 2, "atapi_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( machine, 2, "atapi_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
if (mem_mask == 0x0000ffff) // word-wide command write
{
- verboselog( 2, "atapi_w: data=%04x\n", data );
+ verboselog( machine, 2, "atapi_w: data=%04x\n", data );
// mame_printf_debug("ATAPI: packet write %04x\n", data);
atapi_data[atapi_data_ptr++] = data & 0xff;
@@ -671,7 +673,7 @@ static WRITE32_HANDLER( atapi_w )
{
int phase;
- verboselog( 2, "atapi_w: command %02x\n", atapi_data[0]&0xff );
+ verboselog( machine, 2, "atapi_w: command %02x\n", atapi_data[0]&0xff );
// reset data pointer for reading SCSI results
atapi_data_ptr = 0;
@@ -758,28 +760,28 @@ static WRITE32_HANDLER( atapi_w )
switch( reg )
{
case ATAPI_REG_DATA:
- verboselog( 1, "atapi_w: data=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: data=%02x\n", data );
break;
case ATAPI_REG_ERRFEAT:
- verboselog( 1, "atapi_w: errfeat=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: errfeat=%02x\n", data );
break;
case ATAPI_REG_INTREASON:
- verboselog( 1, "atapi_w: intreason=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: intreason=%02x\n", data );
break;
case ATAPI_REG_SAMTAG:
- verboselog( 1, "atapi_w: samtag=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: samtag=%02x\n", data );
break;
case ATAPI_REG_COUNTLOW:
- verboselog( 1, "atapi_w: countlow=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: countlow=%02x\n", data );
break;
case ATAPI_REG_COUNTHIGH:
- verboselog( 1, "atapi_w: counthigh=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: counthigh=%02x\n", data );
break;
case ATAPI_REG_DRIVESEL:
- verboselog( 1, "atapi_w: drivesel=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: drivesel=%02x\n", data );
break;
case ATAPI_REG_CMDSTATUS:
- verboselog( 1, "atapi_w: cmdstatus=%02x\n", data );
+ verboselog( machine, 1, "atapi_w: cmdstatus=%02x\n", data );
break;
}
@@ -929,11 +931,11 @@ static void atapi_init(running_machine *machine)
static WRITE32_HANDLER( atapi_reset_w )
{
- verboselog( 2, "atapi_reset_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "atapi_reset_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
if (data)
{
- verboselog( 2, "atapi_reset_w: reset\n" );
+ verboselog( space->machine, 2, "atapi_reset_w: reset\n" );
// mame_printf_debug("ATAPI reset\n");
@@ -953,18 +955,20 @@ static WRITE32_HANDLER( atapi_reset_w )
static void cdrom_dma_read( UINT32 n_address, INT32 n_size )
{
- verboselog( 2, "cdrom_dma_read( %08x, %08x )\n", n_address, n_size );
+ verboselog( Machine, 2, "cdrom_dma_read( %08x, %08x )\n", n_address, n_size );
// mame_printf_debug("DMA read: address %08x size %08x\n", n_address, n_size);
}
static void cdrom_dma_write( UINT32 n_address, INT32 n_size )
{
- verboselog( 2, "cdrom_dma_write( %08x, %08x )\n", n_address, n_size );
+ running_machine *machine = Machine;
+
+ verboselog( machine, 2, "cdrom_dma_write( %08x, %08x )\n", n_address, n_size );
// mame_printf_debug("DMA write: address %08x size %08x\n", n_address, n_size);
atapi_xferbase = n_address;
- verboselog( 2, "atapi_xfer_end: %d %d\n", atapi_xferlen, atapi_xfermod );
+ verboselog( machine, 2, "atapi_xfer_end: %d %d\n", atapi_xferlen, atapi_xfermod );
// set a transfer complete timer (Note: CYCLES_PER_SECTOR can't be lower than 2000 or the BIOS ends up "out of order")
timer_adjust_oneshot(atapi_timer, cpu_clocks_to_attotime(Machine->cpu[0], (ATAPI_CYCLES_PER_SECTOR * (atapi_xferlen/2048))), 0);
@@ -979,7 +983,7 @@ static WRITE32_HANDLER( security_w )
{
COMBINE_DATA( &m_n_security_control );
- verboselog( 2, "security_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "security_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
if( ACCESSING_BITS_0_15 )
{
@@ -1031,7 +1035,7 @@ static WRITE32_HANDLER( security_w )
static READ32_HANDLER( security_r )
{
UINT32 data = m_n_security_control;
- verboselog( 2, "security_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "security_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
@@ -1066,14 +1070,14 @@ static READ32_HANDLER( flash_r )
}
}
- verboselog( 2, "flash_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "flash_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
return data;
}
static WRITE32_HANDLER( flash_w )
{
- verboselog( 2, "flash_w( %08x, %08x, %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "flash_w( %08x, %08x, %08x\n", offset, mem_mask, data );
if( flash_bank < 0 )
{
@@ -1618,11 +1622,11 @@ static READ32_HANDLER( ge765pwbba_r )
break;
default:
- verboselog( 0, "ge765pwbba_r: unhandled offset %08x %08x\n", offset, mem_mask );
+ verboselog( space->machine, 0, "ge765pwbba_r: unhandled offset %08x %08x\n", offset, mem_mask );
break;
}
- verboselog( 2, "ge765pwbba_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "ge765pwbba_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
@@ -1656,11 +1660,11 @@ static WRITE32_HANDLER( ge765pwbba_w )
break;
default:
- verboselog( 0, "ge765pwbba_w: unhandled offset %08x %08x %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 0, "ge765pwbba_w: unhandled offset %08x %08x %08x\n", offset, mem_mask, data );
break;
}
- verboselog( 2, "ge765pwbba_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "ge765pwbba_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
}
static DRIVER_INIT( ge765pwbba )
@@ -1709,7 +1713,7 @@ static READ32_HANDLER( gx700pwbf_io_r )
break;
}
- verboselog( 2, "gx700pwbf_io_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "gx700pwbf_io_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
@@ -1735,7 +1739,7 @@ static void gx700pwbf_output( int offset, UINT8 data )
static WRITE32_HANDLER( gx700pwbf_io_w )
{
- verboselog( 2, "gx700pwbf_io_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "gx700pwbf_io_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
switch( offset )
{
@@ -1866,7 +1870,7 @@ static void gn845pwbb_clk_w( int offset, int data )
}
}
- verboselog( 2, "stage: %dp data clk=%d state=%d d0=%d shift=%08x bit=%d stage_mask=%08x\n", offset + 1, clk, stage[ offset ].state, stage[ offset ].DO, stage[ offset ].shift, stage[ offset ].bit, stage_mask );
+ verboselog( Machine, 2, "stage: %dp data clk=%d state=%d d0=%d shift=%08x bit=%d stage_mask=%08x\n", offset + 1, clk, stage[ offset ].state, stage[ offset ].DO, stage[ offset ].shift, stage[ offset ].bit, stage_mask );
}
static CUSTOM_INPUT( gn845pwbb_read )
@@ -1989,17 +1993,17 @@ static READ32_HANDLER( gtrfrks_io_r )
break;
default:
- verboselog( 0, "gtrfrks_io_r: unhandled offset %08x, %08x\n", offset, mem_mask );
+ verboselog( space->machine, 0, "gtrfrks_io_r: unhandled offset %08x, %08x\n", offset, mem_mask );
break;
}
- verboselog( 2, "gtrfrks_io_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "gtrfrks_io_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
static WRITE32_HANDLER( gtrfrks_io_w )
{
- verboselog( 2, "gtrfrks_io_w( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "gtrfrks_io_w( %08x, %08x ) %08x\n", offset, mem_mask, data );
switch( offset )
{
@@ -2014,7 +2018,7 @@ static WRITE32_HANDLER( gtrfrks_io_w )
break;
default:
- verboselog( 0, "gtrfrks_io_w: unhandled offset %08x, %08x\n", offset, mem_mask );
+ verboselog( space->machine, 0, "gtrfrks_io_w: unhandled offset %08x, %08x\n", offset, mem_mask );
break;
}
}
@@ -2134,7 +2138,7 @@ static READ32_HANDLER( gx894pwbba_r )
break;
}
- verboselog( 2, "gx894pwbba_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "gx894pwbba_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
// printf( "%08x: gx894pwbba_r( %08x, %08x ) %08x\n", cpu_get_pc(space->cpu), offset, mem_mask, data );
return data;
}
@@ -2186,7 +2190,7 @@ static WRITE32_HANDLER( gx894pwbba_w )
return;
}
- verboselog( 2, "gx894pwbba_w( %08x, %08x, %08x) %s\n", offset, mem_mask, data, binary( data ) );
+ verboselog( space->machine, 2, "gx894pwbba_w( %08x, %08x, %08x) %s\n", offset, mem_mask, data, binary( data ) );
switch( offset )
{
@@ -2609,7 +2613,7 @@ static void dmx_output_callback( int offset, int data )
static WRITE32_HANDLER( dmx_io_w )
{
- verboselog( 2, "dmx_io_w( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "dmx_io_w( %08x, %08x ) %08x\n", offset, mem_mask, data );
switch( offset )
{
@@ -2624,7 +2628,7 @@ static WRITE32_HANDLER( dmx_io_w )
break;
default:
- verboselog( 0, "dmx_io_w: unhandled offset %08x, %08x\n", offset, mem_mask );
+ verboselog( space->machine, 0, "dmx_io_w: unhandled offset %08x, %08x\n", offset, mem_mask );
break;
}
}
@@ -2679,7 +2683,7 @@ static void salarymc_lamp_clk_write( int data )
{
if( ( salarymc_lamp_shift & ~0xe38 ) != 0 )
{
- verboselog( 0, "unknown bits in salarymc_lamp_shift %08x\n", salarymc_lamp_shift & ~0xe38 );
+ verboselog( Machine, 0, "unknown bits in salarymc_lamp_shift %08x\n", salarymc_lamp_shift & ~0xe38 );
}
output_set_value( "player 1 red", ( salarymc_lamp_shift >> 11 ) & 1 );
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 44b54d8e36f..5540841b156 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -272,7 +272,7 @@ Notes:
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -281,7 +281,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -291,7 +291,7 @@ static size_t namcos11_keycus_size;
static WRITE32_HANDLER( keycus_w )
{
- verboselog( 1, "keycus_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
COMBINE_DATA( &namcos11_keycus[ offset ] );
}
@@ -312,7 +312,7 @@ static READ32_HANDLER( keycus_c406_r )
( ( namcos11_keycus[ 1 ] >> 8 ) & 0xf );
break;
}
- verboselog( 1, "keycus_c406_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c406_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -329,7 +329,7 @@ static READ32_HANDLER( keycus_c409_r )
data = ( data & 0x0000ffff ) | 0x000f0000;
break;
}
- verboselog( 1, "keycus_c409_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c409_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -363,7 +363,7 @@ static READ32_HANDLER( keycus_c410_r )
( ( ( n_value / 10000 ) % 10 ) << 16 );
break;
}
- verboselog( 1, "keycus_c410_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c410_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -396,7 +396,7 @@ static READ32_HANDLER( keycus_c411_r )
break;
}
- verboselog( 1, "keycus_c411_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c411_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -430,7 +430,7 @@ static READ32_HANDLER( keycus_c430_r )
( ( ( n_value / 1 ) % 10 ) << 16 );
break;
}
- verboselog( 1, "keycus_c430_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c430_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -462,7 +462,7 @@ static READ32_HANDLER( keycus_c431_r )
data = ( data & 0xffff0000 ) | ( ( n_value / 10000 ) % 10 );
break;
}
- verboselog( 1, "keycus_c431_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c431_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -495,7 +495,7 @@ static READ32_HANDLER( keycus_c432_r )
break;
}
- verboselog( 1, "keycus_c432_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c432_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -516,7 +516,7 @@ static READ32_HANDLER( keycus_c442_r )
}
break;
}
- verboselog( 1, "keycus_c442_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c442_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -549,19 +549,19 @@ static READ32_HANDLER( keycus_c443_r )
}
break;
}
- verboselog( 1, "keycus_c443_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "keycus_c443_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
static WRITE32_HANDLER( sharedram_w )
{
- verboselog( 1, "sharedram_w( %08x, %08x, %08x )\n", ( offset * 4 ) + 0x4000, data, mem_mask );
+ verboselog( space->machine, 1, "sharedram_w( %08x, %08x, %08x )\n", ( offset * 4 ) + 0x4000, data, mem_mask );
COMBINE_DATA( &namcos11_sharedram[ offset ] );
}
static READ32_HANDLER( sharedram_r )
{
- verboselog( 1, "sharedram_r( %08x, %08x ) %08x\n", ( offset * 4 ) + 0x4000, mem_mask, namcos11_sharedram[ offset ] );
+ verboselog( space->machine, 1, "sharedram_r( %08x, %08x ) %08x\n", ( offset * 4 ) + 0x4000, mem_mask, namcos11_sharedram[ offset ] );
return namcos11_sharedram[ offset ];
}
@@ -645,7 +645,7 @@ INLINE void bankswitch_rom8( int n_bank, int n_data )
static WRITE32_HANDLER( bankswitch_rom32_w )
{
- verboselog( 2, "bankswitch_rom32_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 2, "bankswitch_rom32_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
if( ACCESSING_BITS_0_15 )
{
@@ -659,7 +659,7 @@ static WRITE32_HANDLER( bankswitch_rom32_w )
static WRITE32_HANDLER( bankswitch_rom64_upper_w )
{
- verboselog( 2, "bankswitch_rom64_upper_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 2, "bankswitch_rom64_upper_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
if( ACCESSING_BITS_0_15 )
{
@@ -679,7 +679,7 @@ INLINE void bankswitch_rom64( int n_bank, int n_data )
static WRITE32_HANDLER( bankswitch_rom64_w )
{
- verboselog( 2, "bankswitch_rom64_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 2, "bankswitch_rom64_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
if( ACCESSING_BITS_0_15 )
{
@@ -700,11 +700,11 @@ static WRITE32_HANDLER( lightgun_w )
output_set_value( "recoil0", !( data & 0x02 ) );
output_set_value( "recoil1", !( data & 0x01 ) );
- verboselog( 1, "lightgun_w: outputs (%08x %08x)\n", data, mem_mask );
+ verboselog( space->machine, 1, "lightgun_w: outputs (%08x %08x)\n", data, mem_mask );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 2, "lightgun_w: start reading (%08x %08x)\n", data, mem_mask );
+ verboselog( space->machine, 2, "lightgun_w: start reading (%08x %08x)\n", data, mem_mask );
}
}
@@ -726,7 +726,7 @@ static READ32_HANDLER( lightgun_r )
data = ( input_port_read(space->machine, "GUN2Y" ) ) | ( ( input_port_read(space->machine, "GUN2Y" ) + 1 ) << 16 );
break;
}
- verboselog( 2, "lightgun_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "lightgun_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 3fa9c2d05be..bb3df49a5f0 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -931,7 +931,7 @@ Notes:
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -940,7 +940,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -948,13 +948,13 @@ static UINT32 *namcos12_sharedram;
static WRITE32_HANDLER( sharedram_w )
{
- verboselog( 1, "sharedram_w( %08x, %08x, %08x )\n", ( offset * 4 ), data, mem_mask );
+ verboselog( space->machine, 1, "sharedram_w( %08x, %08x, %08x )\n", ( offset * 4 ), data, mem_mask );
COMBINE_DATA( &namcos12_sharedram[ offset ] );
}
static READ32_HANDLER( sharedram_r )
{
- verboselog( 1, "sharedram_r( %08x, %08x ) %08x\n", ( offset * 4 ), mem_mask, namcos12_sharedram[ offset ] );
+ verboselog( space->machine, 1, "sharedram_r( %08x, %08x ) %08x\n", ( offset * 4 ), mem_mask, namcos12_sharedram[ offset ] );
return namcos12_sharedram[ offset ];
}
@@ -996,7 +996,7 @@ static WRITE32_HANDLER( bankoffset_w )
memory_set_bank(space->machine, 1, m_n_bankoffset );
- verboselog( 1, "bankoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_bankoffset );
+ verboselog( space->machine, 1, "bankoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_bankoffset );
}
static UINT32 m_n_dmaoffset;
@@ -1013,11 +1013,12 @@ static WRITE32_HANDLER( dmaoffset_w )
{
m_n_dmaoffset = ( ( offset + 2 ) * 4 ) | ( data & 0xffff0000 );
}
- verboselog( 1, "dmaoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_dmaoffset );
+ verboselog( space->machine, 1, "dmaoffset_w( %08x, %08x, %08x ) %08x\n", offset, data, mem_mask, m_n_dmaoffset );
}
static void namcos12_rom_read( UINT32 n_address, INT32 n_size )
{
+ running_machine *machine = Machine;
const char *n_region;
int n_offset;
@@ -1031,32 +1032,32 @@ static void namcos12_rom_read( UINT32 n_address, INT32 n_size )
{
n_region = "user1";
n_offset = m_n_dmaoffset & 0x003fffff;
- verboselog( 1, "namcos12_rom_read( %08x, %08x ) boot %08x\n", n_address, n_size, n_offset );
+ verboselog( machine, 1, "namcos12_rom_read( %08x, %08x ) boot %08x\n", n_address, n_size, n_offset );
}
else if( m_n_tektagdmaoffset >= 0x00000000 && m_n_tektagdmaoffset <= 0x03800000 )
{
n_region = "user2";
n_offset = m_n_tektagdmaoffset & 0x7fffffff;
- verboselog( 1, "namcos12_rom_read( %08x, %08x ) tektag1 %08x\n", n_address, n_size, n_offset );
+ verboselog( machine, 1, "namcos12_rom_read( %08x, %08x ) tektag1 %08x\n", n_address, n_size, n_offset );
}
else if( m_n_tektagdmaoffset >= 0x04000000 && m_n_tektagdmaoffset <= 0x04400000 )
{
n_region = "user1";
n_offset = m_n_tektagdmaoffset & 0x003fffff;
- verboselog( 1, "namcos12_rom_read( %08x, %08x ) tektag2 %08x\n", n_address, n_size, n_offset );
+ verboselog( machine, 1, "namcos12_rom_read( %08x, %08x ) tektag2 %08x\n", n_address, n_size, n_offset );
}
else
{
n_region = "user2";
n_offset = m_n_dmaoffset & 0x7fffffff;
- verboselog( 1, "namcos12_rom_read( %08x, %08x ) game %08x\n", n_address, n_size, n_offset );
+ verboselog( machine, 1, "namcos12_rom_read( %08x, %08x ) game %08x\n", n_address, n_size, n_offset );
}
- p_n_src = (UINT32 *)( memory_region( Machine, n_region ) + n_offset );
- n_romleft = ( memory_region_length( Machine, n_region ) - n_offset ) / 4;
+ p_n_src = (UINT32 *)( memory_region( machine, n_region ) + n_offset );
+ n_romleft = ( memory_region_length( machine, n_region ) - n_offset ) / 4;
if( n_size > n_romleft )
{
- verboselog( 1, "namcos12_rom_read dma truncated %d to %d passed end of rom\n", n_size, n_romleft );
+ verboselog( machine, 1, "namcos12_rom_read dma truncated %d to %d passed end of rom\n", n_size, n_romleft );
n_size = n_romleft;
}
@@ -1064,7 +1065,7 @@ static void namcos12_rom_read( UINT32 n_address, INT32 n_size )
n_ramleft = ( g_n_psxramsize - n_address ) / 4;
if( n_size > n_ramleft )
{
- verboselog( 1, "namcos12_rom_read dma truncated %d to %d passed end of ram\n", n_size, n_ramleft );
+ verboselog( machine, 1, "namcos12_rom_read dma truncated %d to %d passed end of ram\n", n_size, n_ramleft );
n_size = n_ramleft;
}
@@ -1125,11 +1126,11 @@ static WRITE32_HANDLER( system11gun_w )
/* !(data & 0x02) */
/* blowback 2 */
/* !(data & 0x01) */
- verboselog( 1, "system11gun_w: outputs (%08x %08x)\n", data, mem_mask );
+ verboselog( space->machine, 1, "system11gun_w: outputs (%08x %08x)\n", data, mem_mask );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 2, "system11gun_w: start reading (%08x %08x)\n", data, mem_mask );
+ verboselog( space->machine, 2, "system11gun_w: start reading (%08x %08x)\n", data, mem_mask );
}
}
@@ -1151,7 +1152,7 @@ static READ32_HANDLER( system11gun_r )
data = ( input_port_read(space->machine, "LIGHT1_Y") ) | ( ( input_port_read(space->machine, "LIGHT1_Y") + 1 ) << 16 );
break;
}
- verboselog( 2, "system11gun_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 2, "system11gun_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
@@ -1176,25 +1177,25 @@ static WRITE32_HANDLER( kcon_w )
static WRITE32_HANDLER( tektagt_protection_1_w )
{
m_n_tektagdmaoffset = data;
- verboselog( 1, "tektagt_protection_1_w( %08x, %08x, %08x)\n", offset, mem_mask, data );
+ verboselog( space->machine, 1, "tektagt_protection_1_w( %08x, %08x, %08x)\n", offset, mem_mask, data );
}
static READ32_HANDLER( tektagt_protection_1_r )
{
UINT32 data = 0x8000;
- verboselog( 1, "tektagt_protection_1_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
+ verboselog( space->machine, 1, "tektagt_protection_1_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
return data;
}
static WRITE32_HANDLER( tektagt_protection_2_w )
{
- verboselog( 1, "tektagt_protection_2_w( %08x, %08x, %08x)\n", offset, mem_mask, data );
+ verboselog( space->machine, 1, "tektagt_protection_2_w( %08x, %08x, %08x)\n", offset, mem_mask, data );
}
static READ32_HANDLER( tektagt_protection_2_r )
{
UINT32 data = 0x36e2;
- verboselog( 1, "tektagt_protection_2_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
+ verboselog( space->machine, 1, "tektagt_protection_2_r( %08x, %08x, %08x)\n", offset, mem_mask, data );
return data;
}
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 9c0d06ad4c4..a5c72ebcc01 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -26,7 +26,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -35,7 +35,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -186,7 +186,7 @@ static emu_timer *dip_timer;
static READ32_HANDLER( znsecsel_r )
{
- verboselog( 2, "znsecsel_r( %08x, %08x )\n", offset, mem_mask );
+ verboselog( space->machine, 2, "znsecsel_r( %08x, %08x )\n", offset, mem_mask );
return m_n_znsecsel;
}
@@ -224,6 +224,8 @@ static void sio_znsec1_handler( int n_data )
static void sio_pad_handler( int n_data )
{
+ running_machine *machine = Machine;
+
if( ( n_data & PSX_SIO_OUT_DTR ) != 0 )
{
m_b_znsecport = 1;
@@ -233,8 +235,8 @@ static void sio_pad_handler( int n_data )
m_b_znsecport = 0;
}
- verboselog( 2, "read pad %04x %04x %02x\n", m_n_znsecsel, m_b_znsecport, n_data );
- psx_sio_input( Machine, 0, PSX_SIO_IN_DATA | PSX_SIO_IN_DSR, PSX_SIO_IN_DATA | PSX_SIO_IN_DSR );
+ verboselog( machine, 2, "read pad %04x %04x %02x\n", m_n_znsecsel, m_b_znsecport, n_data );
+ psx_sio_input( machine, 0, PSX_SIO_IN_DATA | PSX_SIO_IN_DSR, PSX_SIO_IN_DATA | PSX_SIO_IN_DSR );
}
static void sio_dip_handler( int n_data )
@@ -243,9 +245,10 @@ static void sio_dip_handler( int n_data )
{
if( m_b_lastclock )
{
- int bit = ( ( input_port_read(Machine, "DSW") >> m_n_dip_bit ) & 1 );
- verboselog( 2, "read dip %02x -> %02x\n", n_data, bit * PSX_SIO_IN_DATA );
- psx_sio_input( Machine, 0, PSX_SIO_IN_DATA, bit * PSX_SIO_IN_DATA );
+ running_machine *machine = Machine;
+ int bit = ( ( input_port_read(machine, "DSW") >> m_n_dip_bit ) & 1 );
+ verboselog( machine, 2, "read dip %02x -> %02x\n", n_data, bit * PSX_SIO_IN_DATA );
+ psx_sio_input( machine, 0, PSX_SIO_IN_DATA, bit * PSX_SIO_IN_DATA );
m_n_dip_bit++;
m_n_dip_bit &= 7;
}
@@ -289,7 +292,7 @@ static WRITE32_HANDLER( znsecsel_w )
timer_adjust_oneshot( dip_timer, cpu_clocks_to_attotime( space->cpu, 100 ), 1 );
}
- verboselog( 2, "znsecsel_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 2, "znsecsel_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
static TIMER_CALLBACK( dip_timer_fired )
@@ -335,7 +338,7 @@ static READ32_HANDLER( boardconfig_r )
static READ32_HANDLER( unknown_r )
{
- verboselog( 0, "unknown_r( %08x, %08x )\n", offset, mem_mask );
+ verboselog( space->machine, 0, "unknown_r( %08x, %08x )\n", offset, mem_mask );
return 0xffffffff;
}
@@ -349,7 +352,7 @@ static WRITE32_HANDLER( coin_w )
*/
if( ( data & ~0x23 ) != 0 )
{
- verboselog( 0, "coin_w %08x\n", data );
+ verboselog( space->machine, 0, "coin_w %08x\n", data );
}
}
@@ -628,7 +631,7 @@ Notes:
static READ32_HANDLER( capcom_kickharness_r )
{
/* required for buttons 4,5&6 */
- verboselog( 2, "capcom_kickharness_r( %08x, %08x )\n", offset, mem_mask );
+ verboselog( space->machine, 2, "capcom_kickharness_r( %08x, %08x )\n", offset, mem_mask );
return 0xffffffff;
}
@@ -1136,7 +1139,7 @@ static UINT8 *taitofx1_eeprom2 = NULL;
static WRITE32_HANDLER( bank_coh1000t_w )
{
mb3773_set_ck( ( data & 0x20 ) >> 5 );
- verboselog( 1, "bank_coh1000t_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "bank_coh1000t_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) );
}
@@ -1243,18 +1246,18 @@ MACHINE_DRIVER_END
static WRITE32_HANDLER( taitofx1b_volume_w )
{
- verboselog( 1, "taitofx1_volume_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "taitofx1_volume_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
static WRITE32_HANDLER( taitofx1b_sound_w )
{
- verboselog( 1, "taitofx1_sound_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "taitofx1_sound_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
static READ32_HANDLER( taitofx1b_sound_r )
{
UINT32 data = 0; // bit 0 = busy?
- verboselog( 1, "taitofx1_sound_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "taitofx1_sound_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -2268,31 +2271,31 @@ static UINT8 *nbajamex_eeprom;
static WRITE32_HANDLER( acpsx_00_w )
{
- verboselog( 0, "acpsx_00_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 0, "acpsx_00_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
static WRITE32_HANDLER( acpsx_10_w )
{
- verboselog( 0, "acpsx_10_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 0, "acpsx_10_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
static WRITE32_HANDLER( nbajamex_80_w )
{
- verboselog( 0, "nbajamex_80_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 0, "nbajamex_80_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
psx_irq_set(space->machine, 0x400);
}
static READ32_HANDLER( nbajamex_08_r )
{
UINT32 data = 0xffffffff;
- verboselog( 0, "nbajamex_08_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 0, "nbajamex_08_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
static READ32_HANDLER( nbajamex_80_r )
{
UINT32 data = 0xffffffff;
- verboselog( 0, "nbajamex_80_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 0, "nbajamex_80_r( %08x, %08x, %08x )\n", offset, data, mem_mask );
return data;
}
@@ -2699,7 +2702,7 @@ Notes:
static WRITE32_HANDLER( coh1002m_bank_w )
{
- verboselog( 1, "coh1002m_bank_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "coh1002m_bank_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ((data>>16) * 0x800000));
}
diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c
index 0d6fd657609..e8f8593177b 100644
--- a/src/mame/machine/psx.c
+++ b/src/mame/machine/psx.c
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -22,7 +22,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -46,12 +46,12 @@ static UINT32 psx_com_delay = 0;
WRITE32_HANDLER( psx_com_delay_w )
{
COMBINE_DATA( &psx_com_delay );
- verboselog( 1, "psx_com_delay_w( %08x %08x )\n", data, mem_mask );
+ verboselog( space->machine, 1, "psx_com_delay_w( %08x %08x )\n", data, mem_mask );
}
READ32_HANDLER( psx_com_delay_r )
{
- verboselog( 1, "psx_com_delay_r( %08x )\n", mem_mask );
+ verboselog( space->machine, 1, "psx_com_delay_r( %08x )\n", mem_mask );
return psx_com_delay;
}
@@ -64,52 +64,56 @@ static void psx_irq_update( running_machine *machine )
{
if( ( m_n_irqdata & m_n_irqmask ) != 0 )
{
- verboselog( 2, "psx irq assert\n" );
+ verboselog( machine, 2, "psx irq assert\n" );
cpu_set_input_line(machine->cpu[0], PSXCPU_IRQ0, ASSERT_LINE );
}
else
{
- verboselog( 2, "psx irq clear\n" );
+ verboselog( machine, 2, "psx irq clear\n" );
cpu_set_input_line(machine->cpu[0], PSXCPU_IRQ0, CLEAR_LINE );
}
}
WRITE32_HANDLER( psx_irq_w )
{
+ running_machine *machine = space->machine;
+
switch( offset )
{
case 0x00:
- verboselog( 2, "psx irq data ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqdata, ( m_n_irqdata & ~mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ) );
+ verboselog( machine, 2, "psx irq data ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqdata, ( m_n_irqdata & ~mem_mask ) | ( m_n_irqdata & m_n_irqmask & data ) );
m_n_irqdata = ( m_n_irqdata & ~mem_mask ) | ( m_n_irqdata & m_n_irqmask & data );
psx_irq_update(space->machine);
break;
case 0x01:
- verboselog( 2, "psx irq mask ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqmask, ( m_n_irqmask & ~mem_mask ) | data );
+ verboselog( machine, 2, "psx irq mask ( %08x, %08x ) %08x -> %08x\n", data, mem_mask, m_n_irqmask, ( m_n_irqmask & ~mem_mask ) | data );
m_n_irqmask = ( m_n_irqmask & ~mem_mask ) | data;
if( ( m_n_irqmask & ~( 0x1 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 | 0x100 | 0x200 | 0x400 ) ) != 0 )
{
- verboselog( 0, "psx_irq_w( %08x, %08x, %08x ) unknown irq\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_irq_w( %08x, %08x, %08x ) unknown irq\n", offset, data, mem_mask );
}
psx_irq_update(space->machine);
break;
default:
- verboselog( 0, "psx_irq_w( %08x, %08x, %08x ) unknown register\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_irq_w( %08x, %08x, %08x ) unknown register\n", offset, data, mem_mask );
break;
}
}
READ32_HANDLER( psx_irq_r )
{
+ running_machine *machine = space->machine;
+
switch( offset )
{
case 0x00:
- verboselog( 1, "psx_irq_r irq data %08x\n", m_n_irqdata );
+ verboselog( machine, 1, "psx_irq_r irq data %08x\n", m_n_irqdata );
return m_n_irqdata;
case 0x01:
- verboselog( 1, "psx_irq_r irq mask %08x\n", m_n_irqmask );
+ verboselog( machine, 1, "psx_irq_r irq mask %08x\n", m_n_irqmask );
return m_n_irqmask;
default:
- verboselog( 0, "psx_irq_r unknown register %d\n", offset );
+ verboselog( machine, 0, "psx_irq_r unknown register %d\n", offset );
break;
}
return 0;
@@ -117,7 +121,7 @@ READ32_HANDLER( psx_irq_r )
void psx_irq_set( running_machine *machine, UINT32 data )
{
- verboselog( 2, "psx_irq_set %08x\n", data );
+ verboselog( machine, 2, "psx_irq_set %08x\n", data );
m_n_irqdata |= data;
psx_irq_update(machine);
}
@@ -170,18 +174,18 @@ static void dma_interrupt_update( running_machine *machine )
if( ( n_mask & 0x80 ) != 0 && ( n_int & n_mask ) != 0 )
{
- verboselog( 2, "dma_interrupt_update( %02x, %02x ) interrupt triggered\n", n_int, n_mask );
+ verboselog( machine, 2, "dma_interrupt_update( %02x, %02x ) interrupt triggered\n", n_int, n_mask );
m_n_dicr |= 0x80000000;
psx_irq_set( machine, 0x0008 );
}
else if( ( m_n_dicr & 0x80000000 ) != 0 )
{
- verboselog( 2, "dma_interrupt_update( %02x, %02x ) interrupt cleared\n", n_int, n_mask );
+ verboselog( machine, 2, "dma_interrupt_update( %02x, %02x ) interrupt cleared\n", n_int, n_mask );
m_n_dicr &= ~0x80000000;
}
else if( n_int != 0 )
{
- verboselog( 2, "dma_interrupt_update( %02x, %02x ) interrupt not enabled\n", n_int, n_mask );
+ verboselog( machine, 2, "dma_interrupt_update( %02x, %02x ) interrupt not enabled\n", n_int, n_mask );
}
m_n_dicr &= 0x00ffffff | ( m_n_dicr << 8 );
@@ -264,6 +268,7 @@ void psx_dma_install_write_handler( int n_channel, psx_dma_read_handler p_fn_dma
WRITE32_HANDLER( psx_dma_w )
{
+ running_machine *machine = space->machine;
static int n_channel;
n_channel = offset / 4;
if( n_channel < 7 )
@@ -271,15 +276,15 @@ WRITE32_HANDLER( psx_dma_w )
switch( offset % 4 )
{
case 0:
- verboselog( 2, "dmabase( %d ) = %08x\n", n_channel, data );
+ verboselog( machine, 2, "dmabase( %d ) = %08x\n", n_channel, data );
m_p_n_dmabase[ n_channel ] = data;
break;
case 1:
- verboselog( 2, "dmablockcontrol( %d ) = %08x\n", n_channel, data );
+ verboselog( machine, 2, "dmablockcontrol( %d ) = %08x\n", n_channel, data );
m_p_n_dmablockcontrol[ n_channel ] = data;
break;
case 2:
- verboselog( 2, "dmachannelcontrol( %d ) = %08x\n", n_channel, data );
+ verboselog( machine, 2, "dmachannelcontrol( %d ) = %08x\n", n_channel, data );
m_p_n_dmachannelcontrol[ n_channel ] = data;
if( ( m_p_n_dmachannelcontrol[ n_channel ] & ( 1L << 0x18 ) ) != 0 && ( m_n_dpcp & ( 1 << ( 3 + ( n_channel * 4 ) ) ) ) != 0 )
{
@@ -306,14 +311,14 @@ WRITE32_HANDLER( psx_dma_w )
if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000000 &&
m_p_fn_dma_read[ n_channel ] != NULL )
{
- verboselog( 1, "dma %d read block %08x %08x\n", n_channel, n_address, n_size );
+ verboselog( machine, 1, "dma %d read block %08x %08x\n", n_channel, n_address, n_size );
m_p_fn_dma_read[ n_channel ]( n_address, n_size );
dma_finished( space->machine, n_channel );
}
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000200 &&
m_p_fn_dma_read[ n_channel ] != NULL )
{
- verboselog( 1, "dma %d read block %08x %08x\n", n_channel, n_address, n_size );
+ verboselog( machine, 1, "dma %d read block %08x %08x\n", n_channel, n_address, n_size );
m_p_fn_dma_read[ n_channel ]( n_address, n_size );
if( n_channel == 1 )
{
@@ -327,7 +332,7 @@ WRITE32_HANDLER( psx_dma_w )
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000201 &&
m_p_fn_dma_write[ n_channel ] != NULL )
{
- verboselog( 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
+ verboselog( machine, 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
m_p_fn_dma_write[ n_channel ]( n_address, n_size );
dma_finished( space->machine, n_channel );
}
@@ -335,7 +340,7 @@ WRITE32_HANDLER( psx_dma_w )
m_p_fn_dma_write[ n_channel ] != NULL )
{
/* todo: check this is a write not a read... */
- verboselog( 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
+ verboselog( machine, 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
m_p_fn_dma_write[ n_channel ]( n_address, n_size );
dma_finished( space->machine, n_channel );
}
@@ -343,7 +348,7 @@ WRITE32_HANDLER( psx_dma_w )
m_p_fn_dma_write[ n_channel ] != NULL )
{
/* todo: check this is a write not a read... */
- verboselog( 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
+ verboselog( machine, 1, "dma %d write block %08x %08x\n", n_channel, n_address, n_size );
m_p_fn_dma_write[ n_channel ]( n_address, n_size );
dma_finished( space->machine, n_channel );
}
@@ -351,7 +356,7 @@ WRITE32_HANDLER( psx_dma_w )
n_channel == 2 &&
m_p_fn_dma_write[ n_channel ] != NULL )
{
- verboselog( 1, "dma %d write linked list %08x\n",
+ verboselog( machine, 1, "dma %d write linked list %08x\n",
n_channel, m_p_n_dmabase[ n_channel ] );
dma_finished( space->machine, n_channel );
@@ -359,7 +364,7 @@ WRITE32_HANDLER( psx_dma_w )
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11000002 &&
n_channel == 6 )
{
- verboselog( 1, "dma 6 reverse clear %08x %08x\n",
+ verboselog( machine, 1, "dma 6 reverse clear %08x %08x\n",
m_p_n_dmabase[ n_channel ], m_p_n_dmablockcontrol[ n_channel ] );
if( n_size > 0 )
{
@@ -377,16 +382,16 @@ WRITE32_HANDLER( psx_dma_w )
}
else
{
- verboselog( 0, "dma %d unknown mode %08x\n", n_channel, m_p_n_dmachannelcontrol[ n_channel ] );
+ verboselog( machine, 0, "dma %d unknown mode %08x\n", n_channel, m_p_n_dmachannelcontrol[ n_channel ] );
}
}
else if( m_p_n_dmachannelcontrol[ n_channel ] != 0 )
{
- verboselog( 1, "psx_dma_w( %04x, %08x, %08x ) channel not enabled\n", offset, m_p_n_dmachannelcontrol[ n_channel ], mem_mask );
+ verboselog( machine, 1, "psx_dma_w( %04x, %08x, %08x ) channel not enabled\n", offset, m_p_n_dmachannelcontrol[ n_channel ], mem_mask );
}
break;
default:
- verboselog( 1, "psx_dma_w( %04x, %08x, %08x ) Unknown dma channel register\n", offset, data, mem_mask );
+ verboselog( machine, 1, "psx_dma_w( %04x, %08x, %08x ) Unknown dma channel register\n", offset, data, mem_mask );
break;
}
}
@@ -395,7 +400,7 @@ WRITE32_HANDLER( psx_dma_w )
switch( offset % 4 )
{
case 0x0:
- verboselog( 1, "psx_dma_w( %04x, %08x, %08x ) dpcp\n", offset, data, mem_mask );
+ verboselog( machine, 1, "psx_dma_w( %04x, %08x, %08x ) dpcp\n", offset, data, mem_mask );
m_n_dpcp = ( m_n_dpcp & ~mem_mask ) | data;
break;
case 0x1:
@@ -410,11 +415,11 @@ WRITE32_HANDLER( psx_dma_w )
m_n_dicr &= ~0x80000000;
}
*/
- verboselog( 1, "psx_dma_w( %04x, %08x, %08x ) dicr -> %08x\n", offset, data, mem_mask, m_n_dicr );
+ verboselog( machine, 1, "psx_dma_w( %04x, %08x, %08x ) dicr -> %08x\n", offset, data, mem_mask, m_n_dicr );
dma_interrupt_update(space->machine);
break;
default:
- verboselog( 0, "psx_dma_w( %04x, %08x, %08x ) Unknown dma control register\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_dma_w( %04x, %08x, %08x ) Unknown dma control register\n", offset, data, mem_mask );
break;
}
}
@@ -422,6 +427,7 @@ WRITE32_HANDLER( psx_dma_w )
READ32_HANDLER( psx_dma_r )
{
+ running_machine *machine = space->machine;
static int n_channel;
n_channel = offset / 4;
if( n_channel < 7 )
@@ -429,16 +435,16 @@ READ32_HANDLER( psx_dma_r )
switch( offset % 4 )
{
case 0:
- verboselog( 1, "psx_dma_r dmabase[ %d ] ( %08x )\n", n_channel, m_p_n_dmabase[ n_channel ] );
+ verboselog( machine, 1, "psx_dma_r dmabase[ %d ] ( %08x )\n", n_channel, m_p_n_dmabase[ n_channel ] );
return m_p_n_dmabase[ n_channel ];
case 1:
- verboselog( 1, "psx_dma_r dmablockcontrol[ %d ] ( %08x )\n", n_channel, m_p_n_dmablockcontrol[ n_channel ] );
+ verboselog( machine, 1, "psx_dma_r dmablockcontrol[ %d ] ( %08x )\n", n_channel, m_p_n_dmablockcontrol[ n_channel ] );
return m_p_n_dmablockcontrol[ n_channel ];
case 2:
- verboselog( 1, "psx_dma_r dmachannelcontrol[ %d ] ( %08x )\n", n_channel, m_p_n_dmachannelcontrol[ n_channel ] );
+ verboselog( machine, 1, "psx_dma_r dmachannelcontrol[ %d ] ( %08x )\n", n_channel, m_p_n_dmachannelcontrol[ n_channel ] );
return m_p_n_dmachannelcontrol[ n_channel ];
default:
- verboselog( 0, "psx_dma_r( %08x, %08x ) Unknown dma channel register\n", offset, mem_mask );
+ verboselog( machine, 0, "psx_dma_r( %08x, %08x ) Unknown dma channel register\n", offset, mem_mask );
break;
}
}
@@ -447,13 +453,13 @@ READ32_HANDLER( psx_dma_r )
switch( offset % 4 )
{
case 0x0:
- verboselog( 1, "psx_dma_r dpcp ( %08x )\n", m_n_dpcp );
+ verboselog( machine, 1, "psx_dma_r dpcp ( %08x )\n", m_n_dpcp );
return m_n_dpcp;
case 0x1:
- verboselog( 1, "psx_dma_r dicr ( %08x )\n", m_n_dicr );
+ verboselog( machine, 1, "psx_dma_r dicr ( %08x )\n", m_n_dicr );
return m_n_dicr;
default:
- verboselog( 0, "psx_dma_r( %08x, %08x ) Unknown dma control register\n", offset, mem_mask );
+ verboselog( machine, 0, "psx_dma_r( %08x, %08x ) Unknown dma control register\n", offset, mem_mask );
break;
}
}
@@ -559,7 +565,7 @@ static TIMER_CALLBACK( root_finished )
{
int n_counter = param;
- verboselog( 2, "root_finished( %d ) %04x\n", n_counter, root_current( n_counter ) );
+ verboselog( machine, 2, "root_finished( %d ) %04x\n", n_counter, root_current( n_counter ) );
// if( ( m_p_n_root_mode[ n_counter ] & RC_COUNTTARGET ) != 0 )
{
/* TODO: wrap should be handled differently as RC_COUNTTARGET & RC_IRQTARGET don't have to be the same. */
@@ -581,7 +587,7 @@ WRITE32_HANDLER( psx_counter_w )
{
int n_counter;
- verboselog( 1, "psx_counter_w ( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( space->machine, 1, "psx_counter_w ( %08x, %08x, %08x )\n", offset, data, mem_mask );
n_counter = offset / 4;
@@ -611,7 +617,7 @@ WRITE32_HANDLER( psx_counter_w )
m_p_n_root_target[ n_counter ] = data;
break;
default:
- verboselog( 0, "psx_counter_w( %08x, %08x, %08x ) unknown register\n", offset, mem_mask, data );
+ verboselog( space->machine, 0, "psx_counter_w( %08x, %08x, %08x ) unknown register\n", offset, mem_mask, data );
return;
}
@@ -637,10 +643,10 @@ READ32_HANDLER( psx_counter_r )
data = m_p_n_root_target[ n_counter ];
break;
default:
- verboselog( 0, "psx_counter_r( %08x, %08x ) unknown register\n", offset, mem_mask );
+ verboselog( space->machine, 0, "psx_counter_r( %08x, %08x ) unknown register\n", offset, mem_mask );
return 0;
}
- verboselog( 1, "psx_counter_r ( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( space->machine, 1, "psx_counter_r ( %08x, %08x ) %08x\n", offset, mem_mask, data );
return data;
}
@@ -683,7 +689,7 @@ static psx_sio_handler m_p_f_sio_handler[ 2 ];
static void sio_interrupt( running_machine *machine, int n_port )
{
- verboselog( 1, "sio_interrupt( %d )\n", n_port );
+ verboselog( machine, 1, "sio_interrupt( %d )\n", n_port );
m_p_n_sio_status[ n_port ] |= SIO_STATUS_IRQ;
if( n_port == 0 )
{
@@ -697,6 +703,7 @@ static void sio_interrupt( running_machine *machine, int n_port )
static void sio_timer_adjust( int n_port )
{
+ running_machine *machine = Machine;
attotime n_time;
if( ( m_p_n_sio_status[ n_port ] & SIO_STATUS_TX_EMPTY ) == 0 || m_p_n_sio_tx_bits[ n_port ] != 0 )
{
@@ -721,18 +728,18 @@ static void sio_timer_adjust( int n_port )
if( m_p_n_sio_baud[ n_port ] != 0 && n_prescaler != 0 )
{
n_time = attotime_mul(ATTOTIME_IN_HZ(33868800), n_prescaler * m_p_n_sio_baud[n_port]);
- verboselog( 2, "sio_timer_adjust( %d ) = %s ( %d x %d )\n", n_port, attotime_string(n_time, 9), n_prescaler, m_p_n_sio_baud[ n_port ] );
+ verboselog( machine, 2, "sio_timer_adjust( %d ) = %s ( %d x %d )\n", n_port, attotime_string(n_time, 9), n_prescaler, m_p_n_sio_baud[ n_port ] );
}
else
{
n_time = attotime_never;
- verboselog( 0, "sio_timer_adjust( %d ) invalid baud rate ( %d x %d )\n", n_port, n_prescaler, m_p_n_sio_baud[ n_port ] );
+ verboselog( machine, 0, "sio_timer_adjust( %d ) invalid baud rate ( %d x %d )\n", n_port, n_prescaler, m_p_n_sio_baud[ n_port ] );
}
}
else
{
n_time = attotime_never;
- verboselog( 2, "sio_timer_adjust( %d ) finished\n", n_port );
+ verboselog( machine, 2, "sio_timer_adjust( %d ) finished\n", n_port );
}
timer_adjust_oneshot( m_p_timer_sio[ n_port ], n_time, n_port);
}
@@ -740,7 +747,7 @@ static void sio_timer_adjust( int n_port )
static TIMER_CALLBACK( sio_clock )
{
int n_port = param;
- verboselog( 2, "sio tick\n" );
+ verboselog( machine, 2, "sio tick\n" );
if( m_p_n_sio_tx_bits[ n_port ] == 0 &&
( m_p_n_sio_control[ n_port ] & SIO_CONTROL_TX_ENA ) != 0 &&
@@ -809,7 +816,7 @@ static TIMER_CALLBACK( sio_clock )
void psx_sio_input( running_machine *machine, int n_port, int n_mask, int n_data )
{
- verboselog( 1, "psx_sio_input( %d, %02x, %02x )\n", n_port, n_mask, n_data );
+ verboselog( machine, 1, "psx_sio_input( %d, %02x, %02x )\n", n_port, n_mask, n_data );
m_p_n_sio_rx[ n_port ] = ( m_p_n_sio_rx[ n_port ] & ~n_mask ) | ( n_data & n_mask );
if( ( m_p_n_sio_rx[ n_port ] & PSX_SIO_IN_DSR ) != 0 )
@@ -830,6 +837,7 @@ void psx_sio_input( running_machine *machine, int n_port, int n_mask, int n_data
WRITE32_HANDLER( psx_sio_w )
{
+ running_machine *machine = space->machine;
int n_port;
n_port = offset / 4;
@@ -837,35 +845,35 @@ WRITE32_HANDLER( psx_sio_w )
switch( offset % 4 )
{
case 0:
- verboselog( 1, "psx_sio_w %d data %02x (%08x)\n", n_port, data, mem_mask );
+ verboselog( machine, 1, "psx_sio_w %d data %02x (%08x)\n", n_port, data, mem_mask );
m_p_n_sio_tx_data[ n_port ] = data;
m_p_n_sio_status[ n_port ] &= ~( SIO_STATUS_TX_RDY );
m_p_n_sio_status[ n_port ] &= ~( SIO_STATUS_TX_EMPTY );
sio_timer_adjust( n_port );
break;
case 1:
- verboselog( 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
break;
case 2:
if( ACCESSING_BITS_0_15 )
{
m_p_n_sio_mode[ n_port ] = data & 0xffff;
- verboselog( 1, "psx_sio_w %d mode %04x\n", n_port, data & 0xffff );
+ verboselog( machine, 1, "psx_sio_w %d mode %04x\n", n_port, data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 1, "psx_sio_w %d control %04x\n", n_port, data >> 16 );
+ verboselog( machine, 1, "psx_sio_w %d control %04x\n", n_port, data >> 16 );
m_p_n_sio_control[ n_port ] = data >> 16;
if( ( m_p_n_sio_control[ n_port ] & SIO_CONTROL_RESET ) != 0 )
{
- verboselog( 1, "psx_sio_w reset\n" );
+ verboselog( machine, 1, "psx_sio_w reset\n" );
m_p_n_sio_status[ n_port ] |= SIO_STATUS_TX_EMPTY | SIO_STATUS_TX_RDY;
m_p_n_sio_status[ n_port ] &= ~( SIO_STATUS_RX_RDY | SIO_STATUS_OVERRUN | SIO_STATUS_IRQ );
}
if( ( m_p_n_sio_control[ n_port ] & SIO_CONTROL_IACK ) != 0 )
{
- verboselog( 1, "psx_sio_w iack\n" );
+ verboselog( machine, 1, "psx_sio_w iack\n" );
m_p_n_sio_status[ n_port ] &= ~( SIO_STATUS_IRQ );
m_p_n_sio_control[ n_port ] &= ~( SIO_CONTROL_IACK );
}
@@ -892,22 +900,23 @@ WRITE32_HANDLER( psx_sio_w )
case 3:
if( ACCESSING_BITS_0_15 )
{
- verboselog( 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
if( ACCESSING_BITS_16_31 )
{
m_p_n_sio_baud[ n_port ] = data >> 16;
- verboselog( 1, "psx_sio_w %d baud %04x\n", n_port, data >> 16 );
+ verboselog( machine, 1, "psx_sio_w %d baud %04x\n", n_port, data >> 16 );
}
break;
default:
- verboselog( 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
+ verboselog( machine, 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
break;
}
}
READ32_HANDLER( psx_sio_r )
{
+ running_machine *machine = space->machine;
UINT32 data;
int n_port;
@@ -919,44 +928,44 @@ READ32_HANDLER( psx_sio_r )
data = m_p_n_sio_rx_data[ n_port ];
m_p_n_sio_status[ n_port ] &= ~( SIO_STATUS_RX_RDY );
m_p_n_sio_rx_data[ n_port ] = 0xff;
- verboselog( 1, "psx_sio_r %d data %02x (%08x)\n", n_port, data, mem_mask );
+ verboselog( machine, 1, "psx_sio_r %d data %02x (%08x)\n", n_port, data, mem_mask );
break;
case 1:
data = m_p_n_sio_status[ n_port ];
if( ACCESSING_BITS_0_15 )
{
- verboselog( 1, "psx_sio_r %d status %04x\n", n_port, data & 0xffff );
+ verboselog( machine, 1, "psx_sio_r %d status %04x\n", n_port, data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( machine, 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
}
break;
case 2:
data = ( m_p_n_sio_control[ n_port ] << 16 ) | m_p_n_sio_mode[ n_port ];
if( ACCESSING_BITS_0_15 )
{
- verboselog( 1, "psx_sio_r %d mode %04x\n", n_port, data & 0xffff );
+ verboselog( machine, 1, "psx_sio_r %d mode %04x\n", n_port, data & 0xffff );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 1, "psx_sio_r %d control %04x\n", n_port, data >> 16 );
+ verboselog( machine, 1, "psx_sio_r %d control %04x\n", n_port, data >> 16 );
}
break;
case 3:
data = m_p_n_sio_baud[ n_port ] << 16;
if( ACCESSING_BITS_0_15 )
{
- verboselog( 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( machine, 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
}
if( ACCESSING_BITS_16_31 )
{
- verboselog( 1, "psx_sio_r %d baud %04x\n", n_port, data >> 16 );
+ verboselog( machine, 1, "psx_sio_r %d baud %04x\n", n_port, data >> 16 );
}
break;
default:
data = 0;
- verboselog( 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
+ verboselog( machine, 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
break;
}
return data;
@@ -1332,19 +1341,20 @@ static void mdec_yuv2_to_rgb24( void )
static void mdec0_write( UINT32 n_address, INT32 n_size )
{
+ running_machine *machine = Machine;
int n_index;
- verboselog( 2, "mdec0_write( %08x, %08x )\n", n_address, n_size );
+ verboselog( machine, 2, "mdec0_write( %08x, %08x )\n", n_address, n_size );
switch( m_n_mdec0_command >> 28 )
{
case 0x3:
- verboselog( 1, "mdec decode %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
+ verboselog( machine, 1, "mdec decode %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
m_n_mdec0_address = n_address;
m_n_mdec0_size = n_size * 4;
m_n_mdec1_status |= ( 1L << 29 );
break;
case 0x4:
- verboselog( 1, "mdec quantize table %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
+ verboselog( machine, 1, "mdec quantize table %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
n_index = 0;
while( n_size > 0 )
{
@@ -1368,7 +1378,7 @@ static void mdec0_write( UINT32 n_address, INT32 n_size )
}
break;
case 0x6:
- verboselog( 1, "mdec cosine table %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
+ verboselog( machine, 1, "mdec cosine table %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
n_index = 0;
while( n_size > 0 )
{
@@ -1381,7 +1391,7 @@ static void mdec0_write( UINT32 n_address, INT32 n_size )
mdec_cos_precalc();
break;
default:
- verboselog( 0, "mdec unknown command %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
+ verboselog( machine, 0, "mdec unknown command %08x %08x %08x\n", m_n_mdec0_command, n_address, n_size );
break;
}
}
@@ -1391,7 +1401,7 @@ static void mdec1_read( UINT32 n_address, INT32 n_size )
UINT32 n_this;
UINT32 n_nextaddress;
- verboselog( 2, "mdec1_read( %08x, %08x )\n", n_address, n_size );
+ verboselog( Machine, 2, "mdec1_read( %08x, %08x )\n", n_address, n_size );
if( ( m_n_mdec0_command & ( 1L << 29 ) ) != 0 && m_n_mdec0_size != 0 )
{
while( n_size > 0 )
@@ -1450,11 +1460,11 @@ WRITE32_HANDLER( psx_mdec_w )
switch( offset )
{
case 0:
- verboselog( 2, "mdec 0 command %08x\n", data );
+ verboselog( space->machine, 2, "mdec 0 command %08x\n", data );
m_n_mdec0_command = data;
break;
case 1:
- verboselog( 2, "mdec 1 command %08x\n", data );
+ verboselog( space->machine, 2, "mdec 1 command %08x\n", data );
m_n_mdec1_command = data;
break;
}
@@ -1465,10 +1475,10 @@ READ32_HANDLER( psx_mdec_r )
switch( offset )
{
case 0:
- verboselog( 2, "mdec 0 status %08x\n", 0 );
+ verboselog( space->machine, 2, "mdec 0 status %08x\n", 0 );
return 0;
case 1:
- verboselog( 2, "mdec 1 status %08x\n", m_n_mdec1_status );
+ verboselog( space->machine, 2, "mdec 1 status %08x\n", m_n_mdec1_status );
return m_n_mdec1_status;
}
return 0;
diff --git a/src/mame/machine/zs01.c b/src/mame/machine/zs01.c
index 6ef3c4294b0..74e89b271a2 100644
--- a/src/mame/machine/zs01.c
+++ b/src/mame/machine/zs01.c
@@ -13,7 +13,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -22,7 +22,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -75,7 +75,7 @@ void zs01_init( int chip, UINT8 *data, zs01_write_handler write, zs01_read_handl
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_init( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_init( %d ) chip out of range\n", chip );
return;
}
@@ -136,11 +136,12 @@ void zs01_init( int chip, UINT8 *data, zs01_write_handler write, zs01_read_handl
void zs01_rst_write( int chip, int rst )
{
+ running_machine *machine = Machine;
struct zs01_chip *c;
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_rst_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_rst_write( %d ) chip out of range\n", chip );
return;
}
@@ -148,11 +149,11 @@ void zs01_rst_write( int chip, int rst )
if( c->rst != rst )
{
- verboselog( 2, "zs01(%d) rst=%d\n", chip, rst );
+ verboselog( machine, 2, "zs01(%d) rst=%d\n", chip, rst );
}
if( c->rst == 0 && rst != 0 && c->cs == 0 )
{
- verboselog( 1, "zs01(%d) goto response to reset\n", chip );
+ verboselog( machine, 1, "zs01(%d) goto response to reset\n", chip );
c->state = STATE_RESPONSE_TO_RESET;
c->bit = 0;
c->byte = 0;
@@ -162,11 +163,12 @@ void zs01_rst_write( int chip, int rst )
void zs01_cs_write( int chip, int cs )
{
+ running_machine *machine = Machine;
struct zs01_chip *c;
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_cs_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_cs_write( %d ) chip out of range\n", chip );
return;
}
@@ -174,7 +176,7 @@ void zs01_cs_write( int chip, int cs )
if( c->cs != cs )
{
- verboselog( 2, "zs01(%d) cs=%d\n", chip, cs );
+ verboselog( machine, 2, "zs01(%d) cs=%d\n", chip, cs );
}
// if( c->cs != 0 && cs == 0 )
// {
@@ -391,11 +393,12 @@ static int zs01_data_offset( struct zs01_chip *c )
void zs01_scl_write( int chip, int scl )
{
+ running_machine *machine = Machine;
struct zs01_chip *c;
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_scl_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_scl_write( %d ) chip out of range\n", chip );
return;
}
@@ -403,7 +406,7 @@ void zs01_scl_write( int chip, int scl )
if( c->scl != scl )
{
- verboselog( 2, "zs01(%d) scl=%d\n", chip, scl );
+ verboselog( machine, 2, "zs01(%d) scl=%d\n", chip, scl );
}
if( c->cs == 0 )
{
@@ -418,7 +421,7 @@ void zs01_scl_write( int chip, int scl )
if( c->bit == 0 )
{
c->shift = c->response_to_reset[ c->byte ];
- verboselog( 1, "zs01(%d) <- response_to_reset[%d]: %02x\n", chip, c->byte, c->shift );
+ verboselog( machine, 1, "zs01(%d) <- response_to_reset[%d]: %02x\n", chip, c->byte, c->shift );
}
c->sdar = ( c->shift >> 7 ) & 1;
@@ -432,7 +435,7 @@ void zs01_scl_write( int chip, int scl )
if( c->byte == 4 )
{
c->sdar = 1;
- verboselog( 1, "zs01(%d) goto stop\n", chip );
+ verboselog( machine, 1, "zs01(%d) goto stop\n", chip );
c->state = STATE_STOP;
}
}
@@ -444,7 +447,7 @@ void zs01_scl_write( int chip, int scl )
{
if( c->bit < 8 )
{
- verboselog( 2, "zs01(%d) clock\n", chip );
+ verboselog( machine, 2, "zs01(%d) clock\n", chip );
c->shift <<= 1;
if( c->sdaw != 0 )
{
@@ -460,7 +463,7 @@ void zs01_scl_write( int chip, int scl )
{
case STATE_LOAD_COMMAND:
c->write_buffer[ c->byte ] = c->shift;
- verboselog( 2, "zs01(%d) -> write_buffer[%d]: %02x\n", chip, c->byte, c->write_buffer[ c->byte ] );
+ verboselog( machine, 2, "zs01(%d) -> write_buffer[%d]: %02x\n", chip, c->byte, c->write_buffer[ c->byte ] );
c->byte++;
if( c->byte == SIZE_WRITE_BUFFER )
@@ -478,12 +481,12 @@ void zs01_scl_write( int chip, int scl )
if( crc == ( ( c->write_buffer[ 10 ] << 8 ) | c->write_buffer[ 11 ] ) )
{
- verboselog( 1, "zs01(%d) -> command: %02x\n", chip, c->write_buffer[ 0 ] );
- verboselog( 1, "zs01(%d) -> address: %02x\n", chip, c->write_buffer[ 1 ] );
- verboselog( 1, "zs01(%d) -> data: %02x%02x%02x%02x%02x%02x%02x%02x\n", chip,
+ verboselog( machine, 1, "zs01(%d) -> command: %02x\n", chip, c->write_buffer[ 0 ] );
+ verboselog( machine, 1, "zs01(%d) -> address: %02x\n", chip, c->write_buffer[ 1 ] );
+ verboselog( machine, 1, "zs01(%d) -> data: %02x%02x%02x%02x%02x%02x%02x%02x\n", chip,
c->write_buffer[ 2 ], c->write_buffer[ 3 ], c->write_buffer[ 4 ], c->write_buffer[ 5 ],
c->write_buffer[ 6 ], c->write_buffer[ 7 ], c->write_buffer[ 8 ], c->write_buffer[ 9 ] );
- verboselog( 1, "zs01(%d) -> crc: %02x%02x\n", chip, c->write_buffer[ 10 ], c->write_buffer[ 11 ] );
+ verboselog( machine, 1, "zs01(%d) -> crc: %02x%02x\n", chip, c->write_buffer[ 10 ], c->write_buffer[ 11 ] );
switch( c->write_buffer[ 0 ] & 1 )
{
@@ -521,16 +524,16 @@ void zs01_scl_write( int chip, int scl )
}
else
{
- verboselog( 0, "zs01(%d) bad crc\n", chip );
+ verboselog( machine, 0, "zs01(%d) bad crc\n", chip );
/* todo: find out what should be returned. */
memset( &c->read_buffer[ 0 ], 0xff, 2 );
}
- verboselog( 1, "zs01(%d) <- status: %02x%02x\n", chip,
+ verboselog( machine, 1, "zs01(%d) <- status: %02x%02x\n", chip,
c->read_buffer[ 0 ], c->read_buffer[ 1 ] );
- verboselog( 1, "zs01(%d) <- data: %02x%02x%02x%02x%02x%02x%02x%02x\n", chip,
+ verboselog( machine, 1, "zs01(%d) <- data: %02x%02x%02x%02x%02x%02x%02x%02x\n", chip,
c->read_buffer[ 2 ], c->read_buffer[ 3 ], c->read_buffer[ 4 ], c->read_buffer[ 5 ],
c->read_buffer[ 6 ], c->read_buffer[ 7 ], c->read_buffer[ 8 ], c->read_buffer[ 9 ] );
@@ -563,7 +566,7 @@ void zs01_scl_write( int chip, int scl )
{
case STATE_READ_DATA:
c->shift = c->read_buffer[ c->byte ];
- verboselog( 2, "zs01(%d) <- read_buffer[%d]: %02x\n", chip, c->byte, c->shift );
+ verboselog( machine, 2, "zs01(%d) <- read_buffer[%d]: %02x\n", chip, c->byte, c->shift );
break;
}
}
@@ -577,7 +580,7 @@ void zs01_scl_write( int chip, int scl )
c->sdar = 0;
if( c->sdaw == 0 )
{
- verboselog( 2, "zs01(%d) ack <-\n", chip );
+ verboselog( machine, 2, "zs01(%d) ack <-\n", chip );
c->byte++;
if( c->byte == SIZE_READ_BUFFER )
{
@@ -588,7 +591,7 @@ void zs01_scl_write( int chip, int scl )
}
else
{
- verboselog( 2, "zs01(%d) nak <-\n", chip );
+ verboselog( machine, 2, "zs01(%d) nak <-\n", chip );
}
}
}
@@ -600,11 +603,12 @@ void zs01_scl_write( int chip, int scl )
void zs01_sda_write( int chip, int sda )
{
+ running_machine *machine = Machine;
struct zs01_chip *c;
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_sda_write( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_sda_write( %d ) chip out of range\n", chip );
return;
}
@@ -612,13 +616,13 @@ void zs01_sda_write( int chip, int sda )
if( c->sdaw != sda )
{
- verboselog( 2, "zs01(%d) sdaw=%d\n", chip, sda );
+ verboselog( machine, 2, "zs01(%d) sdaw=%d\n", chip, sda );
}
if( c->cs == 0 && c->scl != 0 )
{
// if( c->sdaw == 0 && sda != 0 )
// {
-// verboselog( 1, "zs01(%d) goto stop\n", chip );
+// verboselog( machine, 1, "zs01(%d) goto stop\n", chip );
// c->state = STATE_STOP;
// c->sdar = 0;
// }
@@ -627,12 +631,12 @@ void zs01_sda_write( int chip, int sda )
switch( c->state )
{
case STATE_STOP:
- verboselog( 1, "zs01(%d) goto start\n", chip );
+ verboselog( machine, 1, "zs01(%d) goto start\n", chip );
c->state = STATE_LOAD_COMMAND;
break;
// default:
-// verboselog( 1, "zs01(%d) skipped start (default)\n", chip );
+// verboselog( machine, 1, "zs01(%d) skipped start (default)\n", chip );
// break;
}
@@ -647,21 +651,22 @@ void zs01_sda_write( int chip, int sda )
int zs01_sda_read( int chip )
{
+ running_machine *machine = Machine;
struct zs01_chip *c;
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "zs01_sda_read( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "zs01_sda_read( %d ) chip out of range\n", chip );
return 1;
}
c = &zs01[ chip ];
if( c->cs != 0 )
{
- verboselog( 2, "zs01(%d) not selected\n", chip );
+ verboselog( machine, 2, "zs01(%d) not selected\n", chip );
return 1;
}
- verboselog( 2, "zs01(%d) sdar=%d\n", chip, c->sdar );
+ verboselog( machine, 2, "zs01(%d) sdar=%d\n", chip, c->sdar );
return c->sdar;
}
@@ -672,7 +677,7 @@ static void nvram_handler_zs01( int chip, running_machine *machine, mame_file *f
if( chip >= ZS01_MAXCHIP )
{
- verboselog( 0, "nvram_handler_zs01( %d ) chip out of range\n", chip );
+ verboselog( machine, 0, "nvram_handler_zs01( %d ) chip out of range\n", chip );
return;
}
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index d3b457ded9e..1113505fe26 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -25,7 +25,7 @@
#define VERBOSE_LEVEL ( 0 )
-INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
+INLINE void ATTR_PRINTF(3,4) verboselog( running_machine *machine, int n_level, const char *s_fmt, ... )
{
if( VERBOSE_LEVEL >= n_level )
{
@@ -34,7 +34,7 @@ INLINE void ATTR_PRINTF(2,3) verboselog( int n_level, const char *s_fmt, ... )
va_start( v, s_fmt );
vsprintf( buf, s_fmt, v );
va_end( v );
- logerror( "%s: %s", cpuexec_describe_context(Machine), buf );
+ logerror( "%s: %s", cpuexec_describe_context(machine), buf );
}
}
@@ -948,6 +948,8 @@ f e| d c| b| a 9| 8 7| 6 5| 4| 3 2 1 0
INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
{
+ running_machine *machine = Machine;
+
if( m_n_gputype == 2 )
{
m_n_gpustatus = ( m_n_gpustatus & 0xfffff800 ) | ( tpage & 0x7ff );
@@ -961,11 +963,11 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_psxgpu->n_ti = 0;
if( ( tpage & ~0x39ff ) != 0 )
{
- verboselog( 1, "not handled: draw mode %08x\n", tpage & ~0x39ff );
+ verboselog( machine, 1, "not handled: draw mode %08x\n", tpage & ~0x39ff );
}
if( p_psxgpu->n_tp == 3 )
{
- verboselog( 0, "not handled: tp == 3\n" );
+ verboselog( machine, 0, "not handled: tp == 3\n" );
}
}
else
@@ -981,15 +983,15 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_psxgpu->n_iy = 0;
if( ( tpage & ~0x27ef ) != 0 )
{
- verboselog( 1, "not handled: draw mode %08x\n", tpage & ~0x27ef );
+ verboselog( machine, 1, "not handled: draw mode %08x\n", tpage & ~0x27ef );
}
if( p_psxgpu->n_tp == 3 )
{
- verboselog( 0, "not handled: tp == 3\n" );
+ verboselog( machine, 0, "not handled: tp == 3\n" );
}
else if( p_psxgpu->n_tp == 2 && p_psxgpu->n_ti != 0 )
{
- verboselog( 0, "not handled: interleaved 15 bit texture\n" );
+ verboselog( machine, 0, "not handled: interleaved 15 bit texture\n" );
}
}
}
@@ -1034,7 +1036,7 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_n_redtrans = m_p_n_redaddtrans; \
p_n_greentrans = m_p_n_greenaddtrans; \
p_n_bluetrans = m_p_n_blueaddtrans; \
- verboselog( 2, "Transparency Mode: 0.5*B + 0.5*F\n" ); \
+ verboselog( machine, 2, "Transparency Mode: 0.5*B + 0.5*F\n" ); \
break; \
case 0x01: \
p_n_f = m_p_n_f1; \
@@ -1044,7 +1046,7 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_n_redtrans = m_p_n_redaddtrans; \
p_n_greentrans = m_p_n_greenaddtrans; \
p_n_bluetrans = m_p_n_blueaddtrans; \
- verboselog( 2, "Transparency Mode: 1.0*B + 1.0*F\n" ); \
+ verboselog( machine, 2, "Transparency Mode: 1.0*B + 1.0*F\n" ); \
break; \
case 0x02: \
p_n_f = m_p_n_f1; \
@@ -1054,7 +1056,7 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_n_redtrans = m_p_n_redsubtrans; \
p_n_greentrans = m_p_n_greensubtrans; \
p_n_bluetrans = m_p_n_bluesubtrans; \
- verboselog( 2, "Transparency Mode: 1.0*B - 1.0*F\n" ); \
+ verboselog( machine, 2, "Transparency Mode: 1.0*B - 1.0*F\n" ); \
break; \
case 0x03: \
p_n_f = m_p_n_f025; \
@@ -1064,7 +1066,7 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
p_n_redtrans = m_p_n_redaddtrans; \
p_n_greentrans = m_p_n_greenaddtrans; \
p_n_bluetrans = m_p_n_blueaddtrans; \
- verboselog( 2, "Transparency Mode: 1.0*B + 0.25*F\n" ); \
+ verboselog( machine, 2, "Transparency Mode: 1.0*B + 0.25*F\n" ); \
break; \
} \
break; \
@@ -1451,6 +1453,7 @@ INLINE void decode_tpage( struct PSXGPU *p_psxgpu, UINT32 tpage )
static void FlatPolygon( int n_points )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
@@ -1606,6 +1609,7 @@ static void FlatPolygon( int n_points )
static void FlatTexturedPolygon( int n_points )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
int n_tx;
@@ -1828,6 +1832,7 @@ static void FlatTexturedPolygon( int n_points )
static void GouraudPolygon( int n_points )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
@@ -2041,6 +2046,7 @@ static void GouraudPolygon( int n_points )
static void GouraudTexturedPolygon( int n_points )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
int n_tx;
@@ -2611,6 +2617,7 @@ static void FrameBufferRectangleDraw( void )
static void FlatRectangle( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
@@ -2676,6 +2683,7 @@ static void FlatRectangle( void )
static void FlatRectangle8x8( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
@@ -2741,6 +2749,7 @@ static void FlatRectangle8x8( void )
static void FlatRectangle16x16( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
@@ -2806,6 +2815,7 @@ static void FlatRectangle16x16( void )
static void FlatTexturedRectangle( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
int n_tx;
@@ -2904,6 +2914,7 @@ static void FlatTexturedRectangle( void )
static void Sprite8x8( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
int n_tx;
@@ -3002,6 +3013,7 @@ static void Sprite8x8( void )
static void Sprite16x16( void )
{
+ running_machine *machine = Machine;
INT16 n_y;
INT16 n_x;
int n_tx;
@@ -3182,19 +3194,21 @@ static void MoveImage( void )
void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
{
+ running_machine *machine = Machine;
+
while( n_size > 0 )
{
UINT32 data = *( p_ram );
- verboselog( 2, "PSX Packet #%u %08x\n", m_n_gpu_buffer_offset, data );
+ verboselog( machine, 2, "PSX Packet #%u %08x\n", m_n_gpu_buffer_offset, data );
m_packet.n_entry[ m_n_gpu_buffer_offset ] = data;
switch( m_packet.n_entry[ 0 ] >> 24 )
{
case 0x00:
- verboselog( 1, "not handled: GPU Command 0x00: (%08x)\n", data );
+ verboselog( machine, 1, "not handled: GPU Command 0x00: (%08x)\n", data );
break;
case 0x01:
- verboselog( 1, "not handled: clear cache\n" );
+ verboselog( machine, 1, "not handled: clear cache\n" );
break;
case 0x02:
if( m_n_gpu_buffer_offset < 2 )
@@ -3203,7 +3217,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: frame buffer rectangle %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: frame buffer rectangle %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 1 ] & 0xffff, m_packet.n_entry[ 1 ] >> 16, m_packet.n_entry[ 2 ] & 0xffff, m_packet.n_entry[ 2 ] >> 16 );
FrameBufferRectangleDraw();
m_n_gpu_buffer_offset = 0;
@@ -3219,7 +3233,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: monochrome 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: monochrome 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
FlatPolygon( 3 );
m_n_gpu_buffer_offset = 0;
}
@@ -3234,7 +3248,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: textured 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: textured 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
FlatTexturedPolygon( 3 );
m_n_gpu_buffer_offset = 0;
}
@@ -3249,7 +3263,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: monochrome 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: monochrome 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
FlatPolygon( 4 );
m_n_gpu_buffer_offset = 0;
}
@@ -3264,7 +3278,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: textured 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: textured 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
FlatTexturedPolygon( 4 );
m_n_gpu_buffer_offset = 0;
}
@@ -3279,7 +3293,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudPolygon( 3 );
m_n_gpu_buffer_offset = 0;
}
@@ -3294,7 +3308,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud textured 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud textured 3 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudTexturedPolygon( 3 );
m_n_gpu_buffer_offset = 0;
}
@@ -3309,7 +3323,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudPolygon( 4 );
m_n_gpu_buffer_offset = 0;
}
@@ -3324,7 +3338,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud textured 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud textured 4 point polygon\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudTexturedPolygon( 4 );
m_n_gpu_buffer_offset = 0;
}
@@ -3338,7 +3352,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: monochrome line\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: monochrome line\n", m_packet.n_entry[ 0 ] >> 24 );
MonochromeLine();
m_n_gpu_buffer_offset = 0;
}
@@ -3352,7 +3366,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: monochrome polyline\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: monochrome polyline\n", m_packet.n_entry[ 0 ] >> 24 );
MonochromeLine();
if( ( m_packet.n_entry[ 3 ] & 0xf000f000 ) != 0x50005000 )
{
@@ -3374,7 +3388,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud line\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud line\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudLine();
m_n_gpu_buffer_offset = 0;
}
@@ -3389,7 +3403,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: gouraud polyline\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: gouraud polyline\n", m_packet.n_entry[ 0 ] >> 24 );
GouraudLine();
if( ( m_packet.n_entry[ 4 ] & 0xf000f000 ) != 0x50005000 )
{
@@ -3415,7 +3429,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: rectangle %d,%d %d,%d\n",
+ verboselog( machine, 1, "%02x: rectangle %d,%d %d,%d\n",
m_packet.n_entry[ 0 ] >> 24,
(INT16)( m_packet.n_entry[ 1 ] & 0xffff ), (INT16)( m_packet.n_entry[ 1 ] >> 16 ),
(INT16)( m_packet.n_entry[ 2 ] & 0xffff ), (INT16)( m_packet.n_entry[ 2 ] >> 16 ) );
@@ -3433,7 +3447,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: sprite %d,%d %u,%u %08x, %08x\n",
+ verboselog( machine, 1, "%02x: sprite %d,%d %u,%u %08x, %08x\n",
m_packet.n_entry[ 0 ] >> 24,
(INT16)( m_packet.n_entry[ 1 ] & 0xffff ), (INT16)( m_packet.n_entry[ 1 ] >> 16 ),
m_packet.n_entry[ 3 ] & 0xffff, m_packet.n_entry[ 3 ] >> 16,
@@ -3450,7 +3464,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: dot %d,%d %08x\n",
+ verboselog( machine, 1, "%02x: dot %d,%d %08x\n",
m_packet.n_entry[ 0 ] >> 24,
(INT16)( m_packet.n_entry[ 1 ] & 0xffff ), (INT16)( m_packet.n_entry[ 1 ] >> 16 ),
m_packet.n_entry[ 0 ] & 0xffffff );
@@ -3467,7 +3481,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: 16x16 rectangle %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: 16x16 rectangle %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ] );
FlatRectangle8x8();
m_n_gpu_buffer_offset = 0;
@@ -3483,7 +3497,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: 8x8 sprite %08x %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: 8x8 sprite %08x %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ], m_packet.n_entry[ 2 ] );
Sprite8x8();
m_n_gpu_buffer_offset = 0;
@@ -3498,7 +3512,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: 16x16 rectangle %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: 16x16 rectangle %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ] );
FlatRectangle16x16();
m_n_gpu_buffer_offset = 0;
@@ -3514,7 +3528,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: 16x16 sprite %08x %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: 16x16 sprite %08x %08x %08x\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ], m_packet.n_entry[ 2 ] );
Sprite16x16();
m_n_gpu_buffer_offset = 0;
@@ -3527,7 +3541,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "move image in frame buffer %08x %08x %08x %08x\n", m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ], m_packet.n_entry[ 2 ], m_packet.n_entry[ 3 ] );
+ verboselog( machine, 1, "move image in frame buffer %08x %08x %08x %08x\n", m_packet.n_entry[ 0 ], m_packet.n_entry[ 1 ], m_packet.n_entry[ 2 ], m_packet.n_entry[ 3 ] );
MoveImage();
m_n_gpu_buffer_offset = 0;
}
@@ -3544,7 +3558,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
{
UINT16 *p_vram;
- verboselog( 2, "send image to framebuffer ( pixel %u,%u = %u )\n",
+ verboselog( machine, 2, "send image to framebuffer ( pixel %u,%u = %u )\n",
( m_n_vramx + m_packet.n_entry[ 1 ] ) & 1023,
( m_n_vramy + ( m_packet.n_entry[ 1 ] >> 16 ) ) & 1023,
data & 0xffff );
@@ -3558,7 +3572,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
m_n_vramy++;
if( m_n_vramy >= ( m_packet.n_entry[ 2 ] >> 16 ) )
{
- verboselog( 1, "%02x: send image to framebuffer %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: send image to framebuffer %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 1 ] & 0xffff, ( m_packet.n_entry[ 1 ] >> 16 ),
m_packet.n_entry[ 2 ] & 0xffff, ( m_packet.n_entry[ 2 ] >> 16 ) );
m_n_gpu_buffer_offset = 0;
@@ -3578,12 +3592,12 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 1, "%02x: copy image from frame buffer\n", m_packet.n_entry[ 0 ] >> 24 );
+ verboselog( machine, 1, "%02x: copy image from frame buffer\n", m_packet.n_entry[ 0 ] >> 24 );
m_n_gpustatus |= ( 1L << 0x1b );
}
break;
case 0xe1:
- verboselog( 1, "%02x: draw mode %06x\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: draw mode %06x\n", m_packet.n_entry[ 0 ] >> 24,
m_packet.n_entry[ 0 ] & 0xffffff );
decode_tpage( &psxgpu, m_packet.n_entry[ 0 ] & 0xffffff );
break;
@@ -3592,7 +3606,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
m_n_twx = ( ( ( m_packet.n_entry[ 0 ] >> 10 ) & 0x1f ) << 3 );
m_n_twh = 255 - ( ( ( m_packet.n_entry[ 0 ] >> 5 ) & 0x1f ) << 3 );
m_n_tww = 255 - ( ( m_packet.n_entry[ 0 ] & 0x1f ) << 3 );
- verboselog( 1, "%02x: texture window %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: texture window %u,%u %u,%u\n", m_packet.n_entry[ 0 ] >> 24,
m_n_twx, m_n_twy, m_n_tww, m_n_twh );
break;
case 0xe3:
@@ -3605,7 +3619,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
{
m_n_drawarea_y1 = ( m_packet.n_entry[ 0 ] >> 12 ) & 1023;
}
- verboselog( 1, "%02x: drawing area top left %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: drawing area top left %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
m_n_drawarea_x1, m_n_drawarea_y1 );
break;
case 0xe4:
@@ -3618,7 +3632,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
{
m_n_drawarea_y2 = ( m_packet.n_entry[ 0 ] >> 12 ) & 1023;
}
- verboselog( 1, "%02x: drawing area bottom right %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: drawing area bottom right %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
m_n_drawarea_x2, m_n_drawarea_y2 );
break;
case 0xe5:
@@ -3631,7 +3645,7 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
{
m_n_drawoffset_y = SINT11( ( m_packet.n_entry[ 0 ] >> 12 ) & 2047 );
}
- verboselog( 1, "%02x: drawing offset %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
+ verboselog( machine, 1, "%02x: drawing offset %d,%d\n", m_packet.n_entry[ 0 ] >> 24,
m_n_drawoffset_x, m_n_drawoffset_y );
break;
case 0xe6:
@@ -3639,18 +3653,18 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
m_n_gpustatus |= ( data & 0x03 ) << 0xb;
if( ( m_packet.n_entry[ 0 ] & 3 ) != 0 )
{
- verboselog( 1, "not handled: mask setting %d\n", m_packet.n_entry[ 0 ] & 3 );
+ verboselog( machine, 1, "not handled: mask setting %d\n", m_packet.n_entry[ 0 ] & 3 );
}
else
{
- verboselog( 1, "mask setting %d\n", m_packet.n_entry[ 0 ] & 3 );
+ verboselog( machine, 1, "mask setting %d\n", m_packet.n_entry[ 0 ] & 3 );
}
break;
default:
#if defined( MAME_DEBUG )
popmessage( "unknown GPU packet %08x", m_packet.n_entry[ 0 ] );
#endif
- verboselog( 0, "unknown GPU packet %08x (%08x)\n", m_packet.n_entry[ 0 ], data );
+ verboselog( machine, 0, "unknown GPU packet %08x (%08x)\n", m_packet.n_entry[ 0 ], data );
#if ( STOP_ON_ERROR )
m_n_gpu_buffer_offset = 1;
#endif
@@ -3663,6 +3677,8 @@ void psx_gpu_write( UINT32 *p_ram, INT32 n_size )
WRITE32_HANDLER( psx_gpu_w )
{
+ running_machine *machine = space->machine;
+
switch( offset )
{
case 0x00:
@@ -3672,7 +3688,7 @@ WRITE32_HANDLER( psx_gpu_w )
switch( data >> 24 )
{
case 0x00:
- verboselog( 1, "reset gpu\n" );
+ verboselog( machine, 1, "reset gpu\n" );
m_n_gpu_buffer_offset = 0;
m_n_gpustatus = 0x14802000;
m_n_drawarea_x1 = 0;
@@ -3696,18 +3712,18 @@ WRITE32_HANDLER( psx_gpu_w )
updatevisiblearea(space->machine, NULL);
break;
case 0x01:
- verboselog( 1, "not handled: reset command buffer\n" );
+ verboselog( machine, 1, "not handled: reset command buffer\n" );
m_n_gpu_buffer_offset = 0;
break;
case 0x02:
- verboselog( 1, "not handled: reset irq\n" );
+ verboselog( machine, 1, "not handled: reset irq\n" );
break;
case 0x03:
m_n_gpustatus &= ~( 1L << 0x17 );
m_n_gpustatus |= ( data & 0x01 ) << 0x17;
break;
case 0x04:
- verboselog( 1, "dma setup %d\n", data & 3 );
+ verboselog( machine, 1, "dma setup %d\n", data & 3 );
m_n_gpustatus &= ~( 3L << 0x1d );
m_n_gpustatus |= ( data & 0x03 ) << 0x1d;
m_n_gpustatus &= ~( 1L << 0x19 );
@@ -3726,20 +3742,20 @@ WRITE32_HANDLER( psx_gpu_w )
{
m_n_displaystarty = ( data >> 12 ) & 1023;
}
- verboselog( 1, "start of display area %d %d\n", m_n_displaystartx, m_n_displaystarty );
+ verboselog( machine, 1, "start of display area %d %d\n", m_n_displaystartx, m_n_displaystarty );
break;
case 0x06:
m_n_horiz_disstart = data & 4095;
m_n_horiz_disend = ( data >> 12 ) & 4095;
- verboselog( 1, "horizontal display range %d %d\n", m_n_horiz_disstart, m_n_horiz_disend );
+ verboselog( machine, 1, "horizontal display range %d %d\n", m_n_horiz_disstart, m_n_horiz_disend );
break;
case 0x07:
m_n_vert_disstart = data & 1023;
m_n_vert_disend = ( data >> 10 ) & 2047;
- verboselog( 1, "vertical display range %d %d\n", m_n_vert_disstart, m_n_vert_disend );
+ verboselog( machine, 1, "vertical display range %d %d\n", m_n_vert_disstart, m_n_vert_disend );
break;
case 0x08:
- verboselog( 1, "display mode %02x\n", data & 0xff );
+ verboselog( machine, 1, "display mode %02x\n", data & 0xff );
m_n_gpustatus &= ~( 127L << 0x10 );
m_n_gpustatus |= ( data & 0x3f ) << 0x11; /* width 0 + height + videmode + isrgb24 + isinter */
m_n_gpustatus |= ( ( data & 0x40 ) >> 0x06 ) << 0x10; /* width 1 */
@@ -3750,10 +3766,10 @@ WRITE32_HANDLER( psx_gpu_w )
updatevisiblearea(space->machine, NULL);
break;
case 0x09:
- verboselog( 1, "not handled: GPU Control 0x09: %08x\n", data );
+ verboselog( machine, 1, "not handled: GPU Control 0x09: %08x\n", data );
break;
case 0x0d:
- verboselog( 1, "reset lightgun coordinates %08x\n", data );
+ verboselog( machine, 1, "reset lightgun coordinates %08x\n", data );
m_n_lightgun_x = 0;
m_n_lightgun_y = 0;
break;
@@ -3769,7 +3785,7 @@ WRITE32_HANDLER( psx_gpu_w )
{
m_n_gpuinfo = m_n_drawarea_x1 | ( m_n_drawarea_y1 << 12 );
}
- verboselog( 1, "GPU Info - Draw area top left %08x\n", m_n_gpuinfo );
+ verboselog( machine, 1, "GPU Info - Draw area top left %08x\n", m_n_gpuinfo );
break;
case 0x04:
if( m_n_gputype == 2 )
@@ -3780,7 +3796,7 @@ WRITE32_HANDLER( psx_gpu_w )
{
m_n_gpuinfo = m_n_drawarea_x2 | ( m_n_drawarea_y2 << 12 );
}
- verboselog( 1, "GPU Info - Draw area bottom right %08x\n", m_n_gpuinfo );
+ verboselog( machine, 1, "GPU Info - Draw area bottom right %08x\n", m_n_gpuinfo );
break;
case 0x05:
if( m_n_gputype == 2 )
@@ -3791,35 +3807,35 @@ WRITE32_HANDLER( psx_gpu_w )
{
m_n_gpuinfo = ( m_n_drawoffset_x & 2047 ) | ( ( m_n_drawoffset_y & 2047 ) << 12 );
}
- verboselog( 1, "GPU Info - Draw offset %08x\n", m_n_gpuinfo );
+ verboselog( machine, 1, "GPU Info - Draw offset %08x\n", m_n_gpuinfo );
break;
case 0x07:
m_n_gpuinfo = m_n_gputype;
- verboselog( 1, "GPU Info - GPU Type %08x\n", m_n_gpuinfo );
+ verboselog( machine, 1, "GPU Info - GPU Type %08x\n", m_n_gpuinfo );
break;
case 0x08:
m_n_gpuinfo = m_n_lightgun_x | ( m_n_lightgun_y << 16 );
- verboselog( 1, "GPU Info - lightgun coordinates %08x\n", m_n_gpuinfo );
+ verboselog( machine, 1, "GPU Info - lightgun coordinates %08x\n", m_n_gpuinfo );
break;
default:
- verboselog( 0, "GPU Info - unknown request (%08x)\n", data );
+ verboselog( machine, 0, "GPU Info - unknown request (%08x)\n", data );
m_n_gpuinfo = 0;
break;
}
break;
case 0x20:
- verboselog( 1, "not handled: GPU Control 0x20: %08x\n", data );
+ verboselog( machine, 1, "not handled: GPU Control 0x20: %08x\n", data );
break;
default:
#if defined( MAME_DEBUG )
popmessage( "unknown GPU command %08x", data );
#endif
- verboselog( 0, "gpu_w( %08x ) unknown GPU command\n", data );
+ verboselog( machine, 0, "gpu_w( %08x ) unknown GPU command\n", data );
break;
}
break;
default:
- verboselog( 0, "gpu_w( %08x, %08x, %08x ) unknown register\n", offset, data, mem_mask );
+ verboselog( machine, 0, "gpu_w( %08x, %08x, %08x ) unknown register\n", offset, data, mem_mask );
break;
}
}
@@ -3827,6 +3843,8 @@ WRITE32_HANDLER( psx_gpu_w )
void psx_gpu_read( UINT32 *p_ram, INT32 n_size )
{
+ running_machine *machine = Machine;
+
while( n_size > 0 )
{
if( ( m_n_gpustatus & ( 1L << 0x1b ) ) != 0 )
@@ -3834,7 +3852,7 @@ void psx_gpu_read( UINT32 *p_ram, INT32 n_size )
UINT32 n_pixel;
PAIR data;
- verboselog( 2, "copy image from frame buffer ( %d, %d )\n", m_n_vramx, m_n_vramy );
+ verboselog( machine, 2, "copy image from frame buffer ( %d, %d )\n", m_n_vramx, m_n_vramy );
data.d = 0;
for( n_pixel = 0; n_pixel < 2; n_pixel++ )
{
@@ -3847,7 +3865,7 @@ void psx_gpu_read( UINT32 *p_ram, INT32 n_size )
m_n_vramy++;
if( m_n_vramy >= ( m_packet.n_entry[ 2 ] >> 16 ) )
{
- verboselog( 1, "copy image from frame buffer end\n" );
+ verboselog( machine, 1, "copy image from frame buffer end\n" );
m_n_gpustatus &= ~( 1L << 0x1b );
m_n_gpu_buffer_offset = 0;
m_n_vramx = 0;
@@ -3865,7 +3883,7 @@ void psx_gpu_read( UINT32 *p_ram, INT32 n_size )
}
else
{
- verboselog( 2, "read GPU info (%08x)\n", m_n_gpuinfo );
+ verboselog( machine, 2, "read GPU info (%08x)\n", m_n_gpuinfo );
*( p_ram ) = m_n_gpuinfo;
}
p_ram++;
@@ -3883,11 +3901,11 @@ READ32_HANDLER( psx_gpu_r )
psx_gpu_read( &data, 1 );
break;
case 0x01:
- verboselog( 1, "read GPU status (%08x)\n", m_n_gpustatus );
+ verboselog( space->machine, 1, "read GPU status (%08x)\n", m_n_gpustatus );
data = m_n_gpustatus;
break;
default:
- verboselog( 0, "gpu_r( %08x, %08x ) unknown register\n", offset, mem_mask );
+ verboselog( space->machine, 0, "gpu_r( %08x, %08x ) unknown register\n", offset, mem_mask );
data = 0;
break;
}