Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-24 14:56:21 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixed access violation caused by passing a NULL pointer into the dma finished code.

Browse Source
This commit is contained in:
smf- 2008-12-21 09:52:56 +00:00
parent c17377e8a9
commit 1f25d3f935
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mame/machine/psx.c
View File

@ -190,7 +190,7 @@ static void dma_interrupt_update( running_machine *machine )
m_n_dicr &= 0x00ffffff | ( m_n_dicr << 8 ); m_n_dicr &= 0x00ffffff | ( m_n_dicr << 8 );
} }
static void dma_finished(const address_space *space, int n_channel) static void dma_finished(running_machine *machine, int n_channel)
{ {
if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000401 && n_channel == 2 ) if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000401 && n_channel == 2 )
{ {
@ -224,7 +224,7 @@ static void dma_finished(const address_space *space, int n_channel)
n_address &= n_adrmask; n_address &= n_adrmask;
n_nextaddress = g_p_n_psxram[ n_address / 4 ]; n_nextaddress = g_p_n_psxram[ n_address / 4 ];
n_size = n_nextaddress >> 24; n_size = n_nextaddress >> 24;
m_p_fn_dma_write[ n_channel ]( space->machine, n_address + 4, n_size ); m_p_fn_dma_write[ n_channel ]( machine, n_address + 4, n_size );
//FIXME: //FIXME:
// The following conditions will cause an endless loop. // The following conditions will cause an endless loop.
// If stopping the transfer is correct I cannot judge // If stopping the transfer is correct I cannot judge
@ -246,14 +246,13 @@ static void dma_finished(const address_space *space, int n_channel)
m_p_n_dmachannelcontrol[ n_channel ] &= ~( ( 1L << 0x18 ) | ( 1L << 0x1c ) ); m_p_n_dmachannelcontrol[ n_channel ] &= ~( ( 1L << 0x18 ) | ( 1L << 0x1c ) );
m_n_dicr |= 1 << ( 24 + n_channel ); m_n_dicr |= 1 << ( 24 + n_channel );
dma_interrupt_update(space->machine); dma_interrupt_update(machine);
dma_stop_timer( n_channel ); dma_stop_timer( n_channel );
} }
static TIMER_CALLBACK( dma_finished_callback ) static TIMER_CALLBACK( dma_finished_callback )
{ {
const address_space *space = NULL; dma_finished(machine, param);
dma_finished(space, param);
} }
void psx_dma_install_read_handler( int n_channel, psx_dma_read_handler p_fn_dma_read ) void psx_dma_install_read_handler( int n_channel, psx_dma_read_handler p_fn_dma_read )
@ -313,7 +312,7 @@ WRITE32_HANDLER( psx_dma_w )
{ {
verboselog( machine, 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 ]( space->machine, n_address, n_size ); m_p_fn_dma_read[ n_channel ]( space->machine, n_address, n_size );
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000200 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000200 &&
m_p_fn_dma_read[ n_channel ] != NULL ) m_p_fn_dma_read[ n_channel ] != NULL )
@ -326,7 +325,7 @@ WRITE32_HANDLER( psx_dma_w )
} }
else else
{ {
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000201 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000201 &&
@ -334,7 +333,7 @@ WRITE32_HANDLER( psx_dma_w )
{ {
verboselog( machine, 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 ]( space->machine, n_address, n_size ); m_p_fn_dma_write[ n_channel ]( space->machine, n_address, n_size );
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11050100 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11050100 &&
m_p_fn_dma_write[ n_channel ] != NULL ) m_p_fn_dma_write[ n_channel ] != NULL )
@ -342,7 +341,7 @@ WRITE32_HANDLER( psx_dma_w )
/* todo: check this is a write not a read... */ /* todo: check this is a write not a read... */
verboselog( machine, 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 ]( space->machine, n_address, n_size ); m_p_fn_dma_write[ n_channel ]( space->machine, n_address, n_size );
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11150100 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11150100 &&
m_p_fn_dma_write[ n_channel ] != NULL ) m_p_fn_dma_write[ n_channel ] != NULL )
@ -350,7 +349,7 @@ WRITE32_HANDLER( psx_dma_w )
/* todo: check this is a write not a read... */ /* todo: check this is a write not a read... */
verboselog( machine, 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 ]( space->machine, n_address, n_size ); m_p_fn_dma_write[ n_channel ]( space->machine, n_address, n_size );
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000401 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x01000401 &&
n_channel == 2 && n_channel == 2 &&
@ -359,7 +358,7 @@ WRITE32_HANDLER( psx_dma_w )
verboselog( machine, 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 ] ); n_channel, m_p_n_dmabase[ n_channel ] );
dma_finished( space, n_channel ); dma_finished( machine, n_channel );
} }
else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11000002 && else if( m_p_n_dmachannelcontrol[ n_channel ] == 0x11000002 &&
n_channel == 6 ) n_channel == 6 )
@ -1566,7 +1565,7 @@ void psx_driver_init( running_machine *machine )
for( n = 0; n < 7; n++ ) for( n = 0; n < 7; n++ )
{ {
m_p_timer_dma[ n ] = timer_alloc( machine, dma_finished_callback , NULL); m_p_timer_dma[ n ] = timer_alloc( machine, dma_finished_callback, machine );
m_p_fn_dma_read[ n ] = NULL; m_p_fn_dma_read[ n ] = NULL;
m_p_fn_dma_write[ n ] = NULL; m_p_fn_dma_write[ n ] = NULL;
} }