[vmkit-commits] [vmkit] r76563 - in /vmkit/trunk/lib/JnJVM/VMCore: JnjvmClassLoader.cpp LockedMap.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul 21 05:41:04 2009
New Revision: 76563

URL: http://llvm.org/viewvc/llvm-project?rev=76563&view=rev
Log:
Remove useless information in UTF8Map.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Tue Jul 21 05:41:04 2009
@@ -61,7 +61,7 @@
   
 	TheCompiler = Comp;
   
-  hashUTF8 = new(allocator, "UTF8Map") UTF8Map(allocator, 0);
+  hashUTF8 = new(allocator, "UTF8Map") UTF8Map(allocator);
   classes = new(allocator, "ClassMap") ClassMap();
   javaTypes = new(allocator, "TypeMap") TypeMap(); 
   javaSignatures = new(allocator, "SignMap") SignMap(); 
@@ -257,8 +257,7 @@
   bootstrapLoader = JCL.bootstrapLoader;
   TheCompiler = bootstrapLoader->getCompiler()->Create("Applicative loader");
   
-  hashUTF8 = new(allocator, "UTF8Map")
-    UTF8Map(allocator, bootstrapLoader->upcalls->ArrayOfChar);
+  hashUTF8 = new(allocator, "UTF8Map") UTF8Map(allocator);
   classes = new(allocator, "ClassMap") ClassMap();
   javaTypes = new(allocator, "TypeMap") TypeMap();
   javaSignatures = new(allocator, "SignMap") SignMap();

Modified: vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h?rev=76563&r1=76562&r2=76563&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LockedMap.h Tue Jul 21 05:41:04 2009
@@ -122,16 +122,13 @@
   
   mvm::LockNormal lock;
   mvm::BumpPtrAllocator& allocator;
-  UserClassArray* array;
   std::multimap<const uint32, const UTF8*> map;
   const UTF8* lookupOrCreateAsciiz(const char* asciiz); 
   const UTF8* lookupOrCreateReader(const uint16* buf, uint32 size);
   const UTF8* lookupAsciiz(const char* asciiz); 
   const UTF8* lookupReader(const uint16* buf, uint32 size);
   
-  UTF8Map(mvm::BumpPtrAllocator& A, UserClassArray* cl) : allocator(A) {
-    array = cl;
-  }
+  UTF8Map(mvm::BumpPtrAllocator& A) : allocator(A) {}
 
   ~UTF8Map() {
     for (iterator i = map.begin(), e = map.end(); i!= e; ++i) {