[vmkit-commits] [vmkit] r72230 - in /vmkit/trunk/lib/JnJVM/VMCore: Jnjvm.cpp Jnjvm.h

[Nicolas Geoffray]

Author: geoffray
Date: Thu May 21 16:40:06 2009
New Revision: 72230

URL: http://llvm.org/viewvc/llvm-project?rev=72230&view=rev
Log:
Initialize InstantionException at boot.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Thu May 21 16:40:06 2009
@@ -418,10 +418,15 @@
         obj);
 }
 
-void Jnjvm::instantiationException() {
-  error(upcalls->InstantiationException,
-        upcalls->InitInstantiationException,
-        (JavaString*)0);
+void Jnjvm::instantiationException(UserCommonClass* cl) {
+  JavaString* str = internalUTF8ToStr(cl->name);
+  error(upcalls->InstantiationException, upcalls->InitInstantiationException,
+        str);
+}
+
+void Jnjvm::instantiationError(UserCommonClass* cl) {
+  JavaString* str = internalUTF8ToStr(cl->name);
+  error(upcalls->InstantiationError, upcalls->InitInstantiationError, str);
 }
   
 
@@ -1024,6 +1029,7 @@
   LOAD_CLASS(upcalls->UnknownError);
   LOAD_CLASS(upcalls->ClassNotFoundException); 
   LOAD_CLASS(upcalls->ArithmeticException); 
+  LOAD_CLASS(upcalls->InstantiationException);
 #undef LOAD_CLASS
 
   loadAppClassLoader();

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h Thu May 21 16:40:06 2009
@@ -266,7 +266,8 @@
   void invocationTargetException(const JavaObject* obj);
   void outOfMemoryError();
   void noClassDefFoundError(JavaObject* obj);
-  void instantiationException();
+  void instantiationException(UserCommonClass* cl);
+  void instantiationError(UserCommonClass* cl);
   void illegalArgumentException(const char* msg);
   void classCastException(JavaObject* obj, UserCommonClass* cl);
   void noSuchFieldError(CommonClass* cl, const UTF8* name);