[vmkit-commits] [vmkit] r67749 - /vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Mar 26 09:34:52 2009
New Revision: 67749

URL: http://llvm.org/viewvc/llvm-project?rev=67749&view=rev
Log:
Move what belongs to the bootstrap class loader in its
tracer function.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp?rev=67749&r1=67748&r2=67749&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Thu Mar 26 09:34:52 2009
@@ -144,31 +144,7 @@
 #if defined(ISOLATE_SHARING)
   JnjvmSharedLoader::sharedLoader->MARK_AND_TRACE;
 #endif
-  traceClassMap(bootstrapLoader->getClasses());
   
-#define TRACE_DELEGATEE(prim) \
-  prim->CALL_TRACER;
-
-  TRACE_DELEGATEE(upcalls->OfVoid);
-  TRACE_DELEGATEE(upcalls->OfBool);
-  TRACE_DELEGATEE(upcalls->OfByte);
-  TRACE_DELEGATEE(upcalls->OfChar);
-  TRACE_DELEGATEE(upcalls->OfShort);
-  TRACE_DELEGATEE(upcalls->OfInt);
-  TRACE_DELEGATEE(upcalls->OfFloat);
-  TRACE_DELEGATEE(upcalls->OfLong);
-  TRACE_DELEGATEE(upcalls->OfDouble);
-#undef TRACE_DELEGATEE
-  
-  for (std::vector<JavaString*, gc_allocator<JavaString*> >::iterator i = 
-       bootstrapLoader->strings.begin(),
-       e = bootstrapLoader->strings.end(); i!= e; ++i) {
-    (*i)->MARK_AND_TRACE;
-    // If the string was static allocated, we want to trace its lock.
-    LockObj* l = (*i)->lockObj();
-    if (l) l->MARK_AND_TRACE;
-  }
-
   mvm::Thread* th = th->get();
   th->CALL_TRACER;
   for (mvm::Thread* cur = (mvm::Thread*)th->next(); cur != th; 
@@ -195,7 +171,33 @@
   }
 }
 
-void JnjvmBootstrapLoader::TRACER {}
+void JnjvmBootstrapLoader::TRACER {
+  
+  traceClassMap(classes);
+
+  for (std::vector<JavaString*, gc_allocator<JavaString*> >::iterator i = 
+       bootstrapLoader->strings.begin(),
+       e = bootstrapLoader->strings.end(); i!= e; ++i) {
+    (*i)->MARK_AND_TRACE;
+    // If the string was static allocated, we want to trace its lock.
+    LockObj* l = (*i)->lockObj();
+    if (l) l->MARK_AND_TRACE;
+  }
+
+#define TRACE_DELEGATEE(prim) \
+  prim->CALL_TRACER;
+
+  TRACE_DELEGATEE(upcalls->OfVoid);
+  TRACE_DELEGATEE(upcalls->OfBool);
+  TRACE_DELEGATEE(upcalls->OfByte);
+  TRACE_DELEGATEE(upcalls->OfChar);
+  TRACE_DELEGATEE(upcalls->OfShort);
+  TRACE_DELEGATEE(upcalls->OfInt);
+  TRACE_DELEGATEE(upcalls->OfFloat);
+  TRACE_DELEGATEE(upcalls->OfLong);
+  TRACE_DELEGATEE(upcalls->OfDouble);
+#undef TRACE_DELEGATEE
+}
 
 #if defined(ISOLATE_SHARING)
 void UserClass::TRACER {