47,48c47
< const char * mnemonic,
< bool isMicro, bool isDelayed, bool isFirst, bool isLast,
---
> const char * mnemonic, uint64_t setFlags,
67,68c66
< bool isMicro, bool isDelayed, bool isFirst, bool isLast,
< uint16_t _target, uint8_t _cc);
---
> uint64_t setFlags, uint16_t _target, uint8_t _cc);
97,98c95
< X86MicroopBase(machInst, mnemonic, instMnem,
< false, false, false, false, No_OpClass),
---
> X86MicroopBase(machInst, mnemonic, instMnem, 0, No_OpClass),
105,108c102,103
< bool isMicro, bool isDelayed, bool isFirst, bool isLast,
< uint16_t _target, uint8_t _cc) :
< X86MicroopBase(machInst, mnemonic, instMnem,
< isMicro, isDelayed, isFirst, isLast, No_OpClass),
---
> uint64_t setFlags, uint16_t _target, uint8_t _cc) :
> X86MicroopBase(machInst, mnemonic, instMnem, setFlags, No_OpClass),
131,132c126
< bool isMicro, bool isDelayed, bool isFirst, bool isLast,
< uint16_t _target, uint8_t _cc) :
---
> uint64_t setFlags, uint16_t _target, uint8_t _cc) :
134c128
< isMicro, isDelayed, isFirst, isLast, _target, _cc)
---
> setFlags, _target, _cc)
165,166c159,160
< def getAllocator(self, *microFlags):
< allocator = '''new %(class_name)s(machInst, macrocodeBlock
---
> def getAllocator(self, microFlags):
> allocator = '''new %(class_name)s(machInst, macrocodeBlock,
177,182c171,176
< def getAllocator(self, *microFlags):
< (is_micro, is_delayed, is_first, is_last) = microFlags
< is_last = False
< is_delayed = True
< microFlags = (is_micro, is_delayed, is_first, is_last)
< return super(Br, self).getAllocator(*microFlags)
---
> def getAllocator(self, microFlags):
> if "IsLastMicroop" in microFlags:
> microFlags.remove("IsLastMicroop")
> if not "IsDelayedCommit" in microFlags:
> microFlags.append("IsDelayedCommit")
> return super(Br, self).getAllocator(microFlags)
197,202c191,196
< def getAllocator(self, *microFlags):
< (is_micro, is_delayed, is_first, is_last) = microFlags
< is_last = True
< is_delayed = False
< microFlags = (is_micro, is_delayed, is_first, is_last)
< return super(Eret, self).getAllocator(*microFlags)
---
> def getAllocator(self, microFlags):
> if not "IsLastMicroop" in microFlags:
> microFlags.append("IsLastMicroop")
> if "IsDelayedCommit" in microFlags:
> microFlags.remove("IsDelayedCommit")
> return super(Eret, self).getAllocator(microFlags)