Changeset 156511 in webkit for trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

Timestamp:

Sep 26, 2013, 3:53:54 PM (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/DFGSpeculativeJIT32_64.cpp:
• 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/JITCall32_64.cpp:
• jit/JITInlines.h:
• jit/JITOpcodes.cpp:
• jit/JITOpcodes32_64.cpp:
• jit/JITPropertyAccess32_64.cpp:
• jit/JITStubs.cpp:
• llint/LLIntSlowPaths.cpp:
• profiler/ProfilerBytecodeSequence.cpp:
• runtime/CommonSlowPaths.cpp:
• runtime/JSActivation.cpp:

File:

• trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp

@@ -66 +66 @@
     for (int argument = values.numberOfArguments(); argument--;) {
         RELEASE_ASSERT(
-            exec->r(argumentToOperand(argument)).jsValue() == values.argument(argument));
+            exec->r(virtualRegisterForArgument(argument).offset()).jsValue() == values.argument(argument));
     }
     
@@ -79 +79 @@
     
     int stackFrameSize = entryCodeBlock->m_numCalleeRegisters;
-    if (!vm.interpreter->stack().grow(&exec->registers()[localToOperand(stackFrameSize)])) {
+    if (!vm.interpreter->stack().grow(&exec->registers()[virtualRegisterForLocal(stackFrameSize).offset()])) {
         if (Options::verboseOSR())
             dataLog("    OSR failed bcause stack growth failed.\n");