JavaScriptCore-576.tar.gz

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

diff --git a/API/JSBase.cpp b/API/JSBase.cpp
index 2ffe345d44f55c5061c2b56d7b0385319c5e067d..ebfeafa820a7e703fa59b27d8e7631f126e5ae49 100644 (file)
--- a/API/JSBase.cpp
+++ b/API/JSBase.cpp
@@ -28,6 +28,7 @@
 #include "JSBasePrivate.h"
 
 #include "APICast.h"
 #include "JSBasePrivate.h"
 
 #include "APICast.h"

+#include "APIShims.h"

 #include "Completion.h"
 #include "OpaqueJSString.h"
 #include "SourceCode.h"
 #include "Completion.h"
 #include "OpaqueJSString.h"
 #include "SourceCode.h"


@@ -43,8 +44,7 @@ using namespace JSC;
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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


@@ -55,28 +55,27 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th
 
     if (completion.complType() == Throw) {
         if (exception)
 
     if (completion.complType() == Throw) {
         if (exception)

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

         return 0;
     }
         return 0;
     }

-    
+

     if (completion.value())
     if (completion.value())

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

     
     // 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)
 {
     ExecState* exec = toJS(ctx);
 }
 
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
     Completion completion = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);
     if (completion.complType() == Throw) {
         if (exception)
 
     SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
     Completion completion = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);
     if (completion.complType() == Throw) {
         if (exception)

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

         return false;
     }
     
         return false;
     }
     


@@ -94,12 +93,11 @@ void JSGarbageCollect(JSContextRef ctx)
         return;
 
     ExecState* exec = toJS(ctx);
         return;
 
     ExecState* exec = toJS(ctx);

-    JSGlobalData& globalData = exec->globalData();
-
-    JSLock lock(globalData.isSharedInstance);
+    APIEntryShim entryShim(exec, false);

 
 

+    JSGlobalData& globalData = exec->globalData();

     if (!globalData.heap.isBusy())
     if (!globalData.heap.isBusy())

-        globalData.heap.collect();
+        globalData.heap.collectAllGarbage();

 
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when
 
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when


@@ -109,8 +107,6 @@ void JSGarbageCollect(JSContextRef ctx)
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {
     ExecState* exec = toJS(ctx);
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
-
+    APIEntryShim entryShim(exec);

     exec->globalData().heap.reportExtraMemoryCost(size);
 }
     exec->globalData().heap.reportExtraMemoryCost(size);
 }