Changeset 105785 in vbox for trunk/src

Timestamp:

Aug 21, 2024 5:23:15 PM (3 months ago)

Author:

vboxsync

Message:

Disassembler/ARMv8: Updates, decode basic ldr/str (unsigned with immediate) instructions, add them to the testcase, bugref:10394

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore-armv8.cpp (modified) (4 diffs)
• DisasmFormatArmV8.cpp (modified) (1 diff)
• DisasmInternal-armv8.h (modified) (3 diffs)
• DisasmTables-armv8-a64.cpp (modified) (1 diff)
• testcase/tstDisasmArmv8-1-asm.S (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore-armv8.cpp

@@ -88 +88 @@
 static FNDISPARSEARMV8 disArmV8ParseShift;
 static FNDISPARSEARMV8 disArmV8ParseShiftAmount;
+static FNDISPARSEARMV8 disArmV8ParseImmMemOff;
 /** @}  */
 
@@ -119 +120 @@
     disArmV8ParseImmTbz,
     disArmV8ParseShift,
-    disArmV8ParseShiftAmount
+    disArmV8ParseShiftAmount,
+    disArmV8ParseImmMemOff
 };
 
@@ -242 +244 @@
     pParam->armv8.Reg.idxGenReg = disArmV8ExtractBitVecFromInsn(u32Insn, pInsnParm->idxBitStart, pInsnParm->cBits);
     pParam->armv8.cb            = *pf64Bit ? sizeof(uint64_t) : sizeof(uint32_t);
-    pParam->fUse |=   (*pf64Bit || (pInsnParm->fFlags & (DIS_ARMV8_INSN_PARAM_F_ADDR_BEGIN | DIS_ARMV8_INSN_PARAM_F_ADDR_END) ))
+    pParam->fUse |=   (*pf64Bit || (pParam->armv8.enmType == kDisArmv8OpParmAddrInGpr))
                     ? DISUSE_REG_GEN64
                     : DISUSE_REG_GEN32;
@@ -420 +422 @@
 
 
+static int disArmV8ParseImmMemOff(PDISSTATE pDis, uint32_t u32Insn, PCDISARMV8INSNCLASS pInsnClass, PDISOPPARAM pParam, PCDISARMV8INSNPARAM pInsnParm, bool *pf64Bit)
+{
+    RT_NOREF(pDis, pInsnClass, pf64Bit);
+
+    AssertReturn(pInsnParm->cBits <= 12, VERR_INTERNAL_ERROR_2);
+
+    uint8_t const uScale = *pf64Bit ? 8 : 4;
+    pParam->armv8.offBase = disArmV8ExtractBitVecFromInsn(u32Insn, pInsnParm->idxBitStart, pInsnParm->cBits) * uScale;
+    pParam->armv8.cb = sizeof(uint16_t);
+    return VINF_SUCCESS;
+}
+
+
 static uint32_t disArmV8DecodeIllegal(PDISSTATE pDis, uint32_t u32Insn, PCDISARMV8INSNCLASS pInsnClass)
 {

trunk/src/VBox/Disassembler/DisasmFormatArmV8.cpp

@@ -713 +713 @@
                     break;
                 }
+                case kDisArmv8OpParmAddrInGpr:
+                {
+                    PUT_C('[');
+
+                    size_t cchReg;
+                    const char *pszReg = disasmFormatArmV8Reg(pDis, pParam, &cchReg);
+                    PUT_STR(pszReg, cchReg);
+
+                    if (pParam->armv8.offBase)
+                    {
+                        PUT_SZ(", #");
+                        PUT_NUM_16(pParam->armv8.offBase);
+                    }
+
+                    PUT_C(']');
+                    break;
+                }
                 default:
                     AssertFailed();

trunk/src/VBox/Disassembler/DisasmInternal-armv8.h

@@ -66 +66 @@
     kDisParmParseShift,
     kDisParmParseShiftAmount,
+    kDisParmParseImmMemOff,
     kDisParmParseMax
 } DISPARMPARSEIDX;
@@ -91 +92 @@
     /** The parser to use for the parameter. */
     DISPARMPARSEIDX     idxParse;
