derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sparc: Return debug faults from unimplemented instructions.

Browse Source 
These had been marked as non-speculative so that their execute
functions would only be called if the instruction should really be
executed. Instead, we can return faults which will cause the same
behavior when the instruction is committed and let the instruction
execute as normal.

Change-Id: I39fa5073e93399424144724b99bdc12070e42286
Reviewed-on: https://gem5-review.googlesource.com/5465
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2017-11-06 19:25:21 -08:00
parent 299d7f8c5d
commit bd96f10f99
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/arch/sparc/insts/unimp.hh
View File

@@ -31,6 +31,9 @@
#ifndef __ARCH_SPARC_INSTS_UNIMP_HH__
#define __ARCH_SPARC_INSTS_UNIMP_HH__
#include <memory>
#include "arch/generic/debugfaults.hh"
#include "arch/sparc/insts/static_inst.hh"
#include "base/cprintf.hh"
@@ -55,17 +58,14 @@ class FailUnimplemented : public SparcStaticInst
/// Constructor
FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst) :
SparcStaticInst(_mnemonic, _machInst, No_OpClass)
{
// don't call execute() (which panics) if we're on a
// speculative path
flags[IsNonSpeculative] = true;
}
{}
Fault
execute(ExecContext *xc, Trace::InstRecord *traceData) const override
{
panic("attempt to execute unimplemented instruction '%s' "
"(inst 0x%08x)", mnemonic, machInst);
return std::make_shared<GenericISA::M5PanicFault>(
"attempt to execute unimplemented instruction '%s' (inst %#08x)",
mnemonic, machInst);
}
std::string
@@ -94,17 +94,14 @@ class WarnUnimplemented : public SparcStaticInst
/// Constructor
WarnUnimplemented(const char *_mnemonic, ExtMachInst _machInst) :
SparcStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
{
// don't call execute() (which panics) if we're on a
// speculative path
flags[IsNonSpeculative] = true;
}
{}
Fault
execute(ExecContext *xc, Trace::InstRecord *traceData) const override
{
if (!warned) {
warn("instruction '%s' unimplemented\n", mnemonic);
return std::make_shared<GenericISA::M5WarnFault>(
"instruction '%s' unimplemented\n", mnemonic);
warned = true;
}
return NoFault;