summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
commitf49cdb4f5d8c9740e5f021ad5704a4586e88f6c3 (patch)
treed1b106afe93a5cd27ae99b65293dc7c5297ae408 /src
parent330d9d4dbc8f57479f5db7ead66af5652f853145 (diff)
downloadgem5-f49cdb4f5d8c9740e5f021ad5704a4586e88f6c3.tar.xz
ARM: Make sure ExtMachInst is used consistently instead of regular MachInst.
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/insts/branch.hh8
-rw-r--r--src/arch/arm/insts/pred_inst.hh10
-rw-r--r--src/arch/arm/insts/static_inst.hh7
-rw-r--r--src/arch/arm/isa/formats/unimp.isa4
4 files changed, 15 insertions, 14 deletions
diff --git a/src/arch/arm/insts/branch.hh b/src/arch/arm/insts/branch.hh
index 3c4cd8cd5..c9a4eaf40 100644
--- a/src/arch/arm/insts/branch.hh
+++ b/src/arch/arm/insts/branch.hh
@@ -52,7 +52,7 @@ class PCDependentDisassembly : public PredOp
mutable const SymbolTable *cachedSymtab;
/// Constructor
- PCDependentDisassembly(const char *mnem, MachInst _machInst,
+ PCDependentDisassembly(const char *mnem, ExtMachInst _machInst,
OpClass __opClass)
: PredOp(mnem, _machInst, __opClass),
cachedPC(0), cachedSymtab(0)
@@ -74,7 +74,7 @@ class Branch : public PCDependentDisassembly
int32_t disp;
/// Constructor.
- Branch(const char *mnem, MachInst _machInst, OpClass __opClass)
+ Branch(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: PCDependentDisassembly(mnem, _machInst, __opClass),
disp(machInst.offset << 2)
{
@@ -97,7 +97,7 @@ class BranchExchange : public PredOp
{
protected:
/// Constructor
- BranchExchange(const char *mnem, MachInst _machInst,
+ BranchExchange(const char *mnem, ExtMachInst _machInst,
OpClass __opClass)
: PredOp(mnem, _machInst, __opClass)
{
@@ -123,7 +123,7 @@ class Jump : public PCDependentDisassembly
public:
/// Constructor
- Jump(const char *mnem, MachInst _machInst, OpClass __opClass)
+ Jump(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: PCDependentDisassembly(mnem, _machInst, __opClass),
disp(machInst.offset << 2)
{
diff --git a/src/arch/arm/insts/pred_inst.hh b/src/arch/arm/insts/pred_inst.hh
index 6f9bd9dc2..76b5a4cff 100644
--- a/src/arch/arm/insts/pred_inst.hh
+++ b/src/arch/arm/insts/pred_inst.hh
@@ -51,7 +51,7 @@ class PredOp : public ArmStaticInst
ConditionCode condCode;
/// Constructor
- PredOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
+ PredOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
ArmStaticInst(mnem, _machInst, __opClass),
condCode((ConditionCode)(unsigned)machInst.condCode)
{
@@ -71,7 +71,7 @@ class PredImmOp : public PredOp
uint32_t rotated_carry;
/// Constructor
- PredImmOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
+ PredImmOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
PredOp(mnem, _machInst, __opClass),
imm(machInst.imm), rotate(machInst.rotate << 1),
rotated_imm(0), rotated_carry(0)
@@ -95,7 +95,7 @@ class PredIntOp : public PredOp
uint32_t shift;
/// Constructor
- PredIntOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
+ PredIntOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
PredOp(mnem, _machInst, __opClass),
shift_size(machInst.shiftSize), shift(machInst.shift)
{
@@ -115,7 +115,7 @@ class PredMacroOp : public PredOp
StaticInstPtr * microOps;
/// Constructor
- PredMacroOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
+ PredMacroOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
PredOp(mnem, _machInst, __opClass),
numMicroops(0)
{
@@ -147,7 +147,7 @@ class PredMacroOp : public PredOp
class PredMicroop : public PredOp
{
/// Constructor
- PredMicroop(const char *mnem, MachInst _machInst, OpClass __opClass) :
+ PredMicroop(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
PredOp(mnem, _machInst, __opClass)
{
flags[IsMicroop] = true;
diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh
index 18ca83741..99fa819b5 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -67,7 +67,8 @@ class ArmStaticInstBase : public StaticInst
bool arm_sub_overflow(int32_t result, int32_t lhs, int32_t rhs) const;
// Constructor
- ArmStaticInstBase(const char *mnem, MachInst _machInst, OpClass __opClass)
+ ArmStaticInstBase(const char *mnem, ExtMachInst _machInst,
+ OpClass __opClass)
: StaticInst(mnem, _machInst, __opClass)
{
}
@@ -150,7 +151,7 @@ class ArmStaticInstBase : public StaticInst
class ArmStaticInst : public ArmStaticInstBase
{
protected:
- ArmStaticInst(const char *mnem, MachInst _machInst, OpClass __opClass)
+ ArmStaticInst(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: ArmStaticInstBase(mnem, _machInst, __opClass)
{
}
@@ -167,7 +168,7 @@ class ArmStaticInst : public ArmStaticInstBase
class ArmInterWorking : public ArmStaticInstBase
{
protected:
- ArmInterWorking(const char *mnem, MachInst _machInst, OpClass __opClass)
+ ArmInterWorking(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
: ArmStaticInstBase(mnem, _machInst, __opClass)
{
}
diff --git a/src/arch/arm/isa/formats/unimp.isa b/src/arch/arm/isa/formats/unimp.isa
index 6909c3f85..e7bf67f68 100644
--- a/src/arch/arm/isa/formats/unimp.isa
+++ b/src/arch/arm/isa/formats/unimp.isa
@@ -45,7 +45,7 @@ output header {{
{
public:
/// Constructor
- FailUnimplemented(const char *_mnemonic, MachInst _machInst)
+ FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst)
: ArmStaticInst(_mnemonic, _machInst, No_OpClass)
{
// don't call execute() (which panics) if we're on a
@@ -76,7 +76,7 @@ output header {{
public:
/// Constructor
- WarnUnimplemented(const char *_mnemonic, MachInst _machInst)
+ WarnUnimplemented(const char *_mnemonic, ExtMachInst _machInst)
: ArmStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
{
// don't call execute() (which panics) if we're on a