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

use --debug-opcodes to print instruction in identified buggy cases

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-10-09 14:07:24 +02:00
parent c9739ff601
commit aa944ceead
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cpu.c
View file

@ -1443,7 +1443,6 @@ static void ExecGroup_0( void )
Nibble n = GetNibble( cpu_status.PC++ );
debug1( CPU_CHF_MODULE_ID, DEBUG_C_TRACE, CPU_I_CALLED, "ExecGroup_0" );
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
switch ( n ) {
case 0: /* RTNSXM */
cpu_status.HST |= HST_XM_MASK;
@ -1577,7 +1576,6 @@ static void ExecGroup_1( void )
Address ta;
debug1( CPU_CHF_MODULE_ID, DEBUG_C_TRACE, CPU_I_CALLED, "ExecGroup_1" );
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
switch ( n ) {
case 0: /* Rn=A/C */
n = GetNibble( cpu_status.PC++ );
@ -2059,6 +2057,8 @@ static void ExecGroup_80( void )
case 0xB: /* BUSCC */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_TRACE, CPU_I_CALLED, "ExecBUSCC" );
// FIXME: 49g bugs here on display change
DEBUG_print_cpu_instruction();
ChfGenerate( CPU_CHF_MODULE_ID, __FILE__, __LINE__, CPU_F_INTERR, CHF_WARNING, "BUSCC" );
ChfSignal( CPU_CHF_MODULE_ID );
break;
@ -2774,9 +2774,9 @@ void DumpCpuStatus( char ob[ DUMP_CPU_STATUS_OB_SIZE ] )
char dob[ DISASSEMBLE_OB_SIZE ];
int n;
/* Dump PC and current instruction */
/* Dump PC and current instruction */
( void )Disassemble( cpu_status.PC, dob );
sprintf( ob, "%s\n\n", dob );
sprintf( ob, "\n%s\n\n", dob );
ob += strlen( ob );
/* Dump A, B, C, D */
@ -2811,6 +2811,17 @@ void DumpCpuStatus( char ob[ DUMP_CPU_STATUS_OB_SIZE ] )
ob += strlen( ob );
}
void DEBUG_print_cpu_instruction( void )
{
if ( config.debug_level > 0 && config.debug_level & DEBUG_C_OPCODES ) {
char dob[ DISASSEMBLE_OB_SIZE ];
/* Dump PC and current instruction */
( void )Disassemble( cpu_status.PC, dob );
fprintf( stderr, "\n%s\n\n", dob );
}
}
/* .+
.title : OneStep
@ -2856,17 +2867,14 @@ void OneStep( void )
break;
case 2: /* P=n */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
SetP( GetNibble( cpu_status.PC++ ) );
break;
case 3: /* LC(m) n...n */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
FetchR( cpu_status.C, GetNibble( cpu_status.PC++ ) );
break;
case 4: /* RTNC/GOC */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
if ( cpu_status.carry ) {
offset = Get2Nibbles2C( cpu_status.PC );
if ( offset == 0 )
@ -2879,7 +2887,6 @@ void OneStep( void )
break;
case 5: /* RTNNC/GONC */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
if ( !cpu_status.carry ) {
offset = Get2Nibbles2C( cpu_status.PC );
if ( offset == 0 )
@ -2892,12 +2899,10 @@ void OneStep( void )
break;
case 6: /* GOTO */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
cpu_status.PC += Get3Nibbles2C( cpu_status.PC );
break;
case 7: /* GOSUB */
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
offset = Get3Nibbles2C( cpu_status.PC );
cpu_status.PC += 3;
PushRSTK( cpu_status.PC );
@ -2937,7 +2942,6 @@ void OneStep( void )
break;
default:
debug1( CPU_CHF_MODULE_ID, DEBUG_C_OPCODES, CPU_I_EXECUTING, n );
ChfGenerate( CPU_CHF_MODULE_ID, __FILE__, __LINE__, CPU_E_BAD_OPCODE, CHF_ERROR, cpu_status.PC, n );
ChfSignal( CPU_CHF_MODULE_ID );
break;

1
src/cpu.h
View file

@ -335,5 +335,6 @@ int CpuHaltAllowed( void ); /* 3.13 */
Address Disassemble( Address pc, char ob[ DISASSEMBLE_OB_SIZE ] ); /* dis.c */
void DumpCpuStatus( char ob[ DUMP_CPU_STATUS_OB_SIZE ] );
void DEBUG_print_cpu_instruction( void );
#endif /*!_CPU_H*/

2
src/modules.c
View file

@ -1251,6 +1251,8 @@ void ModConfig( Address config_info )
if ( mod == N_MOD ) {
/* All modules are configured - Signal a warning */
// FIXME: 48gx bugs here when running VERSION
DEBUG_print_cpu_instruction();
ChfGenerate( MOD_CHF_MODULE_ID, __FILE__, __LINE__, MOD_W_BAD_CONFIG, CHF_WARNING, config_info );
ChfSignal( MOD_CHF_MODULE_ID );
} else {

2
src/romram.c
View file

@ -233,6 +233,8 @@ void RomWrite( Address rel_address, Nibble datum )
debug1( MOD_CHF_MODULE_ID, DEBUG_C_TRACE, MOD_I_CALLED, "RomWrite" );
// FIXME: 48gx: saturn48gx-Mid <12>d (src/romram.c,235)-E-Write into ROM A[1B632] D[9]
DEBUG_print_cpu_instruction();
ChfGenerate( MOD_CHF_MODULE_ID, __FILE__, __LINE__, MOD_E_ROM_WRITE, CHF_ERROR, rel_address, datum );
ChfSignal( MOD_CHF_MODULE_ID );
}