From 0fad0c7f7dbb91b693805f94f1cf4040590491a0 Mon Sep 17 00:00:00 2001
From: Mitchell Hayenga <Mitchell.Hayenga@ARM.com>
Date: Wed, 23 Apr 2014 05:18:20 -0400
Subject: 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.
---
 src/arch/arm/isa/formats/aarch64.isa | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/arch/arm/isa/formats/aarch64.isa')

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;
-- 
cgit v1.2.3