--- hatari/src/debug/68kDisass.c	2019/04/09 08:54:22	1.1.1.5
+++ hatari/src/debug/68kDisass.c	2019/04/09 08:56:48	1.1.1.7
@@ -5,16 +5,19 @@
  *	or at your option any later version. Read the file gpl.txt for details.
  ***/
 
-#include <stdio.h>
+#include "main.h"
 #include <ctype.h>
-#include <strings.h>
-#include <stdlib.h>
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
-#include "config.h"
 #include "sysdeps.h"
-#include "main.h"
 #include "configuration.h"
 #include "newcpu.h"
+#include "stMemory.h"
+#ifdef WINUAE_FOR_HATARI
+#include "debug.h"
+#endif
 #include "paths.h"
 #include "profile.h"
 #include "tos.h"
@@ -37,7 +40,7 @@ static const Diss68kOptions optionsMask
 
 // values <0 will hide the group
 static int			optionPosAddress = 0;	// current address
-static int			optionPosHexdump = 10;	// 16-bit words at this address
+static int			optionPosHexdump = 12;	// 16-bit words at this address
 static int			optionPosLabel = 35;	// label, if defined
 static int			optionPosOpcode = 47;	// opcode
 static int			optionPosOperand = 57;	// operands for the opcode
@@ -124,7 +127,10 @@ static disSymbolEntry	*disSymbolEntries;
 
 static inline unsigned short	Disass68kGetWord(long addr)
 {
-	return get_word(addr);
+	if ( ! valid_address ( addr , 2 ) )
+		return 0;
+
+	return STMemory_ReadWord ( addr );
 }
 
 // Load a text file into memory, count the lines and replace the LF with 0-bytes.
