[vmkit-commits] [vmkit] r67751 - in /vmkit/trunk/lib/JnJVM: Isolate/VirtualTables.cpp VMCore/VirtualTables.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Mar 26 10:01:12 2009
New Revision: 67751

URL: http://llvm.org/viewvc/llvm-project?rev=67751&view=rev
Log:
Code refactoring.


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

Added: vmkit/trunk/lib/JnJVM/Isolate/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Isolate/VirtualTables.cpp?rev=67751&view=auto

==============================================================================
--- vmkit/trunk/lib/JnJVM/Isolate/VirtualTables.cpp (added)
+++ vmkit/trunk/lib/JnJVM/Isolate/VirtualTables.cpp Thu Mar 26 10:01:12 2009
@@ -0,0 +1,50 @@
+//===--- VirtualTables.cpp - Virtual methods for Isolate objects ----------===//
+//
+//                          The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "SharedMaps.h"
+#include "IsolateSharedLoader.h"
+
+using namespace jnjvm;
+
+#define INIT(X) VirtualTable* X::VT = 0
+
+  INIT(JnjvmSharedLoader);
+  INIT(SharedClassByteMap);
+  INIT(UserClass);
+  INIT(UserClassArray);
+  INIT(UserConstantPool);
+
+#undef INIT
+
+void UserClass::TRACER {
+  classLoader->MARK_AND_TRACE;
+  delegatee->MARK_AND_TRACE;
+  staticInstance->MARK_AND_TRACE;
+  ctpInfo->MARK_AND_TRACE;
+}
+
+void UserClassPrimitive::TRACER {
+  classLoader->MARK_AND_TRACE;
+  delegatee->MARK_AND_TRACE;
+}
+
+void UserClassArray::TRACER {
+  classLoader->MARK_AND_TRACE;
+  delegatee->MARK_AND_TRACE;
+}
+
+void SharedClassByteMap::TRACER {
+  for (iterator i = map.begin(), e = map.end(); i!= e; ++i) {
+    i->first->MARK_AND_TRACE;
+  }
+}
+
+void JnjvmSharedLoader::TRACER {
+  byteClasses->MARK_AND_TRACE;
+}

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Thu Mar 26 10:01:12 2009
@@ -19,11 +19,6 @@
 #include "JnjvmClassLoader.h"
 #include "LockedMap.h"
 
-#ifdef ISOLATE_SHARING
-#include "SharedMaps.h"
-#include "IsolateSharedLoader.h"
-#endif
-
 using namespace jnjvm;
 
 #define INIT(X) VirtualTable* X::VT = 0
@@ -33,13 +28,6 @@
   INIT(JnjvmBootstrapLoader);
   INIT(JnjvmClassLoader);
   INIT(LockObj);
-#if defined(ISOLATE_SHARING)
-  INIT(JnjvmSharedLoader);
-  INIT(SharedClassByteMap);
-  INIT(UserClass);
-  INIT(UserClassArray);
-  INIT(UserConstantPool);
-#endif
 
 #undef INIT
 
@@ -198,32 +186,3 @@
   TRACE_DELEGATEE(upcalls->OfDouble);
 #undef TRACE_DELEGATEE
 }
-
-#if defined(ISOLATE_SHARING)
-void UserClass::TRACER {
-  classLoader->MARK_AND_TRACE;
-  delegatee->MARK_AND_TRACE;
-  staticInstance->MARK_AND_TRACE;
-  ctpInfo->MARK_AND_TRACE;
-}
-
-void UserClassPrimitive::TRACER {
-  classLoader->MARK_AND_TRACE;
-  delegatee->MARK_AND_TRACE;
-}
-
-void UserClassArray::TRACER {
-  classLoader->MARK_AND_TRACE;
-  delegatee->MARK_AND_TRACE;
-}
-
-void SharedClassByteMap::TRACER {
-  for (iterator i = map.begin(), e = map.end(); i!= e; ++i) {
-    i->first->MARK_AND_TRACE;
-  }
-}
-
-void JnjvmSharedLoader::TRACER {
-  byteClasses->MARK_AND_TRACE;
-}
-#endif