--- hatari/src/debug/68kDisass.c	2019/04/09 08:58:04	1.1.1.8
+++ hatari/src/debug/68kDisass.c	2019/04/09 08:59:19	1.1.1.9
@@ -852,6 +852,7 @@ static char		*Disass68kEA(char *disassbu
 			case 3: 
 				bd = Disass68kGetWord(*addr); *addr += 2;
 				bd <<= 16;
+				/* fall through */
 			case 2:
 				bd |= Disass68kGetWord(*addr); *addr += 2;
 				break;
@@ -922,6 +923,7 @@ static char		*Disass68kEA(char *disassbu
 			case 3:
 				od = Disass68kGetWord(*addr); *addr += 2;
 				od <<= 16;
+				/* fall through */
 			case 2:
 				od |= Disass68kGetWord(*addr); *addr += 2;
 				if(prefixComma)
@@ -2486,10 +2488,10 @@ static void Disass68k_loop (FILE *f, uae
 
 		char	addressBuffer[32];
 		char	hexdumpBuffer[256];
-		char	labelBuffer[256];
+		char	labelBuffer[258];
 		char	opcodeBuffer[64];
 		char	operandBuffer[256];
-		char	commentBuffer[256];
+		char	commentBuffer[258];
 		int	plen, len, j;
 
 		len = Disass68k(addr, labelBuffer, opcodeBuffer, operandBuffer, commentBuffer);
@@ -2578,7 +2580,7 @@ void Disasm (FILE *f, uaecptr addr, uaec
 {
 	if (ConfigureParams.Debugger.bDisasmUAE)
 #ifdef WINUAE_FOR_HATARI
-		m68k_disasm_file (f, addr, nextpc, cnt);
+		m68k_disasm_file (f, addr, nextpc, addr, cnt);
 #else
 		m68k_disasm (f, addr, nextpc, cnt);
 #endif
@@ -2661,22 +2663,23 @@ 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 )
+void Disasm_SetCPUType(int CPU, int FPU, bool bMMU)
 {
-	optionCPUTypeMask = 0;
+	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;
+	}
 
-	if ( ( FPU == 68881 ) || ( FPU == 68882 ) )
+	if (FPU != 0)
 		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;
-	}	
+	if (bMMU)
+		optionCPUTypeMask |= MC_PMMU;
 }
 
 /**
@@ -2709,7 +2712,7 @@ const char *Disasm_ParseOption(const cha
 			assert(option[i].flag == (1 << i));
 			fprintf(stderr, "\t%d: %s\n", option[i].flag, option[i].desc);
 		}
-		fprintf(stderr, "Current settings are:\n\t--disasm %s --disasm %d\n",
+		fprintf(stderr, "Current settings are:\n\t--disasm %s --disasm 0x%x\n",
 			ConfigureParams.Debugger.bDisasmUAE ? "uae" : "ext",
 			ConfigureParams.Debugger.nDisasmOptions);
 		return "";
@@ -2729,7 +2732,12 @@ const char *Disasm_ParseOption(const cha
 	}
 	if (isdigit((unsigned char)*arg))
 	{
-		int newopt = atoi(arg);
+		char *end;
+		int newopt = strtol(arg, &end, 0);
+		if (*end)
+		{
+			return "not a number";
+		}
 		if ((newopt|optionsMask) != optionsMask)
 		{
 			return "unknown flags in the bitmask";