[vmkit-commits] [vmkit] r104049 - in /vmkit/trunk/lib/J3/VMCore: JavaClass.cpp Jnjvm.cpp Jnjvm.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 18 14:57:49 2010
New Revision: 104049

URL: http://llvm.org/viewvc/llvm-project?rev=104049&view=rev
Log:
Throw a NoClassDefFoundError if names don't match.


Modified:
    vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
    vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/J3/VMCore/Jnjvm.h

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=104049&r1=104048&r2=104049&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Tue May 18 14:57:49 2010
@@ -930,7 +930,7 @@
     ctpInfo->resolveClassName(reader.readU2());
   
   if (!(thisClassName->equals(name))) {
-    JavaThread::get()->getJVM()->classFormatError(this, thisClassName);
+    JavaThread::get()->getJVM()->noClassDefFoundError(this, thisClassName);
   }
 
   readParents(reader);

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=104049&r1=104048&r2=104049&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Tue May 18 14:57:49 2010
@@ -621,7 +621,7 @@
         upcalls->InitClassNotFoundException, str);
 }
 
-void Jnjvm::classFormatError(UserClass* cl, const UTF8* name) {
+void Jnjvm::noClassDefFoundError(UserClass* cl, const UTF8* name) {
   uint32 size = 35 + name->size + cl->name->size;
   ArrayUInt16* msg = (ArrayUInt16*)upcalls->ArrayOfChar->doNew(size, this);
   JavaString* str = 0;
@@ -680,7 +680,7 @@
   assert(i == size && "Array overflow");
 
   str = constructString(msg);
-  error(upcalls->ClassFormatError, upcalls->InitClassFormatError, str);
+  error(upcalls->NoClassDefFoundError, upcalls->InitNoClassDefFoundError, str);
 }
 
 

Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=104049&r1=104048&r2=104049&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Tue May 18 14:57:49 2010
@@ -270,8 +270,7 @@
   void abstractMethodError(CommonClass* cl, const UTF8* name); 
   void noClassDefFoundError(const UTF8* name);
   void classNotFoundException(JavaString* str);
-
-  void classFormatError(UserClass* cl, const UTF8* name);
+  void noClassDefFoundError(UserClass* cl, const UTF8* name);
   void classFormatError(const char* str);
   
   /// asciizToStr - Constructs a java/lang/String object from the given asciiz.