Changeset 155415 in webkit

Timestamp:

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

Author:

msaboff@apple.com

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• bytecode/CodeBlock.h (modified) (1 diff)
• bytecode/Operands.h (modified) (6 diffs)
• bytecompiler/BytecodeGenerator.h (modified) (2 diffs)
• dfg/DFGAbstractInterpreterInlines.h (modified) (2 diffs)
• dfg/DFGByteCodeParser.cpp (modified) (10 diffs)
• dfg/DFGCFGSimplificationPhase.cpp (modified) (2 diffs)
• dfg/DFGCPSRethreadingPhase.cpp (modified) (2 diffs)
• dfg/DFGOSREntry.cpp (modified) (3 diffs)
• dfg/DFGOSRExitCompiler32_64.cpp (modified) (7 diffs)
• dfg/DFGOSRExitCompiler64.cpp (modified) (4 diffs)
• dfg/DFGScoreBoard.h (modified) (3 diffs)
• dfg/DFGSpeculativeJIT.cpp (modified) (10 diffs)
• dfg/DFGSpeculativeJIT.h (modified) (18 diffs)
• dfg/DFGSpeculativeJIT32_64.cpp (modified) (12 diffs)
• dfg/DFGSpeculativeJIT64.cpp (modified) (9 diffs)
• dfg/DFGValidate.cpp (modified) (3 diffs)
• dfg/DFGVariableEventStream.cpp (modified) (2 diffs)
• dfg/DFGVirtualRegisterAllocationPhase.cpp (modified) (1 diff)
• jit/JITInlines.h (modified) (1 diff)
• jit/JITOpcodes.cpp (modified) (1 diff)
• jit/JITOpcodes32_64.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-09-09  Michael Saboff  <msaboff@apple.com>
+
+        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:
+
 2013-09-09  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -172 +172 @@
     }
 
-    return toCString("loc", r);
+    return toCString("loc", operandToLocal(r));
 }
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -368 +368 @@
 
         if (inlineCallFrame)
-            return inlineCallFrame->capturedVars.get(operand);
+            return inlineCallFrame->capturedVars.get(operandToLocal(operand));
 
         // The activation object isn't in the captured region, but it's "captured"

trunk/Source/JavaScriptCore/bytecode/Operands.h

@@ -29 +29 @@
 #include "CallFrame.h"
 #include "JSObject.h"
+#include "VirtualRegister.h"
 #include <wtf/PrintStream.h>
 #include <wtf/Vector.h>
 
 namespace JSC {
+
+inline VirtualRegister localToOperand(int local) { return (VirtualRegister)local; }
+inline bool operandIsLocal(int operand) { return operand >= 0; }
+inline int operandToLocal(int operand) { return operand; }
 
 // argument 0 is 'this'.
@@ -144 +149 @@
         }
         
-        return m_locals[operand];
+        return m_locals[operandToLocal(operand)];
     }
     
@@ -153 +158 @@
         if (operandIsArgument(operand))
             return true;
-        return static_cast<size_t>(operand) < numberOfLocals();
+        return static_cast<size_t>(operandToLocal(operand)) < numberOfLocals();
     }
     
@@ -164 +169 @@
         }
         
-        setLocal(operand, value);
+        setLocal(operandToLocal(operand), value);
     }
     
@@ -197 +202 @@
         if (index < numberOfArguments())
             return argumentToOperand(index);
-        return index - numberOfArguments();
+        return localToOperand(index - numberOfArguments());
     }
     
@@ -207 +212 @@
         }
         
-        setLocalFirstTime(operand, value);
+        setLocalFirstTime(operandToLocal(operand), value);
     }
     

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -499 +499 @@
         RegisterID& registerFor(int index)
         {
-            if (index >= 0)
-                return m_calleeRegisters[index];
+            if (operandIsLocal(index))
+                return m_calleeRegisters[operandToLocal(index)];
 
             if (index == JSStack::Callee)
@@ -506 +506 @@
 
             ASSERT(m_parameters.size());
-            return m_parameters[index + m_parameters.size() + JSStack::CallFrameHeaderSize];
+            return m_parameters[operandToArgument(index)];
         }
 

trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

@@ -155 +155 @@
         forNode(node).makeTop();
         if (!operandIsArgument(node->unlinkedLocal())
-            && m_graph.m_lazyVars.get(node->unlinkedLocal())) {
+            && m_graph.m_lazyVars.get(operandToLocal(node->unlinkedLocal()))) {
             // This is kind of pessimistic - we could know in some cases that the
             // DFG code at the point of the OSR had already initialized the lazy
@@ -1599 +1599 @@
     } else {
         for (size_t i = m_codeBlock->m_numVars; i--;) {
-            if (m_codeBlock->isCaptured(i))
+            if (m_codeBlock->isCaptured(localToOperand(i)))
                 m_state.variables().local(i).makeTop();
         }

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));
         }
 

trunk/Source/JavaScriptCore/dfg/DFGCFGSimplificationPhase.cpp

@@ -329 +329 @@
             keepOperandAlive(block, jettisonedBlock, boundaryCodeOrigin, argumentToOperand(i));
         for (size_t i = 0; i < jettisonedBlock->variablesAtHead.numberOfLocals(); ++i)
-            keepOperandAlive(block, jettisonedBlock, boundaryCodeOrigin, i);
+            keepOperandAlive(block, jettisonedBlock, boundaryCodeOrigin, localToOperand(i));
         
         fixJettisonedPredecessors(block, jettisonedBlock);
@@ -383 +383 @@
                 keepOperandAlive(firstBlock, jettisonedBlock, boundaryCodeOrigin, argumentToOperand(i));
             for (size_t i = 0; i < jettisonedBlock->variablesAtHead.numberOfLocals(); ++i)
-                keepOperandAlive(firstBlock, jettisonedBlock, boundaryCodeOrigin, i);
+                keepOperandAlive(firstBlock, jettisonedBlock, boundaryCodeOrigin, localToOperand(i));
         }
         

trunk/Source/JavaScriptCore/dfg/DFGCPSRethreadingPhase.cpp

@@ -221 +221 @@
             canonicalizeGetLocalFor<ArgumentOperand>(node, variable, operandToArgument(variable->local()));
         else
-            canonicalizeGetLocalFor<LocalOperand>(node, variable, variable->local());
+            canonicalizeGetLocalFor<LocalOperand>(node, variable, operandToLocal(variable->local()));
     }
     
@@ -289 +289 @@
             canonicalizeFlushOrPhantomLocalFor<nodeType, ArgumentOperand>(node, variable, operandToArgument(variable->local()));
         else
-            canonicalizeFlushOrPhantomLocalFor<nodeType, LocalOperand>(node, variable, variable->local());
+            canonicalizeFlushOrPhantomLocalFor<nodeType, LocalOperand>(node, variable, operandToLocal(variable->local()));
     }
     

trunk/Source/JavaScriptCore/dfg/DFGOSREntry.cpp

