JavaScriptCore-7600.1.4.13.1.tar.gz

[apple/javascriptcore.git] / API / JSBase.cpp

diff --git a/API/JSBase.cpp b/API/JSBase.cpp
index ebfeafa820a7e703fa59b27d8e7631f126e5ae49..31bdf2b94d487a3d13a2ef3344f0f01447b25778 100644 (file)
--- a/API/JSBase.cpp
+++ b/API/JSBase.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2013 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR


@@ -28,57 +28,89 @@
 #include "JSBasePrivate.h"
 
 #include "APICast.h"
 #include "JSBasePrivate.h"
 
 #include "APICast.h"

-#include "APIShims.h"
+#include "CallFrame.h"

 #include "Completion.h"
 #include "Completion.h"

+#include "InitializeThreading.h"
+#include "JSGlobalObject.h"
+#include "JSLock.h"
+#include "JSObject.h"

 #include "OpaqueJSString.h"
 #include "OpaqueJSString.h"

+#include "JSCInlines.h"

 #include "SourceCode.h"
 #include "SourceCode.h"

-#include <interpreter/CallFrame.h>
-#include <runtime/InitializeThreading.h>
-#include <runtime/Completion.h>
-#include <runtime/JSGlobalObject.h>
-#include <runtime/JSLock.h>
-#include <runtime/JSObject.h>
+#include <wtf/text/StringHash.h>
+
+#if ENABLE(REMOTE_INSPECTOR)
+#include "JSGlobalObjectInspectorController.h"
+#endif

 
 using namespace JSC;
 
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
 
 using namespace JSC;
 
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsThisObject = toJS(thisObject);
 
 
     JSObject* jsThisObject = toJS(thisObject);
 

+    startingLineNumber = std::max(1, startingLineNumber);
+

     // evaluate sets "this" to the global object if it is NULL
     // evaluate sets "this" to the global object if it is NULL

-    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
-    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
-    Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), source, jsThisObject);
+    JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
+    SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
+
+    JSValue evaluationException;
+    JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, &evaluationException);

 
 

-    if (completion.complType() == Throw) {
+    if (evaluationException) {

         if (exception)
         if (exception)

-            *exception = toRef(exec, completion.value());
+            *exception = toRef(exec, evaluationException);
+#if ENABLE(REMOTE_INSPECTOR)
+        // FIXME: If we have a debugger attached we could learn about ParseError exceptions through
+        // ScriptDebugServer::sourceParsed and this path could produce a duplicate warning. The
+        // Debugger path is currently ignored by inspector.
+        // NOTE: If we don't have a debugger, this SourceCode will be forever lost to the inspector.
+        // We could stash it in the inspector in case an inspector is ever opened.
+        globalObject->inspectorController().reportAPIException(exec, evaluationException);
+#endif

         return 0;
     }
 
         return 0;
     }
 

-    if (completion.value())
-        return toRef(exec, completion.value());
-    
+    if (returnValue)
+        return toRef(exec, returnValue);
+

     // happens, for example, when the only statement is an empty (';') statement
     return toRef(exec, jsUndefined());
 }
 
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     // happens, for example, when the only statement is an empty (';') statement
     return toRef(exec, jsUndefined());
 }
 
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);
+
+    startingLineNumber = std::max(1, startingLineNumber);

 
 

-    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
-    Completion completion = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);
-    if (completion.complType() == Throw) {
+    SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
+    
+    JSValue syntaxException;
+    bool isValidSyntax = checkSyntax(exec->vmEntryGlobalObject()->globalExec(), source, &syntaxException);
+
+    if (!isValidSyntax) {

         if (exception)
         if (exception)

-            *exception = toRef(exec, completion.value());
+            *exception = toRef(exec, syntaxException);
+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, syntaxException);
+#endif

         return false;
     }
         return false;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -93,20 +125,63 @@ void JSGarbageCollect(JSContextRef ctx)
         return;
 
     ExecState* exec = toJS(ctx);
         return;
 
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec, false);
-
-    JSGlobalData& globalData = exec->globalData();
-    if (!globalData.heap.isBusy())
-        globalData.heap.collectAllGarbage();
+    JSLockHolder locker(exec);

 
 

-    // FIXME: Perhaps we should trigger a second mark and sweep
-    // once the garbage collector is done if this is called when
-    // the collector is busy.
+    exec->vm().heap.reportAbandonedObjectGraph();

 }
 
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {
 }
 
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
-    exec->globalData().heap.reportExtraMemoryCost(size);
+    JSLockHolder locker(exec);
+    exec->vm().heap.reportExtraMemoryCost(size);

 }
 }

+
+extern "C" JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef);
+extern "C" JS_EXPORT void JSSynchronousEdenCollectForDebugging(JSContextRef);
+
+void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx)
+{
+    if (!ctx)
+        return;
+
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+    exec->vm().heap.collectAllGarbage();
+}
+
+void JSSynchronousEdenCollectForDebugging(JSContextRef ctx)
+{
+    if (!ctx)
+        return;
+
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+    exec->vm().heap.collect(EdenCollection);
+}
+
+void JSDisableGCTimer(void)
+{
+    GCActivityCallback::s_shouldCreateGCTimer = false;
+}
+
+#if PLATFORM(IOS)
+// FIXME: Expose symbols to tell dyld where to find JavaScriptCore on older versions of
+// iOS (< 7.0). We should remove these symbols once we no longer need to support such
+// versions of iOS. See <rdar://problem/13696872> for more details.
+JS_EXPORT extern const char iosInstallName43 __asm("$ld$install_name$os4.3$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char iosInstallName50 __asm("$ld$install_name$os5.0$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char iosInstallName51 __asm("$ld$install_name$os5.1$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char iosInstallName60 __asm("$ld$install_name$os6.0$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char iosInstallName61 __asm("$ld$install_name$os6.1$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+
+const char iosInstallName43 = 0;
+const char iosInstallName50 = 0;
+const char iosInstallName51 = 0;
+const char iosInstallName60 = 0;
+const char iosInstallName61 = 0;
+#endif