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

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 12 07:11:54 2009
New Revision: 71550

URL: http://llvm.org/viewvc/llvm-project?rev=71550&view=rev
Log:
Create a global UTF8 for init exception method signature.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp Tue May 12 07:11:54 2009
@@ -145,8 +145,8 @@
   UserClass* realCl = cl->asClass();
   JavaObject* res = realCl->doNew(vm);
   JavaMethod* init = realCl->lookupMethod(vm->bootstrapLoader->initName,
-              cl->classLoader->asciizConstructUTF8("(Ljava/lang/String;)V"),
-              false, true, 0);
+                                          vm->bootstrapLoader->initExceptionSig,
+                                          false, true, 0);
   init->invokeIntSpecial(vm, realCl, res, vm->asciizToStr(msg));
   th->pendingException = res;
   th->throwFromJNI();

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Tue May 12 07:11:54 2009
@@ -203,6 +203,7 @@
   Attribut::sourceFileAttribut = asciizConstructUTF8("SourceFile");
   
   initName = asciizConstructUTF8("<init>");
+  initExceptionSig = asciizConstructUTF8("(Ljava/lang/String;)V");
   clinitName = asciizConstructUTF8("<clinit>");
   clinitType = asciizConstructUTF8("()V");
   runName = asciizConstructUTF8("run");

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Tue May 12 07:11:54 2009
@@ -348,6 +348,7 @@
   const UTF8* initName;
   const UTF8* clinitName;
   const UTF8* clinitType; 
+  const UTF8* initExceptionSig;
   const UTF8* runName; 
   const UTF8* prelib; 
   const UTF8* postlib;