--- hatari/src/falcon/dsp_cpu.c	2019/04/09 08:49:40	1.1.1.6
+++ hatari/src/falcon/dsp_cpu.c	2019/04/09 08:52:11	1.1.1.8
@@ -19,6 +19,54 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+/*
+	DSP memory mapping
+	------------------
+	
+	The memory map is configured as follows :
+	Program space P is one contiguous block of 32K dsp Words
+	X and Y data space are each separate 16K dsp Word blocks. 
+	Both X and Y can be accessed as blocks starting at 0 or 16K.
+	Program space physically overlaps both X and Y data spaces.
+	Y: memory is mapped at address $0 in P memory
+	X: memory is mapped at address $4000 in P memory 
+
+	The DSP external RAM is zero waitstate, but there is a penalty for
+	accessing it twice in a single instruction, because there is only 
+	one external data bus.
+	The internal buses are all separate (0 waitstate)
+
+
+	              X:             Y:             P:
+	$ffff  |--------------+--------------+--------------|
+	       |   Int. I/O   |   Ext. I/O   |              |
+	$ffc0  |--------------+--------------+              |
+	       |              |              |              |
+	       |   Reserved   |   Reserved   |   Reserved   |
+	       |              |              |              |
+	       |              |              |              |
+	       |              |              |              |
+	$8000  |--------------+--------------+--------------|
+	       |              |              |              |
+	       |  16k Shadow  |  16k Shadow  |              |
+	       |              |              |      32K     |
+	$4000  |--------------+--------------|    Program   |
+	       |     16K      |     16K      |      RAM     |
+	       |   External   |   External   |              |
+	       |     RAM      |     RAM      |              |
+	$0200  |--------------+--------------+--------------|
+	       | Log table or | Sin table or |              |
+	       | external mem | external mem |   Internal   |
+	$0100  |--------------+--------------+    program   |
+	       |  Internal X  |  Internal Y  |    memory    |
+	       |    memory    |    memory    |              |
+	$0000  |--------------+--------------+--------------|
+
+
+	Special Note : As the Falcon DSP is a 0 waitstate access memory, I've simplified a little the cycle counting.
+	If this DSP emulator code is used in another project, one should take into account the bus control register (BCR) waitstates.
+*/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -39,12 +87,6 @@
  *	Defines
  **********************************/
 
-/* cycle counter wait state time when access to external memory  */
-#define XY_WAITSTATE 0
-#define P_WAITSTATE 0
-#define XP_WAITSTATE 0   /* X Peripheral WaitState */
-#define YP_WAITSTATE 0   /* Y Peripheral WaitState */
-
 #define SIGN_PLUS  0
 #define SIGN_MINUS 1
 
@@ -62,11 +104,14 @@ static Uint32 cur_inst_len;	/* =0:jump,
 /* Current instruction */
 static Uint32 cur_inst;
 
+/* Counts the number of access to the external memory for one instruction */
+static Uint16 nb_access_to_extMemory;
+
 /* DSP is in disasm mode ? */
 /* If yes, stack overflow, underflow and illegal instructions messages are not displayed */
 static bool isDsp_in_disasm_mode;
 
-static char   str_disasm_memory[2][50]; /* Buffer for memory change text in disasm mode */
+static char   str_disasm_memory[2][50]; 	/* Buffer for memory change text in disasm mode */
 static Uint16 disasm_memory_ptr;		/* Pointer for memory change in disasm mode */
 
 /**********************************
@@ -236,10 +281,10 @@ static void dsp_and_x1_a(void);
 static void dsp_and_x1_b(void);
 static void dsp_and_y1_a(void);
 static void dsp_and_y1_b(void);
-static void dsp_asl_b_a(void);
-static void dsp_asl_a_b(void);
-static void dsp_asr_b_a(void);
-static void dsp_asr_a_b(void);
+static void dsp_asl_a(void);
+static void dsp_asl_b(void);
+static void dsp_asr_a(void);
+static void dsp_asr_b(void);
 static void dsp_clr_a(void);
 static void dsp_clr_b(void);
 static void dsp_cmp_b_a(void);
@@ -549,10 +594,10 @@ static const dsp_emul_t opcodes_alu[256]
 	dsp_undefined, dsp_tfr_a_b, dsp_addr_a_b, dsp_tst_b, dsp_undefined, dsp_cmp_a_b, dsp_subr_b, dsp_cmpm_a_b,
 	dsp_add_b_a, dsp_rnd_a, dsp_addl_b_a, dsp_clr_a, dsp_sub_b_a, dsp_undefined, dsp_subl_a, dsp_not_a,
 	dsp_add_a_b, dsp_rnd_b, dsp_addl_a_b, dsp_clr_b, dsp_sub_a_b, dsp_undefined, dsp_subl_b, dsp_not_b,
-	dsp_add_x_a, dsp_adc_x_a, dsp_asr_b_a, dsp_lsr_a, dsp_sub_x_a, dsp_sbc_x_a, dsp_abs_a, dsp_ror_a,
-	dsp_add_x_b, dsp_adc_x_b, dsp_asr_a_b, dsp_lsr_b, dsp_sub_x_b, dsp_sbc_x_b, dsp_abs_b, dsp_ror_b,
-	dsp_add_y_a, dsp_adc_y_a, dsp_asl_b_a, dsp_lsl_a, dsp_sub_y_a, dsp_sbc_y_a, dsp_neg_a, dsp_rol_a,
-	dsp_add_y_b, dsp_adc_y_b, dsp_asl_a_b, dsp_lsl_b, dsp_sub_y_b, dsp_sbc_y_b, dsp_neg_b, dsp_rol_b,
+	dsp_add_x_a, dsp_adc_x_a, dsp_asr_a, dsp_lsr_a, dsp_sub_x_a, dsp_sbc_x_a, dsp_abs_a, dsp_ror_a,
+	dsp_add_x_b, dsp_adc_x_b, dsp_asr_b, dsp_lsr_b, dsp_sub_x_b, dsp_sbc_x_b, dsp_abs_b, dsp_ror_b,
+	dsp_add_y_a, dsp_adc_y_a, dsp_asl_a, dsp_lsl_a, dsp_sub_y_a, dsp_sbc_y_a, dsp_neg_a, dsp_rol_a,
+	dsp_add_y_b, dsp_adc_y_b, dsp_asl_b, dsp_lsl_b, dsp_sub_y_b, dsp_sbc_y_b, dsp_neg_b, dsp_rol_b,
 	
 	/* 0x40 - 0x7f */
 	dsp_add_x0_a, dsp_tfr_x0_a, dsp_or_x0_a, dsp_eor_x0_a, dsp_sub_x0_a, dsp_cmp_x0_a, dsp_and_x0_a, dsp_cmpm_x0_a,
