Changeset 636

Timestamp:

Mar 5, 2010, 7:50:20 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

webkit: Appliied r592 to a local javaScriptCore.

Location:

trunk/src/3rdparty/webkit/JavaScriptCore

Files:

• interpreter/RegisterFile.cpp (modified) (2 diffs)
• interpreter/RegisterFile.h (modified) (7 diffs)
• jit/JITStubs.cpp (modified) (35 diffs)
• runtime/Collector.cpp (modified) (16 diffs)
• runtime/Collector.h (modified) (5 diffs)
• runtime/MarkStackPosix.cpp (modified) (2 diffs)
• wtf/FastMalloc.cpp (modified) (26 diffs)
• wtf/Platform.h (modified) (4 diffs)
• wtf/TCSystemAlloc.cpp (modified) (19 diffs)

trunk/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.cpp

@@ -37 +37 @@
     munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
 #elif HAVE(VIRTUALALLOC)
+
+
+
 #if PLATFORM(WINCE)
     VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT);
 #endif
     VirtualFree(m_buffer, 0, MEM_RELEASE);
+
 #else
     fastFree(m_buffer);
@@ -51 +55 @@
     while (madvise(m_start, (m_max - m_start) * sizeof(Register), MADV_FREE) == -1 && errno == EAGAIN) { }
 #elif HAVE(VIRTUALALLOC)
+
+
+
+
     VirtualFree(m_start, (m_max - m_start) * sizeof(Register), MEM_DECOMMIT);
     m_commitEnd = m_start;
+
 #endif
     m_maxUsed = m_start;

trunk/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h

@@ -42 +42 @@
 #endif
 
+
+
+
+
+
 namespace JSC {
 
@@ -130 +135 @@
         bool grow(Register* newEnd);
         void shrink(Register* newEnd);
-        
+
         void setNumGlobals(size_t numGlobals) { m_numGlobals = numGlobals; }
         int numGlobals() const { return m_numGlobals; }
@@ -136 +141 @@
 
         Register* lastGlobal() const { return m_start - m_numGlobals; }
-        
+
         void markGlobals(MarkStack& markStack, Heap* heap) { heap->markConservatively(markStack, lastGlobal(), m_start); }
         void markCallFrames(MarkStack& markStack, Heap* heap) { heap->markConservatively(markStack, m_start, m_end); }
@@ -185 +190 @@
         }
     #elif HAVE(VIRTUALALLOC)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         m_buffer = static_cast<Register*>(VirtualAlloc(0, roundUpAllocationSize(bufferLength, commitSize), MEM_RESERVE, PAGE_READWRITE));
         if (!m_buffer) {
@@ -205 +224 @@
         }
         m_commitEnd = reinterpret_cast<Register*>(reinterpret_cast<char*>(m_buffer) + committedSize);
