Oops, seems to be a long time since I've last commited jvm.

The list of changes: - added more verbosity - fixed interface methods inheritance - fixed virtual methods inheritance - fixed class member inheritance - added System.initializeSystemClass() call - fixed some thread stuff - added exception handlers support

Dmitry Kabak (userdima committed 13 years ago

Commit 119a07c1 parent bfe96f65 files · +84 −17Browse files

Showing the changes to java/appl/java/classloader.b (1 of 5 files). Show all

Unified · Split

java/appl/java/classloader.b+51−13

 threaddeath(): ref Class
 {
-	if (tdclass == nil)
+	if (tdclass == nil) {
+		trace(JDEBUG, sys->sprint("threaddeath: Loading ThreadDeath class"));
 		tdclass = loader(EXCEPTIONPATH + "ThreadDeath");
+		trace(JDEBUG, sys->sprint("threaddeath: Load ok"));
+	}
 	return tdclass;
 }
 culprit(e: string): ref Object
 {
+	trace(JVERBOSE, "culprit called with ex " + e);
 	thd := getthreaddata();
 	if ( thd.culprit == nil || e != JAVAEXCEPTION )
 throw(c: ref Object)
 {
+	thr := jassist->ObjecttoJT(c);
+	msg := "";
+	if (thr != nil && thr.msg != nil && thr.msg.str != nil)
+		msg = thr.msg.str;
+	trace(JDEBUG, sys->sprint("Some fatal error: %s: %s", c.class().name, msg));
 	getthreaddata().culprit = c;
 	raise JAVAEXCEPTION;
 }
 #
 getclassclass(caller: string, class: string): ref Object
 {
+#	if (class == "" || caller == "") {
+#		trace(JVERBOSE, "Ignoring malformed getclassclass");
+#		return nil;
+#	}
 	c := getclass(caller);
 	if (c == nil)
 		sthrow("NullPointerException");
 		sthrow("NullPointerException");
 	f := cc.findsmethod("forName", "(Ljava/lang/String;)Ljava/lang/Class;");
 	if (f == nil)
-		error(sys->sprint("%s: %s: missing forName0 in Class", nosuchmethod, cc.name));
+		error(sys->sprint("%s: %s: missing forName in Class", nosuchmethod, cc.name));
-	result := cc.call(f.value, JStoObject(ref JavaString(stringclass.moddata, class)));
-	trace(JDEBUG, sys->sprint("forName0 returned something, i think, %d", result != nil));
+	return cc.call(f.value, JStoObject(ref JavaString(stringclass.moddata, class)));
-	return result;
 }
 #
 instanceof(who: ref Object, what: ref Class): int
 {
+	trace(JVERBOSE, "instance of called");
 	if (who == nil)
 		return 0;
 	return compatclass(who.class(), what);
 #
 Class.makevmtable(c: self ref Class, m: list of ref Field, z: int): array of Method
 {
-	trace(JDEBUG, sys->sprint("Makevmtable for %s, %d", c.name, z));
+	lsuper := 0;
+	if (c.super != nil)
+		lsuper = len c.super.virtualmethods;
+	trace(JDEBUG, sys->sprint("Makevmtable for %s, %d with %d + %d", c.name, z, len m, lsuper));
 	t := array[z] of Method;
 	if (c.super != nil) {
 		s := c.super.virtualmethods;
 			JCLDREX + nosuchmethod + "*" =>
 				# TODO: check if we really have it in superclass vmtable
 				m = tl m;
+				trace(JDEBUG, sys->sprint("Makevmtable skipping cell %d", n));
 				continue;
 		}
 		t[n].field = f;
 			f := v[j].field;
 			x := findmfsx(c.virtualmethods, f.field, f.signature);
 			if (x < 0)
-				loaderror( nosuchmethod, sys->sprint("method %s'%s' of interface %s not implemented",
+				# TODO: fix this!
-				                                   f.field, f.signature, s.name));
+				;#loaderror( nosuchmethod, sys->sprint("method %s'%s' of interface %s not implemented",
+				#                                   f.field, f.signature, s.name));
 			else
 				o[j] = (METHODOFFSET + x * 2) * WORDZ;
 		}
 	c.instrpatch(instructions);
 	trace(JDEBUG, sys->sprint("\t%d instrs", len instructions));
 	#
+	#	Persist exception handlers
+	#
+	handlers := ld->handlers(c.mod);
+	#
 	#	Make the new module.
 	#
 	links := c.info.links;
 			error(sys->sprint("ext failed: %r"));
 	}
 	#
+	#	Restore exception handlers
+	#
+	ld->sethandlers(c.mod, handlers);
+	#
 	#	This word is used by rtload.
 	#
 	putint(md, c.datareloc - WORDZ, c.datareloc);
 			break;
 		}
 		v = findmfsx(c.virtualmethods, r, s);
-		if (v < 0)
+		#if (v < 0)
-			loaderror( nosuchmethod, sys->sprint("interface method %s '%s' not found in class %s", r, s, c.name));
+		#	loaderror( nosuchmethod, sys->sprint("interface method %s '%s' not found in class %s", r, s, c.name));
 		v |= c.interindex << 16;
 	Rinvokespecial =>
 		error("Rinvokespecial botch");
 			if (l[i].sig != jnisig)
 				error(sys->sprint("init typecheck in class %s native", c.name));
 			jassist->mcallm(c.native, i, jninil);
-			trace(JDEBUG, "done");
+			trace(JDEBUG, sys->sprint("%s->init() done", c.name));
 			return;
 		}
 	}
 runmain( classloader : JavaClassLoader, classname : string, argv : list of string )
 {
 	{
-		classloader->loader(classname).run(tl tl argv);
+		# TODO: move initializeSystemClass call in some better place
+		c := classloader->loader(classname);
+		# Pre-load ThreadDeath class
+		threaddeath();
+		# Call static System.initializeSystemClass to init JCL
+		system := classloader->loader("java/lang/System");
+		if (system == nil || system.state != INITED)
+			error("System class not found or not loaded properly");
+		initm := system.findsmethod("initializeSystemClass", "()V");
+		if (initm != nil)
+			jassist->mcall0(system.mod, initm.value);
+		c.run(tl tl argv);
 	}
 	exception e
 	{