summaryrefslogtreecommitdiff
path: root/src/arch/arm/insts
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/insts')
-rw-r--r--src/arch/arm/insts/misc.cc4
-rw-r--r--src/arch/arm/insts/vfp.cc22
2 files changed, 13 insertions, 13 deletions
diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc
index c40b6711f..6320bb6da 100644
--- a/src/arch/arm/insts/misc.cc
+++ b/src/arch/arm/insts/misc.cc
@@ -80,10 +80,10 @@ MsrBase::printMsrBase(std::ostream &os) const
bool foundPsr = false;
for (unsigned i = 0; i < numDestRegs(); i++) {
int idx = destRegIdx(i);
- if (idx < Ctrl_Base_DepTag) {
+ if (idx < Misc_Reg_Base) {
continue;
}
- idx -= Ctrl_Base_DepTag;
+ idx -= Misc_Reg_Base;
if (idx == MISCREG_CPSR) {
os << "cpsr_";
foundPsr = true;
diff --git a/src/arch/arm/insts/vfp.cc b/src/arch/arm/insts/vfp.cc
index 015247d68..ca0f58226 100644
--- a/src/arch/arm/insts/vfp.cc
+++ b/src/arch/arm/insts/vfp.cc
@@ -50,9 +50,9 @@ FpRegRegOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printMnemonic(ss);
- printReg(ss, dest + FP_Base_DepTag);
+ printReg(ss, dest + FP_Reg_Base);
ss << ", ";
- printReg(ss, op1 + FP_Base_DepTag);
+ printReg(ss, op1 + FP_Reg_Base);
return ss.str();
}
@@ -61,7 +61,7 @@ FpRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printMnemonic(ss);
- printReg(ss, dest + FP_Base_DepTag);
+ printReg(ss, dest + FP_Reg_Base);
ccprintf(ss, ", #%d", imm);
return ss.str();
}
@@ -71,9 +71,9 @@ FpRegRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printMnemonic(ss);
- printReg(ss, dest + FP_Base_DepTag);
+ printReg(ss, dest + FP_Reg_Base);
ss << ", ";
- printReg(ss, op1 + FP_Base_DepTag);
+ printReg(ss, op1 + FP_Reg_Base);
ccprintf(ss, ", #%d", imm);
return ss.str();
}
@@ -83,11 +83,11 @@ FpRegRegRegOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printMnemonic(ss);
- printReg(ss, dest + FP_Base_DepTag);
+ printReg(ss, dest + FP_Reg_Base);
ss << ", ";
- printReg(ss, op1 + FP_Base_DepTag);
+ printReg(ss, op1 + FP_Reg_Base);
ss << ", ";
- printReg(ss, op2 + FP_Base_DepTag);
+ printReg(ss, op2 + FP_Reg_Base);
return ss.str();
}
@@ -96,11 +96,11 @@ FpRegRegRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printMnemonic(ss);
- printReg(ss, dest + FP_Base_DepTag);
+ printReg(ss, dest + FP_Reg_Base);
ss << ", ";
- printReg(ss, op1 + FP_Base_DepTag);
+ printReg(ss, op1 + FP_Reg_Base);
ss << ", ";
- printReg(ss, op2 + FP_Base_DepTag);
+ printReg(ss, op2 + FP_Reg_Base);
ccprintf(ss, ", #%d", imm);
return ss.str();
}