sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm: Don't use a stack allocated mnemonic

Browse source 
FailUnimplemented passed a stack created mnemonic as a const char * which
causes some grief when the stack goes away.
This commit is contained in:
Mitchell Hayenga 2014-04-23 05:18:20 -04:00
parent 84f8fe637c
commit 0fad0c7f7d
3 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/arch/arm/isa/formats/aarch64.isa
View file

@ -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;

29
src/arch/arm/isa/formats/misc.isa
View file

@ -139,10 +139,10 @@ let {{
case MISCREG_NOP:
return new NopInst(machInst);
case MISCREG_CP14_UNIMPL:
return new FailUnimplemented(
return new FailUnimplemented(isRead ? "mrc unknown" : "mcr unknown",
machInst,
csprintf("miscreg crn:%d opc1:%d crm:%d opc2:%d %s unknown",
crn, opc1, crm, opc2, isRead ? "read" : "write").c_str(),
machInst);
crn, opc1, crm, opc2, isRead ? "read" : "write"));
default:
uint32_t iss = mcrMrcIssBuild(isRead, crm, rt, crn, opc1, opc2);
if (isRead) {
@ -183,10 +183,10 @@ let {{
case MISCREG_NOP:
return new NopInst(machInst);
case MISCREG_CP15_UNIMPL:
return new FailUnimplemented(
return new FailUnimplemented(isRead ? "mrc unkown" : "mcr unkown",
machInst,
csprintf("miscreg crn:%d opc1:%d crm:%d opc2:%d %s unknown",
crn, opc1, crm, opc2, isRead ? "read" : "write").c_str(),
machInst);
crn, opc1, crm, opc2, isRead ? "read" : "write"));
case MISCREG_DCCMVAC:
return new FlushPipeInst(
isRead ? "mrc dccmvac" : "mcr dccmvac", machInst);
@ -217,9 +217,9 @@ let {{
return new Mrc15(machInst, rt, (IntRegIndex)miscReg, iss);
return new Mcr15(machInst, (IntRegIndex)miscReg, rt, iss);
} else {
return new FailUnimplemented(csprintf("%s %s",
isRead ? "mrc" : "mcr", miscRegName[miscReg]).c_str(),
machInst);
return new FailUnimplemented(isRead ? "mrc" : "mcr", machInst,
csprintf("%s %s", isRead ? "mrc" : "mcr",
miscRegName[miscReg]));
}
}
}
@ -251,10 +251,9 @@ let {{
switch (miscReg) {
case MISCREG_CP15_UNIMPL:
return new FailUnimplemented(
return new FailUnimplemented(isRead ? "mrc" : "mcr", machInst,
csprintf("miscreg crm:%d opc1:%d 64-bit %s unknown",
crm, opc1, isRead ? "read" : "write").c_str(),
machInst);
crm, opc1, isRead ? "read" : "write"));
default:
if (miscRegInfo[miscReg][MISCREG_WARN_NOT_FAIL]) {
std::string full_mnem = csprintf("%s %s",
@ -278,9 +277,9 @@ let {{
return new Mrrc15(machInst, (IntRegIndex) miscReg, rt2, rt, iss);
return new Mcrr15(machInst, rt2, rt, (IntRegIndex) miscReg, iss);
} else {
return new FailUnimplemented(csprintf("%s %s",
isRead ? "mrrc" : "mcrr", miscRegName[miscReg]).c_str(),
machInst);
return new FailUnimplemented(isRead ? "mrrc" : "mcrr", machInst,
csprintf("%s %s",
isRead ? "mrrc" : "mcrr", miscRegName[miscReg]));
}
}
}

20
src/arch/arm/isa/formats/unimp.isa
View file

@ -56,6 +56,10 @@ output header {{
class FailUnimplemented : public ArmStaticInst
{
public:
/// Full mnemonic for MRC and MCR instructions including the
/// coproc. register name
std::string fullMnemonic;
/// Constructor
FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst)
: ArmStaticInst(_mnemonic, _machInst, No_OpClass)
@ -65,6 +69,16 @@ output header {{
flags[IsNonSpeculative] = true;
}
FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst,
const std::string& _fullMnemonic)
: ArmStaticInst(_mnemonic, _machInst, No_OpClass),
fullMnemonic(_fullMnemonic)
{
// don't call execute() (which panics) if we're on a
// speculative path
flags[IsNonSpeculative] = true;
}
%(BasicExecDeclare)s
std::string
@ -137,14 +151,16 @@ output decoder {{
FailUnimplemented::generateDisassembly(Addr pc,
const SymbolTable *symtab) const
{
return csprintf("%-10s (unimplemented)", mnemonic);
return csprintf("%-10s (unimplemented)",
fullMnemonic.size() ? fullMnemonic.c_str() : mnemonic);
}
std::string
WarnUnimplemented::generateDisassembly(Addr pc,
const SymbolTable *symtab) const
{
return csprintf("%-10s (unimplemented)", mnemonic);
return csprintf("%-10s (unimplemented)",
fullMnemonic.size() ? fullMnemonic.c_str() : mnemonic);
}
std::string