fix FPU decoding of single, double, real, and extended

Author: jack68k

arch/M68K/M68KDisassembler.c

@@ -2333,40 +2333,53 @@ static void d68020_fpu(m68k_info *info)
 
 	if (rm == 1) {
 		switch (src) {
-		case 0x00:
+		case 0x00:  // long integer
 			ext->op_size.cpu_size = M68K_CPU_SIZE_LONG;
 			get_ea_mode_op(info, op0, info->ir, 4);
 			break;
 
-		case 0x06:
+		case 0x06:  // byte integer
 			ext->op_size.cpu_size = M68K_CPU_SIZE_BYTE;
 			get_ea_mode_op(info, op0, info->ir, 1);
 			break;
 
-		case 0x04:
+		case 0x04:  // word integer
 			ext->op_size.cpu_size = M68K_CPU_SIZE_WORD;
 			get_ea_mode_op(info, op0, info->ir, 2);
 			break;
 
-		case 0x01:
+		case 0x01:  // single real
 			ext->op_size.type = M68K_SIZE_TYPE_FPU;
 			ext->op_size.fpu_size = M68K_FPU_SIZE_SINGLE;
 			get_ea_mode_op(info, op0, info->ir, 4);
-			op0->simm = BitsToFloat(op0->imm);
-			op0->type = M68K_OP_FP_SINGLE;
+			if (op0->type == M68K_OP_IMM) {
+				// reinterpret the immediate as float
+				op0->simm = BitsToFloat((uint32_t)op0->imm);
+				op0->type = M68K_OP_FP_SINGLE;
+			}
 			break;
 
-		case 0x05:
+		case 0x05:  // double real
 			ext->op_size.type = M68K_SIZE_TYPE_FPU;
 			ext->op_size.fpu_size = M68K_FPU_SIZE_DOUBLE;
 			get_ea_mode_op(info, op0, info->ir, 8);
-			op0->type = M68K_OP_FP_DOUBLE;
+			if (op0->type == M68K_OP_IMM) {
+				// reinterpret the immediate as double
+				op0->dimm = BitsToDouble(op0->imm);
+				op0->type = M68K_OP_FP_DOUBLE;
+			}
 			break;
 
-		default:
+		case 0x02: // extended real
+		case 0x03: // packed decimal
 			ext->op_size.type = M68K_SIZE_TYPE_FPU;
 			ext->op_size.fpu_size = M68K_FPU_SIZE_EXTENDED;
+			get_ea_mode_op(info, op0, info->ir, 12);
 			break;
+
+		default:
+			d68000_invalid(info);
+			return;
 		}
 	} else {
 		op0->reg = M68K_REG_FP0 + src;

tests/details/m68k.yaml

@@ -1242,3 +1242,147 @@ test_cases:
                 disp_offset: 4
                 br_disp: 0x30
                 br_disp_size: 2
+
+  -
+    input:
+      bytes: [ 0xf2, 0x10, 0x40, 0x00, 0xf2, 0x10, 0x44, 0x00, 0xf2, 0x10, 0x48, 0x00, 0xf2, 0x10, 0x4c, 0x00, 0xf2, 0x10, 0x50, 0x00, 0xf2, 0x10, 0x54, 0x00, 0xf2, 0x10, 0x58, 0x00 ]
+      arch: "m68k"
+      options: [ CS_OPT_DETAIL, CS_MODE_BIG_ENDIAN, CS_MODE_M68K_040 ]
+      address: 0x2000
+    expected:
+      insns:
+      -
+        asm_text: "fmove.l (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.s (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.x (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.x (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.w (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.d (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.b (a0), fp0"
+        details:
+          regs_read: [ a0 ]
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_MEM
+                address_mode: M68K_AM_REGI_ADDR
+              -
+                type: M68K_OP_REG
+                reg: fp0
+  -
+    input:
+      bytes: [ 0xf2, 0x3c, 0x44, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0xf2, 0x3c, 0x54, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x3c, 0x54, 0xa2, 0xbf, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ]
+      arch: "m68k"
+      options: [ CS_OPT_DETAIL, CS_MODE_BIG_ENDIAN, CS_MODE_M68K_040 ]
+      address: 0x2000
+    expected:
+      insns:
+      -
+        asm_text: "fmove.s #1.500000, fp0"
+        details:
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_FP_SINGLE
+                simm: 1.500000
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fmove.d #2.500000, fp0"
+        details:
+          regs_write: [ fp0 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_FP_DOUBLE
+                dimm: 2.500000
+              -
+                type: M68K_OP_REG
+                reg: fp0
+      -
+        asm_text: "fadd.d #-0.500000, fp1"
+        details:
+          regs_write: [ fp1 ]
+          m68k:
+            operands:
+              -
+                type: M68K_OP_FP_DOUBLE
+                dimm: -0.500000
+              -
+                type: M68K_OP_REG
+                reg: fp1