[hatari-devel] Patch to fix disassembler

[ Thread Index | Date Index | More lists.tuxfamily.org/hatari-devel Archives ]


Hi,

attached is a patch to fix a few issues with the external disassembler (non-
uae, in src/debug/68kDisass.c) . It did not set the options correctly for 060, 
and also ommited FPU opcodes for 040 and 060.

There is still a bug with instructions like CINVA/CPUSHA which are not 
disassembled, i thought it was because of some CPU32 entries in the table, but 
i couldn't figure it out yet. At least those entries do not make much sense 
since there is no way to set the cpu type to CPU32.
diff -r 4c4bd8970304 src/debug/68kDisass.c
--- a/src/debug/68kDisass.c	Tue Jan 01 18:25:30 2019 +0100
+++ b/src/debug/68kDisass.c	Mon Jan 07 10:12:28 2019 +0100
@@ -2667,7 +2667,7 @@
 {
 	optionCPUTypeMask = 0;
 
-	if ( ( FPU == 68881 ) || ( FPU == 68882 ) )
+	if ( FPU != 0 )
 		optionCPUTypeMask |= MC_FPU;
 
 	switch ( CPU )
@@ -2676,7 +2676,8 @@
 		case 1 :	optionCPUTypeMask |= MC68010 ; break;
 		case 2 :	optionCPUTypeMask |= MC68020 ; break;
 		case 3 :	optionCPUTypeMask |= MC68030 ; break;
-		case 4 :	optionCPUTypeMask |= MC68040 ; break;
+		case 4 :	optionCPUTypeMask |= MC68040|MC_PMMU ; break;
+		case 5 :	optionCPUTypeMask |= MC68060|MC_PMMU ; break;
 		default :	optionCPUTypeMask |= MC68000 ; break;
 	}	
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/