--- hatari/src/falcon/dsp_cpu.c	2019/04/09 08:53:24	1.1.1.9
+++ hatari/src/falcon/dsp_cpu.c	2019/04/09 08:54:36	1.1.1.10
@@ -74,11 +74,11 @@
 
 #include <stdbool.h>
 
+#include "main.h"
 #include "dsp_core.h"
 #include "dsp_cpu.h"
 #include "dsp_disasm.h"
 #include "log.h"
-#include "main.h"
 #include "debugui.h"
 
 #define DSP_COUNT_IPS 0		/* Count instruction per seconds */
@@ -888,7 +888,7 @@ static void dsp_postexecute_update_pc(vo
 				Uint32 saved_pc, saved_sr;
 
 				dsp_stack_pop(&saved_pc, &saved_sr);
-				dsp_core.registers[DSP_REG_SR] &= 0x7f;
+				dsp_core.registers[DSP_REG_SR] &= 0x7fff;
 				dsp_core.registers[DSP_REG_SR] |= saved_sr & (1<<DSP_SR_LF);
 				dsp_stack_pop(&dsp_core.registers[DSP_REG_LA], &dsp_core.registers[DSP_REG_LC]);
 			} else {
@@ -1425,7 +1425,7 @@ static void dsp_write_reg(Uint32 numreg,
 				dsp_core.registers[DSP_REG_SP] = value & (3<<DSP_SP_SE);
 				if (!isDsp_in_disasm_mode)
 					fprintf(stderr,"Dsp: Stack Overflow or Underflow\n");
-				if (bExceptionDebugging)
+				if (ExceptionDebugMask & EXCEPT_DSP)
 					DebugUI(REASON_DSP_EXCEPTION);
 			}
 			else
@@ -1468,7 +1468,7 @@ static void dsp_stack_push(Uint32 curpc,
 		dsp_add_interrupt(DSP_INTER_STACK_ERROR);
 		if (!isDsp_in_disasm_mode)
 			fprintf(stderr,"Dsp: Stack Overflow\n");
-		if (bExceptionDebugging)
+		if (ExceptionDebugMask & EXCEPT_DSP)
 			DebugUI(REASON_DSP_EXCEPTION);
 	}
 	
@@ -1505,7 +1505,7 @@ static void dsp_stack_pop(Uint32 *newpc,
 		dsp_add_interrupt(DSP_INTER_STACK_ERROR);
 		if (!isDsp_in_disasm_mode)
 			fprintf(stderr,"Dsp: Stack underflow\n");
-		if (bExceptionDebugging)
+		if (ExceptionDebugMask & EXCEPT_DSP)
 			DebugUI(REASON_DSP_EXCEPTION);
 	}
 
@@ -1801,6 +1801,9 @@ static void opcode8h_0(void)
 		case 0x00008c:
 			dsp_enddo();
 			break;
+		default:
+			dsp_undefined();
+			break;
 	}
 }
 
@@ -1820,7 +1823,7 @@ static void dsp_undefined(void)
 		cur_inst_len = 1;
 		dsp_core.instr_cycle = 0;
 	}
-	if (bExceptionDebugging) {
+	if (ExceptionDebugMask & EXCEPT_DSP) {
 		DebugUI(REASON_DSP_EXCEPTION);
 	}
 }
@@ -2365,7 +2368,7 @@ static void dsp_illegal(void)
 {
 	/* Raise interrupt p:0x003e */
 	dsp_add_interrupt(DSP_INTER_ILLEGAL);
-        if (bExceptionDebugging) {
+	if (ExceptionDebugMask & EXCEPT_DSP) {
 		DebugUI(REASON_DSP_EXCEPTION);
 	}
 }
@@ -6960,13 +6963,13 @@ static void dsp_macr_p_x1_y0_b(void)
 
 	dsp_mul56(dsp_core.registers[DSP_REG_X1], dsp_core.registers[DSP_REG_Y0], source, SIGN_PLUS);
 
-	dsp_rnd56(dest);
-
 	dest[0] = dsp_core.registers[DSP_REG_B2];
 	dest[1] = dsp_core.registers[DSP_REG_B1];
 	dest[2] = dsp_core.registers[DSP_REG_B0];
 	newsr = dsp_add56(source, dest);
 
+	dsp_rnd56(dest);
+
 	dsp_core.registers[DSP_REG_B2] = dest[0];
 	dsp_core.registers[DSP_REG_B1] = dest[1];
 	dsp_core.registers[DSP_REG_B0] = dest[2];