[llvm-commits] [vmkit] r51346 - in /vmkit/trunk/lib/JnJVM/Classpath: ClasspathVMClass.cpp ClasspathVMStackWalker.cpp ClasspathVMThrowable.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 20 15:57:41 2008
New Revision: 51346

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


Modified:
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp?rev=51346&r1=51345&r2=51346&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp Tue May 20 15:57:41 2008
@@ -100,7 +100,7 @@
       // TODO: check parameter types
       JavaObject* tmp = (*Classpath::newConstructor)(vm);
       Classpath::initConstructor->invokeIntSpecial(vm, tmp, Cl, meth);
-      ret->setAt(index, tmp);
+      ret->elements[index] = tmp;
     }
     return (jobject)ret;
   }
@@ -146,7 +146,7 @@
       JavaObject* tmp = (*Classpath::newMethod)(vm);
       Classpath::initMethod->invokeIntSpecial(vm, tmp, Cl,
                                               vm->UTF8ToStr(meth->name), meth);
-      ret->setAt(index, tmp);
+      ret->elements[index] = tmp;
     }
     return (jobject)ret;
   }
@@ -325,7 +325,7 @@
       JavaObject* tmp = (*Classpath::newField)(vm);
       Classpath::initField->invokeIntSpecial(vm, tmp, Cl,
                                              vm->UTF8ToStr(field->name), field);
-      ret->setAt(index, tmp);
+      ret->elements[index] = tmp;
     }
     return (jobject)ret;
   }
@@ -345,7 +345,7 @@
   for (std::vector<Class*>::iterator i = interfaces.begin(), e = interfaces.end();
         i != e; ++i, ++index) {
     Class* klass = *i; 
-    ret->setAt(index, vm->getClassDelegatee(klass));
+    ret->elements[index] = vm->getClassDelegatee(klass);
   }
   return (jobject)ret;
 }

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp?rev=51346&r1=51345&r2=51346&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp Tue May 20 15:57:41 2008
@@ -31,7 +31,7 @@
     JavaMethod* meth = JavaJIT::IPToJavaMethod(stack[first]);
     if (meth) {
       ArrayObject* res = recGetClassContext(stack, size, first + 1, rec + 1); 
-      res->setAt(rec, meth->classDef->getClassDelegatee());
+      res->elements[rec] = meth->classDef->getClassDelegatee();
       return res;
     } else {
       return recGetClassContext(stack, size, first + 1, rec);

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp?rev=51346&r1=51345&r2=51346&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp Tue May 20 15:57:41 2008
@@ -82,7 +82,7 @@
     JavaMethod* meth = JavaJIT::IPToJavaMethod(begIp);
     if (meth) {
       ArrayObject* res = recGetStackTrace(stack, first + 1, rec + 1);
-      res->setAt(rec, consStackElement(meth, stack[first]));
+      res->elements[rec] = consStackElement(meth, stack[first]);
       return res;
     } else {
       return recGetStackTrace(stack, first + 1, rec);