Changeset 35231 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Jul 17, 2008, 9:00:28 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-17 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Next step toward putting doubles in registers: Store constant pool
entries as registers, not JSValue*s.

SunSpider reports no change.

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (8 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -575 +575 @@
 }
 
-NEVER_INLINE bool Machine::unwindCallFrame(ExecState* exec, JSValue* exceptionValue, const Instruction*& vPC, CodeBlock*& codeBlock, JSValue**& k, ScopeChainNode*& scopeChain, Register*& r)
+NEVER_INLINE bool Machine::unwindCallFrame(ExecState* exec, JSValue* exceptionValue, const Instruction*& vPC, CodeBlock*& codeBlock, Register*& k, ScopeChainNode*& scopeChain, Register*& r)
 {
     CodeBlock* oldCodeBlock = codeBlock;
@@ -608 +608 @@
         return false;
 
-    k = codeBlock->jsValues.data();
+    k = codeBlock->registers.data();
     scopeChain = callFrame[RegisterFile::CallerScopeChain].scopeChain();
     r = callFrame[RegisterFile::CallerRegisters].r();
@@ -617 +617 @@
 }
 
-NEVER_INLINE Instruction* Machine::throwException(ExecState* exec, JSValue* exceptionValue, const Instruction* vPC, CodeBlock*& codeBlock, JSValue**& k, ScopeChainNode*& scopeChain, Register*& r)
+NEVER_INLINE Instruction* Machine::throwException(ExecState* exec, JSValue* exceptionValue, const Instruction* vPC, CodeBlock*& codeBlock, Register*& k, ScopeChainNode*& scopeChain, Register*& r)
 {
     // Set up the exception object
@@ -978 +978 @@
     Register* registerBase = registerFile->base();
     Instruction* vPC = codeBlock->instructions.begin();
-    JSValue** k = codeBlock->jsValues.data();
+    Register* k = codeBlock->registers.data();
     Profiler** enabledProfilerReference = Profiler::enabledProfilerReference();
     unsigned tickCount = m_ticksUntilNextTimeoutCheck + 1;
@@ -2248 +2248 @@
             codeBlock = newCodeBlock;
             setScopeChain(exec, scopeChain, scopeChainForCall(exec, functionBodyNode, codeBlock, callDataScopeChain, r));
-            k = codeBlock->jsValues.data();
+            k = codeBlock->registers.data();
             vPC = codeBlock->instructions.begin();
 
@@ -2317 +2317 @@
             return returnValue;
 
-        k = codeBlock->jsValues.data();
+        k = codeBlock->registers.data();
         vPC = callFrame[RegisterFile::ReturnVPC].vPC();
         setScopeChain(exec, scopeChain, callFrame[RegisterFile::CallerScopeChain].scopeChain());
@@ -2379 +2379 @@
             codeBlock = newCodeBlock;
             setScopeChain(exec, scopeChain, scopeChainForCall(exec, functionBodyNode, codeBlock, callDataScopeChain, r));
-            k = codeBlock->jsValues.data();
+            k = codeBlock->registers.data();
             vPC = codeBlock->instructions.begin();
 
@@ -2550 +2550 @@
         int message = (++vPC)->u.operand;
 
-        r[dst] = Error::create(exec, (ErrorType)type, k[message]->toString(exec), codeBlock->lineNumberForVPC(vPC), codeBlock->ownerNode->sourceId(), codeBlock->ownerNode->sourceURL());
+        r[dst] = Error::create(exec, (ErrorType)type, k[message].toString(exec), codeBlock->lineNumberForVPC(vPC), codeBlock->ownerNode->sourceId(), codeBlock->ownerNode->sourceURL());
 
         ++vPC;