71a72
> const char * instMnem;
75c76,78
< X86MicroOpBase(bool isMicro, bool isDelayed,
---
> X86MicroOpBase(ExtMachInst _machInst,
> const char *mnem, const char *_instMnem,
> bool isMicro, bool isDelayed,
77d79
< const char *mnem, ExtMachInst _machInst,
79c81,82
< X86StaticInst(mnem, _machInst, __opClass)
---
> X86StaticInst(mnem, _machInst, __opClass),
> instMnem(_instMnem)
85a89,98
>
> std::string generateDisassembly(Addr pc,
> const SymbolTable *symtab) const
> {
> std::stringstream ss;
>
> ccprintf(ss, "\t%s.%s", instMnem, mnemonic);
>
> return ss.str();
> }
130c143
< // instruction which knows specifies which arguments it wants
---
> // instruction which specifies which arguments it wants
140,142c153,157
< %(class_name)s(bool isMicro, bool isDelayed,
< bool isFirst, bool isLast,
< ExtMachInst _machInst %(param_arg_dec)s);
---
> %(class_name)s(ExtMachInst _machInst,
> const char * instMnem,
> bool isMicro, bool isDelayed,
> bool isFirst, bool isLast
> %(param_arg_dec)s);
144c159,161
< %(class_name)s(ExtMachInst _machInst %(param_arg_dec)s);
---
> %(class_name)s(ExtMachInst _machInst,
> const char * instMnem
> %(param_arg_dec)s);
158,160c175,178
< ExtMachInst machInst %(param_arg_dec)s) :
< %(base_class)s(false, false, false, false,
< "%(mnemonic)s", machInst, %(op_class)s)
---
> ExtMachInst machInst, const char * instMnem
> %(param_arg_dec)s) :
> %(base_class)s(machInst, "%(mnemonic)s", instMnem,
> false, false, false, false, %(op_class)s)
167,170c185,189
< bool isMicro, bool isDelayed, bool isFirst, bool isLast,
< ExtMachInst machInst %(param_arg_dec)s)
< : %(base_class)s(isMicro, isDelayed, isFirst, isLast,
< "%(mnemonic)s", machInst, %(op_class)s)
---
> ExtMachInst machInst, const char * instMnem,
> bool isMicro, bool isDelayed, bool isFirst, bool isLast
> %(param_arg_dec)s)
> : %(base_class)s(machInst, "%(mnemonic)s", instMnem,
> isMicro, isDelayed, isFirst, isLast, %(op_class)s)