Changeset 43505 in webkit for trunk/JavaScriptCore/jit/JIT.cpp

Timestamp:

May 11, 2009, 11:05:45 AM (16 years ago)

Author:

[email protected]

Message:

Rename emitGetFromCallFrameHeader to emitGetFromCallFrameHeaderPtr

Reviewed by Maciej Stachowiak

File:

• trunk/JavaScriptCore/jit/JIT.cpp (modified) (10 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -388 +388 @@
             int skip = currentInstruction[3].u.operand + m_codeBlock->needsFullScopeChain();
 
-            emitGetFromCallFrameHeader(RegisterFile::ScopeChain, regT0);
+            emitGetFromCallFrameHeaderPtr(RegisterFile::ScopeChain, regT0);
             while (skip--)
                 loadPtr(Address(regT0, FIELD_OFFSET(ScopeChainNode, next)), regT0);
@@ -400 +400 @@
             int skip = currentInstruction[2].u.operand + m_codeBlock->needsFullScopeChain();
 
-            emitGetFromCallFrameHeader(RegisterFile::ScopeChain, regT1);
+            emitGetFromCallFrameHeaderPtr(RegisterFile::ScopeChain, regT1);
             emitGetVirtualRegister(currentInstruction[3].u.operand, regT0);
             while (skip--)
@@ -432 +432 @@
 
             // Grab the return address.
-            emitGetFromCallFrameHeader(RegisterFile::ReturnPC, regT1);
+            emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
 
             // Restore our caller's "r".
-            emitGetFromCallFrameHeader(RegisterFile::CallerFrame, callFrameRegister);
+            emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
 
             // Return.
@@ -1790 +1790 @@
     // Load caller frame's scope chain into this callframe so that whatever we call can
     // get to its global data.
-    emitGetFromCallFrameHeader(RegisterFile::CallerFrame, regT1);
-    emitGetFromCallFrameHeader(RegisterFile::ScopeChain, regT1, regT1);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, regT1);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::ScopeChain, regT1, regT1);
     emitPutToCallFrameHeader(regT1, RegisterFile::ScopeChain);
     
@@ -1824 +1824 @@
     loadPtr(Address(X86::edx, -(int32_t)sizeof(Register)), X86::edx);
     
-    emitGetFromCallFrameHeader(RegisterFile::Callee, X86::esi);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, X86::esi);
 
     move(callFrameRegister, X86::edi); 
@@ -1832 +1832 @@
     addPtr(Imm32(sizeof(ArgList)), stackPointerRegister);
 #else
-    emitGetFromCallFrameHeader(RegisterFile::ArgumentCount, regT0);
+    emitGetFromCallFrameHeader32(RegisterFile::ArgumentCount, regT0);
 
     /* We have two structs that we use to describe the stackframe we set up for our
@@ -1900 +1900 @@
 
     // Plant callee
-    emitGetFromCallFrameHeader(RegisterFile::Callee, X86::eax);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, X86::eax);
     storePtr(X86::eax, Address(stackPointerRegister, FIELD_OFFSET(NativeCallFrameStructure, callee)));
 
@@ -1912 +1912 @@
 #else
     // Plant callee
-    emitGetFromCallFrameHeader(RegisterFile::Callee, X86::edx);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::Callee, X86::edx);
 
     // Plant callframe
@@ -1930 +1930 @@
 
     // Grab the return address.
-    emitGetFromCallFrameHeader(RegisterFile::ReturnPC, regT1);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
     
     // Restore our caller's "r".
-    emitGetFromCallFrameHeader(RegisterFile::CallerFrame, callFrameRegister);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
     
     // Return.
@@ -1942 +1942 @@
     exceptionHandler.link(this);
     // Grab the return address.
-    emitGetFromCallFrameHeader(RegisterFile::ReturnPC, regT1);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
     move(ImmPtr(&globalData->exceptionLocation), regT2);
     storePtr(regT1, regT2);
     move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
-    emitGetFromCallFrameHeader(RegisterFile::CallerFrame, callFrameRegister);
+    emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
     emitPutCTIParam(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
     push(regT2);