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, 52 deletions

diff --git a/src/arch/x86/isa/microops/mediaop.isa b/src/arch/x86/isa/microops/mediaop.isa
index b36220d14..95864c16d 100644
--- a/src/arch/x86/isa/microops/mediaop.isa
+++ b/src/arch/x86/isa/microops/mediaop.isa
@@ -49,20 +49,12 @@ def template MediaOpExecute {{
 def template MediaOpRegDeclare {{
     class %(class_name)s : public %(base_class)s
     {
-      protected:
-        void buildMe();
-
       public:
         %(class_name)s(ExtMachInst _machInst,
                 const char * instMnem, uint64_t setFlags,
                 InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest,
                 uint8_t _srcSize, uint8_t _destSize, uint16_t _ext);
 
-        %(class_name)s(ExtMachInst _machInst,
-                const char * instMnem,
-                InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest,
-                uint8_t _srcSize, uint8_t _destSize, uint16_t _ext);
-
         %(BasicExecDeclare)s
     };
 }};
@@ -71,42 +63,17 @@ def template MediaOpImmDeclare {{
 
     class %(class_name)s : public %(base_class)s
     {
-      protected:
-        void buildMe();
-
       public:
         %(class_name)s(ExtMachInst _machInst,
                 const char * instMnem, uint64_t setFlags,
                 InstRegIndex _src1, uint16_t _imm8, InstRegIndex _dest,
                 uint8_t _srcSize, uint8_t _destSize, uint16_t _ext);
 
-        %(class_name)s(ExtMachInst _machInst,
-                const char * instMnem,
-                InstRegIndex _src1, uint16_t _imm8, InstRegIndex _dest,
-                uint8_t _srcSize, uint8_t _destSize, uint16_t _ext);
-
         %(BasicExecDeclare)s
     };
 }};
 
 def template MediaOpRegConstructor {{
-
-    inline void %(class_name)s::buildMe()
-    {
-        %(constructor)s;
-    }
-
-    inline %(class_name)s::%(class_name)s(
-            ExtMachInst machInst, const char * instMnem,
-            InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest,
-            uint8_t _srcSize, uint8_t _destSize, uint16_t _ext) :
-        %(base_class)s(machInst, "%(mnemonic)s", instMnem, 0,
-                _src1, _src2, _dest, _srcSize, _destSize, _ext,
-                %(op_class)s)
-    {
-        buildMe();
-    }
-
     inline %(class_name)s::%(class_name)s(
             ExtMachInst machInst, const char * instMnem, uint64_t setFlags,
             InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest,
@@ -115,28 +82,11 @@ def template MediaOpRegConstructor {{
                 _src1, _src2, _dest, _srcSize, _destSize, _ext,
                 %(op_class)s)
     {
-        buildMe();
+        %(constructor)s;
     }
 }};
 
 def template MediaOpImmConstructor {{
-
-    inline void %(class_name)s::buildMe()
-    {
-        %(constructor)s;
-    }
-
-    inline %(class_name)s::%(class_name)s(
-            ExtMachInst machInst, const char * instMnem,
-            InstRegIndex _src1, uint16_t _imm8, InstRegIndex _dest,
-            uint8_t _srcSize, uint8_t _destSize, uint16_t _ext) :
-        %(base_class)s(machInst, "%(mnemonic)s", instMnem, 0,
-                _src1, _imm8, _dest, _srcSize, _destSize, _ext,
-                %(op_class)s)
-    {
-        buildMe();
-    }
-
     inline %(class_name)s::%(class_name)s(
             ExtMachInst machInst, const char * instMnem, uint64_t setFlags,
             InstRegIndex _src1, uint16_t _imm8, InstRegIndex _dest,
@@ -145,7 +95,7 @@ def template MediaOpImmConstructor {{
                 _src1, _imm8, _dest, _srcSize, _destSize, _ext,
                 %(op_class)s)
     {
-        buildMe();
+        %(constructor)s;
     }
 }};