Changeset 33320

Timestamp:

05/12/08 23:03:10 (6 months ago)

Author:

mrowe@apple.com

Message:

Rename unsafeForReentry to safeForReentry to avoid double negatives.

RS=Geoff

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (4 diffs)
• VM/RegisterFile.h (modified) (3 diffs)
• kjs/function.cpp (modified) (2 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-01  Oliver Hunt  <oliver@apple.com>
+
+        RS=Geoff
+
+        Rename unsafeForReentry to safeForReentry to avoid double negatives.
+
+        * VM/Machine.cpp:
+        (KJS::Machine::privateExecute):
+        * VM/RegisterFile.h:
+        * kjs/function.cpp:
+        (KJS::FunctionImp::callAsFunction):
+
 2008-05-01  Oliver Hunt  <oliver@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -718 +718 @@
     JSValue** k = codeBlock->jsValues.data();
     
-    registerFile->setUnsafeForReentry(true);
+    registerFile->setSafeForReentry(false);
 #define VM_CHECK_EXCEPTION() \
      do { \
@@ -1425 +1425 @@
             JSObject* thisObject = r[thisRegister].u.jsObject;
 
-            registerFile->setUnsafeForReentry(false);
+            registerFile->setSafeForReentry(true);
             JSValue* result = eval(exec, thisObject, scopeChain, registerFile, r, argv, argc, exceptionValue);
-            registerFile->setUnsafeForReentry(true);
+            registerFile->setSafeForReentry(false);
             r = (*registerBase) + registerOffset;
 
@@ -1498 +1498 @@
             List args(&r[argv + 1].u.jsValue, argc - 1);
 
-            registerFile->setUnsafeForReentry(false);
+            registerFile->setSafeForReentry(true);
             JSValue* returnValue = static_cast<JSObject*>(v)->callAsFunction(exec, thisObj, args);
-            registerFile->setUnsafeForReentry(true);
+            registerFile->setSafeForReentry(false);
 
             r = (*registerBase) + registerOffset;
@@ -1602 +1602 @@
 
             List args(&r[argv + 1].u.jsValue, argc - 1);
-            registerFile->setUnsafeForReentry(false);
+            registerFile->setSafeForReentry(true);
             JSValue* returnValue = constructor->construct(exec, args);
-            registerFile->setUnsafeForReentry(true);
+            registerFile->setSafeForReentry(false);
         
             r = (*registerBase) + registerOffset;

branches/squirrelfish/JavaScriptCore/VM/RegisterFile.h

@@ -89 +89 @@
         enum { DefaultRegisterFileSize = 2 * 1024 * 1024 };
         RegisterFile(RegisterFileStack* stack, size_t maxSize)
-            : m_unsafeForReentry(false)
+            : m_safeForReentry(true)
             , m_isForImplicitCall(false)
             , m_size(0)
@@ -151 +151 @@
             Collector::markStackObjectsConservatively(m_buffer, m_base + m_size);
         }
-        bool unsafeForReentry() { return m_unsafeForReentry; }
-        void setUnsafeForReentry(bool unsafeForReentry) { m_unsafeForReentry = unsafeForReentry; }
+        bool safeForReentry() { return m_safeForReentry; }
+        void setSafeForReentry(bool safeForReentry) { m_safeForReentry = safeForReentry; }
         void setIsForImplicitCall(bool isForImplicitCall) { m_isForImplicitCall = isForImplicitCall; }
         bool isForImplicitCall() { return m_isForImplicitCall; }
@@ -167 +167 @@
         
         void setBase(Register*);
-        bool m_unsafeForReentry;
+        bool m_safeForReentry;
         bool m_isForImplicitCall;
         size_t m_size;

branches/squirrelfish/JavaScriptCore/kjs/function.cpp

@@ -86 +86 @@
     RegisterFileStack* stack = &exec->dynamicGlobalObject()->registerFileStack();
     RegisterFile* current = stack->current();
-    if (current->unsafeForReentry()) {
+    if (!current->safeForReentry()) {
         stack->pushFunctionRegisterFile();
         JSValue* result = machine().execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
@@ -94 +94 @@
     } else {
         JSValue* result = machine().execute(body.get(), exec, this, thisObj, args, stack, _scope.node(), &exception);
-        current->setUnsafeForReentry(false);
+        current->setSafeForReentry(true);
         exec->setException(exception);
         return result;