Changeset 44884 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 19, 2009, 5:49:36 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-19 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Fix armv7 JIT build issues.

Unfortunate the arm compiler does not like the use of offsetof on JITStackFrame (since it now contains non POD types),
and the FIELD_OFFSET macro does not appear constantish enough for it to be happy with its use in COMPILE_ASSERT macros.

• Replace offsetofs with FIELD_OFFSETs (safe on C++ objects).
• Move COMPILE_ASSERTs defending layout of JITStackFrame structure on armv7 into JITThunks constructor.

• jit/JIT.cpp:
• jit/JIT.h:
• jit/JITInlineMethods.h: (JSC::JIT::restoreArgumentReference):
• jit/JITOpcodes.cpp: (JSC::JIT::emit_op_catch):
• jit/JITStubs.cpp: (JSC::JITThunks::JITThunks):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JIT.cpp (modified) (1 diff)
• jit/JIT.h (modified) (1 diff)
• jit/JITInlineMethods.h (modified) (3 diffs)
• jit/JITOpcodes.cpp (modified) (1 diff)
• jit/JITStubs.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-06-19  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        Fix armv7 JIT build issues.
+
+        Unfortunate the arm compiler does not like the use of offsetof on JITStackFrame (since it now contains non POD types),
+        and the FIELD_OFFSET macro does not appear constantish enough for it to be happy with its use in COMPILE_ASSERT macros.
+
+        * Replace offsetofs with FIELD_OFFSETs (safe on C++ objects).
+        * Move COMPILE_ASSERTs defending layout of JITStackFrame structure on armv7 into JITThunks constructor.
+
+        * jit/JIT.cpp:
+        * jit/JIT.h:
+        * jit/JITInlineMethods.h:
+        (JSC::JIT::restoreArgumentReference):
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_catch):
+        * jit/JITStubs.cpp:
+        (JSC::JITThunks::JITThunks):
+
 2009-06-19  Adam Treat  <[email protected]>
 

trunk/JavaScriptCore/jit/JIT.cpp

@@ -836 +836 @@
     move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
     emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
-    poke(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
+    poke(callFrameRegister, FIELD_OFFSET(struct JITStackFrame, callFrame) / sizeof (void*));
     restoreReturnAddressBeforeReturn(regT2);
     ret();

trunk/JavaScriptCore/jit/JIT.h

@@ -28 +28 @@
 
 #include <wtf/Platform.h>
+
+// FIELD_OFFSET: Like the C++ offsetof macro, but you can use it with classes.
+// The magic number 0x4000 is insignificant. We use it to avoid using NULL, since
+// NULL can cause compiler problems, especially in cases of multiple inheritance.
+#define FIELD_OFFSET(class, field) (reinterpret_cast<ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->field)) - 0x4000)
 
 #if ENABLE(JIT)

trunk/JavaScriptCore/jit/JITInlineMethods.h

@@ -35 +35 @@
 #endif
 
-// FIELD_OFFSET: Like the C++ offsetof macro, but you can use it with classes.
-// The magic number 0x4000 is insignificant. We use it to avoid using NULL, since
-// NULL can cause compiler problems, especially in cases of multiple inheritance.
-#define FIELD_OFFSET(class, field) (reinterpret_cast<ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->field)) - 0x4000)
-
 namespace JSC {
 
@@ -226 +221 @@
 ALWAYS_INLINE void JIT::restoreArgumentReference()
 {
-    poke(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
+    poke(callFrameRegister, FIELD_OFFSET(struct JITStackFrame, callFrame) / sizeof (void*));
 }
 ALWAYS_INLINE void JIT::restoreArgumentReferenceForTrampoline() {}
@@ -233 +228 @@
 {
     move(stackPointerRegister, firstArgumentRegister);
-    poke(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
+    poke(callFrameRegister, FIELD_OFFSET(struct JITStackFrame, callFrame) / sizeof (void*));
 }
 ALWAYS_INLINE void JIT::restoreArgumentReferenceForTrampoline()

trunk/JavaScriptCore/jit/JITOpcodes.cpp

@@ -690 +690 @@
 {
     killLastResultRegister(); // FIXME: Implicitly treat op_catch as a labeled statement, and remove this line of code.
-    peek(callFrameRegister, offsetof(struct JITStackFrame, callFrame) / sizeof (void*));
+    peek(callFrameRegister, FIELD_OFFSET(struct JITStackFrame, callFrame) / sizeof (void*));
     emitPutVirtualRegister(currentInstruction[1].u.operand);
 }

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -196 +196 @@
 #endif
 
-COMPILE_ASSERT(offsetof(struct JITStackFrame, preservedReturnAddress) == 0x20, JITStackFrame_outerReturnAddress_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, preservedR4) == 0x24, JITStackFrame_outerReturnAddress_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, preservedR5) == 0x28, JITStackFrame_outerReturnAddress_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, preservedR6) == 0x2c, JITStackFrame_outerReturnAddress_offset_matches_ctiTrampoline);
-
-COMPILE_ASSERT(offsetof(struct JITStackFrame, registerFile) == 0x30, JITStackFrame_registerFile_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x34, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, exception) == 0x38, JITStackFrame_exception_offset_matches_ctiTrampoline);
-// The fifth argument is the first item already on the stack.
-COMPILE_ASSERT(offsetof(struct JITStackFrame, enabledProfilerReference) == 0x3c, JITStackFrame_enabledProfilerReference_offset_matches_ctiTrampoline);
-
 asm volatile (
 ".text" "\n"
@@ -339 +328 @@
 {
     JIT::compileCTIMachineTrampolines(globalData, &m_executablePool, &m_ctiArrayLengthTrampoline, &m_ctiStringLengthTrampoline, &m_ctiVirtualCallPreLink, &m_ctiVirtualCallLink, &m_ctiVirtualCall, &m_ctiNativeCallThunk);
+
+#if PLATFORM(ARM_V7)
+    // Unfortunate the arm compiler does not like the use of offsetof on JITStackFrame (since it contains non POD types),
+    // and the FIELD_OFFSET macro does not appear constantish enough for it to be happy with its use in COMPILE_ASSERT
+    // macros.
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, preservedReturnAddress) == 0x20);
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, preservedR4) == 0x24);
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, preservedR5) == 0x28);
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, preservedR6) == 0x2c);
+
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, registerFile) == 0x30);
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, callFrame) == 0x34);
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, exception) == 0x38);
+    // The fifth argument is the first item already on the stack.
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, enabledProfilerReference) == 0x3c);
+
+    ASSERT(FIELD_OFFSET(struct JITStackFrame, thunkReturnAddress) == 0x1C);
+#endif
 }
 
@@ -564 +571 @@
 
 #if PLATFORM(ARM_V7)
-
-COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == 0x1C, JITStackFrame_outerReturnAddress_offset_matches_ctiTrampoline);
 
 #define DEFINE_STUB_FUNCTION(rtype, op) \