Changeset 155415 in webkit for trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

Timestamp:

Sep 9, 2013, 10:37:51 PM (12 years ago)

Author:

[email protected]

Message:

Add local to/from operand helpers similar to argument to/from operand2
​https://bugs.webkit.org/show_bug.cgi?id=121056

Reviewed by Geoffrey Garen.

Added localToOperand(), operandToLocal() and operandIsLocal() to Operands.h, very similar to
argumentToOperand(), et al. Used the new helpers everywhere where an index into a data
structure is intended instead of the actual virtual register offset. When the stack is
changed to grow down, local register offsets can be negative. Also added the helper
DFG::SpeculativeJIT::generationInfoFromVirtualRegister() for the common case accessing
m_generationInfo[operandToLocal(val)].

• bytecode/CodeBlock.cpp:
• bytecode/CodeBlock.h:
• bytecode/Operands.h:

(JSC::localToOperand):
(JSC::operandIsLocal):
(JSC::operandToLocal):

• bytecompiler/BytecodeGenerator.h:
• dfg/DFGAbstractInterpreterInlines.h:
• dfg/DFGByteCodeParser.cpp:
• dfg/DFGCFGSimplificationPhase.cpp:
• dfg/DFGCPSRethreadingPhase.cpp:
• dfg/DFGOSREntry.cpp:
• dfg/DFGOSRExitCompiler32_64.cpp:
• dfg/DFGOSRExitCompiler64.cpp:
• dfg/DFGScoreBoard.h:
• dfg/DFGSpeculativeJIT.cpp:
• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::generationInfoFromVirtualRegister):

• dfg/DFGSpeculativeJIT32_64.cpp:
• dfg/DFGSpeculativeJIT64.cpp:
• dfg/DFGValidate.cpp:
• dfg/DFGVariableEventStream.cpp:
• dfg/DFGVirtualRegisterAllocationPhase.cpp:
• jit/JITInlines.h:
• jit/JITOpcodes.cpp:
• jit/JITOpcodes32_64.cpp:

File:

• trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (10 diffs)

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -262 +262 @@
     Node* getLocal(unsigned operand)
     {
-        Node* node = m_currentBlock->variablesAtTail.local(operand);
+        unsigned local = operandToLocal(operand);
+        Node* node = m_currentBlock->variablesAtTail.local(local);
         bool isCaptured = m_codeBlock->isCaptured(operand, inlineCallFrame());
         
@@ -288 +289 @@
             }
         } else {
-            m_preservedVars.set(operand);
+            m_preservedVars.set(local);
             variable = newVariableAccessData(operand, isCaptured);
         }
         
         node = injectLazyOperandSpeculation(addToGraph(GetLocal, OpInfo(variable)));
-        m_currentBlock->variablesAtTail.local(operand) = node;
+        m_currentBlock->variablesAtTail.local(local) = node;
         return node;
     }
     void setLocal(unsigned operand, Node* value, SetMode setMode = NormalSet)
     {
+        unsigned local = operandToLocal(operand);
         bool isCaptured = m_codeBlock->isCaptured(operand, inlineCallFrame());
         
@@ -312 +314 @@
             m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIndexingType));
         Node* node = addToGraph(SetLocal, OpInfo(variableAccessData), value);
-        m_currentBlock->variablesAtTail.local(operand) = node;
+        m_currentBlock->variablesAtTail.local(local) = node;
     }
 
@@ -432 +434 @@
         
         if (!operandIsArgument(operand))
-            m_preservedVars.set(operand);
+            m_preservedVars.set(operandToLocal(operand));
         
         Node* node = m_currentBlock->variablesAtTail.operand(operand);
@@ -460 +462 @@
             flushDirect(inlineStackEntry->remapOperand(argumentToOperand(argument)));
         for (int local = 0; local < inlineStackEntry->m_codeBlock->m_numVars; ++local) {
-            if (!inlineStackEntry->m_codeBlock->isCaptured(local))
+            if (!inlineStackEntry->m_codeBlock->isCaptured(localToOperand(local)))
                 continue;
-            flushDirect(inlineStackEntry->remapOperand(local));
+            flushDirect(inlineStackEntry->remapOperand(localToOperand(local)));
         }
     }
@@ -1281 +1283 @@
     
     // Make sure that the area used by the call frame is reserved.
-    for (int arg = inlineCallFrameStart + JSStack::CallFrameHeaderSize + codeBlock->m_numVars; arg-- > inlineCallFrameStart;)
+    for (int arg = operandToLocal(inlineCallFrameStart) + JSStack::CallFrameHeaderSize + codeBlock->m_numVars; arg-- > operandToLocal(inlineCallFrameStart);)
         m_preservedVars.set(arg);
     
     // Make sure that we have enough locals.
-    unsigned newNumLocals = inlineCallFrameStart + JSStack::CallFrameHeaderSize + codeBlock->m_numCalleeRegisters;
+    unsigned newNumLocals = operandToLocal(inlineCallFrameStart) + JSStack::CallFrameHeaderSize + codeBlock->m_numCalleeRegisters;
     if (newNumLocals > m_numLocals) {
         m_numLocals = newNumLocals;
@@ -1885 +1887 @@
             // Initialize all locals to undefined.
             for (int i = 0; i < m_inlineStackTop->m_codeBlock->m_numVars; ++i)
-                set(i, constantUndefined(), SetOnEntry);
+                set(localToOperand(i), constantUndefined(), SetOnEntry);
             NEXT_OPCODE(op_enter);
 
@@ -3152 +3154 @@
         case op_init_lazy_reg: {
             set(currentInstruction[1].u.operand, getJSConstantForValue(JSValue()));
-            ASSERT(currentInstruction[1].u.operand >= 0);
-            m_graph.m_lazyVars.set(currentInstruction[1].u.operand);
+            ASSERT(operandIsLocal(currentInstruction[1].u.operand));
+            m_graph.m_lazyVars.set(operandToLocal(currentInstruction[1].u.operand));
             NEXT_OPCODE(op_init_lazy_reg);
         }
@@ -3382 +3384 @@
         else {
             for (int i = byteCodeParser->m_codeBlock->m_numVars; i--;) {
-                if (byteCodeParser->m_codeBlock->isCaptured(i))
+                if (byteCodeParser->m_codeBlock->isCaptured(localToOperand(i)))
                     inlineCallFrame.capturedVars.set(i);
             }
@@ -3389 +3391 @@
         for (int i = argumentCountIncludingThis; i--;) {
             if (codeBlock->isCaptured(argumentToOperand(i)))
-                inlineCallFrame.capturedVars.set(argumentToOperand(i) + inlineCallFrame.stackOffset);
+                inlineCallFrame.capturedVars.set(operandToLocal(argumentToOperand(i) + inlineCallFrame.stackOffset));
         }
         for (size_t i = codeBlock->m_numVars; i--;) {
-            if (codeBlock->isCaptured(i))
-                inlineCallFrame.capturedVars.set(i + inlineCallFrame.stackOffset);
+            int localOperand = localToOperand(i);
+            if (codeBlock->isCaptured(localOperand))
+                inlineCallFrame.capturedVars.set(operandToLocal(localOperand + inlineCallFrame.stackOffset));
         }