111c111
< class SatOp : public PredOp
---
> class RegImmRegOp : public PredOp
115c115
< uint32_t satImm;
---
> uint32_t imm;
118,119c118,119
< SatOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
< IntRegIndex _dest, uint32_t _satImm, IntRegIndex _op1) :
---
> RegImmRegOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
> IntRegIndex _dest, uint32_t _imm, IntRegIndex _op1) :
121c121
< dest(_dest), satImm(_satImm), op1(_op1)
---
> dest(_dest), imm(_imm), op1(_op1)
127c127
< class SatShiftOp : public PredOp
---
> class RegImmRegShiftOp : public PredOp
131c131
< uint32_t satImm;
---
> uint32_t imm;
136,138c136,138
< SatShiftOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
< IntRegIndex _dest, uint32_t _satImm, IntRegIndex _op1,
< int32_t _shiftAmt, ArmShiftType _shiftType) :
---
> RegImmRegShiftOp(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
> IntRegIndex _dest, uint32_t _imm, IntRegIndex _op1,
> int32_t _shiftAmt, ArmShiftType _shiftType) :
140c140
< dest(_dest), satImm(_satImm), op1(_op1),
---
> dest(_dest), imm(_imm), op1(_op1),