Implemented ldc class loading, runtime part.

Also some changes in debug behavior, I'm sorry for any garbage that I left here, I will clean it up some day. Disabled exceptions (for better debugging) and fixed native class loading.

Dmitry Kabak (userdima committed 13 years ago

Commit 56c0af11 parent 520ef8d2 files · +64 −27Browse files

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

Unified · Split

java/appl/java/classloader.b+63−27

 	}
 	exception e
 	{
-		"*" =>
+		"*disabled" =>
 			#NOTE: a raise is only expected from the init calls therefore
 			#      when we reach here we need to block and acquire
 			block(t);
 			acquire();
 			trace(JVERBOSE, sys->sprint("Some exception: %s", e));
+			raise e;
 			if ( str->prefix(JCLDREX+exceptionininitializer, e ) == 1 )
 				loaderror(exceptionininitializer, e ); #rethrow
 			else
 	}
 	exception e
 	{
-		"*" =>
+		"*disabled" =>
 			if(released == 0) {
 				release();
 				unblock(t);
 #
 rtload(addr: int)
 {
+	trace(JVERBOSE, sys->sprint("rtload start"));
 	o := getabsint(addr + RTTHISOFFSET);
 	r := getabsint(addr - (o + WORDZ));
 	l := o + r;
 		o += WORDZ;
 	}
 	cur = nil;
+	trace(JVERBOSE, sys->sprint("rtload end"));
 #	if (errors)
 #		error("rtload failed");
 }
 	}
 }
+#
+#	Get Class object for the class
+#
+getclassclass(caller: string, class: string): ref Object
+{
+	c := getclass(caller);
+	if (c == nil)
+		sthrow("NullPointerException");
+	trace(JDEBUG, sys->sprint("Getclassclass called, %s asked for class %s", c.name, class));
+	# TODO: put those strings in header
+	# Prepare necessary classes
+	if (stringclass == nil)
+		loadstringclass();
+	cc := getclass("java/lang/Class");
+	if (cc == nil)
+		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));
+	result := cc.call(f.value, JStoObject(ref JavaString(stringclass.moddata, class)));
+	trace(JDEBUG, sys->sprint("forName0 returned something, i think, %d", result != nil));
+	return result;
+}
 #
 #	Runtime hierarchy/type check routines.
 #
 Class.run(c: self ref Class, args: list of string)
 {
-	m := c.findsmethod(MAINFIELD, MAINSIGNATURE);
+	m := c.findsmethod(MAINFIELD, VOIDSIGNATURE);
 	if (m == nil)
 		loaderror( nosuchmethod, sys->sprint("%s: missing static method main", c.name));
 	main = c;
-	if (arrayclass == nil)
+	#if (arrayclass == nil)
-		loadarrayclass();
+	#	loadarrayclass();
-	if (stringclass == nil)
+	#if (stringclass == nil)
-		loadstringclass();
+	#	loadstringclass();
-	n := len args;
+	#n := len args;
-	h := array[n] of ref JavaString;
+	#h := array[n] of ref JavaString;
-	d := stringclass.moddata;
+	#d := stringclass.moddata;
-	for (i := 0; i < n; i++) {
+	#for (i := 0; i < n; i++) {
-		h[i] = ref JavaString(d, hd args);
+	#	h[i] = ref JavaString(d, hd args);
-		args = tl args;
+	#	args = tl args;
-	}
+	#}
 	#c.xeq(m.value, ref Array(arraymd, h, 1, stringclass, 0));
 	getthreaddata();
-	r := jassist->mcalla(c.mod, m.value, ref Array(arraymd, h, 1, stringclass, 0));
+	#r := jassist->mcalla(c.mod, m.value, ref Array(arraymd, h, 1, stringclass, 0));
+	r := jassist->mcall0(c.mod, m.value);
 	delthreaddata();
 }
 	#	Install the links.
 	#
 	for (i = 0; i < len links; i++) {
-		if (ld->ext(c.mod, i, links[i].pc, links[i].tdesc) < 0)
+		trace(JDEBUG, sys->sprint("link %d pc %d tdesc %d name %s",
+			i, links[i].pc, links[i].tdesc, links[i].name));
+		if (ld->ext(c.mod, i, links[i].pc, links[i].tdesc) < 0)
 			error(sys->sprint("ext failed: %r"));
 	}
 	#
 {
 	a := c.virtualmethods;
 	n := len a;
-	if (c.name == "java/lang/StringBuffer") {
-		trace(JDEBUG, sys->sprint("Class: %s, virtual methods: %d", c.name, n));
-		trace(JDEBUG, sys->sprint("Started looking for method: %s, %s", f, s));
-		statenames := array [] of {"NEW", "HIER", "RESOLVE", "LOADED", "INITED"};
-		trace(JDEBUG, sys->sprint("Class state: %s", statenames[c.state]));
-	}
 	for (i := 0; i < n; i++) {
 		t := a[i].field;
 		if (t.field == f && t.signature == s)
 	instrs := ld->ifetch(mod);
 	if (instrs == nil)
 		error(sys->sprint("%s: native ifetch failed: %r",unsatisfiedlink));
+	imports := ld->imports(mod);
 	nm := ld->newmod("N-" + c.name, STACKSIZE, len links, instrs, getmd(mod));
 	if (nm == nil)
 		error(sys->sprint("%s: native newmod failed: %r",unsatisfiedlink));
 	n := len types;
 	for (i := 1; i < n; i++) {
 		if (ld->tnew(nm, types[i].size, types[i].map) != i)
 		if (ld->ext(nm, i, links[i].pc, links[i].tdesc) < 0)
 			error(sys->sprint("%s: native ext failed: %r",unsatisfiedlink));
 	}
+	if (ld->setimports(nm, imports) < 0)
+		error(sys->sprint("%s: native setimports failed: %r",unsatisfiedlink));
 	addmodclass(nm, c);
 	c.native = nm;
 }
 			c.loadnative();
 		l = c.info.nlinks;
 		m = mangle(f, s);
+		trace(JDEBUG, sys->sprint("Mangled native name: %s", m));
 	} else {
 		l = c.info.links;
 		m = f + s;
 	"rtload",
 	"throw",
 	"unrescue",
+	"getclassclass",
 };
 #
 #
 loadhash(s: string): int
 {
+	# TODO: fix
+	if (s == "getclassclass")
+		return 1;
 	return ((s[len s - 1] + 49) * len s + 19 * s[0]) % LDHASH;
 }
 			x += t >> ISHIFT;
 			if (x < 0 || x >= l)
 				error("bad inst index");
-			if (inst[x].op == byte 57 && inst[x].mid == 0) {
+			debugs := sys->sprint("ipatch inst[%d](%d, %d, %d)->", x, inst[x].src, inst[x].mid, inst[x].dst);
-				trace(JVERBOSE, sys->sprint("Skipping instruction %d", x));
-				continue;
-			}
 			case t & (POP | PTYPE) {
 			PSRC | PIMM or PSRC | PSIND =>
 				inst[x].src += d;
 			* =>
 				error("bad reloc");
 			}
+			#trace(JDEBUG, sys->sprint("%sinst[%d](%d, %d, %d)", debugs, x, inst[x].src, inst[x].mid, inst[x].dst));
 		}
 	} else {
 		for (i := 0; i < n; i++) {
 	}
 	exception e
 	{
-		"*" =>
+		"*disabled" =>
 			m := sys->sprint("uncaught exception: %s", e);
 			mesg(m);
 			if ( (obj := culprit(e)) != nil)