Set POP return info if it writes to PC

rizinorg · Dec 12, 2023 · 9a1c413 · 9a1c413
1 parent 96038ea
commit 9a1c413
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/librz/analysis/p/analysis_arm_cs.c b/librz/analysis/p/analysis_arm_cs.c
@@ -1151,6 +1151,17 @@ static void anop64(ArmCSContext *ctx, RzAnalysisOp *op, cs_insn *insn) {
 	}
 }
 
+/**
+ * \brief Checks if a given intruction is a POP instruction which returns (writes to PC)
+ * and sets the analysis op data accordingly.
+ */
+inline static void set_pop_ret_info(const cs_insn *insn, RZ_BORROW RzAnalysisOp *op) {
+	if (rz_arm_cs_is_group_member(insn, ARM_GRP_RET)) {
+		op->eob = true;
+		op->type = RZ_ANALYSIS_OP_TYPE_RET;
+	}
+}
+
 static void anop32(RzAnalysis *a, csh handle, RzAnalysisOp *op, cs_insn *insn, bool thumb, const ut8 *buf, int len) {
 	ArmCSContext *ctx = (ArmCSContext *)a->plugin_data;
 	const ut64 addr = op->addr;
@@ -1261,6 +1272,7 @@ jmp $$ + 4 + ( [delta] * 2 )
 		op->type = RZ_ANALYSIS_OP_TYPE_POP;
 		op->stackop = RZ_ANALYSIS_STACK_DEC;
 		op->stackptr = -4LL * insn->detail->arm.op_count;
+		set_pop_ret_info(insn, op);
 		// fallthrough
 	case ARM_INS_FLDMDBX:
 	case ARM_INS_FLDMIAX:
@@ -1273,6 +1285,7 @@ jmp $$ + 4 + ( [delta] * 2 )
 			op->type = RZ_ANALYSIS_OP_TYPE_POP;
 			op->stackop = RZ_ANALYSIS_STACK_DEC;
 			op->stackptr = -4LL * (insn->detail->arm.op_count - 1);
+			set_pop_ret_info(insn, op);
 			break;
 		}
 #endif
@@ -1530,6 +1543,7 @@ jmp $$ + 4 + ( [delta] * 2 )
 			op->type = RZ_ANALYSIS_OP_TYPE_POP;
 			op->stackop = RZ_ANALYSIS_STACK_DEC;
 			op->stackptr = -4LL * (insn->detail->arm.op_count - 1);
+			set_pop_ret_info(insn, op);
 			break;
 		}
 #endif