Fix hacky ldrd instruction in ARM32

pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
 requires-python = ">=3.9"
 dependencies = [
     "networkx",
-    "capstone",
+    "capstone==5.0.3",
     "Levenshtein",
     "tqdm",
     "numpy",

remend/disassemble.py

@@ -142,25 +142,21 @@ class DisassemblerARM32(DisassemblerBase):
     def check_ldrd(self, insn):
         if insn.id != ARM_INS_LDRD:
             return False
-        ops = insn.op_str.split(", ")
+        ops = list(insn.operands)
         if len(ops) != 3:
             return False
-        mem = ops[2] # format: [<reg> + #<offset>]
-        if mem[0] != "[" or mem[-1] != "]":
+        if ops[2].type != ARM_OP_MEM:
             return False
-        memcomps = mem[1:-1].split(" ")
-        if memcomps[0] == "pc":
-            base = align4(insn.address + 4)
-        else:
-            basereg = ARM_REG_R0 + int(memcomps[0][1:]) # Shitty hack, may malfunction
-            if basereg not in self.reg_values:
-                return False
-            base = align4(self.reg_values[basereg])
-        if len(memcomps) == 3:
-            offset = int(memcomps[2][1:])
+        mem = ops[2].value.mem
+        if mem.base == ARM_REG_PC:
+            addr = align4(insn.address + 4) + mem.disp
+        elif mem.base in self.reg_values:
+            addr = align4(self.reg_values[mem.base]) + mem.disp
         else:
-            offset = 0
-        addr = base + offset
+            return False
+        if addr < self.loader.min_addr or addr + 8 > self.loader.max_addr:
+            # Out of bounds
+            return False
         fhex = self.loader.memory.load(addr, 8)
         fval = struct.unpack("d", fhex)[0]
         return fval, addr, 8