Changeset 43374 in webkit for trunk/JavaScriptCore/jit/JITStubs.cpp

Timestamp:

May 7, 2009, 4:33:00 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

Replaced two more macros with references to the JITStackFrame structure.

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

File:

• trunk/JavaScriptCore/jit/JITStubs.cpp (modified) (6 diffs)

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -66 +66 @@
 #if COMPILER(GCC) && PLATFORM(X86)
 
-COMPILE_ASSERT(STUB_ARGS_code == 0x0C, STUB_ARGS_code_is_0x0C);
-COMPILE_ASSERT(STUB_ARGS_callFrame == 0x0E, STUB_ARGS_callFrame_is_0x0E);
+// These ASSERTs remind you that, if you change the layout of JITStackFrame, you
+// need to change the assembly trampolines below to match.
+COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
 
 #if PLATFORM(DARWIN)
@@ -85 +88 @@
     "subl $0x1c, %esp" "\n"
     "movl $512, %esi" "\n"
-    "movl 0x38(%esp), %edi" "\n" // Ox38 = 0x0E * 4, 0x0E = STUB_ARGS_callFrame (see assertion above)
-    "call *0x30(%esp)" "\n" // Ox30 = 0x0C * 4, 0x0C = STUB_ARGS_code (see assertion above)
+    "movl 0x38(%esp), %edi" "\n"
+    "call *0x30(%esp)" "\n"
     "addl $0x1c, %esp" "\n"
     "popl %ebx" "\n"
@@ -118 +121 @@
 #elif COMPILER(GCC) && PLATFORM(X86_64)
 
-COMPILE_ASSERT(STUB_ARGS_code == 0x10, STUB_ARGS_code_is_0x10);
-COMPILE_ASSERT(STUB_ARGS_callFrame == 0x12, STUB_ARGS_callFrame_is_0x12);
+// These ASSERTs remind you that, if you change the layout of JITStackFrame, you
+// need to change the assembly trampolines below to match.
+COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
 
 #if PLATFORM(DARWIN)
@@ -141 +147 @@
     "movq $0xFFFF000000000000, %r14" "\n"
     "movq $0xFFFF000000000002, %r15" "\n"
-    "movq 0x90(%rsp), %r13" "\n" // Ox90 = 0x12 * 8, 0x12 = STUB_ARGS_callFrame (see assertion above)
-    "call *0x80(%rsp)" "\n" // Ox80 = 0x10 * 8, 0x10 = STUB_ARGS_code (see assertion above)
+    "movq 0x90(%rsp), %r13" "\n"
+    "call *0x80(%rsp)" "\n"
     "addq $0x48, %rsp" "\n"
     "popq %rbx" "\n"
@@ -171 +177 @@
     "ret" "\n"
 );
-    
+
 #elif COMPILER(MSVC)
+
+// These ASSERTs remind you that, if you change the layout of JITStackFrame, you
+// need to change the assembly trampolines below to match.
+COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
+COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
 
 extern "C" {
@@ -188 +200 @@
             mov ecx, esp;
             mov edi, [esp + 0x38];
-            call [esp + 0x30]; // Ox30 = 0x0C * 4, 0x0C = STUB_ARGS_code (see assertion above)
+            call [esp + 0x30];
             add esp, 0x1c;
             pop ebx;