-    #else 
-        /* 
+#endif
+    #else
+        /*
          * If neither MMAP nor VIRTUALALLOC are available - use fastMalloc instead.
          *
@@ -240 +260 @@
 
 #if !HAVE(MMAP) && HAVE(VIRTUALALLOC)
+
+
+
+
+
+
+
+
+
+
+
         if (newEnd > m_commitEnd) {
             size_t size = roundUpAllocationSize(reinterpret_cast<char*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), commitSize);
@@ -253 +284 @@
         }
 #endif
+
 
         if (newEnd > m_maxUsed)

trunk/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp

@@ -64 +64 @@
 namespace JSC {
 
-#if PLATFORM(DARWIN) || PLATFORM(WIN_OS)
+#if PLATFORM(DARWIN) || PLATFORM(WIN_OS)
 #define SYMBOL_STRING(name) "_" #name
 #else
@@ -143 +143 @@
     "ret" "\n"
 );
-    
+
 asm volatile (
 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
@@ -155 +155 @@
     "ret" "\n"
 );
-    
+
 #elif COMPILER(GCC) && PLATFORM(X86_64)
 
@@ -405 +405 @@
     "ret" "\n"
 );
-    
+
 asm volatile (
 ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n"
@@ -417 +417 @@
     "ret" "\n"
 );
-    
+
 #elif COMPILER(GCC) && PLATFORM(X86_64)
 
@@ -648 +648 @@
         }
     }
-     
+
      __declspec(naked) void ctiOpThrowNotCaught()
      {
@@ -709 +709 @@
         return;
     }
-    
+
     JSCell* baseCell = asCell(baseValue);
     Structure* structure = baseCell->structure();
@@ -741 +741 @@
         return;
     }
-    
+
     stubInfo->initPutByIdReplace(structure);
 
@@ -757 +757 @@
         return;
     }
-    
+
     JSGlobalData* globalData = &callFrame->globalData();
 
@@ -764 +764 @@
         return;
     }
-    
+
     if (isJSString(globalData, baseValue) && propertyName == callFrame->propertyNames().length) {
         // The tradeoff of compiling an patched inline string length access routine does not seem
@@ -810 +810 @@
         if (slotBaseObject->structure()->isDictionary())
             slotBaseObject->setStructure(Structure::fromDictionaryTransition(slotBaseObject->structure()));
-        
+
         stubInfo->initGetByIdProto(structure, slotBaseObject->structure());
 
@@ -840 +840 @@
 extern "C" {
 
-static void jscGeneratedNativeCode() 
+static void jscGeneratedNativeCode()
 {
     // When executing a JIT stub function (which might do an allocation), we hack the return address
@@ -850 +850 @@
 
 struct StackHack {
-    ALWAYS_INLINE StackHack(JITStackFrame& stackFrame) 
+    ALWAYS_INLINE StackHack(JITStackFrame& stackFrame)
         : stackFrame(stackFrame)
         , savedReturnAddress(*stackFrame.returnAddressSlot())
@@ -857 +857 @@
     }
 
-    ALWAYS_INLINE ~StackHack() 
-    { 
+    ALWAYS_INLINE ~StackHack()
+    {
         *stackFrame.returnAddressSlot() = savedReturnAddress;
     }
@@ -996 +996 @@
     if (rightIsNumber && v1.getNumber(left))
         return JSValue::encode(jsNumber(stackFrame.globalData, left + right));
-    
+
     CallFrame* callFrame = stackFrame.callFrame;
 
@@ -1043 +1043 @@
 {
     STUB_INIT_STACK_FRAME(stackFrame);
-    
+
     JSGlobalData* globalData = stackFrame.globalData;
     TimeoutChecker& timeoutChecker = globalData->timeoutChecker;
@@ -1051 +1051 @@
         VM_THROW_EXCEPTION_AT_END();
     }
-    
+
     return timeoutChecker.ticksUntilNextCheck();
 }
@@ -1338 +1338 @@
         ASSERT_NOT_REACHED();
     }
-    
+
     ASSERT(listIndex < POLYMORPHIC_LIST_CACHE_SIZE);
     return prototypeStructureList;
@@ -1458 +1458 @@
     // At least one of these checks must have failed to get to the slow case.
     ASSERT(!value.isCell() || !baseVal.isCell() || !proto.isCell()
-           || !value.isObject() || !baseVal.isObject() || !proto.isObject() 
+           || !value.isObject() || !baseVal.isObject() || !proto.isObject()
            || (asObject(baseVal)->structure()->typeInfo().flags() & (ImplementsHasInstance | OverridesHasInstance)) != ImplementsHasInstance);
 
@@ -1495 +1495 @@
 
     CallFrame* callFrame = stackFrame.callFrame;
-    
+
     JSObject* baseObj = stackFrame.args[0].jsValue().toObject(callFrame);
 
@@ -1600 +1600 @@
     ExecutableBase* executable = callee->executable();
     JITCode& jitCode = executable->generatedJITCode();
-    
+
     CodeBlock* codeBlock = 0;
     if (!executable->isHostFunction())
@@ -1866 +1866 @@
     return JSValue::encode(result);
 }
-    
+
 DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_string)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
-    
+
     CallFrame* callFrame = stackFrame.callFrame;
     JSGlobalData* globalData = stackFrame.globalData;
-    
+
     JSValue baseValue = stackFrame.args[0].jsValue();
     JSValue subscript = stackFrame.args[1].jsValue();
-    
+
     JSValue result;
-    
+
     if (LIKELY(subscript.isUInt32())) {
         uint32_t i = subscript.asUInt32();
@@ -1892 +1892 @@
         result = baseValue.get(callFrame, property);
     }
-    
-    CHECK_FOR_EXCEPTION_AT_END();
-    return JSValue::encode(result);
-}
-    
+
+    CHECK_FOR_EXCEPTION_AT_END();
+    return JSValue::encode(result);
+}
+
 DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_byte_array)
 {
     STUB_INIT_STACK_FRAME(stackFrame);
-    
+
     CallFrame* callFrame = stackFrame.callFrame;
     JSGlobalData* globalData = stackFrame.globalData;
-    
+
     JSValue baseValue = stackFrame.args[0].jsValue();
     JSValue subscript = stackFrame.args[1].jsValue();
-    
+
     JSValue result;
 
@@ -1923 +1923 @@
         result = baseValue.get(callFrame, property);
     }
-    
+
     CHECK_FOR_EXCEPTION_AT_END();
     return JSValue::encode(result);
@@ -1997 +1997 @@
 {
     STUB_INIT_STACK_FRAME(stackFrame);
-    
+
     CallFrame* callFrame = stackFrame.callFrame;
     JSGlobalData* globalData = stackFrame.globalData;
-    
+
     JSValue baseValue = stackFrame.args[0].jsValue();
     JSValue subscript = stackFrame.args[1].jsValue();
     JSValue value = stackFrame.args[2].jsValue();
-    
+
     if (LIKELY(subscript.isUInt32())) {
         uint32_t i = subscript.asUInt32();
         if (isJSByteArray(globalData, baseValue) && asByteArray(baseValue)->canAccessIndex(i)) {
             JSByteArray* jsByteArray = asByteArray(baseValue);
-            
+
             // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks.
             if (value.isInt32()) {
@@ -2015 +2015 @@
                 return;
             } else {
-                double dValue = 0;                
+                double dValue = 0;
                 if (value.getNumber(dValue)) {
                     jsByteArray->setIndex(i, dValue);
@@ -2033 +2033 @@
         }
     }
-    
+
     CHECK_FOR_EXCEPTION_AT_END();
 }
@@ -2059 +2059 @@
     return result;
 }
-    
+
 DEFINE_STUB_FUNCTION(int, op_load_varargs)
 {
@@ -2080 +2080 @@
         int32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
         int32_t inplaceArgs = min(providedParams, expectedParams);
-        
+
         Register* inplaceArgsDst = callFrame->registers() + argsOffset;
 
@@ -2088 +2088 @@
         Register* inplaceArgsSrc = callFrame->registers() - RegisterFile::CallFrameHeaderSize - expectedParams;
         Register* inplaceArgsSrc2 = inplaceArgsSrc - providedParams - 1 + inplaceArgs;
- 
+
         // First step is to copy the "expected" parameters from their normal location relative to the callframe
         while (inplaceArgsDst < inplaceArgsEnd)
@@ -2345 +2345 @@
     start:
     if (src2.isUndefined()) {
-        return src1.isNull() || 
+        return src1.isNull() ||
                (src1.isCell() && asCell(src1)->structure()->typeInfo().masqueradesAsUndefined()) ||
                src1.isUndefined();
     }
-    
+
     if (src2.isNull()) {
-        return src1.isUndefined() || 
+        return src1.isUndefined() ||
                (src1.isCell() && asCell(src1)->structure()->typeInfo().masqueradesAsUndefined()) ||
                src1.isNull();
@@ -2387 +2387 @@
         return d == 0.0;
     }
-    
+
     if (src1.isUndefined())
         return src2.isCell() && asCell(src2)->structure()->typeInfo().masqueradesAsUndefined();
-    
+
     if (src1.isNull())
         return src2.isCell() && asCell(src2)->structure()->typeInfo().masqueradesAsUndefined();
@@ -2399 +2399 @@
         if (src2.isInt32())
             return static_cast<JSString*>(cell1)->value().toDouble() == src2.asInt32();
-            
+
         if (src2.isDouble())
             return static_cast<JSString*>(cell1)->value().toDouble() == src2.asDouble();
@@ -2553 +2553 @@
     JSFunction* func = function->make(callFrame, callFrame->scopeChain());
 
-    /* 
+    /*
         The Identifier in a FunctionExpression can be referenced from inside
         the FunctionExpression's FunctionBody to allow the function to call
@@ -2663 +2663 @@
 
     Interpreter* interpreter = stackFrame.globalData->interpreter;
-    
+
     JSValue funcVal = stackFrame.args[0].jsValue();
     int registerOffset = stackFrame.args[1].int32();

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

@@ -144 +144 @@
 class Heap::Thread {
 public:
-    Thread(pthread_t pthread, const PlatformThread& platThread, void* base) 
+    Thread(pthread_t pthread, const PlatformThread& platThread, void* base)
         : posixThread(pthread)
         , platformThread(platThread)
@@ -188 +188 @@
     }
 #endif // PLATFORM(SYMBIAN)
-    
+
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
     memset(&numberHeap, 0, sizeof(CollectorHeap));
@@ -255 +255 @@
 
     memset(reinterpret_cast<void*>(address), 0, BLOCK_SIZE);
+
+
+
 #elif PLATFORM(WINCE)
     void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
@@ -328 +331 @@
 
     if (heap.numBlocks > MIN_ARRAY_SIZE && heap.usedBlocks < heap.numBlocks / LOW_WATER_FACTOR) {
-        heap.numBlocks = heap.numBlocks / GROWTH_FACTOR; 
+        heap.numBlocks = heap.numBlocks / GROWTH_FACTOR;
         heap.blocks = static_cast<CollectorBlock**>(fastRealloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock*)));
     }
@@ -341 +344 @@
 #elif PLATFORM(SYMBIAN)
     userChunk->Free(reinterpret_cast<TAny*>(block));
+
+
 #elif PLATFORM(WINCE)
     VirtualFree(block, 0, MEM_RELEASE);
@@ -377 +382 @@
     // if a large value survives one garbage collection, there is not much point to
     // collecting more frequently as long as it stays alive.
-    // NOTE: we target the primaryHeap unconditionally as JSNumber doesn't modify cost 
+    // NOTE: we target the primaryHeap unconditionally as JSNumber doesn't modify cost
 
     primaryHeap.extraCost += cost;
@@ -602 +607 @@
         );
     return static_cast<void*>(pTib->StackBase);
+
+
+
+
 #elif PLATFORM(QNX)
     return currentThreadStackBaseQNX();
@@ -821 +830 @@
                 }
             }
-          
+
             // Mark the primary heap
             for (size_t block = 0; block < usedPrimaryBlocks; block++) {
@@ -926 +935 @@
     unsigned user_count = x86_THREAD_STATE64_COUNT;
     thread_state_flavor_t flavor = x86_THREAD_STATE64;
-#elif PLATFORM(PPC) 
+#elif PLATFORM(PPC)
     unsigned user_count = PPC_THREAD_STATE_COUNT;
     thread_state_flavor_t flavor = PPC_THREAD_STATE;
@@ -941 +950 @@
     kern_return_t result = thread_get_state(platformThread, flavor, (thread_state_t)&regs, &user_count);
     if (result != KERN_SUCCESS) {
-        WTFReportFatalError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, 
+        WTFReportFatalError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION,
                             "JavaScript garbage collection failed because thread_get_state returned an error (%d). This is probably the result of running inside Rosetta, which is not supported.", result);
         CRASH();
@@ -1026 +1035 @@
 
 #ifndef NDEBUG
-        // Forbid malloc during the mark phase. Marking a thread suspends it, so 
-        // a malloc inside markChildren() would risk a deadlock with a thread that had been 
+        // Forbid malloc during the mark phase. Marking a thread suspends it, so
+        // a malloc inside markChildren() would risk a deadlock with a thread that had been
         // suspended while holding the malloc lock.
         fastMallocForbid();
@@ -1082 +1091 @@
     // SWEEP: delete everything with a zero refcount (garbage) and unmark everything else
     CollectorHeap& heap = heapType == PrimaryHeap ? primaryHeap : numberHeap;
-    
+
     size_t emptyBlocks = 0;
     size_t numLiveObjects = heap.numLiveObjects;
-    
+
     for (size_t block = 0; block < heap.usedBlocks; block++) {
         Block* curBlock = reinterpret_cast<Block*>(heap.blocks[block]);
-        
+
         size_t usedCells = curBlock->usedCells;
         Cell* freeList = curBlock->freeList;
-        
+
         if (usedCells == HeapConstants<heapType>::cellsPerBlock) {
             // special case with a block where all cells are used -- testing indicates this happens often
@@ -1097 +1106 @@
                 if (!curBlock->marked.get(i >> HeapConstants<heapType>::bitmapShift)) {
                     Cell* cell = curBlock->cells + i;
-                    
+
                     if (heapType != NumberHeap) {
                         JSCell* imp = reinterpret_cast<JSCell*>(cell);
                         // special case for allocated but uninitialized object
-                        // (We don't need this check earlier because nothing prior this point 
+                        // (We don't need this check earlier because nothing prior this point
                         // assumes the object has a valid vptr.)
                         if (cell->u.freeCell.zeroIfFree == 0)
                             continue;
-                        
+
                         imp->~JSCell();
                     }
-                    
+
                     --usedCells;
                     --numLiveObjects;
-                    
+
                     // put cell on the free list
                     cell->u.freeCell.zeroIfFree = 0;
@@ -1132 +1141 @@
                         --usedCells;
                         --numLiveObjects;
-                        
+
                         // put cell on the free list
                         cell->u.freeCell.zeroIfFree = 0;
-                        cell->u.freeCell.next = freeList - (cell + 1); 
+                        cell->u.freeCell.next = freeList - (cell + 1);
                         freeList = cell;
                     }
@@ -1141 +1150 @@
             }
         }
-        
+
         curBlock->usedCells = static_cast<uint32_t>(usedCells);
         curBlock->freeList = freeList;
         curBlock->marked.clearAll();
-        
+
         if (!usedCells)
             ++emptyBlocks;
     }
-    
+
     if (heap.numLiveObjects != numLiveObjects)
         heap.firstBlockWithPossibleSpace = 0;
-    
+
     heap.numLiveObjects = numLiveObjects;
     heap.numLiveObjectsAtLastCollect = numLiveObjects;
     heap.extraCost = 0;
-    
+
     if (!emptyBlocks)
         return numLiveObjects;
@@ -1224 +1233 @@
 }
 
-size_t Heap::objectCount() 
-{
-    return primaryHeap.numLiveObjects + numberHeap.numLiveObjects - m_globalData->smallStrings.count(); 
-}
-
-template <HeapType heapType> 
+size_t Heap::objectCount()
+{
+    return primaryHeap.numLiveObjects + numberHeap.numLiveObjects - m_globalData->smallStrings.count();
+}
+
+template <HeapType heapType>
 static void addToStatistics(Heap::Statistics& statistics, const CollectorHeap& heap)
 {

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

@@ -111 +111 @@
         JSGlobalData* globalData() const { return m_globalData; }
         static bool isNumber(JSCell*);
-        
+
         // Iterators for the object heap.
         iterator primaryHeapBegin();
@@ -172 +172 @@
     template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
 
-#if PLATFORM(WINCE) || PLATFORM(SYMBIAN)
+#if PLATFORM(WINCE) || PLATFORM(SYMBIAN)
     const size_t BLOCK_SIZE = 64 * 1024; // 64k
 #else
@@ -191 +191 @@
     const size_t BITMAP_SIZE = (CELLS_PER_BLOCK + 7) / 8;
     const size_t BITMAP_WORDS = (BITMAP_SIZE + 3) / sizeof(uint32_t);
-  
+
     struct CollectorBitmap {
         uint32_t bits[BITMAP_WORDS];
-        bool get(size_t n) const { return !!(bits[n >> 5] & (1 << (n & 0x1F))); } 
-        void set(size_t n) { bits[n >> 5] |= (1 << (n & 0x1F)); } 
-        void clear(size_t n) { bits[n >> 5] &= ~(1 << (n & 0x1F)); } 
+        bool get(size_t n) const { return !!(bits[n >> 5] & (1 << (n & 0x1F))); }
+        void set(size_t n) { bits[n >> 5] |= (1 << (n & 0x1F)); }
+        void clear(size_t n) { bits[n >> 5] &= ~(1 << (n & 0x1F)); }
         void clearAll() { memset(bits, 0, sizeof(bits)); }
     };
-  
+
     struct CollectorCell {
         union {
@@ -239 +239 @@
         HeapType type;
     };
-    
+
     template <HeapType heapType> struct HeapConstants;
 
@@ -285 +285 @@
     inline void Heap::reportExtraMemoryCost(size_t cost)
     {
-        if (cost > minExtraCostSize) 
-            recordExtraCost(cost / (CELL_SIZE * 2)); 
+        if (cost > minExtraCostSize)
+            recordExtraCost(cost / (CELL_SIZE * 2));
     }
 

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

@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -41 +41 @@
 void* MarkStack::allocateStack(size_t size)
 {
+
+
+
     return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+
 }
 void MarkStack::releaseStack(void* addr, size_t size)
 {
+
+
+
     munmap(addr, size);
+
 }
 

trunk/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp

@@ -2 +2 @@
 // All rights reserved.
 // Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
-// 
+//
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ -16 +16 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -172 +172 @@
 #endif
 
-void* fastZeroedMalloc(size_t n) 
+void* fastZeroedMalloc(size_t n)
 {
     void* result = fastMalloc(n);
@@ -178 +178 @@
     return result;
 }
-    
-TryMallocReturnValue tryFastZeroedMalloc(size_t n) 
+
+TryMallocReturnValue tryFastZeroedMalloc(size_t n)
 {
     void* result;
@@ -193 +193 @@
 
 #include <stdlib.h>
-#if !PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS)
+    #include "windows.h"
+#elif PLATFORM(OS2)
+    #define INCL_BASE
+    #include <os2.h>
+#else
     #include <pthread.h>
-#else
-    #include "windows.h"
 #endif
 
 namespace WTF {
 
-TryMallocReturnValue tryFastMalloc(size_t n) 
+TryMallocReturnValue tryFastMalloc(size_t n)
 {
     ASSERT(!isForbidden());
@@ -222 +225 @@
 }
 
-void* fastMalloc(size_t n) 
+void* fastMalloc(size_t n)
 {
     ASSERT(!isForbidden());
@@ -341 +344 @@
 
 void releaseFastMallocFreeMemory() { }
-    
+
 FastMallocStatistics fastMallocStatistics()
 {
@@ -417 +420 @@
   }                                                                           \
   using FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead::FLAGS_##name
-  
+
 #define DEFINE_int64(name, value, meaning) \
   DEFINE_VARIABLE(int64_t, name, value, meaning)
-  
+
 #define DEFINE_double(name, value, meaning) \
   DEFINE_VARIABLE(double, name, value, meaning)
@@ -1174 +1177 @@
 #if defined(WTF_CHANGES)
 #if PLATFORM(X86_64)
-// On all known X86-64 platforms, the upper 16 bits are always unused and therefore 
+// On all known X86-64 platforms, the upper 16 bits are always unused and therefore
 // can be excluded from the PageMap key.
 // See http://en.wikipedia.org/wiki/X86-64#Virtual_address_space_details
@@ -1271 +1274 @@
       return GetDescriptor(p);
   }
-    
+
   size_t ReturnedBytes() const;
 #endif
@@ -1356 +1359 @@
     }
   }
-  
+
     // Allocate a large span of length == n.  If successful, returns a
   // span of exactly the specified length.  Else, returns NULL.
@@ -1372 +1375 @@
   // Index of last free list we scavenged
   size_t scavenge_index_;
-  
+
 #if defined(WTF_CHANGES) && PLATFORM(DARWIN)
   friend class FastMallocZone;
@@ -1438 +1441 @@
 }
 
-void TCMalloc_PageHeap::scavenge() 
+void TCMalloc_PageHeap::scavenge()
 {
     // If we have to commit memory in the last 5 seconds, it means we don't have enough free committed pages
@@ -1451 +1454 @@
         if (!DLL_IsEmpty(&slist->normal)) {
             // Release the last span on the normal portion of this list
-            Span* s = slist->normal.prev; 
+            Span* s = slist->normal.prev;
             // Only decommit up to a fraction of the free committed pages if pages_allocated_since_last_scavenge_ > 0.
             if ((pagesDecommitted + s->length) * kMaxScavengeAmountFactor > free_committed_pages_)
@@ -1473 +1476 @@
 }
 
-inline bool TCMalloc_PageHeap::shouldContinueScavenging() const 
-{
-    return free_committed_pages_ > kMinimumFreeCommittedPageCount; 
+inline bool TCMalloc_PageHeap::shouldContinueScavenging() const
+{
+    return free_committed_pages_ > kMinimumFreeCommittedPageCount;
 }
 
@@ -1795 +1798 @@
   }
 }
-    
+
 #ifdef WTF_CHANGES
 size_t TCMalloc_PageHeap::ReturnedBytes() const {
@@ -1804 +1807 @@
         result += r_pages << kPageShift;
     }
-    
+
     for (Span* s = large_.returned.next; s != &large_.returned; s = s->next)
         result += s->length << kPageShift;
@@ -2284 +2287 @@
     ::Sleep(seconds * 1000);
 }
+
+
+
+
+
 #endif
 
@@ -2875 +2883 @@
 #endif
   tsd_inited = true;
-    
+
 #if !COMPILER(MSVC)
   // We may have used a fake pthread_t for the main thread.  Fix it.
@@ -3579 +3587 @@
 
 #ifndef WTF_CHANGES
-extern "C" 
+extern "C"
 #else
 #define do_malloc do_malloc<crashOnFailure>
@@ -3621 +3629 @@
 
 #ifndef WTF_CHANGES
-extern "C" 
+extern "C"
 #endif
 void free(void* ptr) {
@@ -3642 +3650 @@
 
 #ifndef WTF_CHANGES
-extern "C" 
+extern "C"
 #else
 template <bool crashOnFailure>
@@ -3662 +3670 @@
 void* calloc(size_t n, size_t elem_size) {
   size_t totalBytes = n * elem_size;
-    
+
   // Protect against overflow
   if (n > 1 && elem_size && (totalBytes / elem_size) != n)
@@ -3695 +3703 @@
 #ifndef WTF_CHANGES
 #ifndef WTF_CHANGES
-extern "C" 
+extern "C"
 #endif
 void cfree(void* ptr) {
@@ -3706 +3714 @@
 
 #ifndef WTF_CHANGES
-extern "C" 
+extern "C"
 #else
 template <bool crashOnFailure>
@@ -4348 +4356 @@
     pageheap->ReleaseFreePages();
 }
-    
+
 FastMallocStatistics fastMallocStatistics()
 {

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

@@ -58 +58 @@
 #endif
 
+
+
+
+
+
+
+
 /* PLATFORM(WINCE) */
 /* Operating system level dependencies for Windows CE that should be used */
