Changeset 46598 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Jul 30, 2009, 1:57:44 PM (16 years ago)

Author:

[email protected]

Message:

Merged nitro-extreme branch into trunk.

Location:

trunk/JavaScriptCore/wtf

Files:

• MainThread.cpp (modified) (1 diff)
• Platform.h (modified) (2 diffs)
• StdLibExtras.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/MainThread.cpp

@@ -30 +30 @@
 #include "MainThread.h"
 
+#include "StdLibExtras.h"
 #include "CurrentTime.h"
 #include "Deque.h"
-#include "StdLibExtras.h"
 #include "Threading.h"
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -558 +558 @@
 #endif
 
-#if !defined(WTF_USE_ALTERNATE_JSIMMEDIATE) && PLATFORM(X86_64) && PLATFORM(MAC)
-#define WTF_USE_ALTERNATE_JSIMMEDIATE 1
-#endif
+#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+#if PLATFORM(X86_64) && PLATFORM(MAC)
+#define WTF_USE_JSVALUE64 1
+#else
+#define WTF_USE_JSVALUE32 1
+#endif
+#endif // !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
 
 #if !defined(ENABLE_REPAINT_THROTTLING)
@@ -609 +613 @@
 #define ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS 1
 #endif
-#ifndef ENABLE_JIT_OPTIMIZE_ARITHMETIC
-#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1
-#endif
 #ifndef ENABLE_JIT_OPTIMIZE_METHOD_CALLS
 #define ENABLE_JIT_OPTIMIZE_METHOD_CALLS 1

trunk/JavaScriptCore/wtf/StdLibExtras.h

@@ -42 +42 @@
 #endif
 
+// OBJECT_OFFSETOF: 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 OBJECT_OFFSETOF(class, field) (reinterpret_cast<ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->field)) - 0x4000)
+
 namespace WTF {