From 9581562e653f6df810e40c076bc97d50daccf302 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 23 Aug 2010 09:44:19 -0700
Subject: X86: Get rid of the flagless microop constructor.

This will reduce clutter in the source and hopefully speed up compilation.
---
 src/arch/x86/isa/microops/seqop.isa | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'src/arch/x86/isa/microops/seqop.isa')

diff --git a/src/arch/x86/isa/microops/seqop.isa b/src/arch/x86/isa/microops/seqop.isa
index 2a29a8771..57c44d48c 100644
--- a/src/arch/x86/isa/microops/seqop.isa
+++ b/src/arch/x86/isa/microops/seqop.isa
@@ -59,15 +59,10 @@ output header {{
 def template SeqOpDeclare {{
     class %(class_name)s : public %(base_class)s
     {
-      private:
-        void buildMe();
       public:
         %(class_name)s(ExtMachInst _machInst, const char * instMnem,
                 uint64_t setFlags, uint16_t _target, uint8_t _cc);
 
-        %(class_name)s(ExtMachInst _machInst, const char * instMnem,
-                uint16_t _target, uint8_t _cc);
-
         %(BasicExecDeclare)s
     };
 }};
@@ -89,14 +84,6 @@ def template SeqOpExecute {{
 }};
 
 output decoder {{
-    inline SeqOpBase::SeqOpBase(
-            ExtMachInst machInst, const char * mnemonic, const char * instMnem,
-            uint16_t _target, uint8_t _cc) :
-        X86MicroopBase(machInst, mnemonic, instMnem, 0, No_OpClass),
-        target(_target), cc(_cc)
-    {
-    }
-
     inline SeqOpBase::SeqOpBase(
             ExtMachInst machInst, const char * mnemonic, const char * instMnem,
             uint64_t setFlags, uint16_t _target, uint8_t _cc) :
@@ -107,27 +94,13 @@ output decoder {{
 }};
 
 def template SeqOpConstructor {{
-
-    inline void %(class_name)s::buildMe()
-    {
-        %(constructor)s;
-    }
-
-    inline %(class_name)s::%(class_name)s(
-            ExtMachInst machInst, const char * instMnem,
-            uint16_t _target, uint8_t _cc) :
-        %(base_class)s(machInst, "%(mnemonic)s", instMnem, _target, _cc)
-    {
-        buildMe();
-    }
-
     inline %(class_name)s::%(class_name)s(
             ExtMachInst machInst, const char * instMnem,
             uint64_t setFlags, uint16_t _target, uint8_t _cc) :
         %(base_class)s(machInst, "%(mnemonic)s", instMnem,
                 setFlags, _target, _cc)
     {
-        buildMe();
+        %(constructor)s;
     }
 }};
 
-- 
cgit v1.2.3