summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/formats/aarch64.isa
diff options
context:
space:
mode:
authorMitchell Hayenga <Mitchell.Hayenga@ARM.com>2014-04-23 05:18:20 -0400
committerMitchell Hayenga <Mitchell.Hayenga@ARM.com>2014-04-23 05:18:20 -0400
commit0fad0c7f7dbb91b693805f94f1cf4040590491a0 (patch)
tree601b8ebaec27c9ae5f619b54e9d1440485a0b457 /src/arch/arm/isa/formats/aarch64.isa
parent84f8fe637cbf15c403f39aaa10c0ea66ace6083d (diff)
downloadgem5-0fad0c7f7dbb91b693805f94f1cf4040590491a0.tar.xz
arm: Don't use a stack allocated mnemonic
FailUnimplemented passed a stack created mnemonic as a const char * which causes some grief when the stack goes away.
Diffstat (limited to 'src/arch/arm/isa/formats/aarch64.isa')
-rw-r--r--src/arch/arm/isa/formats/aarch64.isa8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm/isa/formats/aarch64.isa b/src/arch/arm/isa/formats/aarch64.isa
index 3ed70ce81..c7cc776e3 100644
--- a/src/arch/arm/isa/formats/aarch64.isa
+++ b/src/arch/arm/isa/formats/aarch64.isa
@@ -374,9 +374,11 @@ namespace Aarch64
return new WarnUnimplemented(read ? "mrs" : "msr",
machInst, full_mnem);
} else {
- return new FailUnimplemented(csprintf("%s %s",
- read ? "mrs" : "msr", miscRegName[miscReg]).c_str(),
- machInst);
+ return new FailUnimplemented(read ? "mrs" : "msr",
+ machInst,
+ csprintf("%s %s",
+ read ? "mrs" : "msr",
+ miscRegName[miscReg]));
}
}
break;