Changeset 730

Timestamp:

May 12, 2010, 10:21:17 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

javascriptcore: Ported r726, r728:729 from webkit.

Location:

trunk/src/3rdparty/javascriptcore/JavaScriptCore

Files:

• runtime/Collector.cpp (modified) (3 diffs)
• runtime/Collector.h (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp

@@ -239 +239 @@
 
     memset(reinterpret_cast<void*>(address), 0, BLOCK_SIZE);
-#elif PLATFORM(OS2)
+#elif (PLATFORM(OS2) && !HAVE(POSIX_MEMALIGN))
     void* address = NULL;
     DosAllocMem(&address, BLOCK_SIZE, PAG_COMMIT | PAG_READ | PAG_WRITE);
+    memset(address, 0, BLOCK_SIZE);
 #elif PLATFORM(WINCE)
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
@@ -328 +329 @@
 #elif PLATFORM(SYMBIAN)
     userChunk->Free(reinterpret_cast<TAny*>(block));
-#elif PLATFORM(OS2)
+#elif (PLATFORM(OS2) && !HAVE(POSIX_MEMALIGN))
     DosFreeMem(block);
 #elif PLATFORM(WINCE)
@@ -637 +638 @@
     PTIB ptib;
     DosGetInfoBlocks(&ptib, NULL);
-    return static_cast<void*>(ptib->tib_pstack);
+    return static_cast<void*>(ptib->tib_pstacklimit);
 #elif PLATFORM(QNX)
     return currentThreadStackBaseQNX();

trunk/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h

@@ -182 +182 @@
     template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
 
-#if PLATFORM(WINCE) || PLATFORM(SYMBIAN) || PLATFORM(OS2)
+#if PLATFORM(WINCE) || PLATFORM(SYMBIAN) || (PLATFORM(OS2) && !HAVE(POSIX_MEMALIGN))
     const size_t BLOCK_SIZE = 64 * 1024; // 64k
 #else

trunk/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h

@@ -615 +615 @@
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_TIME_H 1
+#define HAVE_POSIX_MEMALIGN 1
 
 #elif PLATFORM(SYMBIAN)