Check for VPT blocks.

rizinorg · Jul 4, 2023 · 14cb25f · 14cb25f
1 parent b7b3fba
commit 14cb25f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/librz/asm/arch/arm/arm_it.c b/librz/asm/arch/arm/arm_it.c
@@ -52,7 +52,7 @@ RZ_API void rz_arm_it_update_block(RzArmITContext *ctx, cs_insn *insn) {
 			cond.cond = insn->detail->arm.cc;
 			break;
 		case 0x65: //'e'
-			cond.cond = (insn->detail->arm.cc % 2) ? insn->detail->arm.cc + 1 : insn->detail->arm.cc - 1;
+			cond.cond = ARMCC_getOppositeCondition(insn->detail->arm.cc);
 			break;
 		default:
 			break;

diff --git a/librz/asm/p/asm_arm_cs.c b/librz/asm/p/asm_arm_cs.c
@@ -119,7 +119,7 @@ static int disassemble(RzAsm *a, RzAsmOp *op, const ut8 *buf, int len) {
 	}
 	if (op && !op->size) {
 		op->size = insn->size;
-		if (insn->id == ARM_INS_IT) {
+		if (insn->id == ARM_INS_IT || insn->id == ARM_INS_VPT) {
 			rz_arm_it_update_block(&ctx->it, insn);
 		} else {
 			rz_arm_it_update_nonblock(&ctx->it, insn);