-    /** Additional flags for the parameter. */
-    uint32_t            fFlags;
     /** Bit index at which the field starts. */
     uint8_t             idxBitStart;
@@ -103 +102 @@
 typedef const DISARMV8INSNPARAM *PCDISARMV8INSNPARAM;
 
-#define DIS_ARMV8_INSN_PARAM_NONE { kDisParmParseNop, 0, 0, 0, DIS_ARMV8_INSN_PARAM_UNSET }
+#define DIS_ARMV8_INSN_PARAM_NONE { kDisParmParseNop, 0, 0, DIS_ARMV8_INSN_PARAM_UNSET }
 #define DIS_ARMV8_INSN_PARAM_CREATE(a_idxParse, a_idxBitStart, a_cBits, a_idxParam) \
-    { a_idxParse, 0, a_idxBitStart, a_cBits, a_idxParam }
-#define DIS_ARMV8_INSN_PARAM_CREATE_EX(a_idxParse, a_idxBitStart, a_cBits, a_idxParam, a_fFlags) \
-    { a_idxParse, a_fFlags, a_idxBitStart, a_cBits, a_idxParam }
+    { a_idxParse, a_idxBitStart, a_cBits, a_idxParam }
 
 #define DIS_ARMV8_INSN_PARAM_UNSET        UINT8_MAX
-
-#define DIS_ARMV8_INSN_PARAM_F_ADDR_BEGIN RT_BIT_32(0)
-#define DIS_ARMV8_INSN_PARAM_F_ADDR_END   RT_BIT_32(1)
 
 /**

trunk/src/VBox/Disassembler/DisasmTables-armv8-a64.cpp

@@ -522 +522 @@
                                             kDisArmV8OpcDecodeLookup, 0xbfc00000, 0,
                                             kDisArmv8OpParmGpr, kDisArmv8OpParmAddrInGpr)
-    DIS_ARMV8_INSN_PARAM_CREATE(   kDisParmParseIs32Bit,       30,  1, DIS_ARMV8_INSN_PARAM_UNSET),
-    DIS_ARMV8_INSN_PARAM_CREATE(   kDisParmParseReg,            0,  5, 0 /*idxParam*/),
-    DIS_ARMV8_INSN_PARAM_CREATE_EX(kDisParmParseReg,            5,  5, 1 /*idxParam*/, DIS_ARMV8_INSN_PARAM_F_ADDR_BEGIN),
-    DIS_ARMV8_INSN_PARAM_CREATE_EX(kDisParmParseImm,           10, 12, 2 /*idxParam*/, DIS_ARMV8_INSN_PARAM_F_ADDR_END),
+    DIS_ARMV8_INSN_PARAM_CREATE(kDisParmParseIs32Bit,       30,  1, DIS_ARMV8_INSN_PARAM_UNSET),
+    DIS_ARMV8_INSN_PARAM_CREATE(kDisParmParseReg,            0,  5, 0 /*idxParam*/),
+    DIS_ARMV8_INSN_PARAM_CREATE(kDisParmParseReg,            5,  5, 1 /*idxParam*/),
+    DIS_ARMV8_INSN_PARAM_CREATE(kDisParmParseImmMemOff,     10, 12, 1 /*idxParam*/),
     DIS_ARMV8_INSN_PARAM_NONE
 DIS_ARMV8_DECODE_INSN_CLASS_DEFINE_END;

trunk/src/VBox/Disassembler/testcase/tstDisasmArmv8-1-asm.S

@@ -280 +280 @@
         bics x0, x1, x28, ROR #63
 
+        ; Memory loads
+        ldr x0, [x28]
+        ldr x0, [x28, #8]
+        ldr x0, [x28, #32760]
+
+        ldr w0, [x28]
+        ldr w0, [x28, #4]
+        ldr w0, [x28, #16380]
+
+        ; Memory stores
+        str x0, [x28]
+        str x0, [x28, #8]
+        str x0, [x28, #32760]
+
+        str w0, [x28]
+        str w0, [x28, #4]
+        str w0, [x28, #16380]
+
         ;
         ; Keep last so the testcase can catch errors in