@@ -132,28 +138,31 @@ static int			Disass68kLoadTextFile(const
 {
 	long	index;
 	long	fileLength;
-	int	lineCount;
+	int	lineCount = 0;
 	char	*fbuf;
 	FILE	*f;
 	
 	if(filebuf)
 		*filebuf = NULL;
 	f = fopen(filename, "r");
-	if(!f) return 0;
-	if(fseek(f, 0, SEEK_END))
+	if (!f)
 		return 0;
+	if (fseek(f, 0, SEEK_END))
+		goto out;
 	fileLength = ftell(f);
-	if(fileLength <= 0) return 0;
-	if(fseek(f, 0, SEEK_SET))
-		return 0;
+	if (fileLength <= 0)
+		goto out;
+	if (fseek(f, 0, SEEK_SET))
+		goto out;
 	fbuf = malloc(fileLength);
-	if(!fbuf) return 0;
+	if(!fbuf)
+		goto out;
 	if((size_t)fileLength != fread(fbuf, sizeof(char), fileLength, f))
 	{
 		free(fbuf);
-		return 0;
+		goto out;
 	}
-	lineCount = 0;
+
 	for(index=0; index<fileLength; ++index)
 	{
 		if(fbuf[index] == '\r')	// convert potential CR into a space (which we ignore at the end of the line anyway)
@@ -166,6 +175,8 @@ static int			Disass68kLoadTextFile(const
 	}
 	if(filebuf)
 		*filebuf = fbuf;
+out:
+	fclose(f);
 	return lineCount;
 }
 
@@ -1299,7 +1310,7 @@ typedef const struct {
 	int				disassFlag;
 } OpcodeTableStruct;
 
-static const OpcodeTableStruct	OpcodeTable[] = {
+static OpcodeTableStruct	OpcodeTable[] = {
 	{ MC_ALL, {0xff00, 0x0000}, {-1,6,2,0}, {ofI,ofEa}, "ORI.?",{0,EA_Immed|EA_PCRel|EA_An}},
 	{ MC_ALL, {0xf1c0, 0x0100}, {4}, {ofDestDn,ofEa}, "BTST",{0,EA_An|EA_Immed} },
 	{ MC_ALL, {0xf1c0, 0x0140}, {4}, {ofDestDn,ofEa}, "BCHG",{0,EA_Immed|EA_PCRel|EA_An}},
@@ -1718,7 +1729,6 @@ static const OpcodeTableStruct	OpcodeTab
 static int	Disass68k(long addr, char *labelBuffer, char *opcodeBuffer, char *operandBuffer, char *commentBuffer)
 {
 	long	baseAddr = addr;
-	int		val;
 	int		i;
 	int		count = 0;
 	char	addressLabel[256];
@@ -1819,10 +1829,10 @@ static int	Disass68k(long addr, char *la
 
 	case dtASCString:
 	{
-		int	count = 1;
-		unsigned short	val = Disass68kGetWord(addr+0);
+		unsigned short	opcval = Disass68kGetWord(addr+0);
+		count = 1;
 		strcpy(opcodeBuffer,"DC.B");
-		if((val >> 8) == 0)
+		if ((opcval >> 8) == 0)
 		{
 			strcat(operandBuffer, "0");
 		} else {
@@ -1859,13 +1869,14 @@ static int	Disass68k(long addr, char *la
 	case dtFunctionPointer:
 	{
 		const char	*sp;
+		int		val;
 		val = (Disass68kGetWord(addr) << 16) | Disass68kGetWord(addr+2);
 		sp = Disass68kSymbolName(val, 2);
 		strcpy(opcodeBuffer,"DC.L");
 		if(sp)
 			sprintf(operandBuffer,"%s", sp);
 		else
-			sprintf(operandBuffer,"$%6.6x", val);
+			sprintf(operandBuffer,"$%8.8x", val);
 		return 4;
 	}
 
@@ -1887,13 +1898,12 @@ more:
 	while(1)
 	{
 		unsigned short	opcode[5];
-		unsigned int	i;
 		OpcodeTableStruct	*ots = &OpcodeTable[index++];
 		int	size;
 		char	sizeChar = 0;
 		char	*dbuf;
 		int	ea;
-		unsigned int	maxop;
+		int	maxop;
 
 		if(ots->opcodeName == NULL)
 			break;
@@ -2015,10 +2025,10 @@ more:
 		ea = opcode[0] & 0x3F;
 		dbuf = operandBuffer;
 
-		maxop=(sizeof(ots->op)/sizeof(ots->op[0]));
+		maxop = (int)(sizeof(ots->op)/sizeof(ots->op[0]));
 		for(i=0; i<maxop; ++i)
 		{
-			int reg;
+			int reg, val;
 
 			switch(ots->op[i])
 			{
@@ -2443,7 +2453,7 @@ static void Disass68k_loop (FILE *f, uae
 	}
 
 	while (cnt-- > 0) {
-		const int	addrWidth = 6;		// 6 on an ST, 8 on a TT
+		const int	addrWidth = 8;		// 6 on an ST (24 bit addressing), 8 on a TT (32 bit addressing)
 		char	lineBuffer[1024];
 
 		char	addressBuffer[32];
@@ -2498,10 +2508,10 @@ static void Disass68k_loop (FILE *f, uae
 		if (optionPosComment >= 0)
 		{
 			float percentage;
-			Uint32 count, cycles, misses;
-			if (Profile_CpuAddressData(addr, &percentage, &count, &cycles, &misses))
+			Uint32 count, cycles, i_misses, d_hits;
+			if (Profile_CpuAddressData(addr, &percentage, &count, &cycles, &i_misses, &d_hits))
 			{
-				sprintf(commentBuffer, "%5.2f%% (%u, %u, %u)", percentage, count, cycles, misses);
+				sprintf(commentBuffer, "%5.2f%% (%u, %u, %u, %u)", percentage, count, cycles, i_misses, d_hits);
 				Disass68kComposeStr(lineBuffer, commentBuffer, optionPosComment+1, 0);
 			}
 			/* show comments only if profile data is missing */
@@ -2542,7 +2552,11 @@ Uint32 Disasm_GetNextPC(Uint32 pc)
 void Disasm (FILE *f, uaecptr addr, uaecptr *nextpc, int cnt)
 {
 	if (ConfigureParams.Debugger.bDisasmUAE)
+#ifdef WINUAE_FOR_HATARI
+		m68k_disasm_file (f, addr, nextpc, cnt);
+#else
 		m68k_disasm (f, addr, nextpc, cnt);
+#endif
 	else
 		Disass68k_loop (f, addr, nextpc, cnt);
 }
@@ -2620,6 +2634,27 @@ int Disasm_GetOptions(void)
 }
 
 /**
+ * Set CPU and FPU mask used for disassembly (when changed from the UI or the options)
+ */
+void Disasm_SetCPUType ( int CPU , int FPU )
+{
+	optionCPUTypeMask = 0;
+
+	if ( ( FPU == 68881 ) || ( FPU == 68882 ) )
+		optionCPUTypeMask |= MC_FPU;
+
+	switch ( CPU )
+	{
+		case 0 :	optionCPUTypeMask |= MC68000 ; break;
+		case 1 :	optionCPUTypeMask |= MC68010 ; break;
+		case 2 :	optionCPUTypeMask |= MC68020 ; break;
+		case 3 :	optionCPUTypeMask |= MC68030 ; break;
+		case 4 :	optionCPUTypeMask |= MC68040 ; break;
+		default :	optionCPUTypeMask |= MC68000 ; break;
+	}	
+}
+
+/**
  * Parse disasm command line option argument
  * @return	error string (""=silent 'error') or NULL for success.
  */