Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Dec 10, 2005, 6:06:17 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Rubber stamped by Maciej.

• did long-promised KJS renaming:

ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell

A renaming to get a class out of the way

KJS::Bindings::JSObject -> JavaJSObject

and some other "imp-reduction" renaming

*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod

• most files and functions

WebCore:

Rubber stamped by Maciej.

• updated for KJS class renaming

• many files and functions

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (9 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -283 +283 @@
 gotGoodPointer:
       if (((CollectorCell *)x)->u.freeCell.zeroIfFree != 0) {
-        AllocatedValueImp *imp = reinterpret_cast<AllocatedValueImp *>(x);
+        JSCell *imp = reinterpret_cast<JSCell *>(x);
         if (!imp->marked())
           imp->mark();
@@ -385 +385 @@
   Entry *end = table + ProtectedValues::_tableSize;
   for (Entry *entry = table; entry != end; ++entry) {
-    AllocatedValueImp *val = entry->key;
+    JSCell *val = entry->key;
     if (val && !val->marked()) {
       val->mark();
@@ -427 +427 @@
       for (size_t i = 0; i < CELLS_PER_BLOCK; i++) {
         CollectorCell *cell = curBlock->cells + i;
-        AllocatedValueImp *imp = reinterpret_cast<AllocatedValueImp *>(cell);
+        JSCell *imp = reinterpret_cast<JSCell *>(cell);
         if (imp->m_marked) {
           imp->m_marked = false;
         } else {
-          imp->~AllocatedValueImp();
+          imp->~JSCell();
           --usedCells;
           --numLiveObjects;
@@ -448 +448 @@
           ++minimumCellsToProcess;
         } else {
-          AllocatedValueImp *imp = reinterpret_cast<AllocatedValueImp *>(cell);
+          JSCell *imp = reinterpret_cast<JSCell *>(cell);
           if (imp->m_marked) {
             imp->m_marked = false;
           } else {
-            imp->~AllocatedValueImp();
+            imp->~JSCell();
             --usedCells;
             --numLiveObjects;
@@ -492 +492 @@
   size_t cell = 0;
   while (cell < heap.usedOversizeCells) {
-    AllocatedValueImp *imp = (AllocatedValueImp *)heap.oversizeCells[cell];
+    JSCell *imp = (JSCell *)heap.oversizeCells[cell];
     
     if (!imp->m_marked) {
-      imp->~AllocatedValueImp();
+      imp->~JSCell();
 #if DEBUG_COLLECTOR
       heap.oversizeCells[cell]->u.freeCell.zeroIfFree = 0;
@@ -564 +564 @@
   ProtectedValues::KeyValue *table = ProtectedValues::_table;
   for (size_t i = 0; i < size; i++) {
-    AllocatedValueImp *val = table[i].key;
+    JSCell *val = table[i].key;
     if (val) {
       ++count;
@@ -575 +575 @@
 #if APPLE_CHANGES
 
-static const char *className(AllocatedValueImp *val)
+static const char *className(JSCell *val)
 {
   const char *name = "???";
@@ -597 +597 @@
       break;
     case ObjectType: {
-      const ClassInfo *info = static_cast<ObjectImp *>(val)->classInfo();
+      const ClassInfo *info = static_cast<JSObject *>(val)->classInfo();
       name = info ? info->className : "Object";
       break;
@@ -612 +612 @@
   ProtectedValues::KeyValue *table = ProtectedValues::_table;
   for (int i = 0; i < size; i++) {
-    AllocatedValueImp *val = table[i].key;
+    JSCell *val = table[i].key;
     if (val) {
       CFStringRef name = CFStringCreateWithCString(NULL, className(val), kCFStringEncodingASCII);