[RFC PATCH 3/3] MIPS: Reject reserved VFPU prefix instruction bits when disassembling
Yaroslav Solodovnyk
dublikunt@gmail.com
Fri Nov 6 07:10:00 GMT 2026
Source prefixes have 20 immediate bits, while destination prefixes have 12. Mask the unused high bits so unrelated encodings such as the MIPS III ld instruction 0xdc820000 are not decoded as vpfxs on Allegrex.
Add reserved-encoding checks for all three prefixes. This also restores the existing Allegrex ISA-override GAS test.
---
contrib/allegrex-vfpu/check-pseudo.py | 8 ++++++++
include/opcode/vfpu.h | 3 ++-
opcodes/mips-opc.c | 22 +++++++++++-----------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/contrib/allegrex-vfpu/check-pseudo.py b/contrib/allegrex-vfpu/check-pseudo.py
index 6d9d8f92..64c7e571 100644
--- a/contrib/allegrex-vfpu/check-pseudo.py
+++ b/contrib/allegrex-vfpu/check-pseudo.py
@@ -83,4 +83,12 @@ with tempfile.TemporaryDirectory(prefix='psp-pseudos-') as directory:
result = run('psp-objdump', '-d', obj)
require_ok(result)
assert '5.96046e-08' in result.stdout, result.stdout
+ # Prefix immediates occupy 20 bits (source) or 12 bits (destination).
+ # Reserved high bits must not alias another architecture's instructions.
+ source.write_text('.word 0xdc820000,0xdd800000,0xde001000\n')
+ require_ok(run('psp-as', '-march=allegrex', source, '-o', obj))
+ result = run('psp-objdump', '-d', obj)
+ require_ok(result)
+ for opcode in ('dc820000', 'dd800000', 'de001000'):
+ assert '.word\t0x' + opcode in result.stdout, result.stdout
print('PASS VFPU load-immediate macros and invalid operands')
diff --git a/include/opcode/vfpu.h b/include/opcode/vfpu.h
index 1fa1d321..add3f208 100644
--- a/include/opcode/vfpu.h
+++ b/include/opcode/vfpu.h
@@ -63,7 +63,8 @@
#define VF_SH_BMCOND 0
#define VF_BITCNT_HFLOAT 16
#define VF_SH_HFLOAT 0
-#define VF_BITCNT_PFX 24
+#define VF_BITCNT_SPFX 20
+#define VF_BITCNT_DPFX 12
#define VF_SH_PFX 0
#define VF_BITCNT_RWB 0x1
#define VF_SH_RWB 1
diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c
index 7ae32862..419ad2cf 100644
--- a/opcodes/mips-opc.c
+++ b/opcodes/mips-opc.c
@@ -284,14 +284,14 @@ decode_mips_operand (const char *p)
case 'w': VFPU (VF_BITCNT_ROT, VF_SH_ROT, ROTCNT); break;
case 'z': VFPU (VF_BITCNT_RWB, VF_SH_RWB, WRB_BOOL); break;
- case '0': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, SPREFIX, 0); break;
- case '1': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, SPREFIX, 1); break;
- case '2': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, SPREFIX, 2); break;
- case '3': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, SPREFIX, 3); break;
- case '4': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, DPREFIX, 0); break;
- case '5': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, DPREFIX, 1); break;
- case '6': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, DPREFIX, 2); break;
- case '7': VFPU_EX (VF_BITCNT_PFX, VF_SH_PFX, DPREFIX, 3); break;
+ case '0': VFPU_EX (VF_BITCNT_SPFX, VF_SH_PFX, SPREFIX, 0); break;
+ case '1': VFPU_EX (VF_BITCNT_SPFX, VF_SH_PFX, SPREFIX, 1); break;
+ case '2': VFPU_EX (VF_BITCNT_SPFX, VF_SH_PFX, SPREFIX, 2); break;
+ case '3': VFPU_EX (VF_BITCNT_SPFX, VF_SH_PFX, SPREFIX, 3); break;
+ case '4': VFPU_EX (VF_BITCNT_DPFX, VF_SH_PFX, DPREFIX, 0); break;
+ case '5': VFPU_EX (VF_BITCNT_DPFX, VF_SH_PFX, DPREFIX, 1); break;
+ case '6': VFPU_EX (VF_BITCNT_DPFX, VF_SH_PFX, DPREFIX, 2); break;
+ case '7': VFPU_EX (VF_BITCNT_DPFX, VF_SH_PFX, DPREFIX, 3); break;
default:
assert(0); // Bad operand type
@@ -3538,9 +3538,9 @@ const struct mips_opcode mips_builtin_opcodes[] =
{"vcmovt.s", "?d0a,?s0a,?e", 0xd2a00000, 0xfff88080, RD_C2, VFPU_REG, ALX, 0, 0 },
{"vcmovf.s", "?d0a,?s0a,?e", 0xd2a80000, 0xfff88080, RD_C2, VFPU_REG, ALX, 0, 0 },
{"vwbn.s", "?d0a,?s0a,?i", 0xd3000000, 0xff008080, RD_C2, VFPU_REG, ALX, 0, 0 },
-{"vpfxs", "?0,?1,?2,?3", 0xdc000000, 0xff000000, RD_C2, 0, ALX, 0, 0 },
-{"vpfxt", "?0,?1,?2,?3", 0xdd000000, 0xff000000, RD_C2, 0, ALX, 0, 0 },
-{"vpfxd", "?4,?5,?6,?7", 0xde000000, 0xff000000, RD_C2, 0, ALX, 0, 0 },
+{"vpfxs", "?0,?1,?2,?3", 0xdc000000, 0xfff00000, RD_C2, 0, ALX, 0, 0 },
+{"vpfxt", "?0,?1,?2,?3", 0xdd000000, 0xfff00000, RD_C2, 0, ALX, 0, 0 },
+{"vpfxd", "?4,?5,?6,?7", 0xde000000, 0xfffff000, RD_C2, 0, ALX, 0, 0 },
{"viim.s", "?t0a,j", 0xdf000000, 0xff800000, RD_C2, VFPU_REG, ALX, 0, 0 },
{"vfim.s", "?t0a,?u", 0xdf800000, 0xff800000, RD_C2, VFPU_REG, ALX, 0, 0 },
{"vflush", "", 0xffff040d, 0xffffffff, RD_C2, 0, ALX, 0, 0 },
--
2.56.0
More information about the Binutils
mailing list