Changeset 156474 in webkit for trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

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/DFGSpeculativeJIT.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -49 +49 @@
     , m_arguments(jit.codeBlock()->numParameters())
     , m_variables(jit.graph().m_localVars)
-    , m_lastSetOperand(std::numeric_limits<int>::max())
+    , m_lastSetOperand(VirtualRegister())
     , m_state(m_jit.graph())
     , m_interpreter(m_jit.graph(), m_state)
@@ -1184 +1184 @@
     for (gpr_iterator iter = m_gprs.begin(); iter != m_gprs.end(); ++iter) {
         VirtualRegister virtualRegister = iter.name();
-        if (virtualRegister == InvalidVirtualRegister)
+        if (!virtualRegister.isValid())
             continue;
 
@@ -1210 +1210 @@
     for (fpr_iterator iter = m_fprs.begin(); iter != m_fprs.end(); ++iter) {
         VirtualRegister virtualRegister = iter.name();
-        if (virtualRegister == InvalidVirtualRegister)
+        if (!virtualRegister.isValid())
             continue;
 
@@ -1539 +1539 @@
         noticeOSRBirth(child->child1().node());
     
-    m_stream->appendAndLog(VariableEvent::movHint(MinifiedID(child), node->local()));
+    m_stream->appendAndLog(VariableEvent::movHint(MinifiedID(child), node->local().offset()));
 }
 
@@ -1557 +1557 @@
     for (int i = 0; i < argumentCountIncludingThis; ++i) {
         ValueRecovery recovery;
-        if (codeBlock->isCaptured(argumentToOperand(i)))
+        if (codeBlock->isCaptured(virtualRegisterForArgument(i)))
             recovery = ValueRecovery::alreadyInJSStack();
         else {
@@ -1640 +1640 @@
         ValueSource valueSource = ValueSource(ValueInJSStack);
         m_arguments[i] = valueSource;
-        m_stream->appendAndLog(VariableEvent::setLocal(argumentToOperand(i), valueSource.dataFormat()));
+        m_stream->appendAndLog(VariableEvent::setLocal(virtualRegisterForArgument(i), valueSource.dataFormat()));
     }
     
@@ -1660 +1660 @@
         m_variables[i] = valueSource;
         // FIXME: Don't emit SetLocal(Dead). https://bugs.webkit.org/show_bug.cgi?id=108019
-        m_stream->appendAndLog(VariableEvent::setLocal(localToOperand(i), valueSource.dataFormat()));
-    }
-    
-    m_lastSetOperand = std::numeric_limits<int>::max();
+        m_stream->appendAndLog(VariableEvent::setLocal(virtualRegisterForLocal(i), valueSource.dataFormat()));
+    }
+    
+    m_lastSetOperand = VirtualRegister();
     m_codeOriginForExitTarget = CodeOrigin();
     m_codeOriginForExitProfile = CodeOrigin();