@@ -201 +208 @@
 /* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */
 /* FIXME: This should be changed from a blacklist to a whitelist */
-#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU)
+#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU)
 #define WTF_PLATFORM_CAIRO 1
 #endif
@@ -565 +572 @@
 
 #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \
-    && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT)
+    && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) \
+    && !PLATFORM(OS2)
 #define HAVE_TM_GMTOFF 1
 #define HAVE_TM_ZONE 1
 #define HAVE_TIMEGM 1
-#endif     
+#endif
 
 #if PLATFORM(DARWIN)
@@ -602 +610 @@
 #endif
 #define HAVE_VIRTUALALLOC 1
+
+
+
+
+
+
+
+
+
 
 #elif PLATFORM(SYMBIAN)

trunk/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp

@@ -1 +1 @@
 // Copyright (c) 2005, 2007, Google Inc.
 // All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
-// 
+//
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ -15 +15 @@
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -50 +50 @@
 #if PLATFORM(WIN_OS)
 #include "windows.h"
+
+
+
 #else
 #include <errno.h>
@@ -90 +93 @@
 #if HAVE(MMAP)
 static bool use_mmap = true;
-#endif 
+#endif
 
 #if HAVE(VIRTUALALLOC)
@@ -118 +121 @@
 static void* TrySbrk(size_t size, size_t *actual_size, size_t alignment) {
   size = ((size + alignment - 1) / alignment) * alignment;
-  
+
   // could theoretically return the "extra" bytes here, but this
   // is simple and correct.
-  if (actual_size) 
+  if (actual_size)
     *actual_size = size;
-    
+
   void* result = sbrk(size);
   if (result == reinterpret_cast<void*>(-1)) {
@@ -165 +168 @@
   if (alignment < pagesize) alignment = pagesize;
   size = ((size + alignment - 1) / alignment) * alignment;
-  
+
   // could theoretically return the "extra" bytes here, but this
   // is simple and correct.
-  if (actual_size) 
+  if (actual_size)
     *actual_size = size;
-    
+
   // Ask for extra memory if alignment > pagesize
   size_t extra = 0;
@@ -211 +214 @@
   // Enforce page alignment
   if (pagesize == 0) {
+
+
+
     SYSTEM_INFO system_info;
     GetSystemInfo(&system_info);
     pagesize = system_info.dwPageSize;
+
   }
 
@@ -221 +228 @@
   // could theoretically return the "extra" bytes here, but this
   // is simple and correct.
-  if (actual_size) 
+  if (actual_size)
     *actual_size = size;
-    
+
   // Ask for extra memory if alignment > pagesize
   size_t extra = 0;
@@ -229 +236 @@
     extra = alignment - pagesize;
   }
+
+
+
+
   void* result = VirtualAlloc(NULL, size + extra,
-                              MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN, 
+                              MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN,
                               PAGE_READWRITE);
+
 
   if (result == NULL) {
@@ -248 +260 @@
   // is decommit, since Windows only lets you free the whole allocation.
   if (adjust > 0) {
+
+
+
     VirtualFree(reinterpret_cast<void*>(ptr), adjust, MEM_DECOMMIT);
+
   }
   if (adjust < extra) {
+
+
+
     VirtualFree(reinterpret_cast<void*>(ptr + adjust + size), extra-adjust, MEM_DECOMMIT);
+
   }
 
@@ -258 +278 @@
 }
 
-#endif /* HAVE(MMAP) */
+#endif /* HAVE() */
 
 #ifndef WTF_CHANGES
@@ -266 +286 @@
   static off_t physmem_limit; // maximum physical address allowed
   static int physmem_fd;      // file descriptor for /dev/mem
-  
+
   // Check if we should use /dev/mem allocation.  Note that it may take
   // a while to get this flag initialized, so meanwhile we fall back to
@@ -276 +296 @@
     return NULL;
   }
