50c50
< class MemoryNew : public PredOp
---
> class Memory : public PredOp
65,66c65,66
< MemoryNew(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
< IntRegIndex _dest, IntRegIndex _base, bool _add)
---
> Memory(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
> IntRegIndex _dest, IntRegIndex _base, bool _add)
79c79
< class MemoryNewImm : public MemoryNew
---
> class MemoryImm : public Memory
84,86c84,86
< MemoryNewImm(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
< IntRegIndex _dest, IntRegIndex _base, bool _add, int32_t _imm)
< : MemoryNew(mnem, _machInst, __opClass, _dest, _base, _add), imm(_imm)
---
> MemoryImm(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
> IntRegIndex _dest, IntRegIndex _base, bool _add, int32_t _imm)
> : Memory(mnem, _machInst, __opClass, _dest, _base, _add), imm(_imm)
100c100
< class MemoryNewReg : public MemoryNew
---
> class MemoryReg : public Memory
107,111c107,111
< MemoryNewReg(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
< IntRegIndex _dest, IntRegIndex _base, bool _add,
< int32_t _shiftAmt, ArmShiftType _shiftType,
< IntRegIndex _index)
< : MemoryNew(mnem, _machInst, __opClass, _dest, _base, _add),
---
> MemoryReg(const char *mnem, ExtMachInst _machInst, OpClass __opClass,
> IntRegIndex _dest, IntRegIndex _base, bool _add,
> int32_t _shiftAmt, ArmShiftType _shiftType,
> IntRegIndex _index)
> : Memory(mnem, _machInst, __opClass, _dest, _base, _add),
153c153
< class MemoryNewOffset : public Base
---
> class MemoryOffset : public Base
156,158c156,158
< MemoryNewOffset(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _imm)
---
> MemoryOffset(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _imm)
162,165c162,165
< MemoryNewOffset(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
< IntRegIndex _index)
---
> MemoryOffset(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
> IntRegIndex _index)
174c174
< this->printInst(ss, MemoryNew::AddrMd_Offset);
---
> this->printInst(ss, Memory::AddrMd_Offset);
180c180
< class MemoryNewPreIndex : public Base
---
> class MemoryPreIndex : public Base
183,185c183,185
< MemoryNewPreIndex(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _imm)
---
> MemoryPreIndex(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _imm)
189,192c189,192
< MemoryNewPreIndex(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
< IntRegIndex _index)
---
> MemoryPreIndex(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
> IntRegIndex _index)
201c201
< this->printInst(ss, MemoryNew::AddrMd_PreIndex);
---
> this->printInst(ss, Memory::AddrMd_PreIndex);
207c207
< class MemoryNewPostIndex : public Base
---
> class MemoryPostIndex : public Base
210,212c210,212
< MemoryNewPostIndex(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _imm)
---
> MemoryPostIndex(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _imm)
216,219c216,219
< MemoryNewPostIndex(const char *mnem, ExtMachInst _machInst,
< OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
< bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
< IntRegIndex _index)
---
> MemoryPostIndex(const char *mnem, ExtMachInst _machInst,
> OpClass __opClass, IntRegIndex _dest, IntRegIndex _base,
> bool _add, int32_t _shiftAmt, ArmShiftType _shiftType,
> IntRegIndex _index)
228c228
< this->printInst(ss, MemoryNew::AddrMd_PostIndex);
---
> this->printInst(ss, Memory::AddrMd_PostIndex);