[thumb2] Fix #6328: "Invalid intrinsic lifting for MRS instruction: destination register incorrectly specified" by correctly specifying the intrinsic outputs

galenbwill · galenbwill · commit 13e8a11adf49 · 2025-01-17T19:35:56.000-05:00
diff --git a/arch/armv7/thumb2_disasm/il_thumb2.cpp b/arch/armv7/thumb2_disasm/il_thumb2.cpp
@@ -994,7 +994,8 @@ bool GetLowLevelILForThumbInstruction(Architecture* arch, LowLevelILFunction& il
 		break;
 	case armv7::ARMV7_MRS:
 	{
-		int dest_reg = ReadILOperand(il, instr, 0);
+		int dest_reg = GetRegisterByIndex(instr->fields[instr->format->operands[0].field0], instr->format->operands[0].prefix);
+
 		int intrinsic_id = ARMV7_INTRIN_MRS;
 
 		il.AddInstruction(

Original file line number	Diff line number	Diff line change
`@@ -994,7 +994,8 @@ bool GetLowLevelILForThumbInstruction(Architecture* arch, LowLevelILFunction& il`
`994`	`994`	`break;`
`995`	`995`	`case armv7::ARMV7_MRS:`
`996`	`996`	`{`
`997`		`- int dest_reg = ReadILOperand(il, instr, 0);`
	`997`	`+ int dest_reg = GetRegisterByIndex(instr->fields[instr->format->operands[0].field0], instr->format->operands[0].prefix);`
	`998`	`+`
`998`	`999`	`int intrinsic_id = ARMV7_INTRIN_MRS;`
`999`	`1000`
`1000`	`1001`	`il.AddInstruction(`