[llvm-commits] [vmkit] r51344 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaArray.cpp JavaRuntimeJIT.cpp Jnjvm.cpp LockedMap.cpp NativeUtil.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 20 15:56:21 2008
New Revision: 51344

URL: http://llvm.org/viewvc/llvm-project?rev=51344&view=rev
Log:
Do inline accesses on arrays.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LockedMap.cpp
    vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp Tue May 20 15:56:21 2008
@@ -199,7 +199,7 @@
                                  unsigned int len) const {
   uint16* java = (uint16*) alloca(len * sizeof(uint16));
   for (uint32 i = 0; i < len; i++) {
-    uint16 cur = at(start + i);
+    uint16 cur = elements[start + i];
     if (cur == '.') java[i] = '/';
     else java[i] = cur;
   }
@@ -211,7 +211,7 @@
                                  unsigned int len) const {
   uint16* java = (uint16*) alloca(len * sizeof(uint16));
   for (uint32 i = 0; i < len; i++) {
-    uint16 cur = at(start + i);
+    uint16 cur = elements[start + i];
     if (cur == '/') java[i] = '.';
     else java[i] = cur;
   }
@@ -224,7 +224,7 @@
   uint16* buf = (uint16*)alloca(sizeof(uint16) * len);
 
   for (uint32 i = 0; i < len; i++) {
-    buf[i] = at(i + start);
+    buf[i] = elements[i + start];
   }
 
   return readerConstruct(vm, buf, len);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Tue May 20 15:56:21 2008
@@ -248,8 +248,8 @@
       arrayCtor_t newCtor = func->arrayCtor;
       if (dims[0] > 0) {
         for (sint32 i = 0; i < dims[0]; ++i) {
-          res->setAt(i, multiCallNewIntern(newCtor, base, (len - 1), &dims[1],
-                                           vm));
+          res->elements[i] = multiCallNewIntern(newCtor, base, (len - 1),
+                                                &dims[1], vm);
         }
       } else {
         for (uint32 i = 1; i < len; ++i) {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Tue May 20 15:56:21 2008
@@ -28,7 +28,6 @@
 #include "JavaTypes.h"
 #include "JavaUpcalls.h"
 #include "Jnjvm.h"
-#include "JnjvmModule.h"
 #include "JnjvmModuleProvider.h"
 #include "LockedMap.h"
 #include "Reader.h"
@@ -576,7 +575,7 @@
 
   if (len == 0) {
     return 0;
-  } else if (name->at(0) == AssessorDesc::I_TAB) {
+  } else if (name->elements[0] == AssessorDesc::I_TAB) {
     
     while (doLoop) {
       --len;
@@ -584,12 +583,12 @@
         doLoop = false;
       } else {
         ++start;
-        if (name->at(start) != AssessorDesc::I_TAB) {
-          if (name->at(start) == AssessorDesc::I_REF) {
+        if (name->elements[start] != AssessorDesc::I_TAB) {
+          if (name->elements[start] == AssessorDesc::I_REF) {
             uint32 size = (uint32)name->size;
             if ((size == (start + 1)) || (size == (start + 2)) || 
-                 (name->at(start + 1) == AssessorDesc::I_TAB) || 
-                 (utf8->at(origLen - 1) != AssessorDesc::I_END_REF)) {
+                 (name->elements[start + 1] == AssessorDesc::I_TAB) || 
+                 (utf8->elements[origLen - 1] != AssessorDesc::I_END_REF)) {
               doLoop = false; 
             } else {
               const UTF8* componentName = utf8->javaToInternal(this, start + 1,
@@ -604,7 +603,7 @@
               }
             }
           } else {
-            uint16 cur = name->at(start);
+            uint16 cur = name->elements[start];
             if ((cur == AssessorDesc::I_BOOL || cur == AssessorDesc::I_BYTE ||
                  cur == AssessorDesc::I_CHAR || cur == AssessorDesc::I_SHORT ||
                  cur == AssessorDesc::I_INT || cur == AssessorDesc::I_FLOAT || 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LockedMap.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LockedMap.cpp Tue May 20 15:56:21 2008
@@ -46,7 +46,7 @@
   if (len != size) return false;
   else {
     for (sint32 i = 0; i < len; i++) {
-      if (asciiz[i] != val->at(i)) return false;
+      if (asciiz[i] != val->elements[i]) return false;
     }
     return true;
   }
@@ -92,7 +92,7 @@
   if (res == 0) {
     UTF8* tmp = (UTF8*)UTF8::acons(size, JavaArray::ofChar, vm);
     for (sint32 i = 0; i < size; i++) {
-      tmp->setAt(i, asciiz[i]);
+      tmp->elements[i] = asciiz[i];
     }
     res = (const UTF8*)tmp;
     map.insert(std::make_pair(key, res));

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp Tue May 20 15:56:21 2008
@@ -388,7 +388,7 @@
   sint32 index = 0;
   for (std::vector<Typedef*>::iterator i = args.begin(), e = args.end();
           i != e; ++i, ++index) {
-    res->setAt(index, getClassType(loader, (*i)));
+    res->elements[index] = getClassType(loader, (*i));
   }
 
   return res;