ARM: Make sure ExtMachInst is used consistently instead of regular MachInst.
This commit is contained in:
parent
330d9d4dbc
commit
f49cdb4f5d
4 changed files with 15 additions and 14 deletions
|
@ -52,7 +52,7 @@ class PCDependentDisassembly : public PredOp
|
||||||
mutable const SymbolTable *cachedSymtab;
|
mutable const SymbolTable *cachedSymtab;
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PCDependentDisassembly(const char *mnem, MachInst _machInst,
|
PCDependentDisassembly(const char *mnem, ExtMachInst _machInst,
|
||||||
OpClass __opClass)
|
OpClass __opClass)
|
||||||
: PredOp(mnem, _machInst, __opClass),
|
: PredOp(mnem, _machInst, __opClass),
|
||||||
cachedPC(0), cachedSymtab(0)
|
cachedPC(0), cachedSymtab(0)
|
||||||
|
@ -74,7 +74,7 @@ class Branch : public PCDependentDisassembly
|
||||||
int32_t disp;
|
int32_t disp;
|
||||||
|
|
||||||
/// Constructor.
|
/// Constructor.
|
||||||
Branch(const char *mnem, MachInst _machInst, OpClass __opClass)
|
Branch(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
|
||||||
: PCDependentDisassembly(mnem, _machInst, __opClass),
|
: PCDependentDisassembly(mnem, _machInst, __opClass),
|
||||||
disp(machInst.offset << 2)
|
disp(machInst.offset << 2)
|
||||||
{
|
{
|
||||||
|
@ -97,7 +97,7 @@ class BranchExchange : public PredOp
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
/// Constructor
|
/// Constructor
|
||||||
BranchExchange(const char *mnem, MachInst _machInst,
|
BranchExchange(const char *mnem, ExtMachInst _machInst,
|
||||||
OpClass __opClass)
|
OpClass __opClass)
|
||||||
: PredOp(mnem, _machInst, __opClass)
|
: PredOp(mnem, _machInst, __opClass)
|
||||||
{
|
{
|
||||||
|
@ -123,7 +123,7 @@ class Jump : public PCDependentDisassembly
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// Constructor
|
/// Constructor
|
||||||
Jump(const char *mnem, MachInst _machInst, OpClass __opClass)
|
Jump(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
|
||||||
: PCDependentDisassembly(mnem, _machInst, __opClass),
|
: PCDependentDisassembly(mnem, _machInst, __opClass),
|
||||||
disp(machInst.offset << 2)
|
disp(machInst.offset << 2)
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,7 +51,7 @@ class PredOp : public ArmStaticInst
|
||||||
ConditionCode condCode;
|
ConditionCode condCode;
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PredOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
|
PredOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
||||||
ArmStaticInst(mnem, _machInst, __opClass),
|
ArmStaticInst(mnem, _machInst, __opClass),
|
||||||
condCode((ConditionCode)(unsigned)machInst.condCode)
|
condCode((ConditionCode)(unsigned)machInst.condCode)
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@ class PredImmOp : public PredOp
|
||||||
uint32_t rotated_carry;
|
uint32_t rotated_carry;
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PredImmOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
|
PredImmOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
||||||
PredOp(mnem, _machInst, __opClass),
|
PredOp(mnem, _machInst, __opClass),
|
||||||
imm(machInst.imm), rotate(machInst.rotate << 1),
|
imm(machInst.imm), rotate(machInst.rotate << 1),
|
||||||
rotated_imm(0), rotated_carry(0)
|
rotated_imm(0), rotated_carry(0)
|
||||||
|
@ -95,7 +95,7 @@ class PredIntOp : public PredOp
|
||||||
uint32_t shift;
|
uint32_t shift;
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PredIntOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
|
PredIntOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
||||||
PredOp(mnem, _machInst, __opClass),
|
PredOp(mnem, _machInst, __opClass),
|
||||||
shift_size(machInst.shiftSize), shift(machInst.shift)
|
shift_size(machInst.shiftSize), shift(machInst.shift)
|
||||||
{
|
{
|
||||||
|
@ -115,7 +115,7 @@ class PredMacroOp : public PredOp
|
||||||
StaticInstPtr * microOps;
|
StaticInstPtr * microOps;
|
||||||
|
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PredMacroOp(const char *mnem, MachInst _machInst, OpClass __opClass) :
|
PredMacroOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
||||||
PredOp(mnem, _machInst, __opClass),
|
PredOp(mnem, _machInst, __opClass),
|
||||||
numMicroops(0)
|
numMicroops(0)
|
||||||
{
|
{
|
||||||
|
@ -147,7 +147,7 @@ class PredMacroOp : public PredOp
|
||||||
class PredMicroop : public PredOp
|
class PredMicroop : public PredOp
|
||||||
{
|
{
|
||||||
/// Constructor
|
/// Constructor
|
||||||
PredMicroop(const char *mnem, MachInst _machInst, OpClass __opClass) :
|
PredMicroop(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
|
||||||
PredOp(mnem, _machInst, __opClass)
|
PredOp(mnem, _machInst, __opClass)
|
||||||
{
|
{
|
||||||
flags[IsMicroop] = true;
|
flags[IsMicroop] = true;
|
||||||
|
|
|
@ -67,7 +67,8 @@ class ArmStaticInstBase : public StaticInst
|
||||||
bool arm_sub_overflow(int32_t result, int32_t lhs, int32_t rhs) const;
|
bool arm_sub_overflow(int32_t result, int32_t lhs, int32_t rhs) const;
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
ArmStaticInstBase(const char *mnem, MachInst _machInst, OpClass __opClass)
|
ArmStaticInstBase(const char *mnem, ExtMachInst _machInst,
|
||||||
|
OpClass __opClass)
|
||||||
: StaticInst(mnem, _machInst, __opClass)
|
: StaticInst(mnem, _machInst, __opClass)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -150,7 +151,7 @@ class ArmStaticInstBase : public StaticInst
|
||||||
class ArmStaticInst : public ArmStaticInstBase
|
class ArmStaticInst : public ArmStaticInstBase
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
ArmStaticInst(const char *mnem, MachInst _machInst, OpClass __opClass)
|
ArmStaticInst(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
|
||||||
: ArmStaticInstBase(mnem, _machInst, __opClass)
|
: ArmStaticInstBase(mnem, _machInst, __opClass)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -167,7 +168,7 @@ class ArmStaticInst : public ArmStaticInstBase
|
||||||
class ArmInterWorking : public ArmStaticInstBase
|
class ArmInterWorking : public ArmStaticInstBase
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
ArmInterWorking(const char *mnem, MachInst _machInst, OpClass __opClass)
|
ArmInterWorking(const char *mnem, ExtMachInst _machInst, OpClass __opClass)
|
||||||
: ArmStaticInstBase(mnem, _machInst, __opClass)
|
: ArmStaticInstBase(mnem, _machInst, __opClass)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ output header {{
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/// Constructor
|
/// Constructor
|
||||||
FailUnimplemented(const char *_mnemonic, MachInst _machInst)
|
FailUnimplemented(const char *_mnemonic, ExtMachInst _machInst)
|
||||||
: ArmStaticInst(_mnemonic, _machInst, No_OpClass)
|
: ArmStaticInst(_mnemonic, _machInst, No_OpClass)
|
||||||
{
|
{
|
||||||
// don't call execute() (which panics) if we're on a
|
// don't call execute() (which panics) if we're on a
|
||||||
|
@ -76,7 +76,7 @@ output header {{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/// Constructor
|
/// Constructor
|
||||||
WarnUnimplemented(const char *_mnemonic, MachInst _machInst)
|
WarnUnimplemented(const char *_mnemonic, ExtMachInst _machInst)
|
||||||
: ArmStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
|
: ArmStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
|
||||||
{
|
{
|
||||||
// don't call execute() (which panics) if we're on a
|
// don't call execute() (which panics) if we're on a
|
||||||
|
|
Loading…
Reference in a new issue