[SCM] WebKit Debian packaging branch, debian/unstable, updated. upstream/1.1.10-167-gf021aeb
Gustavo Noronha Silva
kov at debian.org
Wed Jun 17 01:03:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit cf3e01221fa42cd13186167959cd6408f32a1129
Merge: 0c5216a66ce903e4c44feabf4f537c5821b8818c 7615f3d779e633c045265cfb27b55480c098b87b
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Tue Jun 16 18:22:08 2009 -0300
Merge commit 'origin/webkit-1.1' into debian/unstable
diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index ce316f4,c65ba85..ec07afd
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -533,7 -533,7 +533,7 @@@ static const size_t kNumClasses = 68
static const size_t kPageMapBigAllocationThreshold = 128 << 20;
// Minimum number of pages to fetch from system at a time. Must be
- // significantly bigger than kPageSize to amortize system-call
+ // significantly bigger than kBlockSize to amortize system-call
// overhead, and also to reduce external fragementation. Also, we
// should keep this value big because various incarnations of Linux
// have small limits on the number of mmap() regions per
@@@ -2083,13 -2083,13 +2083,13 @@@ static TCMalloc_Central_FreeListPadded
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
-static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
static bool phinited = false;
// Avoid extra level of indirection by making "pageheap" be just an alias
// of pageheap_memory.
typedef union {
- void* m_memory;
+ uint64_t* m_memory;
TCMalloc_PageHeap* m_pageHeap;
} PageHeapUnion;
@@@ -4089,7 -4089,7 +4089,7 @@@ extern "C"
malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
&FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
- #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+ #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
, 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
#endif
diff --combined JavaScriptCore/wtf/Platform.h
index 2975e6a,ae620cb..ddfc73f
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -46,6 -46,7 +46,7 @@@
#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
#define BUILDING_ON_LEOPARD 1
#endif
+ #include <TargetConditionals.h>
#endif
/* PLATFORM(WIN_OS) */
@@@ -149,11 -150,30 +150,30 @@@
#define WTF_PLATFORM_WIN 1
#endif
+ /* PLATFORM(IPHONE) */
+ #if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
+ #define WTF_PLATFORM_IPHONE 1
+ #endif
+
+ /* PLATFORM(IPHONE_SIMULATOR) */
+ #if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
+ #define WTF_PLATFORM_IPHONE 1
+ #define WTF_PLATFORM_IPHONE_SIMULATOR 1
+ #else
+ #define WTF_PLATFORM_IPHONE_SIMULATOR 0
+ #endif
+
+ #if !defined(WTF_PLATFORM_IPHONE)
+ #define WTF_PLATFORM_IPHONE 0
+ #endif
+
/* Graphics engines */
/* PLATFORM(CG) and PLATFORM(CI) */
- #if PLATFORM(MAC)
+ #if PLATFORM(MAC) || PLATFORM(IPHONE)
#define WTF_PLATFORM_CG 1
+ #endif
+ #if PLATFORM(MAC) && !PLATFORM(IPHONE)
#define WTF_PLATFORM_CI 1
#endif
@@@ -208,6 -228,9 +228,9 @@@
#define WTF_PLATFORM_FORCE_PACK 1
#endif
#endif
+ #if defined(__ARM_ARCH_7A__)
+ #define WTF_PLATFORM_ARM_V7 1
+ #endif
/* PLATFORM(X86) */
#if defined(__i386__) \
@@@ -224,13 -247,6 +247,13 @@@
#define WTF_PLATFORM_X86_64 1
#endif
+/* PLATFORM(SPARC) */
+#if defined(__sparc__) \
+ || defined(__sparc)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
/* PLATFORM(SH4) */
#if defined(__SH4__)
#define WTF_PLATFORM_SH4 1
@@@ -256,16 -272,6 +279,16 @@@
# endif
#endif
+/* For undefined platforms */
+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
+#include <sys/param.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#elif __BYTE_ORDER == __PDP_ENDIAN
+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
+#endif
+#endif
+
/* Compiler */
/* COMPILER(MSVC) */
@@@ -309,7 -315,7 +332,7 @@@
#define WTF_COMPILER_WINSCW 1
#endif
- #if (PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
+ #if (PLATFORM(IPHONE) || PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
#define ENABLE_JSC_MULTIPLE_THREADS 1
#endif
@@@ -324,7 -330,7 +347,7 @@@
#define WTF_USE_ICU_UNICODE 1
#endif
- #if PLATFORM(MAC)
+ #if PLATFORM(MAC) && !PLATFORM(IPHONE)
#define WTF_PLATFORM_CF 1
#define WTF_USE_PTHREADS 1
#if !defined(ENABLE_MAC_JAVA_BRIDGE)
@@@ -342,6 -348,18 +365,18 @@@
#define WTF_USE_PTHREADS 1
#endif
+ #if PLATFORM(IPHONE)
+ #define WTF_PLATFORM_CF 1
+ #define WTF_USE_PTHREADS 1
+ #define ENABLE_FTPDIR 1
+ #define ENABLE_MAC_JAVA_BRIDGE 0
+ #define ENABLE_ICONDATABASE 0
+ #define ENABLE_GEOLOCATION 1
+ #define ENABLE_NETSCAPE_PLUGIN_API 0
+ #define HAVE_READLINE 1
+ #define ENABLE_REPAINT_THROTTLING 1
+ #endif
+
#if PLATFORM(WIN)
#define WTF_USE_WININET 1
#endif
@@@ -359,15 -377,11 +394,11 @@@
#endif
#if !defined(HAVE_ACCESSIBILITY)
- #if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
+ #if PLATFORM(IPHONE) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
#define HAVE_ACCESSIBILITY 1
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
- #if COMPILER(GCC)
- #define HAVE_COMPUTED_GOTO 1
- #endif
-
#if PLATFORM(DARWIN)
#define HAVE_ERRNO_H 1
@@@ -380,11 -394,14 +411,14 @@@
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TIMEB_H 1
- #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+ #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
#define HAVE_MADV_FREE_REUSE 1
+ #define HAVE_MADV_FREE 1
#endif
+ #if PLATFORM(IPHONE)
#define HAVE_MADV_FREE 1
+ #endif
#elif PLATFORM(WIN_OS)
@@@ -498,49 -515,60 +532,60 @@@
/* The JIT is tested & working on x86_64 Mac */
#if PLATFORM(X86_64) && PLATFORM(MAC)
#define ENABLE_JIT 1
- #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
/* The JIT is tested & working on x86 Mac */
#elif PLATFORM(X86) && PLATFORM(MAC)
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
+ #elif PLATFORM(ARM_V7) && PLATFORM(IPHONE)
+ /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */
+ #define ENABLE_JIT 0
+ #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 0
/* The JIT is tested & working on x86 Windows */
#elif PLATFORM(X86) && PLATFORM(WIN)
#define ENABLE_JIT 1
- #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
#endif
- #define ENABLE_JIT_OPTIMIZE_CALL 1
- #define ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS 1
- #define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1
#endif
- #if ENABLE(JIT)
- #if !(USE(JIT_STUB_ARGUMENT_VA_LIST) || USE(JIT_STUB_ARGUMENT_REGISTER) || USE(JIT_STUB_ARGUMENT_STACK))
- #error Please define one of the JIT_STUB_ARGUMENT settings.
- #elif (USE(JIT_STUB_ARGUMENT_VA_LIST) && USE(JIT_STUB_ARGUMENT_REGISTER)) \
- || (USE(JIT_STUB_ARGUMENT_VA_LIST) && USE(JIT_STUB_ARGUMENT_STACK)) \
- || (USE(JIT_STUB_ARGUMENT_REGISTER) && USE(JIT_STUB_ARGUMENT_STACK))
- #error Please do not define more than one of the JIT_STUB_ARGUMENT settings.
+ #ifndef ENABLE_JIT_OPTIMIZE_CALL
+ #define ENABLE_JIT_OPTIMIZE_CALL 1
+ #endif
+ #ifndef ENABLE_JIT_OPTIMIZE_NATIVE_CALL
+ #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 1
+ #endif
+ #ifndef ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS
+ #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
+ #endif
+
+ #if PLATFORM(X86) && COMPILER(MSVC)
+ #define JSC_HOST_CALL __fastcall
+ #elif PLATFORM(X86) && COMPILER(GCC)
+ #define JSC_HOST_CALL __attribute__ ((fastcall))
+ #else
+ #define JSC_HOST_CALL
#endif
+
+ #if COMPILER(GCC) && !ENABLE(JIT)
+ #define HAVE_COMPUTED_GOTO 1
#endif
- #if PLATFORM(X86_64)
- #define JSC_HOST_CALL
- #elif COMPILER(MSVC)
- #define JSC_HOST_CALL __fastcall
- #elif COMPILER(GCC) && PLATFORM(X86)
- #define JSC_HOST_CALL __attribute__ ((fastcall))
+ #if ENABLE(JIT) && defined(COVERAGE)
+ #define WTF_USE_INTERPRETER 0
#else
- #if ENABLE(JIT)
- #error Need to support register calling convention in this compiler
- #else
- #define JSC_HOST_CALL
- #endif
+ #define WTF_USE_INTERPRETER 1
#endif
/* Yet Another Regex Runtime. */
/* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */
#if (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(MAC)) \
|| (!defined(ENABLE_YARR_JIT) && PLATFORM(X86_64) && PLATFORM(MAC)) \
+ /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */ \
+ || (!defined(ENABLE_YARR_JIT) && PLATFORM(ARM_V7) && PLATFORM(IPHONE) && 0) \
|| (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(WIN))
#define ENABLE_YARR 1
#define ENABLE_YARR_JIT 1
@@@ -553,6 -581,13 +598,13 @@@
#if ENABLE(JIT) || ENABLE(YARR_JIT)
#define ENABLE_ASSEMBLER 1
#endif
+ /* Setting this flag prevents the assembler from using RWX memory; this may improve
+ security but currectly comes at a significant performance cost. */
+ #if PLATFORM(ARM_V7) && PLATFORM(IPHONE)
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
+ #else
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
+ #endif
#if !defined(ENABLE_PAN_SCROLLING) && PLATFORM(WIN_OS)
#define ENABLE_PAN_SCROLLING 1
diff --combined WebCore/platform/text/AtomicString.cpp
index 0085738,409439e..9552fd7
--- a/WebCore/platform/text/AtomicString.cpp
+++ b/WebCore/platform/text/AtomicString.cpp
@@@ -101,7 -101,7 +101,7 @@@ static inline bool equal(StringImpl* st
if (string->length() != length)
return false;
-#if PLATFORM(ARM) || PLATFORM(SH4)
+#if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
@@@ -206,7 -206,7 +206,7 @@@ PassRefPtr<StringImpl> AtomicString::ad
PassRefPtr<StringImpl> AtomicString::add(StringImpl* r)
{
- if (!r || r->m_inTable)
+ if (!r || r->inTable())
return r;
if (r->length() == 0)
@@@ -214,7 -214,7 +214,7 @@@
StringImpl* result = *stringTable().add(r).first;
if (result == r)
- r->m_inTable = true;
+ r->setInTable();
return result;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list