ii

Author: radare

libr/arch/p/arm/armass64.c

@@ -865,6 +865,17 @@ static ut32 tb(ArmOp *op) {
 	} else {
 		return UT32_MAX;
 	}
+	if (reg64_imm) {
+		if (op->operands[1].immediate > 0x3f) {
+			R_LOG_ERROR ("Bit to be tested must be in range 0-63 for %s", op->mnemonic);
+			return UT32_MAX;
+		}
+	} else if (reg32_imm) {
+		if (op->operands[1].immediate > 0x1f) {
+			R_LOG_ERROR ("Bit to be tested must be in range 0-31 for %s", op->mnemonic);
+			return UT32_MAX;
+		}
+	}
 	ut64 dst = op->operands[2].immediate;
 	st64 delta = dst - op->addr;
 	ut64 maxis = R_ABS (delta);
@@ -2182,20 +2193,28 @@ bool arm64ass (const char *str, ut64 addr, ut32 *op) {
 	} else if (r_str_startswith (str, "ldur")) {
 		*op = regsluop (&ops, 0x000040f8);
 	} else if (r_str_startswith (str, "str")) {
+#if 0
+		// AITODO: maybe
+		*op = reglsop (&ops, 0x000000f8);
+#else
 		*op = UT32_MAX;
 		*op = lsop (&ops, 0x000000f8, -1);
 		if (*op == UT32_MAX) {
 			*op = reglsop (&ops, 0x000000f8);
 		}
+#endif
 	} else if (r_str_startswith (str, "stp")) {
 		*op = stp (&ops, 0x000000a9);
 	} else if (r_str_startswith (str, "ldp")) {
 		*op = stp (&ops, 0x000040a9);
 	} else if (r_str_startswith (str, "sub") && !r_str_startswith (str, "subg") && !r_str_startswith (str, "subp")) { // w, skip this for mte versions of sub, e.g. subg, subp ins
 		*op = arithmetic (&ops, 0xd1);
+#if 0
+		// AITODO
 	} else if (r_str_startswith (str, "msub x")) {
 		/* msub: multiply-subtract (Rd = Rn * Rm - Ra) */
 		*op = math (&ops, 0x1b008000, true);
+#endif
 	} else if (r_str_startswith (str, "madd x")) {
 		*op = math (&ops, 0x9b, true);
 	} else if (r_str_startswith (str, "add x")) {

test/db/asm/arm_64

@@ -667,3 +667,5 @@ ad "tbnz x29, 0x30, 0x1fd0" 9DFE80B7
 ad "tbnz w25, 0x16, 0x14" B900B037
 ad "tbnz w30, 0xf, 4" 3E007837
 ad "tbnz w11, 0x1d, 0x18" CB00E837
+ad "msub x7, x8, x9, x5" 0795099b
+ad "str x2, [x16, 0x2058]" 022e10f9