Changeset 156474 in webkit for trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.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/bytecode/UnlinkedCodeBlock.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h

@@ -255 +255 @@
 
     // Special registers
-    void setThisRegister(int thisRegister) { m_thisRegister = thisRegister; }
-    void setActivationRegister(int activationRegister) { m_activationRegister = activationRegister; }
-
-    void setArgumentsRegister(int argumentsRegister) { m_argumentsRegister = argumentsRegister; }
-    bool usesArguments() const { return m_argumentsRegister != (int)InvalidVirtualRegister; }
-    int argumentsRegister() const { return m_argumentsRegister; }
-
-
-    bool usesGlobalObject() const { return m_globalObjectRegister != (int)InvalidVirtualRegister; }
-    void setGlobalObjectRegister(int globalObjectRegister) { m_globalObjectRegister = globalObjectRegister; }
-    int globalObjectRegister() const { return m_globalObjectRegister; }
+    void setThisRegister(VirtualRegister thisRegister) { m_thisRegister = thisRegister; }
+    void setActivationRegister(VirtualRegister activationRegister) { m_activationRegister = activationRegister; }
+
+    void setArgumentsRegister(VirtualRegister argumentsRegister) { m_argumentsRegister = argumentsRegister; }
+    bool usesArguments() const { return m_argumentsRegister.isValid(); }
+    VirtualRegister argumentsRegister() const { return m_argumentsRegister; }
+
+
+    bool usesGlobalObject() const { return m_globalObjectRegister.isValid(); }
+    void setGlobalObjectRegister(VirtualRegister globalObjectRegister) { m_globalObjectRegister = globalObjectRegister; }
+    VirtualRegister globalObjectRegister() const { return m_globalObjectRegister; }
 
     // Parameter information
@@ -400 +400 @@
     CodeType codeType() const { return m_codeType; }
 
-    int thisRegister() const { return m_thisRegister; }
-    int activationRegister() const { return m_activationRegister; }
+    VirtualRegister thisRegister() const { return m_thisRegister; }
+    VirtualRegister activationRegister() const { return m_activationRegister; }
 
 
@@ -480 +480 @@
     VM* m_vm;
 
-    int m_thisRegister;
-    int m_argumentsRegister;
-    int m_activationRegister;
-    int m_globalObjectRegister;
+    VirtualRegister m_thisRegister;
+    VirtualRegister m_argumentsRegister;
+    VirtualRegister m_activationRegister;
+    VirtualRegister m_globalObjectRegister;
 
     bool m_needsFullScopeChain : 1;