@@ -660,11 +705,11 @@ void dsp56k_init_cpu(void)
 /**
  * Execute one instruction in trace mode at a given PC address.
  * */
-Uint32 dsp56k_execute_one_disasm_instruction(Uint32 pc)
+Uint16 dsp56k_execute_one_disasm_instruction(Uint16 pc)
 {
 	dsp_core_t *ptr1, *ptr2;
 	static dsp_core_t dsp_core_save;
-	Uint32 instruction_length;
+	Uint16 instruction_length;
 
 	ptr1 = &dsp_core;
 	ptr2 = &dsp_core_save;
@@ -701,11 +746,14 @@ void dsp56k_execute_instruction(void)
 	Uint32 disasm_return = 0;
 	disasm_memory_ptr = 0;
 
+	/* Initialise the number of access to the external memory for this instruction */
+	nb_access_to_extMemory = 0;
+	
 	/* Decode and execute current instruction */
 	cur_inst = read_memory_p(dsp_core.pc);
-	cur_inst_len = 1;
 	
-	/* Initialize instruction cycle counter */
+	/* Initialize instruction size and cycle counter */
+	cur_inst_len = 1;
 	dsp_core.instr_cycle = 2;
 
 	/* Disasm current instruction ? (trace mode only) */
@@ -730,6 +778,10 @@ void dsp56k_execute_instruction(void)
 		opcodes_parmove[(cur_inst>>20) & BITMASK(4)]();
 	}
 
