changeset 1cc6e860d95f in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=1cc6e860d95f
description:
ARM: Don't downconvert ExtMachInsts to MachInsts.
diffstat:
4 files changed, 17 insertions(+), 17 deletions(-)
src/arch/arm/isa/formats/basic.isa | 4 ++--
src/arch/arm/isa/formats/macromem.isa | 14 +++++++-------
src/arch/arm/isa/formats/mem.isa | 14 +++++++-------
src/arch/arm/isa/formats/unknown.isa | 2 +-
diffs (162 lines):
diff -r ba13184587a5 -r 1cc6e860d95f src/arch/arm/isa/formats/basic.isa
--- a/src/arch/arm/isa/formats/basic.isa Sun Jun 21 16:40:33 2009 -0700
+++ b/src/arch/arm/isa/formats/basic.isa Sun Jun 21 16:41:07 2009 -0700
@@ -42,14 +42,14 @@
{
public:
/// Constructor.
- %(class_name)s(MachInst machInst);
+ %(class_name)s(ExtMachInst machInst);
%(BasicExecDeclare)s
};
}};
// Basic instruction class constructor template.
def template BasicConstructor {{
- inline %(class_name)s::%(class_name)s(MachInst machInst) :
%(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
+ inline %(class_name)s::%(class_name)s(ExtMachInst machInst) :
%(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
{
%(constructor)s;
}
diff -r ba13184587a5 -r 1cc6e860d95f src/arch/arm/isa/formats/macromem.isa
--- a/src/arch/arm/isa/formats/macromem.isa Sun Jun 21 16:40:33 2009 -0700
+++ b/src/arch/arm/isa/formats/macromem.isa Sun Jun 21 16:41:07 2009 -0700
@@ -57,7 +57,7 @@
writeback,
loadop;
- ArmMacroMemoryOp(const char *mnem, MachInst _machInst, OpClass
__opClass,
+ ArmMacroMemoryOp(const char *mnem, ExtMachInst _machInst, OpClass
__opClass,
StaticInstPtr _eaCompPtr = nullStaticInstPtr,
StaticInstPtr _memAccPtr = nullStaticInstPtr)
: PredMacroOp(mnem, _machInst, __opClass),
@@ -86,7 +86,7 @@
loadop;
int32_t disp8;
- ArmMacroFPAOp(const char *mnem, MachInst _machInst, OpClass __opClass)
+ ArmMacroFPAOp(const char *mnem, ExtMachInst _machInst, OpClass
__opClass)
: PredMacroOp(mnem, _machInst, __opClass),
puswl(PUSWL), prepost(PREPOST), up(UP),
psruser(PSRUSER), writeback(WRITEBACK), loadop(LOADOP),
@@ -113,7 +113,7 @@
count;
int32_t disp8;
- ArmMacroFMOp(const char *mnem, MachInst _machInst, OpClass __opClass)
+ ArmMacroFMOp(const char *mnem, ExtMachInst _machInst, OpClass
__opClass)
: PredMacroOp(mnem, _machInst, __opClass),
punwl(PUNWL), prepost(PREPOST), up(UP),
n1bit(OPCODE_22), writeback(WRITEBACK), loadop(LOADOP),
@@ -143,13 +143,13 @@
{
public:
// Constructor
- %(class_name)s(MachInst machInst);
+ %(class_name)s(ExtMachInst machInst);
%(BasicExecDeclare)s
};
}};
def template MacroStoreConstructor {{
- inline %(class_name)s::%(class_name)s(MachInst machInst)
+ inline %(class_name)s::%(class_name)s(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
{
%(constructor)s;
@@ -275,7 +275,7 @@
}};
def template MacroFPAConstructor {{
- inline %(class_name)s::%(class_name)s(MachInst machInst)
+ inline %(class_name)s::%(class_name)s(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
{
%(constructor)s;
@@ -317,7 +317,7 @@
def template MacroFMConstructor {{
- inline %(class_name)s::%(class_name)s(MachInst machInst)
+ inline %(class_name)s::%(class_name)s(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s)
{
%(constructor)s;
diff -r ba13184587a5 -r 1cc6e860d95f src/arch/arm/isa/formats/mem.isa
--- a/src/arch/arm/isa/formats/mem.isa Sun Jun 21 16:40:33 2009 -0700
+++ b/src/arch/arm/isa/formats/mem.isa Sun Jun 21 16:41:07 2009 -0700
@@ -57,7 +57,7 @@
shift;
/// Constructor
- Memory(const char *mnem, MachInst _machInst, OpClass __opClass,
+ Memory(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
StaticInstPtr _eaCompPtr = nullStaticInstPtr,
StaticInstPtr _memAccPtr = nullStaticInstPtr)
: PredOp(mnem, _machInst, __opClass),
@@ -134,7 +134,7 @@
{
public:
/// Constructor
- EAComp(MachInst machInst);
+ EAComp(ExtMachInst machInst);
%(BasicExecDeclare)s
};
@@ -146,7 +146,7 @@
{
public:
/// Constructor
- MemAcc(MachInst machInst);
+ MemAcc(ExtMachInst machInst);
%(BasicExecDeclare)s
};
@@ -154,7 +154,7 @@
public:
/// Constructor.
- %(class_name)s(MachInst machInst);
+ %(class_name)s(ExtMachInst machInst);
%(BasicExecDeclare)s
@@ -176,7 +176,7 @@
def template EACompConstructor {{
- inline %(class_name)s::EAComp::EAComp(MachInst machInst)
+ inline %(class_name)s::EAComp::EAComp(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s (EAComp)", machInst, IntAluOp)
{
%(constructor)s;
@@ -185,7 +185,7 @@
def template MemAccConstructor {{
- inline %(class_name)s::MemAcc::MemAcc(MachInst machInst)
+ inline %(class_name)s::MemAcc::MemAcc(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s (MemAcc)", machInst, %(op_class)s)
{
%(constructor)s;
@@ -194,7 +194,7 @@
def template LoadStoreConstructor {{
- inline %(class_name)s::%(class_name)s(MachInst machInst)
+ inline %(class_name)s::%(class_name)s(ExtMachInst machInst)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s,
new EAComp(machInst), new MemAcc(machInst))
{
diff -r ba13184587a5 -r 1cc6e860d95f src/arch/arm/isa/formats/unknown.isa
--- a/src/arch/arm/isa/formats/unknown.isa Sun Jun 21 16:40:33 2009 -0700
+++ b/src/arch/arm/isa/formats/unknown.isa Sun Jun 21 16:41:07 2009 -0700
@@ -43,7 +43,7 @@
{
public:
/// Constructor
- Unknown(MachInst _machInst)
+ Unknown(ExtMachInst _machInst)
: ArmStaticInst("unknown", _machInst, No_OpClass)
{
// don't call execute() (which panics) if we're on a
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
