Changeset 61778 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 24, 2010, 11:28:06 AM (15 years ago)

Author:

[email protected]

Message:

2010-06-21 Nathan Lawrence <​[email protected]>

Reviewed by Geoff Garen.

​https://bugs.webkit.org/show_bug.cgi?id=40128
Fixed broken debug functionality.

• interpreter/Interpreter.cpp: (JSC::Interpreter::dumpRegisters):

Fixed to work with updated call frame.

• runtime/JSImmediate.h: (JSC::JSValue::isCell):

Added assert for aligned cell.

• runtime/JSValue.cpp: (JSC::JSValue::description):

Fixed to work with current JSValue implementation.

• runtime/JSZombie.cpp: (JSC::JSZombie::leakedZombieStructure):

JSombies compile again.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)
• runtime/JSImmediate.h (modified) (2 diffs)
• runtime/JSValue.cpp (modified) (1 diff)
• runtime/JSZombie.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+ 2010-06-21  Nathan Lawrence  <[email protected]>
+
+         Reviewed by Geoff Garen.
+
+         https://bugs.webkit.org/show_bug.cgi?id=40128
+         Fixed broken debug functionality.
+
+         * interpreter/Interpreter.cpp:
+         (JSC::Interpreter::dumpRegisters):
+             Fixed to work with updated call frame.
+         * runtime/JSImmediate.h:
+         (JSC::JSValue::isCell):
+             Added assert for aligned cell.
+         * runtime/JSValue.cpp:
+         (JSC::JSValue::description):
+             Fixed to work with current JSValue implementation.
+         * runtime/JSZombie.cpp:
+         (JSC::JSZombie::leakedZombieStructure):
+             JSombies compile again.
+
 2010-06-24  Leandro Pereira  <[email protected]>
 

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -457 +457 @@
     printf("[CallerRegisters]          | %10p | %d \n", it, (*it).i()); ++it;
     printf("[ReturnPC]                 | %10p | %p \n", it, (*it).vPC()); ++it;
-    ++it;
     printf("[ArgumentCount]            | %10p | %d \n", it, (*it).i()); ++it;
     printf("[Callee]                   | %10p | %p \n", it, (*it).function()); ++it;

trunk/JavaScriptCore/runtime/JSImmediate.h

@@ -44 +44 @@
     class JSObject;
     class UString;
+
+    extern const size_t CELL_MASK;
 
 #if USE(JSVALUE64)
@@ -596 +598 @@
     inline bool JSValue::isCell() const
     {
+#ifndef NDEBUG
+        bool r = !JSImmediate::isImmediate(asValue());
+        ASSERT(!r || !(JSImmediate::rawValue(asValue()) & CELL_MASK));
+        return r;
+#else
         return !JSImmediate::isImmediate(asValue());
+#endif
     }
 

trunk/JavaScriptCore/runtime/JSValue.cpp

@@ -127 +127 @@
     else if (isNull())
         snprintf(description, size, "Null");
-    else {
-        ASSERT(isUndefined());
+    else if (isUndefined())
         snprintf(description, size, "Undefined");
-    }
+    else
+        snprintf(description, size, "INVALID");
 
     return description;

trunk/JavaScriptCore/runtime/JSZombie.cpp

@@ -38 +38 @@
     if (!structure) {
         Structure::startIgnoringLeaks();
-        structure = Structure::create(jsNull(), TypeInfo(UnspecifiedType)).releaseRef();
+        structure = Structure::create(jsNull(), TypeInfo(UnspecifiedType), 0).releaseRef();
         Structure::stopIgnoringLeaks();
     }