+	/* Add the waitstate due to external memory access */
+	if (nb_access_to_extMemory > 1)
+		dsp_core.instr_cycle += nb_access_to_extMemory - 1;
+	
 	/* Disasm current instruction ? (trace mode only) */
 	if (LOG_TRACE_LEVEL(TRACE_DSP_DISASM)) {
 		/* Display only when DSP is called in trace mode */
@@ -789,7 +841,7 @@ static void dsp_postexecute_update_pc(vo
 			dsp_core.registers[DSP_REG_LC] &= BITMASK(16);
 
 			if (dsp_core.registers[DSP_REG_LC] > 0) {
-				cur_inst_len=0;	/* Stay on this instruction */
+				cur_inst_len = 0;	/* Stay on this instruction */
 			} else {
 				dsp_core.loop_rep = 0;
 				dsp_core.registers[DSP_REG_LC] = dsp_core.registers[DSP_REG_LCSAVE];
@@ -811,11 +863,11 @@ static void dsp_postexecute_update_pc(vo
 	if (dsp_core.registers[DSP_REG_SR] & (1<<DSP_SR_LF)) {
 
 		/* Did we execute the last instruction in loop ? */
-		if (dsp_core.pc == dsp_core.registers[DSP_REG_LA]+1) {		
+		if (dsp_core.pc == dsp_core.registers[DSP_REG_LA] + 1) {		
 			--dsp_core.registers[DSP_REG_LC];
 			dsp_core.registers[DSP_REG_LC] &= BITMASK(16);
 
-			if (dsp_core.registers[DSP_REG_LC]==0) {
+			if (dsp_core.registers[DSP_REG_LC] == 0) {
 				/* end of loop */
 				Uint32 saved_pc, saved_sr;
 
@@ -857,12 +909,12 @@ static void dsp_setInterruptIPL(Uint32 v
 	ipl_hi  = ((value >> 10) & 3) - 1;
 
 	/* set IPL_HI */
-	for (i=5;i<8;i++) {
+	for (i=5; i<8; i++) {
 		dsp_core.interrupt_ipl[i] = ipl_hi;
 	}
 
 	/* set IPL_SSI */
-	for (i=8;i<12;i++) {
+	for (i=8; i<12; i++) {
 		dsp_core.interrupt_ipl[i] = ipl_ssi;
 	}
 }
@@ -1128,12 +1180,14 @@ static Uint32 read_memory_disasm(int spa
 static inline Uint32 read_memory_p(Uint16 address)
 {
 	/* Internal RAM ? */
-	if (address<0x200) {
+	if (address < 0x200) {
 		return dsp_core.ramint[DSP_SPACE_P][address] & BITMASK(24);
 	}
 
+	/* Access to the external memory */
+	nb_access_to_extMemory ++;
+
 	/* External RAM, mask address to available ram size */
-//	dsp_core.instr_cycle += P_WAITSTATE;
 	return dsp_core.ramext[address & (DSP_RAMSIZE-1)] & BITMASK(24);
 }
 
@@ -1168,16 +1222,12 @@ static Uint32 read_memory(int space, Uin
 			else if (address == 0xffc0+DSP_SSI_RX) {
 				value = dsp_core_ssi_readRX();
 			}
-			dsp_core.instr_cycle += XP_WAITSTATE;
-		}
-		else {
-			dsp_core.instr_cycle += YP_WAITSTATE;
 		}
 		return value;
 	}
 
-	/* 1 more cycle for external RAM access */
-	dsp_core.instr_cycle += XY_WAITSTATE;
+	/* Access to the external memory */
+	nb_access_to_extMemory ++;
 	
 	/* Falcon: External RAM, map X to upper 16K of matching space in Y,P */
 	address &= (DSP_RAMSIZE>>1) - 1;
@@ -1192,7 +1242,7 @@ static Uint32 read_memory(int space, Uin
 
 static inline void write_memory(int space, Uint16 address, Uint32 value)
 {
-	if (LOG_TRACE_LEVEL(TRACE_DSP_DISASM_MEM))
+	if (unlikely(LOG_TRACE_LEVEL(TRACE_DSP_DISASM_MEM)))
 		write_memory_disasm(space, address, value);
 	else	
 		write_memory_raw(space, address, value);
@@ -1244,12 +1294,10 @@ static void write_memory_raw(int space,
 					dsp_core.periph[DSP_SPACE_X][address-0xffc0] = value;
 					break;
 			}
-			dsp_core.instr_cycle += XP_WAITSTATE;
 			return;
 		} 
 		else if (space == DSP_SPACE_Y) {
 			dsp_core.periph[DSP_SPACE_Y][address-0xffc0] = value;
-			dsp_core.instr_cycle += YP_WAITSTATE;
 			return;
 		}
 	}
@@ -1275,8 +1323,8 @@ static void write_memory_raw(int space,
 		}
 	}
 
-	/* 1 more cycle for external RAM access */
-	dsp_core.instr_cycle += XY_WAITSTATE;
+	/* Access to the external memory */
+	nb_access_to_extMemory ++;
 
 	/* Falcon: External RAM, map X to upper 16K of matching space in Y,P */
 	if (space != DSP_SPACE_P) {
@@ -1321,49 +1369,51 @@ static void dsp_write_reg(Uint32 numreg,
 {
 	Uint32 stack_error;
 
-	if ((numreg==DSP_REG_A) || (numreg==DSP_REG_B)) {
-		numreg &= 1;
-		dsp_core.registers[DSP_REG_A0+numreg]= 0;
-		dsp_core.registers[DSP_REG_A1+numreg]= value;
-		dsp_core.registers[DSP_REG_A2+numreg]= 0;
-		if (value & (1<<23)) {
-			dsp_core.registers[DSP_REG_A2+numreg]= 0xff;
-		}
-	} else {
-		switch (numreg) {
-			case DSP_REG_OMR:
-				dsp_core.registers[DSP_REG_OMR] = value & 0xc7;
-				break;
-			case DSP_REG_SR:
-				dsp_core.registers[DSP_REG_SR] = value & 0xaf7f;
-				break;
-			case DSP_REG_SP:
-				stack_error = dsp_core.registers[DSP_REG_SP] & (1<<DSP_SP_SE);
-				if ((stack_error==0) && (value & (1<<DSP_SP_SE))) {
-					/* Stack full, raise interrupt */
-					dsp_add_interrupt(DSP_INTER_STACK_ERROR);
-					if (!isDsp_in_disasm_mode)
-						fprintf(stderr,"Dsp: Stack Overflow\n");
-				}
+	switch (numreg) {
+		case DSP_REG_A:
+			dsp_core.registers[DSP_REG_A0] = 0;
+			dsp_core.registers[DSP_REG_A1] = value;
+			dsp_core.registers[DSP_REG_A2] = value & (1<<23) ? 0xff : 0x0;
+			break;
+		case DSP_REG_B:
+			dsp_core.registers[DSP_REG_B0] = 0;
+			dsp_core.registers[DSP_REG_B1] = value;
+			dsp_core.registers[DSP_REG_B2] = value & (1<<23) ? 0xff : 0x0;
+			break;
+		case DSP_REG_OMR:
+			dsp_core.registers[DSP_REG_OMR] = value & 0xc7;
+			break;
+		case DSP_REG_SR:
+			dsp_core.registers[DSP_REG_SR] = value & 0xaf7f;
+			break;
+		case DSP_REG_SP:
+			stack_error = dsp_core.registers[DSP_REG_SP] & (3<<DSP_SP_SE);
+			if ((stack_error==0) && (value & (3<<DSP_SP_SE))) {
+				/* Stack underflow or overflow detected, raise interrupt */
+				dsp_add_interrupt(DSP_INTER_STACK_ERROR);
+				if (!isDsp_in_disasm_mode)
+					fprintf(stderr,"Dsp: Stack Overflow or Underflow\n");
+				dsp_core.registers[DSP_REG_SP] = value & (3<<DSP_SP_SE);
+			}
+			else
 				dsp_core.registers[DSP_REG_SP] = value & BITMASK(6); 
-				dsp_compute_ssh_ssl();
-				break;
-			case DSP_REG_SSH:
-				dsp_stack_push(value, 0, 1);
-				break;
-			case DSP_REG_SSL:
-				numreg = dsp_core.registers[DSP_REG_SP] & BITMASK(4);
-				if (numreg == 0) {
-					value = 0;
-				}
-				dsp_core.stack[1][numreg] = value & BITMASK(16);
-				dsp_core.registers[DSP_REG_SSL] = value & BITMASK(16);
-				break;
-			default:
-				dsp_core.registers[numreg] = value; 
-				dsp_core.registers[numreg] &= BITMASK(registers_mask[numreg]);
-				break;
-		}
+			dsp_compute_ssh_ssl();
+			break;
+		case DSP_REG_SSH:
+			dsp_stack_push(value, 0, 1);
+			break;
+		case DSP_REG_SSL:
+			numreg = dsp_core.registers[DSP_REG_SP] & BITMASK(4);
+			if (numreg == 0) {
+				value = 0;
+			}
+			dsp_core.stack[1][numreg] = value & BITMASK(16);
+			dsp_core.registers[DSP_REG_SSL] = value & BITMASK(16);
+			break;
+		default:
+			dsp_core.registers[numreg] = value; 
+			dsp_core.registers[numreg] &= BITMASK(registers_mask[numreg]);
+			break;
 	}
 }
 
@@ -1451,17 +1501,17 @@ static void dsp_update_rn(Uint32 numreg,
 	Uint16 m_reg;
 
 	m_reg = (Uint16) dsp_core.registers[DSP_REG_M0+numreg];
-	if (m_reg == 0) {
+	if (m_reg == 65535) {
+		/* Linear addressing mode */
+		value = (Sint16) dsp_core.registers[DSP_REG_R0+numreg];
+		value += modifier;
+		dsp_core.registers[DSP_REG_R0+numreg] = ((Uint32) value) & BITMASK(16);
+	} else if (m_reg == 0) {
 		/* Bit reversed carry update */
 		dsp_update_rn_bitreverse(numreg);
 	} else if (m_reg<=32767) {
 		/* Modulo update */
 		dsp_update_rn_modulo(numreg, modifier);
-	} else if (m_reg == 65535) {
-		/* Linear addressing mode */
-		value = (Sint16) dsp_core.registers[DSP_REG_R0+numreg];
-		value += modifier;
-		dsp_core.registers[DSP_REG_R0+numreg] = ((Uint32) value) & BITMASK(16);
 	} else {
 		/* Undefined */
 	}
@@ -1726,7 +1776,7 @@ static void dsp_undefined(void)
 	if (isDsp_in_disasm_mode == false) {
 		cur_inst_len = 0;
 		fprintf(stderr, "Dsp: 0x%04x: 0x%06x Illegal instruction\n",dsp_core.pc, cur_inst);
-		/* Add some CPU cycles to avoid being stuck in an infinite loop */
+		/* Add some artificial CPU cycles to avoid being stuck in an infinite loop */
 		dsp_core.instr_cycle += 100;
 	}
 	else {
@@ -1805,9 +1855,6 @@ static void dsp_bchg_ea(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (addr>=0x200) {
-		dsp_core.instr_cycle += XY_WAITSTATE;
-	}
 }
 
 static void dsp_bchg_pp(void)
@@ -1833,11 +1880,6 @@ static void dsp_bchg_pp(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (memspace == DSP_SPACE_X) {
-		dsp_core.instr_cycle += XP_WAITSTATE;
-	} else {
-		dsp_core.instr_cycle += YP_WAITSTATE;
-	}
 }
 
 static void dsp_bchg_reg(void)
@@ -1908,9 +1950,6 @@ static void dsp_bclr_ea(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (addr>=0x200) {
-		dsp_core.instr_cycle += XY_WAITSTATE;
-	}
 }
 
 static void dsp_bclr_pp(void)
@@ -1932,11 +1971,6 @@ static void dsp_bclr_pp(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (memspace == DSP_SPACE_X) {
-		dsp_core.instr_cycle += XP_WAITSTATE;
-	} else {
-		dsp_core.instr_cycle += YP_WAITSTATE;
-	}	
 }
 
 static void dsp_bclr_reg(void)
@@ -2004,9 +2038,6 @@ static void dsp_bset_ea(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (addr>=0x200) {
-		dsp_core.instr_cycle += XY_WAITSTATE;
-	}
 }
 
 static void dsp_bset_pp(void)
@@ -2027,11 +2058,6 @@ static void dsp_bset_pp(void)
 	dsp_core.registers[DSP_REG_SR] |= newcarry<<DSP_SR_C;
 
 	dsp_core.instr_cycle += 2;
-	if (memspace == DSP_SPACE_X) {
-		dsp_core.instr_cycle += XP_WAITSTATE;
-	} else {
-		dsp_core.instr_cycle += YP_WAITSTATE;
-	}
 }
 
 static void dsp_bset_reg(void)
@@ -2150,18 +2176,21 @@ static void dsp_div(void)
 		case 2:	srcreg = DSP_REG_X1;	break;
 		case 3:	srcreg = DSP_REG_Y1;	break;
 	}
-	destreg = DSP_REG_A+((cur_inst>>3) & 1);
+	source[2] = 0;
+	source[1] = dsp_core.registers[srcreg];
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
-	source[0] = 0;
-    source[1] = dsp_core.registers[srcreg];
-    if (source[1] & (1<<23)) {
-        source[0] = 0xff;
-    }
-    source[2] = 0;
-
-	dest[0] = dsp_core.registers[DSP_REG_A2+(destreg & 1)];
-	dest[1] = dsp_core.registers[DSP_REG_A1+(destreg & 1)];
-	dest[2] = dsp_core.registers[DSP_REG_A0+(destreg & 1)];
+	destreg = DSP_REG_A + ((cur_inst>>3) & 1);
+	if (destreg == DSP_REG_A) {
+		dest[0] = dsp_core.registers[DSP_REG_A2];
+		dest[1] = dsp_core.registers[DSP_REG_A1];
+		dest[2] = dsp_core.registers[DSP_REG_A0];
+	}
+	else {
+		dest[0] = dsp_core.registers[DSP_REG_B2];
+		dest[1] = dsp_core.registers[DSP_REG_B1];
+		dest[2] = dsp_core.registers[DSP_REG_B0];
+	}
 
 	if (((dest[0]>>7) & 1) ^ ((source[1]>>23) & 1)) {
 		/* D += S */
@@ -2175,10 +2204,17 @@ static void dsp_div(void)
 
 	dest[2] |= (dsp_core.registers[DSP_REG_SR]>>DSP_SR_C) & 1;
 
-	dsp_core.registers[DSP_REG_A2+(destreg & 1)] = dest[0];
-	dsp_core.registers[DSP_REG_A1+(destreg & 1)] = dest[1];
-	dsp_core.registers[DSP_REG_A0+(destreg & 1)] = dest[2];
-
+	if (destreg == DSP_REG_A) {
+		dsp_core.registers[DSP_REG_A2] = dest[0];
+		dsp_core.registers[DSP_REG_A1] = dest[1];
+		dsp_core.registers[DSP_REG_A0] = dest[2];
+	}
+	else {
+		dsp_core.registers[DSP_REG_B2] = dest[0];
+		dsp_core.registers[DSP_REG_B1] = dest[1];
+		dsp_core.registers[DSP_REG_B0] = dest[2];
+	}
+	
 	dsp_core.registers[DSP_REG_SR] &= BITMASK(16)-((1<<DSP_SR_C)|(1<<DSP_SR_V));
 	dsp_core.registers[DSP_REG_SR] |= (1-((dest[0]>>7) & 1))<<DSP_SR_C;
 	dsp_core.registers[DSP_REG_SR] |= newsr & (1<<DSP_SR_L);
@@ -2303,9 +2339,6 @@ static void dsp_jcc_imm(void)
 	}
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jcc_ea(void)
@@ -2321,9 +2354,6 @@ static void dsp_jcc_ea(void)
 	}
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jclr_aa(void)
@@ -2337,9 +2367,6 @@ static void dsp_jclr_aa(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if ((value & (1<<numbit))==0) {
 		dsp_core.pc = newaddr;
@@ -2362,9 +2389,6 @@ static void dsp_jclr_ea(void)
 	value = read_memory(memspace, addr);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if ((value & (1<<numbit))==0) {
 		dsp_core.pc = newaddr;
@@ -2386,9 +2410,6 @@ static void dsp_jclr_pp(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if ((value & (1<<numbit))==0) {
 		dsp_core.pc = newaddr;
@@ -2413,9 +2434,6 @@ static void dsp_jclr_reg(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if ((value & (1<<numbit))==0) {
 		dsp_core.pc = newaddr;
@@ -2434,9 +2452,6 @@ static void dsp_jmp_ea(void)
 	dsp_core.pc = newpc;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jmp_imm(void)
@@ -2448,9 +2463,6 @@ static void dsp_jmp_imm(void)
 	dsp_core.pc = newpc;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jscc_ea(void)
@@ -2467,9 +2479,6 @@ static void dsp_jscc_ea(void)
 	} 
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jscc_imm(void)
@@ -2485,9 +2494,6 @@ static void dsp_jscc_imm(void)
 	} 
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jsclr_aa(void)
@@ -2501,9 +2507,6 @@ static void dsp_jsclr_aa(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 	
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if ((value & (1<<numbit))==0) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2527,9 +2530,6 @@ static void dsp_jsclr_ea(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if ((value & (1<<numbit))==0) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2553,9 +2553,6 @@ static void dsp_jsclr_pp(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if ((value & (1<<numbit))==0) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2582,9 +2579,6 @@ static void dsp_jsclr_reg(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if ((value & (1<<numbit))==0) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2607,9 +2601,6 @@ static void dsp_jset_aa(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if (value & (1<<numbit)) {
 		newpc = newaddr;
@@ -2632,10 +2623,7 @@ static void dsp_jset_ea(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
-	
+
 	if (value & (1<<numbit)) {
 		newpc = newaddr;
 		dsp_core.pc = newpc;
@@ -2657,9 +2645,6 @@ static void dsp_jset_pp(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if (value & (1<<numbit)) {
 		newpc = newaddr;
@@ -2685,9 +2670,6 @@ static void dsp_jset_reg(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 	
 	if (value & (1<<numbit)) {
 		newpc = newaddr;
@@ -2715,9 +2697,6 @@ static void dsp_jsr_imm(void)
 	cur_inst_len = 0;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jsr_ea(void)
@@ -2737,9 +2716,6 @@ static void dsp_jsr_ea(void)
 	cur_inst_len = 0;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_jsset_aa(void)
@@ -2753,9 +2729,6 @@ static void dsp_jsset_aa(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 	
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if (value & (1<<numbit)) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2779,9 +2752,6 @@ static void dsp_jsset_ea(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 	
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if (value & (1<<numbit)) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2805,9 +2775,6 @@ static void dsp_jsset_pp(void)
 	newaddr = read_memory_p(dsp_core.pc+1);
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if (value & (1<<numbit)) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2834,9 +2801,6 @@ static void dsp_jsset_reg(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (newaddr >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 
 	if (value & (1<<numbit)) {
 		dsp_stack_push(dsp_core.pc+2, dsp_core.registers[DSP_REG_SR], 0);
@@ -2899,14 +2863,17 @@ static void dsp_movec_reg(void)
 			value = dsp_core.registers[numreg1];
 		}
 
-		if ((numreg2 == DSP_REG_A) || (numreg2 == DSP_REG_B)) {
-			dsp_core.registers[DSP_REG_A2+(numreg2 & 1)] = 0;
-			if (value & (1<<23)) {
-				dsp_core.registers[DSP_REG_A2+(numreg2 & 1)] = 0xff;
-			}
-			dsp_core.registers[DSP_REG_A1+(numreg2 & 1)] = value & BITMASK(24);
-			dsp_core.registers[DSP_REG_A0+(numreg2 & 1)] = 0;
-		} else {
+		if (numreg2 == DSP_REG_A) {
+			dsp_core.registers[DSP_REG_A0] = 0;
+			dsp_core.registers[DSP_REG_A1] = value & BITMASK(24);
+			dsp_core.registers[DSP_REG_A2] = value & (1<<23) ? 0xff : 0x0;
+		}
+		else if (numreg2 == DSP_REG_B) {
+			dsp_core.registers[DSP_REG_B0] = 0;
+			dsp_core.registers[DSP_REG_B1] = value & BITMASK(24);
+			dsp_core.registers[DSP_REG_B2] = value & (1<<23) ? 0xff : 0x0;
+		}
+		else {
 			dsp_core.registers[numreg2] = value & BITMASK(registers_mask[numreg2]);
 		}
 	}
@@ -3018,9 +2985,6 @@ static void dsp_movem_aa(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (addr>=0x200) {
-		dsp_core.instr_cycle += P_WAITSTATE;
-	}
 }
 
 static void dsp_movem_ea(void)
@@ -3051,9 +3015,6 @@ static void dsp_movem_ea(void)
 	}
 
 	dsp_core.instr_cycle += 4;
-	if (addr>=0x200) {
-		dsp_core.instr_cycle += P_WAITSTATE;
-	}
 }
 
 static void dsp_movep_0(void)
@@ -3112,7 +3073,10 @@ static void dsp_movep_1(void)
 		write_memory(DSP_SPACE_P, paddr, read_memory(memspace, xyaddr));
 	}
 
-	dsp_core.instr_cycle += 2;
+	/* Movep is 4 cycles, but according to the motorola doc, */
+	/* movep from p memory to x or y peripheral memory takes */
+	/* 2 more cycles, so +4 cycles at total */
+	dsp_core.instr_cycle += 4;
 }
 
 static void dsp_movep_23(void)
@@ -3144,16 +3108,10 @@ static void dsp_movep_23(void)
 		if (retour) {
 			write_memory(perspace, peraddr, addr);
 		} else {
-			if (peraddr>=0x200) {
-				dsp_core.instr_cycle += P_WAITSTATE;
-			}
 			write_memory(perspace, peraddr, read_memory(easpace, addr));
 		}
 	} else {
 		/* Read pp */
-		if (peraddr>=0x200) {
-			dsp_core.instr_cycle += P_WAITSTATE;
-		}
 		write_memory(easpace, addr, read_memory(perspace, peraddr));
 	}
 
@@ -3312,9 +3270,6 @@ static void dsp_rti(void)
 	cur_inst_len = 0;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_rts(void)
@@ -3326,9 +3281,6 @@ static void dsp_rts(void)
 	cur_inst_len = 0;
 
 	dsp_core.instr_cycle += 2;
-	if (newpc >= 0x200) {
-		dsp_core.instr_cycle += 2*P_WAITSTATE;
-	}
 }
 
 static void dsp_stop(void)
@@ -3355,23 +3307,33 @@ static void dsp_tcc(void)
 		regdest1 = registers_tcc[(cur_inst>>3) & BITMASK(4)][1];
 
 		/* Read S1 */
-		if ((regsrc1 == DSP_REG_A) || (regsrc1 == DSP_REG_B)) {
-			val0 = dsp_core.registers[DSP_REG_A0+(regsrc1 & 1)];
-			val1 = dsp_core.registers[DSP_REG_A1+(regsrc1 & 1)];
-			val2 = dsp_core.registers[DSP_REG_A2+(regsrc1 & 1)];
-		} else {
+		if (regsrc1 == DSP_REG_A) {
+			val0 = dsp_core.registers[DSP_REG_A0];
+			val1 = dsp_core.registers[DSP_REG_A1];
+			val2 = dsp_core.registers[DSP_REG_A2];
+		}
+		else if (regsrc1 == DSP_REG_B) {
+			val0 = dsp_core.registers[DSP_REG_B0];
+			val1 = dsp_core.registers[DSP_REG_B1];
+			val2 = dsp_core.registers[DSP_REG_B2];
+		}
+		else {
 			val0 = 0;
 			val1 = dsp_core.registers[regsrc1];
-			if (val1 & (1<<23))
-				val2 = 0xff;
-			else
-				val2 = 0x0;
+			val2 = val1 & (1<<23) ? 0xff : 0x0;
 		}
 		
 		/* Write D1 */
-		dsp_core.registers[DSP_REG_A2+(regdest1 & 1)] = val2;
-		dsp_core.registers[DSP_REG_A1+(regdest1 & 1)] = val1;
-		dsp_core.registers[DSP_REG_A0+(regdest1 & 1)] = val0;
+		if (regdest1 == DSP_REG_A) {
+			dsp_core.registers[DSP_REG_A2] = val2;
+			dsp_core.registers[DSP_REG_A1] = val1;
+			dsp_core.registers[DSP_REG_A0] = val0;
+		}
+		else {
+			dsp_core.registers[DSP_REG_B2] = val2;
+			dsp_core.registers[DSP_REG_B1] = val1;
+			dsp_core.registers[DSP_REG_B0] = val0;
+		}
 
 		/* S2,D2 transfer */
 		if (cur_inst & (1<<16)) {
@@ -3391,7 +3353,7 @@ static void dsp_wait(void)
 static int dsp_pm_read_accu24(int numreg, Uint32 *dest)
 {
 	Uint32 scaling, value, reg;
-	int got_limited=0;
+	int got_limited = 0;
 
 	/* Read an accumulator, stores it limited */
 
@@ -3479,10 +3441,7 @@ static void dsp_pm_0(void)
 	/* Move [x|y]0 to [A|B] */
 	dsp_core.registers[DSP_REG_A0+numreg] = 0;
 	dsp_core.registers[DSP_REG_A1+numreg] = save_xy0;
-	if (save_xy0 & (1<<23))
-		dsp_core.registers[DSP_REG_A2+numreg] = 0xff;
-	else
-		dsp_core.registers[DSP_REG_A2+numreg] = 0x0;
+	dsp_core.registers[DSP_REG_A2+numreg] = save_xy0 & (1<<23) ? 0xff : 0x0;
 }
 
 static void dsp_pm_1(void)
@@ -3918,6 +3877,7 @@ static void dsp_pm_5(void)
 		}
 	}
 	else {
+		/* Read S */
 		write_memory(memspace, xy_addr, value);
 	}
 }
@@ -4330,10 +4290,7 @@ static void dsp_adc_x_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 	
@@ -4365,10 +4322,7 @@ static void dsp_adc_x_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 	
@@ -4400,10 +4354,7 @@ static void dsp_adc_y_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 	
@@ -4435,10 +4386,7 @@ static void dsp_adc_y_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 	
@@ -4518,10 +4466,7 @@ static void dsp_add_x_a(void)
 
 	source[1] = dsp_core.registers[DSP_REG_X1];
 	source[2] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4546,10 +4491,7 @@ static void dsp_add_x_b(void)
 
 	source[1] = dsp_core.registers[DSP_REG_X1];
 	source[2] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4574,10 +4516,7 @@ static void dsp_add_y_a(void)
 
 	source[1] = dsp_core.registers[DSP_REG_Y1];
 	source[2] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4602,10 +4541,7 @@ static void dsp_add_y_b(void)
 
 	source[1] = dsp_core.registers[DSP_REG_Y1];
 	source[2] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4630,10 +4566,7 @@ static void dsp_add_x0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4658,10 +4591,7 @@ static void dsp_add_x0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4686,10 +4616,7 @@ static void dsp_add_y0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4714,10 +4641,7 @@ static void dsp_add_y0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4742,10 +4666,7 @@ static void dsp_add_x1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4770,10 +4691,7 @@ static void dsp_add_x1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4798,10 +4716,7 @@ static void dsp_add_y1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -4826,10 +4741,7 @@ static void dsp_add_y1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_add56(source, dest);
 
@@ -5015,7 +4927,7 @@ static void dsp_and_y1_b(void)
 	dsp_core.registers[DSP_REG_SR] |= (dsp_core.registers[DSP_REG_B1]==0)<<DSP_SR_Z;
 }
 
-static void dsp_asl_b_a(void)
+static void dsp_asl_a(void)
 {
 	Uint32 dest[3];
 	Uint16 newsr;
@@ -5036,7 +4948,7 @@ static void dsp_asl_b_a(void)
 	dsp_ccr_update_e_u_n_z(dest[0], dest[1], dest[2]);
 }
 
-static void dsp_asl_a_b(void)
+static void dsp_asl_b(void)
 {
 	Uint32 dest[3];
 	Uint16 newsr;
@@ -5057,7 +4969,7 @@ static void dsp_asl_a_b(void)
 	dsp_ccr_update_e_u_n_z(dest[0], dest[1], dest[2]);
 }
 
-static void dsp_asr_b_a(void)
+static void dsp_asr_a(void)
 {
 	Uint32 dest[3];
 	Uint16 newsr;
@@ -5078,7 +4990,7 @@ static void dsp_asr_b_a(void)
 	dsp_ccr_update_e_u_n_z(dest[0], dest[1], dest[2]);
 }
 
-static void dsp_asr_a_b(void)
+static void dsp_asr_b(void)
 {
 	Uint32 dest[3];
 	Uint16 newsr;
@@ -5101,9 +5013,9 @@ static void dsp_asr_a_b(void)
 
 static void dsp_clr_a(void)
 {
-	dsp_core.registers[DSP_REG_A2]=0;
-	dsp_core.registers[DSP_REG_A1]=0;
-	dsp_core.registers[DSP_REG_A0]=0;
+	dsp_core.registers[DSP_REG_A2] = 0;
+	dsp_core.registers[DSP_REG_A1] = 0;
+	dsp_core.registers[DSP_REG_A0] = 0;
 
 	dsp_core.registers[DSP_REG_SR] &= BITMASK(16)-((1<<DSP_SR_E)|(1<<DSP_SR_N)|(1<<DSP_SR_V));
 	dsp_core.registers[DSP_REG_SR] |= (1<<DSP_SR_U)|(1<<DSP_SR_Z);
@@ -5111,9 +5023,9 @@ static void dsp_clr_a(void)
 
 static void dsp_clr_b(void)
 {
-	dsp_core.registers[DSP_REG_B2]=0;
-	dsp_core.registers[DSP_REG_B1]=0;
-	dsp_core.registers[DSP_REG_B0]=0;
+	dsp_core.registers[DSP_REG_B2] = 0;
+	dsp_core.registers[DSP_REG_B1] = 0;
+	dsp_core.registers[DSP_REG_B0] = 0;
 
 	dsp_core.registers[DSP_REG_SR] &= BITMASK(16)-((1<<DSP_SR_E)|(1<<DSP_SR_N)|(1<<DSP_SR_V));
 	dsp_core.registers[DSP_REG_SR] |= (1<<DSP_SR_U)|(1<<DSP_SR_Z);
@@ -5172,10 +5084,7 @@ static void dsp_cmp_x0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5196,10 +5105,7 @@ static void dsp_cmp_x0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5220,10 +5126,7 @@ static void dsp_cmp_y0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5244,10 +5147,7 @@ static void dsp_cmp_y0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5267,10 +5167,7 @@ static void dsp_cmp_x1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5291,10 +5188,7 @@ static void dsp_cmp_x1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5315,10 +5209,7 @@ static void dsp_cmp_y1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5339,10 +5230,7 @@ static void dsp_cmp_y1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -5410,10 +5298,7 @@ static void dsp_cmpm_x0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5436,10 +5321,7 @@ static void dsp_cmpm_x0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5462,10 +5344,7 @@ static void dsp_cmpm_y0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5488,10 +5367,7 @@ static void dsp_cmpm_y0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5514,10 +5390,7 @@ static void dsp_cmpm_x1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5540,10 +5413,7 @@ static void dsp_cmpm_x1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5566,10 +5436,7 @@ static void dsp_cmpm_y1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -5592,10 +5459,7 @@ static void dsp_cmpm_y1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 	dsp_abs56(source);
 
 	newsr = dsp_sub56(source, dest);
@@ -8398,10 +8262,7 @@ static void dsp_sbc_x_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 	
@@ -8433,10 +8294,7 @@ static void dsp_sbc_x_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 	
@@ -8468,10 +8326,7 @@ static void dsp_sbc_y_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 	
@@ -8503,10 +8358,7 @@ static void dsp_sbc_y_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 	
@@ -8586,11 +8438,7 @@ static void dsp_sub_x_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8615,11 +8463,7 @@ static void dsp_sub_x_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_X0];
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8644,11 +8488,7 @@ static void dsp_sub_y_a(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8673,11 +8513,7 @@ static void dsp_sub_y_b(void)
 
 	source[2] = dsp_core.registers[DSP_REG_Y0];
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8702,11 +8538,7 @@ static void dsp_sub_x0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8731,11 +8563,7 @@ static void dsp_sub_x0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8760,11 +8588,7 @@ static void dsp_sub_y0_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8789,11 +8613,7 @@ static void dsp_sub_y0_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y0];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8818,11 +8638,7 @@ static void dsp_sub_x1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8847,11 +8663,7 @@ static void dsp_sub_x1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_X1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8876,11 +8688,7 @@ static void dsp_sub_y1_a(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -8905,11 +8713,7 @@ static void dsp_sub_y1_b(void)
 
 	source[2] = 0;
 	source[1] = dsp_core.registers[DSP_REG_Y1];
-	if (source[1] & (1<<23))
-		source[0] = 0xff;
-	else
-		source[0] = 0x0;
-
+	source[0] = source[1] & (1<<23) ? 0xff : 0x0;
 
 	newsr = dsp_sub56(source, dest);
 
@@ -9124,8 +8928,8 @@ static void dsp_tfr_y1_b(void)
 static void dsp_tst_a(void)
 {
 	dsp_ccr_update_e_u_n_z(	dsp_core.registers[DSP_REG_A2],
-							dsp_core.registers[DSP_REG_A1],
-							dsp_core.registers[DSP_REG_A0]);
+				dsp_core.registers[DSP_REG_A1],
+				dsp_core.registers[DSP_REG_A0]);
 
 	dsp_core.registers[DSP_REG_SR] &= BITMASK(16)-(1<<DSP_SR_V);
 }
@@ -9133,8 +8937,8 @@ static void dsp_tst_a(void)
 static void dsp_tst_b(void)
 {
 	dsp_ccr_update_e_u_n_z(	dsp_core.registers[DSP_REG_B2],
-							dsp_core.registers[DSP_REG_B1],
-							dsp_core.registers[DSP_REG_B0]);
+				dsp_core.registers[DSP_REG_B1],
+				dsp_core.registers[DSP_REG_B0]);
 
 	dsp_core.registers[DSP_REG_SR] &= BITMASK(16)-(1<<DSP_SR_V);
 }