git: 9front

Info  •  Files  •  Log  •  Branches

bring kernel acid library in sync (import from sources)

--- a/sys/lib/acid/kernel

+++ b/sys/lib/acid/kernel

@@ -32,7 +32,7 @@

 defn imagecacheline(h) {

 	while h != 0 do {

 		complex Image h;

-		print (h\X, " ", qid(h.qid), " type ", h.type\D, " ref ", h.ref, " next ", h.next\X, " ", cname(h.c), "\n");

+		print (h\X, " ", qid(h.qid), " type ", h.type\D, " ref ", h.ref, " next ", h.next\X, " ", path(h.c.path), "\n");

 		h = h.hash;

 	}

 }

@@ -46,10 +46,6 @@

 	}

 }

-defn cname(c) {

-	return *(((Path)c.path).s\s);

-}

-

 // dump channels

 defn chan(c) {

 	local d, q;

@@ -60,9 +56,9 @@

 	print("chan(", c\X, "): ref=", c.ref\D, " #", d.dc\r, c.dev\D, " (", q.path, " ", q.vers\D, " ", q.type\X, ")");

 	print(" fid=", c.fid\D, " iounit=", c.iounit\D);

 	if c.ref != 0 then {

-		print(" ", cname(c), " mchan=", c.mchan\X);

+		print(" ", path(c.path), " mchan=", c.mchan\X);

 		if c.mchan != 0 then {

-			print(" ", cname(c.mchan));

+			print(" ", path(c.mchan.path));

 		}

 	}

 	print("\n");

@@ -190,7 +186,7 @@

 	e = p.egrp;

 	complex Egrp e;

-	v = e.entries;

+	v = e.ent;

 	while v != 0 do {

 		complex Evalue v;

 		print(*(v.name\s), "=");

@@ -337,7 +333,7 @@

 defn up() {

 	local mach;

-	MACHADDR = KZERO+0x4000;

+	MACHADDR = KZERO+0x15000;

 	mach = MACHADDR;

 	complex Mach mach;

 	return mach.externup;

-- 

⑨