Changeset 156474 in webkit for trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

Timestamp:

Sep 26, 2013, 10:50:46 AM (12 years ago)

Author:

[email protected]

Message:

VirtualRegister should be a class
​https://bugs.webkit.org/show_bug.cgi?id=121732

Reviewed by Geoffrey Garen.

This is a refactoring change. Changed VirtualRegister from an enum to a class.
Moved Operands::operandIsArgument(), operandToArgument(), argumentToOperand()
and the similar functions for locals to VirtualRegister class.

This is in preparation for changing the offset for the first local register from
0 to -1. This is needed since most native calling conventions have the architected
frame pointer (e.g. %rbp for X86) point at the slot that stores the previous frame
pointer. Local values start below that address.

• bytecode/CodeBlock.cpp:
• bytecode/CodeBlock.h:
• bytecode/Instruction.h:
• bytecode/LazyOperandValueProfile.h:
• bytecode/MethodOfGettingAValueProfile.cpp:
• bytecode/Operands.h:
• bytecode/UnlinkedCodeBlock.cpp:
• bytecode/UnlinkedCodeBlock.h:
• bytecode/ValueRecovery.h:
• bytecode/VirtualRegister.h:
• bytecompiler/BytecodeGenerator.cpp:
• bytecompiler/BytecodeGenerator.h:
• bytecompiler/RegisterID.h:
• debugger/DebuggerCallFrame.cpp:
• dfg/DFGAbstractHeap.h:
• dfg/DFGAbstractInterpreterInlines.h:
• dfg/DFGArgumentPosition.h:
• dfg/DFGArgumentsSimplificationPhase.cpp:
• dfg/DFGByteCodeParser.cpp:
• dfg/DFGCFGSimplificationPhase.cpp:
• dfg/DFGCPSRethreadingPhase.cpp:
• dfg/DFGCapabilities.cpp:
• dfg/DFGConstantFoldingPhase.cpp:
• dfg/DFGFlushLivenessAnalysisPhase.cpp:
• dfg/DFGGraph.cpp:
• dfg/DFGGraph.h:
• dfg/DFGJITCode.cpp:
• dfg/DFGNode.h:
• dfg/DFGOSREntry.cpp:
• dfg/DFGOSREntrypointCreationPhase.cpp:
• dfg/DFGOSRExit.h:
• dfg/DFGOSRExitCompiler32_64.cpp:
• dfg/DFGOSRExitCompiler64.cpp:
• dfg/DFGRegisterBank.h:
• dfg/DFGScoreBoard.h:
• dfg/DFGSpeculativeJIT.cpp:
• dfg/DFGSpeculativeJIT.h:
• dfg/DFGSpeculativeJIT64.cpp:
• dfg/DFGValidate.cpp:
• dfg/DFGValueRecoveryOverride.h:
• dfg/DFGVariableAccessData.h:
• dfg/DFGVariableEvent.h:
• dfg/DFGVariableEventStream.cpp:
• dfg/DFGVirtualRegisterAllocationPhase.cpp:
• ftl/FTLExitArgumentForOperand.h:
• ftl/FTLLink.cpp:
• ftl/FTLLowerDFGToLLVM.cpp:
• ftl/FTLOSREntry.cpp:
• ftl/FTLOSRExit.cpp:
• ftl/FTLOSRExit.h:
• ftl/FTLOSRExitCompiler.cpp:
• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp:
• jit/AssemblyHelpers.h:
• jit/JIT.h:
• jit/JITCall.cpp:
• jit/JITInlines.h:
• jit/JITOpcodes.cpp:
• jit/JITOpcodes32_64.cpp:
• jit/JITStubs.cpp:
• llint/LLIntSlowPaths.cpp:
• profiler/ProfilerBytecodeSequence.cpp:
• runtime/CommonSlowPaths.cpp:
• runtime/JSActivation.cpp:

File:

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

trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

@@ -143 +143 @@
         ASSERT(m_graph.m_form == SSA);
         VariableAccessData* variable = node->variableAccessData();
-        AbstractValue& value = m_state.variables().operand(variable->local());
+        AbstractValue& value = m_state.variables().operand(variable->local().offset());
         ASSERT(value.isHeapTop());
         FiltrationResult result =
@@ -153 +153 @@
         
     case ExtractOSREntryLocal: {
-        if (!operandIsArgument(node->unlinkedLocal())
-            && m_graph.m_lazyVars.get(operandToLocal(node->unlinkedLocal()))) {
+        if (!(node->unlinkedLocal().isArgument())
+            && m_graph.m_lazyVars.get(node->unlinkedLocal().toLocal())) {
             // 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
@@ -172 +172 @@
             break;
         }
-        AbstractValue value = m_state.variables().operand(variableAccessData->local());
+        AbstractValue value = m_state.variables().operand(variableAccessData->local().offset());
         if (!variableAccessData->isCaptured()) {
             if (value.isClear())
@@ -184 +184 @@
         
     case GetLocalUnlinked: {
-        AbstractValue value = m_state.variables().operand(node->unlinkedLocal());
+        AbstractValue value = m_state.variables().operand(node->unlinkedLocal().offset());
         if (value.value())
             m_state.setFoundConstants(true);
@@ -192 +192 @@
         
     case SetLocal: {
-        m_state.variables().operand(node->local()) = forNode(node->child1());
+        m_state.variables().operand(node->local().offset()) = forNode(node->child1());
         break;
     }
@@ -1134 +1134 @@
         if (isEmptySpeculation(
                 m_state.variables().operand(
-                    m_graph.argumentsRegisterFor(node->codeOrigin)).m_type))
+                    m_graph.argumentsRegisterFor(node->codeOrigin).offset()).m_type))
             m_state.setFoundConstants(true);
         else
@@ -1608 +1608 @@
     } else {
         for (size_t i = m_codeBlock->m_numVars; i--;) {
-            if (m_codeBlock->isCaptured(localToOperand(i)))
+            if (m_codeBlock->isCaptured(virtualRegisterForLocal(i)))
                 m_state.variables().local(i).makeHeapTop();
         }
@@ -1614 +1614 @@
 
     for (size_t i = m_state.variables().numberOfArguments(); i--;) {
-        if (m_codeBlock->isCaptured(argumentToOperand(i)))
+        if (m_codeBlock->isCaptured(virtualRegisterForArgument(i)))
             m_state.variables().argument(i).makeHeapTop();
     }