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

[Nicolas Geoffray]

Author: geoffray
Date: Sat May 16 16:04:09 2009
New Revision: 71958

URL: http://llvm.org/viewvc/llvm-project?rev=71958&view=rev
Log:
Code cleanup, no functionality changes.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp Sat May 16 16:04:09 2009
@@ -73,14 +73,3 @@
   return buf;
 #endif
 }
-
-const UTF8* UTF8::acons(sint32 n, UserClassArray* cl,
-                        mvm::BumpPtrAllocator& allocator) {
-  assert(n >= 0 && "Creating an UTF8 with a size < 0");
-  assert(n <= JavaArray::MaxArraySize && 
-         "Creating an UTF8 with a size too big");
-
-  UTF8* res = new (allocator, n) UTF8();
-  res->size = n; 
-  return (const UTF8*)res;
-}

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Sat May 16 16:04:09 2009
@@ -117,10 +117,10 @@
                               size * sizeof(uint16));
   }
   
-  /// acons - Allocates an UTF8 in permanent memory. The class argument must be
-  /// JavaArray::ofChar.
-  static const UTF8* acons(sint32 n, UserClassArray* cl,
-                           mvm::BumpPtrAllocator& allocator);
+  UTF8(sint32 n) {
+    size = n;
+  }
+
 public:
   
   

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LockedMap.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LockedMap.cpp Sat May 16 16:04:09 2009
@@ -90,7 +90,7 @@
   }
 
   if (res == 0) {
-    UTF8* tmp = (UTF8*)UTF8::acons(size, array, allocator);
+    UTF8* tmp = new(allocator, size) UTF8(size);
     for (sint32 i = 0; i < size; i++) {
       tmp->elements[i] = asciiz[i];
     }
@@ -118,7 +118,7 @@
   }
 
   if (res == 0) {
-    UTF8* tmp = (UTF8*)UTF8::acons(size, array, allocator);
+    UTF8* tmp = new(allocator, size) UTF8(size);
     memcpy(tmp->elements, buf, len * sizeof(uint16));
     res = (const UTF8*)tmp;
     map.insert(std::make_pair(key, res));