Changeset 48558 in webkit

Timestamp:

Sep 19, 2009 10:41:44 AM (15 years ago)

Author:

Simon Hausmann

Message:

QtWebKit Windows CE compile fix

Patch by Joerg Bornemann <​joerg.bornemann@nokia.com> on 2009-09-19
Reviewed by George Staikos.

​https://bugs.webkit.org/show_bug.cgi?id=29379

There is no _aligned_alloc or _aligned_free on Windows CE.
We just use the Windows code that was there before and use VirtualAlloc.
But that also means that the BLOCK_SIZE must be 64K as this function
allocates on 64K boundaries.

• runtime/Collector.cpp:

(JSC::Heap::allocateBlock):
(JSC::Heap::freeBlock):

• runtime/Collector.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Collector.cpp (modified) (2 diffs)
• runtime/Collector.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-19  Joerg Bornemann  <joerg.bornemann@nokia.com>
+
+        Reviewed by George Staikos.
+
+        QtWebKit Windows CE compile fix
+
+        https://bugs.webkit.org/show_bug.cgi?id=29379
+
+        There is no _aligned_alloc or _aligned_free on Windows CE.
+        We just use the Windows code that was there before and use VirtualAlloc.
+        But that also means that the BLOCK_SIZE must be 64K as this function
+        allocates on 64K boundaries.
+
+        * runtime/Collector.cpp:
+        (JSC::Heap::allocateBlock):
+        (JSC::Heap::freeBlock):
+        * runtime/Collector.h:
+
 2009-09-19  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -237 +237 @@
 
     memset(reinterpret_cast<void*>(address), 0, BLOCK_SIZE);
+#elif PLATFORM(WINCE)
+    void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif PLATFORM(WIN_OS)
 #if COMPILER(MINGW)
@@ -319 +321 @@
 #elif PLATFORM(SYMBIAN)
     userChunk->Free(reinterpret_cast<TAny*>(block));
+#elif PLATFORM(WINCE)
+    VirtualFree(block, 0, MEM_RELEASE);
 #elif PLATFORM(WIN_OS)
 #if COMPILER(MINGW)

trunk/JavaScriptCore/runtime/Collector.h

@@ -182 +182 @@
     template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
 
+#if PLATFORM(WINCE)
+    const size_t BLOCK_SIZE = 64 * 1024; // 64k
+#else
     const size_t BLOCK_SIZE = 64 * 4096; // 256k
+#endif
 
     // derived constants