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

[Nicolas Geoffray]

Author: geoffray
Date: Wed May 13 06:54:41 2009
New Revision: 71652

URL: http://llvm.org/viewvc/llvm-project?rev=71652&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/JavaString.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp Wed May 13 06:54:41 2009
@@ -68,18 +68,6 @@
   return map->lookupOrCreateReader(buf, len);
 }
 
-const UTF8* UTF8::extract(Jnjvm* vm, uint32 start, uint32 end) const {
-  uint32 len = end - start;
-  UTF8* array = (UTF8*) vm->upcalls->ArrayOfChar->doNew(len, vm);
-  uint16* buf = array->elements;
-
-  for (uint32 i = 0; i < len; i++) {
-    buf[i] = elements[i + start];
-  }
-
-  return (const UTF8*)array;
-}
-
 char* UTF8::UTF8ToAsciiz() const {
 #ifndef DEBUG
   mvm::NativeString* buf = mvm::NativeString::alloc(size + 1);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Wed May 13 06:54:41 2009
@@ -127,10 +127,6 @@
   const UTF8* javaToInternal(UTF8Map* map, unsigned int start,
                              unsigned int len) const;
   
-  /// extract - Creates an UTF8 by extracting the contents at the given size
-  /// of this.
-  const UTF8* extract(Jnjvm* vm, uint32 start, uint32 len) const;
-  
   /// extract - Similar, but creates it in the map.
   const UTF8* extract(UTF8Map* map, uint32 start, uint32 len) const;
 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp Wed May 13 06:54:41 2009
@@ -49,8 +49,14 @@
 const UTF8* JavaString::strToUTF8(Jnjvm* vm) {
   const UTF8* utf8 = this->value;
   assert(utf8 && "String without an UTF8?");
-  if (offset || (offset + count < utf8->size)) {
-    return utf8->extract(vm, offset, offset + count);
+  if (offset || (count != utf8->size)) {
+    UTF8* array = (UTF8*) vm->upcalls->ArrayOfChar->doNew(count, vm);
+    uint16* buf = array->elements;
+
+    for (sint32 i = 0; i < count; i++) {
+      buf[i] = value->elements[i + offset];
+    }
+    return (const UTF8*)array;
   } else {
     return utf8;
   }