-  
+
   if (!initialized) {
     physmem_fd = open("/dev/mem", O_RDWR);
@@ -287 +307 @@
     initialized = true;
   }
-  
+
   // Enforce page alignment
   if (pagesize == 0) pagesize = getpagesize();
   if (alignment < pagesize) alignment = pagesize;
   size = ((size + alignment - 1) / alignment) * alignment;
-    
+
   // could theoretically return the "extra" bytes here, but this
   // is simple and correct.
   if (actual_size)
     *actual_size = size;
-    
+
   // Ask for extra memory if alignment > pagesize
   size_t extra = 0;
@@ -303 +323 @@
     extra = alignment - pagesize;
   }
-  
+
   // check to see if we have any memory left
   if (physmem_limit != 0 && physmem_base + size + extra > physmem_limit) {
@@ -357 +377 @@
     }
 #endif
-    
+
 #if HAVE(SBRK)
     if (use_sbrk && !sbrk_failure) {
@@ -365 +385 @@
 #endif
 
-#if HAVE(MMAP)    
+#if HAVE(MMAP)
     if (use_mmap && !mmap_failure) {
       void* result = TryMmap(size, actual_size, alignment);
@@ -452 +472 @@
 void TCMalloc_SystemRelease(void* start, size_t length)
 {
+
+
+
+
     if (VirtualFree(start, length, MEM_DECOMMIT))
         return;
+
 
     // The decommit may fail if the memory region consists of allocations
@@ -492 +517 @@
 void TCMalloc_SystemCommit(void* start, size_t length)
 {
+
+
+
+
     if (VirtualAlloc(start, length, MEM_COMMIT, PAGE_READWRITE) == start)
         return;
+
 
     // The commit may fail if the memory region consists of allocations