X86: Get rid of the flagless microop constructor.

This will reduce clutter in the source and hopefully speed up compilation.

1 files changed, 2 insertions, 22 deletions

diff --git a/src/arch/x86/isa/microops/limmop.isa b/src/arch/x86/isa/microops/limmop.isa
index d80a9b9fa..2871d5a89 100644
--- a/src/arch/x86/isa/microops/limmop.isa
+++ b/src/arch/x86/isa/microops/limmop.isa
@@ -61,7 +61,6 @@ def template MicroLimmOpDeclare {{
         const uint64_t imm;
         const uint8_t dataSize;
         RegIndex foldOBit;
-        void buildMe();
 
         std::string generateDisassembly(Addr pc,
             const SymbolTable *symtab) const;
@@ -72,10 +71,6 @@ def template MicroLimmOpDeclare {{
                 uint64_t setFlags, InstRegIndex _dest,
                 uint64_t _imm, uint8_t _dataSize);
 
-        %(class_name)s(ExtMachInst _machInst,
-                const char * instMnem,
-                InstRegIndex _dest, uint64_t _imm, uint8_t _dataSize);
-
         %(BasicExecDeclare)s
     };
 }};
@@ -95,22 +90,6 @@ def template MicroLimmOpDisassembly {{
 }};
 
 def template MicroLimmOpConstructor {{
-
-    inline void %(class_name)s::buildMe()
-    {
-        foldOBit = (dataSize == 1 && !machInst.rex.present) ? 1 << 6 : 0;
-        %(constructor)s;
-    }
-
-    inline %(class_name)s::%(class_name)s(
-            ExtMachInst machInst, const char * instMnem,
-            InstRegIndex _dest, uint64_t _imm, uint8_t _dataSize) :
-        %(base_class)s(machInst, "%(mnemonic)s", instMnem, 0, %(op_class)s),
-                dest(_dest.idx), imm(_imm), dataSize(_dataSize)
-    {
-        buildMe();
-    }
-
     inline %(class_name)s::%(class_name)s(
             ExtMachInst machInst, const char * instMnem, uint64_t setFlags,
             InstRegIndex _dest, uint64_t _imm, uint8_t _dataSize) :
@@ -118,7 +97,8 @@ def template MicroLimmOpConstructor {{
                 setFlags, %(op_class)s),
                 dest(_dest.idx), imm(_imm), dataSize(_dataSize)
     {
-        buildMe();
+        foldOBit = (dataSize == 1 && !machInst.rex.present) ? 1 << 6 : 0;
+        %(constructor)s;
     }
 }};