@@ -140 +140 @@
     for (size_t local = 0; local < entry->m_expectedValues.numberOfLocals(); ++local) {
         if (entry->m_localsForcedDouble.get(local)) {
-            if (!exec->registers()[local].jsValue().isNumber()) {
+            if (!exec->registers()[localToOperand(local)].jsValue().isNumber()) {
                 if (Options::verboseOSR()) {
                     dataLog(
-                        "    OSR failed because variable ", local, " is ",
-                        exec->registers()[local].jsValue(), ", expected number.\n");
+                        "    OSR failed because variable ", localToOperand(local), " is ",
+                        exec->registers()[localToOperand(local)].jsValue(), ", expected number.\n");
                 }
                 return 0;
@@ -150 +150 @@
             continue;
         }
-        if (!entry->m_expectedValues.local(local).validate(exec->registers()[local].jsValue())) {
+        if (!entry->m_expectedValues.local(local).validate(exec->registers()[localToOperand(local)].jsValue())) {
             if (Options::verboseOSR()) {
                 dataLog(
-                    "    OSR failed because variable ", local, " is ",
-                    exec->registers()[local].jsValue(), ", expected ",
+                    "    OSR failed because variable ", localToOperand(local), " is ",
+                    exec->registers()[localToOperand(local)].jsValue(), ", expected ",
                     entry->m_expectedValues.local(local), ".\n");
             }
@@ -180 +180 @@
     for (size_t local = 0; local < entry->m_expectedValues.numberOfLocals(); ++local) {
         if (entry->m_localsForcedDouble.get(local))
-            *bitwise_cast<double*>(exec->registers() + local) = exec->registers()[local].jsValue().asNumber();
+            *bitwise_cast<double*>(exec->registers() + localToOperand(local)) = exec->registers()[localToOperand(local)].jsValue().asNumber();
     }
     

trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler32_64.cpp

@@ -200 +200 @@
         case Int32DisplacedInJSStack:
         case CellDisplacedInJSStack:
-        case BooleanDisplacedInJSStack:
+        case BooleanDisplacedInJSStack: {
             numberOfDisplacedVirtualRegisters++;
-            ASSERT((int)recovery.virtualRegister() >= 0);
+            ASSERT(operandIsLocal(recovery.virtualRegister()));
             
             // See if we might like to store to this virtual register before doing
@@ -211 +211 @@
             // to be rare, so the handling of it is optimized for the cases in
             // which it does not happen.
-            if (recovery.virtualRegister() < (int)operands.numberOfLocals()) {
-                switch (operands.local(recovery.virtualRegister()).technique()) {
+            int local = operandToLocal(recovery.virtualRegister());
+            if (local < (int)operands.numberOfLocals()) {
+                switch (operands.local(local).technique()) {
                 case InGPR:
                 case UnboxedInt32InGPR:
@@ -219 +220 @@
                 case InPair:
                 case InFPR:
-                    if (!poisonedVirtualRegisters[recovery.virtualRegister()]) {
-                        poisonedVirtualRegisters[recovery.virtualRegister()] = true;
+                    if (!poisonedVirtualRegisters[local]) {
+                        poisonedVirtualRegisters[local] = true;
                         numberOfPoisonedVirtualRegisters++;
                     }
@@ -229 +230 @@
             }
             break;
-            
+
+            }
         case UInt32InGPR:
             haveUInt32s = true;
@@ -544 +546 @@
             case UnboxedBooleanInGPR: {
                 m_jit.load32(reinterpret_cast<char*>(scratchDataBuffer + poisonIndex(virtualRegister)) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload), GPRInfo::regT0);
-                m_jit.store32(GPRInfo::regT0, AssemblyHelpers::payloadFor((VirtualRegister)virtualRegister));
+                m_jit.store32(GPRInfo::regT0, AssemblyHelpers::payloadFor(localToOperand(virtualRegister)));
                 uint32_t tag = JSValue::EmptyValueTag;
                 if (recovery.technique() == InGPR)
@@ -552 +554 @@
                 else
                     tag = JSValue::BooleanTag;
-                m_jit.store32(AssemblyHelpers::TrustedImm32(tag), AssemblyHelpers::tagFor((VirtualRegister)virtualRegister));
+                m_jit.store32(AssemblyHelpers::TrustedImm32(tag), AssemblyHelpers::tagFor(localToOperand(virtualRegister)));
                 break;
             }
@@ -561 +563 @@
                 m_jit.load32(reinterpret_cast<char*>(scratchDataBuffer + poisonIndex(virtualRegister)) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload), GPRInfo::regT0);
                 m_jit.load32(reinterpret_cast<char*>(scratchDataBuffer + poisonIndex(virtualRegister)) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag), GPRInfo::regT1);
-                m_jit.store32(GPRInfo::regT0, AssemblyHelpers::payloadFor((VirtualRegister)virtualRegister));
-                m_jit.store32(GPRInfo::regT1, AssemblyHelpers::tagFor((VirtualRegister)virtualRegister));
+                m_jit.store32(GPRInfo::regT0, AssemblyHelpers::payloadFor(localToOperand(virtualRegister)));
+                m_jit.store32(GPRInfo::regT1, AssemblyHelpers::tagFor(localToOperand(virtualRegister)));
                 break;
                 

trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler64.cpp

@@ -181 +181 @@
         case Int32DisplacedInJSStack:
         case DoubleDisplacedInJSStack:
-        case DisplacedInJSStack:
+        case DisplacedInJSStack: {
             numberOfDisplacedVirtualRegisters++;
-            ASSERT((int)recovery.virtualRegister() >= 0);
+            ASSERT(operandIsLocal(recovery.virtualRegister()));
             
             // See if we might like to store to this virtual register before doing
@@ -192 +192 @@
             // to be rare, so the handling of it is optimized for the cases in
             // which it does not happen.
-            if (recovery.virtualRegister() < (int)operands.numberOfLocals()) {
-                switch (operands.local(recovery.virtualRegister()).technique()) {
+            int local = operandToLocal(recovery.virtualRegister());
+            if (local < (int)operands.numberOfLocals()) {
+                switch (operands.local(local).technique()) {
                 case InGPR:
                 case UnboxedInt32InGPR:
                 case UInt32InGPR:
                 case InFPR:
-                    if (!poisonedVirtualRegisters[recovery.virtualRegister()]) {
-                        poisonedVirtualRegisters[recovery.virtualRegister()] = true;
+                    if (!poisonedVirtualRegisters[local]) {
+                        poisonedVirtualRegisters[local] = true;
                         numberOfPoisonedVirtualRegisters++;
                     }
@@ -208 +209 @@
             }
             break;
-            
+            }
         case UnboxedInt32InGPR:
         case AlreadyInJSStackAsUnboxedInt32:
@@ -531 +532 @@
             case InFPR:
                 m_jit.load64(scratchDataBuffer + poisonIndex(virtualRegister), GPRInfo::regT0);
-                m_jit.store64(GPRInfo::regT0, AssemblyHelpers::addressFor((VirtualRegister)virtualRegister));
+                m_jit.store64(GPRInfo::regT0, AssemblyHelpers::addressFor(localToOperand(virtualRegister)));
                 break;
                 

trunk/Source/JavaScriptCore/dfg/DFGScoreBoard.h

@@ -90 +90 @@
             ASSERT(!m_used[index]);
             m_highWatermark = std::max(m_highWatermark, static_cast<unsigned>(index) + 1);
-            return (VirtualRegister)index;
+            return localToOperand(index);
         }
 
@@ -97 +97 @@
         m_used.append(0);
         m_highWatermark = std::max(m_highWatermark, static_cast<unsigned>(next) + 1);
-        return (VirtualRegister)next;
+        return localToOperand(next);
     }
 
-    // Increment the usecount for the VirtualRegsiter associated with 'child',
-    // if it reaches the node's refcount, free the VirtualRegsiter.
+    // Increment the usecount for the VirtualRegister associated with 'child',
+    // if it reaches the node's refcount, free the VirtualRegister.
     void use(Node* child)
     {
@@ -108 +108 @@
 
         // Find the virtual register number for this child, increment its use count.
-        uint32_t index = child->virtualRegister();
+        uint32_t index = operandToLocal(child->virtualRegister());
         ASSERT(m_used[index] != max());
         if (child->refCount() == ++m_used[index]) {

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -318 +318 @@
 SilentRegisterSavePlan SpeculativeJIT::silentSavePlanForGPR(VirtualRegister spillMe, GPRReg source)
 {
-    GenerationInfo& info = m_generationInfo[spillMe];
+    GenerationInfo& info = generationInfoFromVirtualRegister(spillMe);
     Node* node = info.node();
     DataFormat registerFormat = info.registerFormat();
@@ -437 +437 @@
 SilentRegisterSavePlan SpeculativeJIT::silentSavePlanForFPR(VirtualRegister spillMe, FPRReg source)
 {
-    GenerationInfo& info = m_generationInfo[spillMe];
+    GenerationInfo& info = generationInfoFromVirtualRegister(spillMe);
     Node* node = info.node();
     ASSERT(info.registerFormat() == DataFormatDouble);
@@ -778 +778 @@
 {
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
     
     switch (info.registerFormat()) {
@@ -1077 +1077 @@
     for (unsigned i = 0; i < m_generationInfo.size(); ++i) {
         VirtualRegister virtualRegister = (VirtualRegister)i;
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         if (!info.alive())
             continue;
@@ -1125 +1125 @@
             continue;
 
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 #if USE(JSVALUE64)
         if (iter.regID() != info.gpr()) {
@@ -1151 +1151 @@
             continue;
 
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         if (iter.regID() != info.fpr()) {
             dataLogF("DFG_CONSISTENCY_CHECK failed: name mismatch for fpr %s (virtual register %d).\n", iter.debugName(), virtualRegister);
@@ -1549 +1549 @@
     
     VirtualRegister virtualRegister = node->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
     
     info.noticeOSRBirth(*m_stream, node, virtualRegister);
@@ -1682 +1682 @@
         m_variables[i] = valueSource;
         // FIXME: Don't emit SetLocal(Dead). https://bugs.webkit.org/show_bug.cgi?id=108019
-        m_stream->appendAndLog(VariableEvent::setLocal(i, valueSource.dataFormat()));
+        m_stream->appendAndLog(VariableEvent::setLocal(localToOperand(i), valueSource.dataFormat()));
     }
     
@@ -2177 +2177 @@
 #endif
     VirtualRegister virtualRegister = node->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -2291 +2291 @@
             Node* childNode = node->child1().node();
             VirtualRegister virtualRegister = childNode->virtualRegister();
-            GenerationInfo& info = m_generationInfo[virtualRegister];
+            GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
             JSValueOperand op1(this, node->child1(), ManualOperandSpeculation);

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h

@@ -162 +162 @@
     {
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         return info.canReuse();
     }
@@ -190 +190 @@
         if (spillMe != InvalidVirtualRegister) {
 #if USE(JSVALUE32_64)
-            GenerationInfo& info = m_generationInfo[spillMe];
+            GenerationInfo& info = generationInfoFromVirtualRegister(spillMe);
             RELEASE_ASSERT(info.registerFormat() != DataFormatJSDouble);
             if ((info.registerFormat() & DataFormatJS))
@@ -207 +207 @@
         if (spillMe != InvalidVirtualRegister) {
 #if USE(JSVALUE32_64)
-            GenerationInfo& info = m_generationInfo[spillMe];
+            GenerationInfo& info = generationInfoFromVirtualRegister(spillMe);
             RELEASE_ASSERT(info.registerFormat() != DataFormatJSDouble);
             if ((info.registerFormat() & DataFormatJS))
@@ -240 +240 @@
     {
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         return info.registerFormat() != DataFormatNone;
     }
@@ -246 +246 @@
     {
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         return info.registerFormat() == DataFormatDouble;
     }
@@ -256 +256 @@
             return;
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
         // use() returns true when the value becomes dead, and any
@@ -484 +484 @@
     void spill(VirtualRegister spillMe)
     {
-        GenerationInfo& info = m_generationInfo[spillMe];
+        GenerationInfo& info = generationInfoFromVirtualRegister(spillMe);
 
 #if USE(JSVALUE32_64)
@@ -797 +797 @@
 
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
         if (format == DataFormatInteger) {
@@ -831 +831 @@
         VirtualRegister virtualRegister = node->virtualRegister();
         m_gprs.retain(reg, virtualRegister, SpillOrderCell);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initCell(node, node->refCount(), reg);
     }
@@ -841 +841 @@
         VirtualRegister virtualRegister = node->virtualRegister();
         m_gprs.retain(reg, virtualRegister, SpillOrderBoolean);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initBoolean(node, node->refCount(), reg);
     }
@@ -855 +855 @@
         VirtualRegister virtualRegister = node->virtualRegister();
         m_gprs.retain(reg, virtualRegister, SpillOrderJS);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initJSValue(node, node->refCount(), reg, format);
     }
@@ -871 +871 @@
         m_gprs.retain(tag, virtualRegister, SpillOrderJS);
         m_gprs.retain(payload, virtualRegister, SpillOrderJS);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initJSValue(node, node->refCount(), tag, payload, format);
     }
@@ -886 +886 @@
         VirtualRegister virtualRegister = node->virtualRegister();
         m_gprs.retain(reg, virtualRegister, SpillOrderStorage);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initStorage(node, node->refCount(), reg);
     }
@@ -896 +896 @@
         VirtualRegister virtualRegister = node->virtualRegister();
         m_fprs.retain(reg, virtualRegister, SpillOrderDouble);
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         info.initDouble(node, node->refCount(), reg);
     }
@@ -902 +902 @@
     {
         ASSERT(isInt32Constant(node) || isNumberConstant(node) || isJSConstant(node));
-        m_generationInfo[node->virtualRegister()].initConstant(node, node->refCount());
+        generationInfoFromVirtualRegister(node->virtualRegister()).initConstant(node, node->refCount());
     }
     
@@ -1886 +1886 @@
 
         VirtualRegister virtualRegister = node->virtualRegister();
-        GenerationInfo& info = m_generationInfo[virtualRegister];
+        GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
         
         return info.isJSInteger();
@@ -2173 +2173 @@
             return m_arguments[argument];
         }
+
+        int local = operandToLocal(operand);
+        if ((unsigned)local >= m_variables.size())
+            m_variables.resize(local + 1);
         
-        if ((unsigned)operand >= m_variables.size())
-            m_variables.resize(operand + 1);
-        
-        return m_variables[operand];
+        return m_variables[local];
     }
     
@@ -2185 +2186 @@
         m_stream->appendAndLog(VariableEvent::setLocal(operand, valueSource.dataFormat()));
     }
-    
+
+    GenerationInfo& generationInfoFromVirtualRegister(VirtualRegister virtualRegister)
+    {
+        return m_generationInfo[operandToLocal(virtualRegister)];
+    }
+
     // The JIT, while also provides MacroAssembler functionality.
     JITCompiler& m_jit;

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

@@ -47 +47 @@
     
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     if (info.registerFormat() == DataFormatNone) {
@@ -123 +123 @@
 
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -866 +866 @@
     m_interpreter.filter(value, SpecInt32);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -967 +967 @@
     m_interpreter.filter(value, SpecNumber);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     if (info.registerFormat() == DataFormatNone) {
@@ -1104 +1104 @@
     m_interpreter.filter(value, SpecCell);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -1185 +1185 @@
     m_interpreter.filter(value, SpecBoolean);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -2003 +2003 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_fprs.retain(result.fpr(), virtualRegister, SpillOrderDouble);
-            m_generationInfo[virtualRegister].initDouble(node, node->refCount(), result.fpr());
+            generationInfoFromVirtualRegister(virtualRegister).initDouble(node, node->refCount(), result.fpr());
             break;
         }
@@ -2015 +2015 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_gprs.retain(result.gpr(), virtualRegister, SpillOrderInteger);
-            m_generationInfo[virtualRegister].initInteger(node, node->refCount(), result.gpr());
+            generationInfoFromVirtualRegister(virtualRegister).initInteger(node, node->refCount(), result.gpr());
             break;
         }
@@ -2027 +2027 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_gprs.retain(result.gpr(), virtualRegister, SpillOrderCell);
-            m_generationInfo[virtualRegister].initCell(node, node->refCount(), result.gpr());
+            generationInfoFromVirtualRegister(virtualRegister).initCell(node, node->refCount(), result.gpr());
             break;
         }
@@ -2039 +2039 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_gprs.retain(result.gpr(), virtualRegister, SpillOrderBoolean);
-            m_generationInfo[virtualRegister].initBoolean(node, node->refCount(), result.gpr());
+            generationInfoFromVirtualRegister(virtualRegister).initBoolean(node, node->refCount(), result.gpr());
             break;
         }
@@ -2054 +2054 @@
         m_gprs.retain(tag.gpr(), virtualRegister, SpillOrderJS);
 
-        m_generationInfo[virtualRegister].initJSValue(node, node->refCount(), tag.gpr(), result.gpr(), DataFormatJS);
+        generationInfoFromVirtualRegister(virtualRegister).initJSValue(node, node->refCount(), tag.gpr(), result.gpr(), DataFormatJS);
         break;
     }
@@ -2102 +2102 @@
             }
             SpeculatedType predictedType = node->variableAccessData()->argumentAwarePrediction();
-            if (m_generationInfo[node->child1()->virtualRegister()].registerFormat() == DataFormatDouble) {
+            if (generationInfoFromVirtualRegister(node->child1()->virtualRegister()).registerFormat() == DataFormatDouble) {
                 SpeculateDoubleOperand value(this, node->child1(), ManualOperandSpeculation);
                 m_jit.storeDouble(value.fpr(), JITCompiler::addressFor(node->local()));

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp

@@ -46 +46 @@
     
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     if (info.registerFormat() == DataFormatNone) {
@@ -124 +124 @@
 {
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
     
     switch (info.registerFormat()) {
@@ -826 +826 @@
     m_interpreter.filter(value, SpecInt32);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -976 +976 @@
     m_interpreter.filter(value, SpecNumber);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     if (info.registerFormat() == DataFormatNone) {
@@ -1133 +1133 @@
     m_interpreter.filter(value, SpecCell);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -1215 +1215 @@
     m_interpreter.filter(value, SpecBoolean);
     VirtualRegister virtualRegister = edge->virtualRegister();
-    GenerationInfo& info = m_generationInfo[virtualRegister];
+    GenerationInfo& info = generationInfoFromVirtualRegister(virtualRegister);
 
     switch (info.registerFormat()) {
@@ -1970 +1970 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_fprs.retain(result.fpr(), virtualRegister, SpillOrderDouble);
-            m_generationInfo[virtualRegister].initDouble(node, node->refCount(), result.fpr());
+            generationInfoFromVirtualRegister(virtualRegister).initDouble(node, node->refCount(), result.fpr());
             break;
         }
@@ -1982 +1982 @@
             VirtualRegister virtualRegister = node->virtualRegister();
             m_gprs.retain(result.gpr(), virtualRegister, SpillOrderInteger);
-            m_generationInfo[virtualRegister].initInteger(node, node->refCount(), result.gpr());
+            generationInfoFromVirtualRegister(virtualRegister).initInteger(node, node->refCount(), result.gpr());
             break;
         }
@@ -2002 +2002 @@
             format = DataFormatJS;
 
-        m_generationInfo[virtualRegister].initJSValue(node, node->refCount(), result.gpr(), format);
+        generationInfoFromVirtualRegister(virtualRegister).initJSValue(node, node->refCount(), result.gpr(), format);
         break;
     }

trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp

@@ -75 +75 @@
         // NB. This code is not written for performance, since it is not intended to run
         // in release builds.
-        
+
         // Validate that all local variables at the head of the root block are dead.
         BasicBlock* root = m_graph.block(0);
         for (unsigned i = 0; i < root->variablesAtHead.numberOfLocals(); ++i)
-            V_EQUAL((static_cast<VirtualRegister>(i), 0), static_cast<Node*>(0), root->variablesAtHead.local(i));
+            V_EQUAL((static_cast<VirtualRegister>(localToOperand(i)), 0), static_cast<Node*>(0), root->variablesAtHead.local(i));
         
         // Validate ref counts and uses.
@@ -326 +326 @@
             }
             for (size_t i = 0; i < block->variablesAtHead.numberOfLocals(); ++i) {
-                VALIDATE((static_cast<VirtualRegister>(i), block), !block->variablesAtHead.local(i) || block->variablesAtHead.local(i)->hasVariableAccessData(m_graph));
+                VALIDATE((static_cast<VirtualRegister>(localToOperand(i)), block), !block->variablesAtHead.local(i) || block->variablesAtHead.local(i)->hasVariableAccessData(m_graph));
                 if (m_graph.m_form == ThreadedCPS)
-                    VALIDATE((static_cast<VirtualRegister>(i), block), !block->variablesAtTail.local(i) || block->variablesAtTail.local(i)->hasVariableAccessData(m_graph));
+                    VALIDATE((static_cast<VirtualRegister>(localToOperand(i)), block), !block->variablesAtTail.local(i) || block->variablesAtTail.local(i)->hasVariableAccessData(m_graph));
 
                 getLocalPositions.local(i) = notSet;
@@ -394 +394 @@
             for (size_t i = 0; i < block->variablesAtHead.numberOfLocals(); ++i) {
                 checkOperand(
-                    block, getLocalPositions, setLocalPositions, i);
+                    block, getLocalPositions, setLocalPositions, localToOperand(i));
             }
         }

trunk/Source/JavaScriptCore/dfg/DFGVariableEventStream.cpp

@@ -116 +116 @@
     unsigned numVariables;
     if (codeOrigin.inlineCallFrame)
-        numVariables = baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame)->m_numCalleeRegisters + codeOrigin.inlineCallFrame->stackOffset;
+        numVariables = baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame)->m_numCalleeRegisters + operandToLocal(codeOrigin.inlineCallFrame->stackOffset);
     else
         numVariables = baselineCodeBlock->m_numCalleeRegisters;
@@ -310 +310 @@
     for (InlineCallFrame* inlineCallFrame = codeOrigin.inlineCallFrame; inlineCallFrame; inlineCallFrame = inlineCallFrame->caller.inlineCallFrame) {
         for (unsigned i = JSStack::CallFrameHeaderSize; i--;)
-            valueRecoveries.setLocal(inlineCallFrame->stackOffset - i - 1, ValueRecovery::alreadyInJSStack());
+            valueRecoveries.setLocal(operandToLocal(inlineCallFrame->stackOffset) - i - 1, ValueRecovery::alreadyInJSStack());
     }
 }

trunk/Source/JavaScriptCore/dfg/DFGVirtualRegisterAllocationPhase.cpp

@@ -127 +127 @@
             InlineCallFrame& inlineCallFrame = codeBlock()->inlineCallFrames()[i];
             CodeBlock* codeBlock = baselineCodeBlockForInlineCallFrame(&inlineCallFrame);
-            unsigned requiredCalleeRegisters = inlineCallFrame.stackOffset + codeBlock->m_numCalleeRegisters;
+            unsigned requiredCalleeRegisters = operandToLocal(inlineCallFrame.stackOffset) + codeBlock->m_numCalleeRegisters;
             if (requiredCalleeRegisters > calleeRegisters)
                 calleeRegisters = requiredCalleeRegisters;

trunk/Source/JavaScriptCore/jit/JITInlines.h

@@ -759 +759 @@
     }
 
-    if (src == m_lastResultBytecodeRegister && m_codeBlock->isTemporaryRegisterIndex(src) && !atJumpTarget()) {
+    if (src == m_lastResultBytecodeRegister && m_codeBlock->isTemporaryRegisterIndex(operandToLocal(src)) && !atJumpTarget()) {
         // The argument we want is already stored in eax
         if (dst != cachedResultRegister)

trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp

@@ -837 +837 @@
     size_t count = m_codeBlock->m_numVars;
     for (size_t j = 0; j < count; ++j)
-        emitInitRegister(j);
+        emitInitRegister(localToOperand(j));
 }
 

trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp

@@ -1100 +1100 @@
     // object lifetime and increasing GC pressure.
     for (int i = 0; i < m_codeBlock->m_numVars; ++i)
-        emitStore(i, jsUndefined());
+        emitStore(localToOperand(i), jsUndefined());
 }