Changeset 769 for trunk/src/3rdparty/webkit/JavaScriptCore

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/JavaScriptCore/ChangeLog (modified) (1 diff)
• src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri (modified) (3 diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp (modified) (6 diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h (modified) (2 diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp (modified) (1 diff)
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian )
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp )
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h )

trunk/src/3rdparty/webkit/JavaScriptCore/ChangeLog

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 2010-01-07  Norbert Leser  <[email protected]>
 

trunk/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri

@@ -8 +8 @@
     isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}release
     !CONFIG(QTDIR_build):OBJECTS_DIR = obj/release
+
+
+
+
 }
 
@@ -24 +28 @@
     $$PWD/wrec \
     $$PWD/wtf \
+
     $$PWD/wtf/unicode \
     $$PWD/yarr \
@@ -244 +249 @@
     wtf/DateMath.cpp \
     wtf/FastMalloc.cpp \
+
     wtf/Threading.cpp \
     wtf/qt/MainThreadQt.cpp

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

@@ -53 +53 @@
 #include <mach/vm_map.h>
 
-#elif PLATFORM(SYMBIAN)
-#include <e32std.h>
-#include <e32cmn.h>
-#include <unistd.h>
-
 #elif PLATFORM(WIN_OS)
 
@@ -125 +120 @@
 #define MIN_ARRAY_SIZE (static_cast<size_t>(14))
 
-#if PLATFORM(SYMBIAN)
-const size_t MAX_NUM_BLOCKS = 256; // Max size of collector heap set to 16 MB
-static RHeap* userChunk = 0;
-#endif
-
 #if ENABLE(JSC_MULTIPLE_THREADS)
 
@@ -166 +156 @@
 #endif
     , m_globalData(globalData)
+
+
+
 {
     ASSERT(globalData);
-
-#if PLATFORM(SYMBIAN)
-    // Symbian OpenC supports mmap but currently not the MAP_ANON flag.
-    // Using fastMalloc() does not properly align blocks on 64k boundaries
-    // and previous implementation was flawed/incomplete.
-    // UserHeap::ChunkHeap allows allocation of continuous memory and specification
-    // of alignment value for (symbian) cells within that heap.
-    //
-    // Clarification and mapping of terminology:
-    // RHeap (created by UserHeap::ChunkHeap below) is continuos memory chunk,
-    // which can dynamically grow up to 8 MB,
-    // that holds all CollectorBlocks of this session (static).
-    // Each symbian cell within RHeap maps to a 64kb aligned CollectorBlock.
-    // JSCell objects are maintained as usual within CollectorBlocks.
-    if (!userChunk) {
-        userChunk = UserHeap::ChunkHeap(0, 0, MAX_NUM_BLOCKS * BLOCK_SIZE, BLOCK_SIZE, BLOCK_SIZE);
-        if (!userChunk)
-            CRASH();
-    }
-#endif // PLATFORM(SYMBIAN)
-
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
     memset(&numberHeap, 0, sizeof(CollectorHeap));
@@ -234 +206 @@
     }
 #endif
-
+#if PLATFORM(SYMBIAN)
+    m_blockallocator.destroy();
+#endif
     m_globalData = 0;
 }
@@ -248 +222 @@
     vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE | VM_TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
 #elif PLATFORM(SYMBIAN)
-    // Allocate a 64 kb aligned CollectorBlock
-    unsigned char* mask = reinterpret_cast<unsigned char*>(userChunk->Alloc(BLOCK_SIZE));
-    if (!mask)
+    void* address = m_blockallocator.alloc();  
+    if (!address)
         CRASH();
-    uintptr_t address = reinterpret_cast<uintptr_t>(mask);
-
     memset(reinterpret_cast<void*>(address), 0, BLOCK_SIZE);
 #elif (PLATFORM(OS2) && !HAVE(POSIX_MEMALIGN))
@@ -344 +315 @@
     vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(block), BLOCK_SIZE);
 #elif PLATFORM(SYMBIAN)
-    userChunk->Free(reinterpret_cast<TAny*>(block));
+    *>(block));
 #elif (PLATFORM(OS2) && !HAVE(POSIX_MEMALIGN))
     DosFreeMem(block);

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

@@ -36 +36 @@
 #endif
 
+
+
+
+
 #define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class) <= CELL_SIZE, class_fits_in_cell)
 
@@ -158 +162 @@
 #endif
 
+
+
+
+
+
         JSGlobalData* m_globalData;
     };

trunk/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp

@@ -175 +175 @@
 NEVER_INLINE double nonInlineNaN()
 {
+
+
+
     return std::numeric_limits<double>::quiet_NaN();
+
 }