Changeset 636 for trunk/src

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));