Changeset 43352 in webkit for trunk/JavaScriptCore/jit

Timestamp:

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

Author:

[email protected]

Message:

2009-05-07 Geoffrey Garen <​[email protected]>

Reviewed by Gavin Barraclough.

Removed a few more special constants, and replaced them with uses of
the JITStackFrame struct.

Removed one of the two possible definitions of VoidPtrPair. The Mac
definition was more elegant, but SunSpider doesn't think it's any
faster, and it's net less elegant to have two ways of doing things.

• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile):
• jit/JITStubs.h: (JSC::):

Location:

trunk/JavaScriptCore/jit

Files:

• JIT.cpp (modified) (3 diffs)
• JITStubs.h (modified) (3 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -1103 +1103 @@
         }
         case op_profile_will_call: {
-            emitGetCTIParam(STUB_ARGS_profilerReference, regT0);
+            emitGetCTIParam(FIELD_OFFSET(JITStackFrame, enabledProfilerReference) / sizeof (void*), regT0);
             Jump noProfiler = branchTestPtr(Zero, Address(regT0));
             emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, regT0);
@@ -1112 +1112 @@
         }
         case op_profile_did_call: {
-            emitGetCTIParam(STUB_ARGS_profilerReference, regT0);
+            emitGetCTIParam(FIELD_OFFSET(JITStackFrame, enabledProfilerReference) / sizeof (void*), regT0);
             Jump noProfiler = branchTestPtr(Zero, Address(regT0));
             emitPutJITStubArgFromVirtualRegister(currentInstruction[1].u.operand, 1, regT0);
@@ -1524 +1524 @@
         emitPutImmediateToCallFrameHeader(m_codeBlock, RegisterFile::CodeBlock);
 
-        emitGetCTIParam(STUB_ARGS_registerFile, regT0);
+        emitGetCTIParam(FIELD_OFFSET(JITStackFrame, registerFile) / sizeof (void*), regT0);
         addPtr(Imm32(m_codeBlock->m_numCalleeRegisters * sizeof(Register)), callFrameRegister, regT1);
         

trunk/JavaScriptCore/jit/JITStubs.h

@@ -110 +110 @@
 #endif
 
+#define STUB_ARGS_code (offsetof(struct JITStackFrame, code) / sizeof (void*))
+#define STUB_ARGS_callFrame (offsetof(struct JITStackFrame, callFrame) / sizeof (void*))
+
+#define STUB_RETURN_ADDRESS_SLOT (STUB_ARGS[-1])
+
 #if USE(JIT_STUB_ARGUMENT_VA_LIST)
     #define STUB_ARGS_DECLARATION void* args, ...
@@ -136 +141 @@
 #endif
 
-#if PLATFORM(X86_64)
-#define STUB_ARGS_offset 0x10
-#else
-#define STUB_ARGS_offset 0x0C
-#endif
-
-#define STUB_ARGS_code (STUB_ARGS_offset)
-#define STUB_ARGS_registerFile (STUB_ARGS_offset + 1)
-#define STUB_ARGS_callFrame (STUB_ARGS_offset + 2)
-#define STUB_ARGS_exception (STUB_ARGS_offset + 3)
-#define STUB_ARGS_profilerReference (STUB_ARGS_offset + 4)
-#define STUB_ARGS_globalData (STUB_ARGS_offset + 5)
-
-#define STUB_RETURN_ADDRESS_SLOT (STUB_ARGS[-1])
-
-// The Mac compilers are fine with this, 
-#if PLATFORM(MAC)
-    struct VoidPtrPair {
-        void* first;
-        void* second;
-    };
-#define RETURN_PAIR(a,b) VoidPtrPair pair = { a, b }; return pair
-#else
     typedef uint64_t VoidPtrPair;
     union VoidPtrPairValue {
@@ -164 +146 @@
         VoidPtrPair i;
     };
-#define RETURN_PAIR(a,b) VoidPtrPairValue pair = {{ a, b }}; return pair.i
-#endif
+    #define RETURN_PAIR(a,b) VoidPtrPairValue pair = {{ a, b }}; return pair.i
 
     extern "C" void ctiVMThrowTrampoline();