gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reduce divergence between x11 and sdl1 in emulate.c

Browse source
This commit is contained in:
Gwenhael Le Moine 2023-05-03 10:54:36 +02:00
parent bfd5ef7703
commit 2b78fb7b28
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 5 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/emulate.c
View file

@ -2416,13 +2416,13 @@ int emulate() {
do { do {
step_instruction(); step_instruction();
#if defined( GUI_IS_X11 )
{ {
int i; int i;
for ( i = 0; i < ( int )( sizeof( saturn.keybuf.rows ) / for ( i = 0; i < ( int )( sizeof( saturn.keybuf.rows ) /
sizeof( saturn.keybuf.rows[ 0 ] ) ); sizeof( saturn.keybuf.rows[ 0 ] ) );
i++ ) { i++ ) {
if ( saturn.keybuf.rows[ i ] || throttle ) { if ( saturn.keybuf.rows[ i ] || throttle ) {
#if defined( GUI_IS_X11 )
gettimeofday( &tv, &tz ); gettimeofday( &tv, &tz );
while ( ( tv.tv_sec == tv2.tv_sec ) && while ( ( tv.tv_sec == tv2.tv_sec ) &&
( ( tv.tv_usec - tv2.tv_usec ) < 2 ) ) { ( ( tv.tv_usec - tv2.tv_usec ) < 2 ) ) {
@ -2432,6 +2432,9 @@ int emulate() {
tv2.tv_usec = tv.tv_usec; tv2.tv_usec = tv.tv_usec;
tv2.tv_sec = tv.tv_sec; tv2.tv_sec = tv.tv_sec;
break; break;
#elif defined( GUI_IS_SDL1 )
gettimeofday( &tv, NULL );
#endif
} }
} }
} }
@ -2446,56 +2449,6 @@ int emulate() {
schedule(); schedule();
} }
} while ( !enter_debugger ); } while ( !enter_debugger );
#endif
#if defined( GUI_IS_SDL1 )
int i;
for ( i = 0;
i < sizeof( saturn.keybuf.rows ) / sizeof( saturn.keybuf.rows[ 0 ] );
i++ ) {
if ( saturn.keybuf.rows[ i ] || throttle ) {
gettimeofday( &tv, NULL ); return 0;
// while ((tv.tv_sec == tv2.tv_sec) && ((tv.tv_usec -
// tv2.tv_usec) < 2))
/*while ((tv.tv_sec == tv2.tv_sec) && ((tv.tv_usec -
tv2.tv_usec) < 1))
{
gettimeofday(&tv, &tz);
}
tv2.tv_usec = tv.tv_usec;
tv2.tv_sec = tv.tv_sec;*/
// usleep(1);
break;
}
}
if ( schedule_event < 0 ) {
// puts("bug");
// schedule_event = 0;
}
if ( schedule_event-- <= 0 ) {
schedule();
}
}
while ( !enter_debugger )
;
printf( "emulate: returning\n" );
// Version from android:
/*
do {
step_instruction();
if (schedule_event-- == 0)
{
schedule();
}
} while (!enter_debugger); // exit_state
*/
#endif
return 0;
} }