Changeset 6472 in webkit for trunk/JavaScriptCore/kjs/value.cpp

Timestamp:

Apr 23, 2004, 3:40:31 PM (21 years ago)

Author:

mjs

Message:

Reviewed by Darin.

Implementation of conservative GC, based partly on code from
Darin. It's turned off for now, so it shouldn't have any effect on
the normal build.

• JavaScriptCore.pbproj/project.pbxproj:
• kjs/collector.cpp: (KJS::Collector::markStackObjectsConservatively): (KJS::Collector::markProtectedObjects): (KJS::Collector::collect):
• kjs/collector.h:
• kjs/protect.h: (KJS::gcProtect): (KJS::gcUnprotect):
• kjs/protected_values.cpp: Added. (KJS::ProtectedValues::getProtectCount): (KJS::ProtectedValues::increaseProtectCount): (KJS::ProtectedValues::insert): (KJS::ProtectedValues::decreaseProtectCount): (KJS::ProtectedValues::expand): (KJS::ProtectedValues::shrink): (KJS::ProtectedValues::rehash): (KJS::ProtectedValues::computeHash):
• kjs/protected_values.h: Added.
• kjs/value.cpp: (ValueImp::useConservativeMark): (ValueImp::mark): (ValueImp::marked):
• kjs/value.h: (KJS::ValueImp::):

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -57 +57 @@
 }
 
+#if TEST_CONSERVATIVE_GC
+static bool conservativeMark = false;
+
+void ValueImp::useConservativeMark(bool use)
+{
+  conservativeMark = use;
+}
+#endif
+
 void ValueImp::mark()
 {
   //fprintf(stderr,"ValueImp::mark %p\n",(void*)this);
+#if TEST_CONSERVATIVE_GC
+  if (conservativeMark) {
+    _flags |= VI_CONSERVATIVE_MARKED;
+  } else {
+    if (!(_flags | VI_CONSERVATIVE_MARKED)) {
+      printf("Conservative collector missed ValueImp 0x%x.\n", (int)this);
+    }
+    _flags |= VI_MARKED;
+  }
+#else
   _flags |= VI_MARKED;
+#endif
 }
 
@@ -66 +86 @@
 {
   // Simple numbers are always considered marked.
+#if TEST_CONSERVATIVE_GC
+  if (conservativeMark) {
+    return SimpleNumber::is(this) || (_flags & VI_CONSERVATIVE_MARKED);
+  } else {
+    return SimpleNumber::is(this) || (_flags & VI_MARKED);
+  }
+#else
   return SimpleNumber::is(this) || (_flags & VI_MARKED);
+#endif
 }