Changeset 155645 in webkit for trunk/Source/JavaScriptCore/dfg/DFGGenerationInfo.h

Timestamp:

Sep 12, 2013, 1:40:03 PM (12 years ago)

Author:

[email protected]

Message:

DFG::GenerationInfo init/fill methods shouldn't duplicate a bunch of logic
​https://bugs.webkit.org/show_bug.cgi?id=121253

Reviewed by Oliver Hunt.

• dfg/DFGGenerationInfo.h:

(JSC::DFG::GenerationInfo::initGPR):
(JSC::DFG::GenerationInfo::initInt32):
(JSC::DFG::GenerationInfo::initJSValue):
(JSC::DFG::GenerationInfo::initCell):
(JSC::DFG::GenerationInfo::initBoolean):
(JSC::DFG::GenerationInfo::initStorage):
(JSC::DFG::GenerationInfo::fillGPR):
(JSC::DFG::GenerationInfo::fillJSValue):
(JSC::DFG::GenerationInfo::fillCell):
(JSC::DFG::GenerationInfo::fillInt32):
(JSC::DFG::GenerationInfo::fillBoolean):
(JSC::DFG::GenerationInfo::fillStorage):

File:

• trunk/Source/JavaScriptCore/dfg/DFGGenerationInfo.h (modified) (8 diffs)

trunk/Source/JavaScriptCore/dfg/DFGGenerationInfo.h

@@ -70 +70 @@
         ASSERT(m_useCount);
     }
-    void initInt32(Node* node, uint32_t useCount, GPRReg gpr)
-    {
+    void initGPR(Node* node, uint32_t useCount, GPRReg gpr, DataFormat format)
+    {
+        ASSERT(gpr != InvalidGPRReg);
         m_node = node;
         m_useCount = useCount;
-        m_registerFormat = DataFormatInt32;
+        m_registerFormat = format;
         m_spillFormat = DataFormatNone;
         m_canFill = false;
@@ -82 +83 @@
         ASSERT(m_useCount);
     }
+    void initInt32(Node* node, uint32_t useCount, GPRReg gpr)
+    {
+        initGPR(node, useCount, gpr, DataFormatInt32);
+    }
 #if USE(JSVALUE64)
     void initJSValue(Node* node, uint32_t useCount, GPRReg gpr, DataFormat format = DataFormatJS)
     {
         ASSERT(format & DataFormatJS);
-
-        m_node = node;
-        m_useCount = useCount;
-        m_registerFormat = format;
-        m_spillFormat = DataFormatNone;
-        m_canFill = false;
-        u.gpr = gpr;
-        m_bornForOSR = false;
-        m_isConstant = false;
-        ASSERT(m_useCount);
+        initGPR(node, useCount, gpr, format);
     }
 #elif USE(JSVALUE32_64)
@@ -116 +112 @@
     void initCell(Node* node, uint32_t useCount, GPRReg gpr)
     {
-        m_node = node;
-        m_useCount = useCount;
-        m_registerFormat = DataFormatCell;
-        m_spillFormat = DataFormatNone;
-        m_canFill = false;
-        u.gpr = gpr;
-        m_bornForOSR = false;
-        m_isConstant = false;
-        ASSERT(m_useCount);
+        initGPR(node, useCount, gpr, DataFormatCell);
     }
     void initBoolean(Node* node, uint32_t useCount, GPRReg gpr)
     {
-        m_node = node;
-        m_useCount = useCount;
-        m_registerFormat = DataFormatBoolean;
-        m_spillFormat = DataFormatNone;
-        m_canFill = false;
-        u.gpr = gpr;
-        m_bornForOSR = false;
-        m_isConstant = false;
-        ASSERT(m_useCount);
+        initGPR(node, useCount, gpr, DataFormatBoolean);
     }
     void initDouble(Node* node, uint32_t useCount, FPRReg fpr)
@@ -153 +133 @@
     void initStorage(Node* node, uint32_t useCount, GPRReg gpr)
     {
-        m_node = node;
-        m_useCount = useCount;
-        m_registerFormat = DataFormatStorage;
-        m_spillFormat = DataFormatNone;
-        m_canFill = false;
-        u.gpr = gpr;
-        m_bornForOSR = false;
-        m_isConstant = false;
-        ASSERT(m_useCount);
+        initGPR(node, useCount, gpr, DataFormatStorage);
     }
 
@@ -305 +277 @@
         m_canFill = false;
     }
+    
+    void fillGPR(VariableEventStream& stream, GPRReg gpr, DataFormat format)
+    {
+        ASSERT(gpr != InvalidGPRReg);
+        m_registerFormat = format;
+        u.gpr = gpr;
+        if (m_bornForOSR)
+            appendFill(Fill, stream);
+    }
 
     // Record that this value is filled into machine registers,
@@ -312 +293 @@
     {
         ASSERT(format & DataFormatJS);
-        m_registerFormat = format;
-        u.gpr = gpr;
-        
-        if (m_bornForOSR)
-            appendFill(Fill, stream);
+        fillGPR(stream, gpr, format);
     }
 #elif USE(JSVALUE32_64)
@@ -331 +308 @@
     void fillCell(VariableEventStream& stream, GPRReg gpr)
     {
-        m_registerFormat = DataFormatCell;
-        u.gpr = gpr;
-        
-        if (m_bornForOSR)
-            appendFill(Fill, stream);
+        fillGPR(stream, gpr, DataFormatCell);
     }
 #endif
     void fillInt32(VariableEventStream& stream, GPRReg gpr)
     {
-        m_registerFormat = DataFormatInt32;
-        u.gpr = gpr;
-        
-        if (m_bornForOSR)
-            appendFill(Fill, stream);
+        fillGPR(stream, gpr, DataFormatInt32);
     }
     void fillBoolean(VariableEventStream& stream, GPRReg gpr)
     {
-        m_registerFormat = DataFormatBoolean;
-        u.gpr = gpr;
-        
-        if (m_bornForOSR)
-            appendFill(Fill, stream);
+        fillGPR(stream, gpr, DataFormatBoolean);
     }
     void fillDouble(VariableEventStream& stream, FPRReg fpr)
@@ -365 +330 @@
     void fillStorage(VariableEventStream& stream, GPRReg gpr)
     {
-        m_registerFormat = DataFormatStorage;
-        u.gpr = gpr;
-        
-        if (m_bornForOSR)
-            appendFill(Fill, stream);
+        fillGPR(stream, gpr, DataFormatStorage);
     }