JavaScriptCore-1218.tar.gz

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

diff --git a/API/JSBase.cpp b/API/JSBase.cpp
index 65f2128728e53286ceea50ade383072d188624ba..c51231c3c43e88e57d818dde1eb5b546455006ec 100644 (file)
--- a/API/JSBase.cpp
+++ b/API/JSBase.cpp
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *


@@ -21,70 +20,136 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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.

  */
 
 #include "config.h"
 #include "JSBase.h"
  */
 
 #include "config.h"
 #include "JSBase.h"

+#include "JSBasePrivate.h"

 
 #include "APICast.h"
 
 #include "APICast.h"

+#include "APIShims.h"
+#include "CallFrame.h"
+#include "Completion.h"
+#include "InitializeThreading.h"
+#include "JSGlobalObject.h"
+#include "JSLock.h"
+#include "JSObject.h"
+#include "OpaqueJSString.h"
+#include "Operations.h"

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

-#include <kjs/ExecState.h>
-#include <kjs/JSGlobalObject.h>
-#include <kjs/JSLock.h>
-#include <kjs/interpreter.h>
-#include <kjs/object.h>
+#include <wtf/text/StringHash.h>

 
 

-using namespace KJS;
+using namespace JSC;

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

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

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

+    APIEntryShim entryShim(exec);
+

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

-    UString::Rep* scriptRep = toJS(script);
-    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
-    SourceCode source = makeSource(UString(scriptRep), UString(sourceURLRep), startingLineNumber);
-    // Interpreter::evaluate sets "this" to the global object if it is NULL
-    Completion completion = Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), source, jsThisObject);

 
 

-    if (completion.complType() == Throw) {
+    // evaluate sets "this" to the global object if it is NULL
+    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
+    SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
+
+    JSValue evaluationException;
+    JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, &evaluationException);
+
+    if (evaluationException) {

         if (exception)
         if (exception)

-            *exception = toRef(completion.value());
+            *exception = toRef(exec, evaluationException);

         return 0;
     }
         return 0;
     }

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

     // happens, for example, when the only statement is an empty (';') statement
     // happens, for example, when the only statement is an empty (';') statement

-    return toRef(jsUndefined());
+    return toRef(exec, jsUndefined());

 }
 
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
 }
 
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {

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

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

-    UString::Rep* scriptRep = toJS(script);
-    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
-    SourceCode source = makeSource(UString(scriptRep), UString(sourceURLRep), startingLineNumber);
-    Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);
-    if (completion.complType() == Throw) {
+    APIEntryShim entryShim(exec);
+
+    SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
+    
+    JSValue syntaxException;
+    bool isValidSyntax = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source, &syntaxException);
+
+    if (!isValidSyntax) {

         if (exception)
         if (exception)

-            *exception = toRef(completion.value());
+            *exception = toRef(exec, syntaxException);

         return false;
     }
         return false;
     }

-    
+

     return true;
 }
 
     return true;
 }
 

-void JSGarbageCollect(JSContextRef)
+void JSGarbageCollect(JSContextRef ctx)
+{
+    // We used to recommend passing NULL as an argument here, which caused the only heap to be collected.
+    // As there is no longer a shared heap, the previously recommended usage became a no-op (but the GC
+    // will happen when the context group is destroyed).
+    // Because the function argument was originally ignored, some clients may pass their released context here,
+    // in which case there is a risk of crashing if another thread performs GC on the same heap in between.
+    if (!ctx)
+        return;
+
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec, false);
+
+    exec->vm().heap.reportAbandonedObjectGraph();
+}
+
+void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+    exec->vm().heap.reportExtraMemoryCost(size);
+}
+
+extern "C" JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef);
+
+void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx)

 {
 {

-    JSLock lock;
-    if (!Collector::isBusy())
-        Collector::collect();
-    // 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.
+    if (!ctx)
+        return;
+
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+    exec->vm().heap.collectAllGarbage();

 }
 }

+
+#if PLATFORM(IOS)
+void JSDisableGCTimer(void)
+{
+    GCActivityCallback::s_shouldCreateGCTimer = false;
+}
+
+JS_EXPORT extern const char install_name_4_3 __asm("$ld$install_name$os4.3$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char install_name_5_0 __asm("$ld$install_name$os5.0$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char install_name_5_1 __asm("$ld$install_name$os5.1$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char install_name_6_0 __asm("$ld$install_name$os6.0$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+JS_EXPORT extern const char install_name_6_1 __asm("$ld$install_name$os6.1$/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore");
+
+const char install_name_4_3 = 0;
+const char install_name_5_0 = 0;
+const char install_name_5_1 = 0;
+const char install_name_6_0 = 0;
+const char install_name_6_1 = 0;
+#endif // PLATFORM(IOS)