146,147c146,147
< IsMacroOp, ///< Is a macroop containing microops
< IsMicroOp, ///< Is a microop
---
> IsMacroop, ///< Is a macroop containing microops
> IsMicroop, ///< Is a microop
149,150c149,150
< IsLastMicroOp, ///< This microop ends a microop sequence
< IsFirstMicroOp, ///< This microop begins a microop sequence
---
> IsLastMicroop, ///< This microop ends a microop sequence
> IsFirstMicroop, ///< This microop begins a microop sequence
245,246c245,246
< bool isMacroOp() const { return flags[IsMacroOp]; }
< bool isMicroOp() const { return flags[IsMicroOp]; }
---
> bool isMacroop() const { return flags[IsMacroop]; }
> bool isMicroop() const { return flags[IsMicroop]; }
248,249c248,249
< bool isLastMicroOp() const { return flags[IsLastMicroOp]; }
< bool isFirstMicroOp() const { return flags[IsFirstMicroOp]; }
---
> bool isLastMicroop() const { return flags[IsLastMicroop]; }
> bool isFirstMicroop() const { return flags[IsFirstMicroop]; }
372c372
< virtual StaticInstPtr fetchMicroOp(MicroPC micropc);
---
> virtual StaticInstPtr fetchMicroop(MicroPC micropc);