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

[Nicolas Geoffray]

Author: geoffray
Date: Tue Apr 14 17:15:40 2009
New Revision: 69085

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


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Tue Apr 14 17:15:40 2009
@@ -97,29 +97,29 @@
   upcalls->OfByte = UPCALL_PRIMITIVE_CLASS(this, "byte", 1);
   
   // Create the primitive arrays.
-  upcalls->ArrayOfChar = constructPrimitiveArray(asciizConstructUTF8("[C"),
-                                                 upcalls->OfChar);
+  upcalls->ArrayOfChar = constructArray(asciizConstructUTF8("[C"),
+                                        upcalls->OfChar);
 
-  upcalls->ArrayOfByte = constructPrimitiveArray(asciizConstructUTF8("[B"),
-                                                 upcalls->OfByte);
+  upcalls->ArrayOfByte = constructArray(asciizConstructUTF8("[B"),
+                                        upcalls->OfByte);
   
-  upcalls->ArrayOfInt = constructPrimitiveArray(asciizConstructUTF8("[I"),
-                                                upcalls->OfInt);
+  upcalls->ArrayOfInt = constructArray(asciizConstructUTF8("[I"),
+                                       upcalls->OfInt);
   
-  upcalls->ArrayOfBool = constructPrimitiveArray(asciizConstructUTF8("[Z"),
-                                                 upcalls->OfBool);
+  upcalls->ArrayOfBool = constructArray(asciizConstructUTF8("[Z"),
+                                        upcalls->OfBool);
   
-  upcalls->ArrayOfLong = constructPrimitiveArray(asciizConstructUTF8("[J"),
-                                                 upcalls->OfLong);
+  upcalls->ArrayOfLong = constructArray(asciizConstructUTF8("[J"),
+                                        upcalls->OfLong);
   
-  upcalls->ArrayOfFloat = constructPrimitiveArray(asciizConstructUTF8("[F"),
-                                                  upcalls->OfFloat);
+  upcalls->ArrayOfFloat = constructArray(asciizConstructUTF8("[F"),
+                                         upcalls->OfFloat);
   
-  upcalls->ArrayOfDouble = constructPrimitiveArray(asciizConstructUTF8("[D"),
-                                                   upcalls->OfDouble);
+  upcalls->ArrayOfDouble = constructArray(asciizConstructUTF8("[D"),
+                                          upcalls->OfDouble);
   
-  upcalls->ArrayOfShort = constructPrimitiveArray(asciizConstructUTF8("[S"),
-                                                  upcalls->OfShort);
+  upcalls->ArrayOfShort = constructArray(asciizConstructUTF8("[S"),
+                                         upcalls->OfShort);
   
   // Fill the maps.
   primitiveMap[I_VOID] = upcalls->OfVoid;
@@ -596,15 +596,6 @@
   return res;
 }
 
-ClassArray* 
-JnjvmBootstrapLoader::constructPrimitiveArray(const UTF8* name,
-                                              ClassPrimitive* baseClass) {
-    
-  ClassArray* cl = new(allocator) UserClassArray(this, name, baseClass);
-  classes->map.insert(std::make_pair(name, cl));
-  return cl;
-}
-
 Typedef* JnjvmClassLoader::internalConstructType(const UTF8* name) {
   short int cur = name->elements[0];
   Typedef* res = 0;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Tue Apr 14 17:15:40 2009
@@ -287,11 +287,6 @@
   ///
   ArrayUInt8* openName(const UTF8* utf8);
   
-  /// constructPrimitiveArray - Hashes the primitive array.
-  ///
-  ClassArray* constructPrimitiveArray(const UTF8* name,
-                                      ClassPrimitive* prim);
-
 public:
   
   /// tracer - Traces instances of this class.