The entire set of implementation defined system registers for ARM64 w…

…ill flatten to a single register named "IMPLEMENTATION_DEFINED_SYSREG".
dyninst · May 20, 2016 · f47f425 · f47f425
1 parent 893d7ee
commit f47f425
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/instructionAPI/src/InstructionDecoder-aarch64.C b/instructionAPI/src/InstructionDecoder-aarch64.C
@@ -432,7 +432,12 @@ namespace Dyninst
 			if(InstructionDecoder_aarch64::sysRegMap.count(systemRegEncoding) <= 0)
 				assert(!"tried to access system register not accessible in EL0");
 
-			insn_in_progress->appendOperand(makeRegisterExpression(InstructionDecoder_aarch64::sysRegMap[systemRegEncoding]), !isRtRead, isRtRead);
+			MachRegister reg;
+			if((op0Field & 0x3) == 0x3 && (crnField & 0x3) == 0x3 && (crnField & 0x8) == 0x8)
+				reg = aarch64::IMPLEMENTATION_DEFINED_SYSREG;
+			else
+				reg = InstructionDecoder_aarch64::sysRegMap[systemRegEncoding];
+			insn_in_progress->appendOperand(makeRegisterExpression(reg), !isRtRead, isRtRead);
 			insn_in_progress->appendOperand(makeRtExpr(), isRtRead, !isRtRead);
 			if(!isRtRead)
 			    insn_in_progress->m_Operands.reverse();