From b92f5111328b52859c3cc4afb53c2e2282856ab7 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 21 Jul 1990 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1990-07-21

---
 gnot/dat.h      |    1 +
 gnot/main.c     |    4 +-
 gnot/sturp.c    |   29 +-
 port/devbit.c   |   52 +-
 port/devlance.c |    2 +-
 port/sturp.c    |   29 +-
 power/boot.c    |   39 +-
 power/boot.h    | 1290 ++++++++++++++++++++++++-----------------------
 power/dat.h     |    1 +
 9 files changed, 776 insertions(+), 671 deletions(-)

diff --git a/gnot/dat.h b/gnot/dat.h
index 487ef5c6350cfce7618d7879e4509cfc31c6ae2b..42dab4ef894883bdef51085eef833deaaa14108a 100644
--- a/gnot/dat.h
+++ b/gnot/dat.h
@@ -417,6 +417,7 @@ struct Queue {
 #define QHUNGUP	0x1	/* flag bit meaning the stream has been hung up */
 #define QINUSE	0x2
 #define QHIWAT	0x4	/* queue has gone past the high water mark */	
+#define QDEBUG	0x8
 
 /*
  *  a stream head
diff --git a/gnot/main.c b/gnot/main.c
index 185a4402a679376cba3fa2820956aa4e5bb2a9e7..f8551ff819d1cbf6213db1dcf09e7d4932da5124 100644
--- a/gnot/main.c
+++ b/gnot/main.c
@@ -289,13 +289,13 @@ confinit(void)
 	conf.base1 = 16*1024*1024;
 	conf.npage = conf.npage0+conf.npage1;
 	mul = 1 + (conf.npage1>0);
-	conf.nproc = 40*mul;
+	conf.nproc = 50*mul;
 	conf.npgrp = 12*mul;
 	conf.npte = 700*mul;
 	conf.nmod = 400*mul;
 	conf.nalarm = 1000;
 	conf.norig = 150*mul;
-	conf.nchan = 150*mul;
+	conf.nchan = 200*mul;
 	conf.nenv = 100*mul;
 	conf.nenvchar = 8000*mul;
 	conf.npgenv = 200*mul;
diff --git a/gnot/sturp.c b/gnot/sturp.c
index 2ebfe9f3e635dda8bb94998278fdbb8bc967898f..a6879dc8ccef1fbff799e5511a68737309705caa 100644
--- a/gnot/sturp.c
+++ b/gnot/sturp.c
@@ -11,7 +11,7 @@ enum {
 	Nmask=		0x7,
 };
 
-#define DPRINT if(0)
+#define DPRINT if(q->flag&QDEBUG)kprint
 
 typedef struct Urp	Urp;
 
@@ -438,8 +438,9 @@ urpiput(Queue *q, Block *bp)
 		break;
 
 	case BOT:
-	case BOTS:
 	case BOTM:
+	case BOTS:
+		DPRINT("rBOT%d...", ctl-BOT);
 		up->trx = 1;
 		up->trbuf[0] = ctl;
 		break;
@@ -458,8 +459,8 @@ urpiput(Queue *q, Block *bp)
 		break;
 
 	/*
-	 *  if the seuence number is the next expected
-	 *	and te trailer length == 3
+	 *  if the sequence number is the next expected
+	 *	and the trailer length == 3
 	 *	and the block count matches the bytes received
 	 *  then send the bytes upstream.
 	 */
@@ -483,6 +484,7 @@ urpiput(Queue *q, Block *bp)
 			flushinput(up);
 			break;
 		}
+		DPRINT("rSEQ%d accept %d\n", i, q->len);
 
 		/*
 		 *  send data upstream
@@ -536,6 +538,21 @@ urpctloput(Urp *up, Queue *q, Block *bp)
 			freeb(bp);
 			return;
 		}
+		if(streamparse("debug", bp)){
+			switch(getfields((char *)bp->rptr, fields, 2, ' ')){
+			case 1:
+				if (strcmp(fields[0], "on") == 0) {
+					q->flag |= QDEBUG;
+					q->other->flag |= QDEBUG;
+				}
+				if (strcmp(fields[0], "off") == 0) {
+					q->flag &= ~QDEBUG;
+					q->other->flag &= ~QDEBUG;
+				}
+			}
+			freeb(bp);
+			return;
+		}
 	}
 	PUTNEXT(q, bp);
 }
@@ -688,6 +705,7 @@ sendctl(Urp *up, int ctl)
 static void
 sendrej(Urp *up)
 {
+	Queue *q = up->wq;
 	flushinput(up);
 	qlock(&up->ack);
 	if((up->lastecho&~Nmask) == ECHO){
@@ -923,9 +941,10 @@ todo(void *arg)
 static void
 urpkproc(void *arg)
 {
-	Urp *up;
+	Urp *up; Queue *q;
 
 	up = (Urp *)arg;
+	q = up->wq;
 
 	if(waserror()){
 		print("urpkproc error %ux\n", up);
diff --git a/port/devbit.c b/port/devbit.c
index 5c8fa65d9755aa61500aa4776209ffa9f833f321..382b4f7fe034311380dd05989081a54d3efefbcb 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -471,7 +471,7 @@ bitwrite(Chan *c, void *va, long n)
 	uchar *p, *q;
 	long m, v, miny, maxy, t, x, y;
 	ulong l, nw, ws;
-	int off, i;
+	int off, isoff, i;
 	Point pt, pt1, pt2;
 	Rectangle rect;
 	Cursor curs;
@@ -485,6 +485,12 @@ bitwrite(Chan *c, void *va, long n)
 	if(c->qid != Qbitblt)
 		error(0, Egreg);
 
+	isoff = 0;
+	if(waserror()){
+		if(isoff)
+			cursoron(1);
+		nexterror();
+	}
 	p = va;
 	m = n;
 	while(m > 0)
@@ -580,11 +586,11 @@ bitwrite(Chan *c, void *va, long n)
 			rect.max.x = GLONG(p+21);
 			rect.max.y = GLONG(p+25);
 			v = GSHORT(p+29);
-			if(off)
+			if(off && !isoff){
 				cursoroff(1);
+				isoff = 1;
+			}
 			bitblt(dst, pt, src, rect, v);
-			if(off)
-				cursoron(1);
 			m -= 31;
 			p += 31;
 			break;
@@ -599,9 +605,11 @@ bitwrite(Chan *c, void *va, long n)
 			 *	set		32
 			 */
 			if(m == 1){
-				cursoroff(1);
+				if(!isoff){
+					cursoroff(1);
+					isoff = 1;
+				}
 				Cursortocursor(&arrow);
-				cursoron(1);
 				m -= 1;
 				p += 1;
 				break;
@@ -612,9 +620,11 @@ bitwrite(Chan *c, void *va, long n)
 			curs.offset.y = GLONG(p+5);
 			memcpy(curs.clr, p+9, 2*16);
 			memcpy(curs.set, p+41, 2*16);
-			cursoroff(1);
+			if(!isoff){
+				cursoroff(1);
+				isoff = 1;
+			}
 			Cursortocursor(&curs);
-			cursoron(1);
 			m -= 73;
 			p += 73;
 			break;
@@ -736,11 +746,11 @@ bitwrite(Chan *c, void *va, long n)
 			pt2.y = GLONG(p+15);
 			t = p[19];
 			v = GSHORT(p+20);
-			if(off)
+			if(off && !isoff){
 				cursoroff(1);
+				isoff = 1;
+			}
 			segment(dst, pt1, pt2, t, v);
-			if(off)
-				cursoron(1);
 			m -= 22;
 			p += 22;
 			break;
@@ -801,11 +811,11 @@ bitwrite(Chan *c, void *va, long n)
 			q = memchr(p, 0, m);
 			if(q == 0)
 				error(0, Ebadblt);
-			if(off)
+			if(off && !isoff){
 				cursoroff(1);
+				isoff = 1;
+			}
 			string(dst, pt, f, (char*)p, v);
-			if(off)
-				cursoron(1);
 			q++;
 			m -= q-p;
 			p = q;
@@ -846,11 +856,11 @@ bitwrite(Chan *c, void *va, long n)
 
 				for(i=0; i<16; i++)
 					t.bits[i] = src->base[i]>>16;
-				if(off)
+				if(off && !isoff){
 					cursoroff(1);
+					isoff = 1;
+				}
 				texture(dst, rect, &t, v);
-				if(off)
-					cursoron(1);
 			}
 			m -= 23;
 			p += 23;
@@ -891,8 +901,10 @@ bitwrite(Chan *c, void *va, long n)
 			m -= 11;
 			if(m < l*(maxy-miny))
 				error(0, Ebadblt);
-			if(off)
+			if(off && !isoff){
 				cursoroff(1);
+				isoff = 1;
+			}
 			for(y=miny; y<maxy; y++){
 				q = (uchar*)addr(dst, Pt(dst->r.min.x, y));
 				q += (dst->r.min.x&((sizeof(ulong))*ws-1))/8;
@@ -900,11 +912,11 @@ bitwrite(Chan *c, void *va, long n)
 					*q++ = U2K(*p++);
 				m -= l;
 			}
-			if(off)
-				cursoron(1);
 			break;
 		}
 
+	if(isoff)
+		cursoron(1);
 	return n;
 }
 
diff --git a/port/devlance.c b/port/devlance.c
index fa3d24145ef59b1d180547497a70c52875204cee..c922333f9f4dad0eb87b88d8928563516621204b 100644
--- a/port/devlance.c
+++ b/port/devlance.c
@@ -313,8 +313,8 @@ lancestclose(Queue *q)
 {
 	Ethertype *et;
 
-	qlock(et);
 	et = (Ethertype *)(q->ptr);
+	qlock(et);
 	et->type = 0;
 	et->q = 0;
 	qunlock(et);
diff --git a/port/sturp.c b/port/sturp.c
index 2ebfe9f3e635dda8bb94998278fdbb8bc967898f..8d923bb4fa1c12cb5ee05ef7c6d8dd715fa5422b 100644
--- a/port/sturp.c
+++ b/port/sturp.c
@@ -11,7 +11,7 @@ enum {
 	Nmask=		0x7,
 };
 
-#define DPRINT if(0)
+#define DPRINT /*if(q->flag&QDEBUG)kprint*/
 
 typedef struct Urp	Urp;
 
@@ -438,8 +438,9 @@ urpiput(Queue *q, Block *bp)
 		break;
 
 	case BOT:
-	case BOTS:
 	case BOTM:
+	case BOTS:
+		DPRINT("rBOT%d...", ctl-BOT);
 		up->trx = 1;
 		up->trbuf[0] = ctl;
 		break;
@@ -458,8 +459,8 @@ urpiput(Queue *q, Block *bp)
 		break;
 
 	/*
-	 *  if the seuence number is the next expected
-	 *	and te trailer length == 3
+	 *  if the sequence number is the next expected
+	 *	and the trailer length == 3
 	 *	and the block count matches the bytes received
 	 *  then send the bytes upstream.
 	 */
@@ -483,6 +484,7 @@ urpiput(Queue *q, Block *bp)
 			flushinput(up);
 			break;
 		}
+		DPRINT("rSEQ%d accept %d\n", i, q->len);
 
 		/*
 		 *  send data upstream
@@ -536,6 +538,21 @@ urpctloput(Urp *up, Queue *q, Block *bp)
 			freeb(bp);
 			return;
 		}
+		if(streamparse("debug", bp)){
+			switch(getfields((char *)bp->rptr, fields, 2, ' ')){
+			case 1:
+				if (strcmp(fields[0], "on") == 0) {
+					q->flag |= QDEBUG;
+					q->other->flag |= QDEBUG;
+				}
+				if (strcmp(fields[0], "off") == 0) {
+					q->flag &= ~QDEBUG;
+					q->other->flag &= ~QDEBUG;
+				}
+			}
+			freeb(bp);
+			return;
+		}
 	}
 	PUTNEXT(q, bp);
 }
@@ -688,6 +705,7 @@ sendctl(Urp *up, int ctl)
 static void
 sendrej(Urp *up)
 {
+	Queue *q = up->wq;
 	flushinput(up);
 	qlock(&up->ack);
 	if((up->lastecho&~Nmask) == ECHO){
@@ -923,9 +941,10 @@ todo(void *arg)
 static void
 urpkproc(void *arg)
 {
-	Urp *up;
+	Urp *up; Queue *q;
 
 	up = (Urp *)arg;
+	q = up->wq;
 
 	if(waserror()){
 		print("urpkproc error %ux\n", up);
diff --git a/power/boot.c b/power/boot.c
index 6b1406eab5d375a4d1360deb8249cd89b8b6de95..2a7bcaa8b850a8217c32f728637033020bf30eaa 100644
--- a/power/boot.c
+++ b/power/boot.c
@@ -22,22 +22,23 @@ typedef
 struct address {
 	char *name;
 	char *cmd;
+	char *srvname;
 } Address;
 
 Address addr[] = {
-	{ "bitbootes", "bitconnect" },
-	{ "ross", "connect 020701005eff" },
-	{ "bootes", "connect 080069020205" },
-	{ "helix", "connect 080069020427" },
-	{ "spindle", "connect 0800690202df" },
-	{ "r70", "connect 08002b04265d" },
+	{ "bitbootes", "bitconnect", "bit!bootes" },
+	{ "ross", "connect 020701005eff", "nonet!ross" },
+	{ "bootes", "connect 080069020205", "nonet!bootes" },
+	{ "helix", "connect 080069020427", "nonet!helix" },
+	{ "spindle", "connect 0800690202df", "nonet!spindle" },
+	{ "r70", "connect 08002b04265d", "nonet!r70" },
 	{ 0 }
 };
 
 /*
  *  predeclared
  */
-char	*lookup(char *);
+Address* lookup(char *);
 int	outin(char *, char *, char *, int);
 void	prerror(char *);
 void	error(char *);
@@ -106,18 +107,18 @@ void
 boot(int ask)
 {
 	int n, f;
+	Address *a;
 
-	if(!ask)
-		scmd = lookup(sys);
-	else {
+	if(ask){
 		outin("server", sys, sbuf, sizeof(sbuf));
 		sys = sbuf;
-		scmd = lookup(sys);
 	}
-	if(scmd == 0){
+	a = lookup(sys);
+	if(a == 0){
 		fprint(2, "boot: %s unknown\n", sys);
 		return;
 	}
+	scmd = a->cmd;
 
 	/*
 	 *  for the bit, we skip all the ether goo
@@ -148,16 +149,20 @@ boot(int ask)
 		prerror("push noether");
 		return;
 	}
+	if(write(efd, "config nonet", sizeof("config nonet")-1)<0){
+		prerror("config nonet");
+		return;
+	}
 
 	/*
 	 *  grab a nonet channel and call up the ross file server
 	 */
-	fd = open("#n/2/data", 2);
+	fd = open("#nnonet/2/data", 2);
 	if(fd < 0) {
 		prerror("opening #n/2/data");
 		return;
 	}
-	cfd = open("#n/2/ctl", 2);
+	cfd = open("#nnonet/2/ctl", 2);
 	if(cfd < 0){
 		prerror("opening #n/2/ctl");
 		return;
@@ -220,7 +225,7 @@ boot(int ask)
 	}
 
 	print("post...");
-	sprint(buf, "#s/%s", sys);
+	sprint(buf, "#s/%s", a->srvname);
 	f = create(buf, 1, 0666);
 	if(f < 0)
 		error("create");
@@ -279,7 +284,7 @@ error(char *s)
 /*
  *  lookup the address for a system
  */
-char *
+Address *
 lookup(char *arg)
 {
 	Address *a;
@@ -291,7 +296,7 @@ lookup(char *arg)
 	}
 	for(a = addr; a->name; a++){
 		if(strcmp(a->name, arg) == 0)
-			return a->cmd;
+			return a;
 	}
 	return 0;
 }
diff --git a/power/boot.h b/power/boot.h
index 735bf1139feee10884d0f17ea32816ac64c8990f..2167126d7aba174cd955ec7668de649723a6a6fd 100644
--- a/power/boot.h
+++ b/power/boot.h
@@ -1,7 +1,7 @@
 ulong bootcode[]={
 	0x000000407,
-	0x0000041b8,
-	0x000000548,
+	0x0000041f0,
+	0x0000005d0,
 	0x0000010d0,
 	0x000000000,
 	0x000001020,
@@ -16,43 +16,43 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x00c000415,
 	0x0afa20008,
-	0x00c000752,
+	0x00c000761,
 	0x0afa10004,
 	0x008000411,
 	0x000000027,
 	0x023bdffe4,
 	0x0afbf0000,
 	0x0afa00014,
-	0x023c18232,
+	0x023c18241,
 	0x0afa10004,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa00008,
-	0x023c1823a,
+	0x023c18249,
 	0x0afa10004,
 	0x020010001,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa10008,
-	0x023c18242,
+	0x023c18251,
 	0x0afa10004,
 	0x020010001,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa10008,
-	0x023c2824a,
+	0x023c28259,
 	0x0afa20004,
 	0x020020001,
 	0x0afa20008,
 	0x0200201b6,
-	0x00c000eb3,
+	0x00c000ec2,
 	0x0afa2000c,
 	0x004210004,
 	0x0afa10018,
-	0x023c18255,
-	0x00c00069c,
+	0x023c18264,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fa40024,
 	0x000000027,
 	0x08c850000,
-	0x00c000849,
+	0x00c000858,
 	0x0afa50004,
 	0x0afa10010,
 	0x08fa30018,
@@ -64,15 +64,15 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa40008,
 	0x08fa30010,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa3000c,
 	0x01c200004,
 	0x000000027,
-	0x023c1825d,
-	0x00c00069c,
+	0x023c1826c,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fa20018,
-	0x00c000eae,
+	0x00c000ebd,
 	0x0afa20004,
 	0x08fa80014,
 	0x0200a002d,
@@ -106,9 +106,9 @@ ulong bootcode[]={
 	0x000000027,
 	0x0104afff1,
 	0x000000027,
-	0x023c18265,
+	0x023c18274,
 	0x0afc18002,
-	0x023c1826f,
+	0x023c1827e,
 	0x038e30001,
 	0x010600029,
 	0x0afc18006,
@@ -121,21 +121,21 @@ ulong bootcode[]={
 	0x000000027,
 	0x018c00003,
 	0x000000027,
-	0x00c000eae,
+	0x00c000ebd,
 	0x0afa60004,
 	0x08fc28016,
 	0x000000027,
 	0x018400004,
 	0x000000027,
 	0x08fc28016,
-	0x00c000eae,
+	0x00c000ebd,
 	0x0afa20004,
 	0x08fc2801a,
 	0x000000027,
 	0x018400004,
 	0x000000027,
 	0x08fc2801a,
-	0x00c000eae,
+	0x00c000ebd,
 	0x0afa20004,
 	0x0afc0801a,
 	0x0afc08016,
@@ -155,465 +155,495 @@ ulong bootcode[]={
 	0x08cc30000,
 	0x008000474,
 	0x0afc38006,
-	0x023bdffdc,
+	0x023bdffd8,
 	0x0afbf0000,
 	0x08fc68002,
-	0x08fa20028,
+	0x08fa2002c,
 	0x000000027,
-	0x0144001d9,
+	0x01040000a,
 	0x000000027,
-	0x00c0006b1,
+	0x023c18286,
+	0x0afa10004,
+	0x0afa60008,
+	0x023c18056,
+	0x0afa1000c,
+	0x020010038,
+	0x00c000703,
+	0x0afa10010,
+	0x023c68056,
+	0x0afc68002,
+	0x00c0006c1,
 	0x0afa60004,
-	0x000013025,
-	0x014c0000c,
-	0x0afc6802e,
+	0x01420000c,
+	0x000000027,
 	0x020010002,
 	0x0afa10004,
-	0x023c1827e,
+	0x023c1828d,
 	0x0afa10008,
 	0x08fc28002,
-	0x00c0007a2,
+	0x00c0007b1,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
+	0x0afa1001c,
+	0x08c260004,
+	0x023c2829f,
+	0x0afc6802e,
 	0x0afa60004,
-	0x023c28290,
-	0x00c0007e0,
+	0x00c0007ef,
 	0x0afa20008,
-	0x014200165,
+	0x014200167,
 	0x020060002,
-	0x023c2829b,
+	0x023c282aa,
 	0x0afa20004,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa60008,
 	0x004210008,
 	0x0afc18052,
-	0x023c182a3,
-	0x00c000689,
+	0x023c182b2,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c18339,
-	0x00c00077d,
+	0x023bd0028,
+	0x023c1836c,
+	0x00c00078c,
 	0x0afa10004,
-	0x0a3c095ce,
-	0x023c295ce,
+	0x0a3c09656,
+	0x023c29656,
 	0x0afa20004,
-	0x023c285ce,
-	0x00c000861,
+	0x023c28656,
+	0x00c000870,
 	0x0afa20008,
 	0x08fc38052,
-	0x023c285ce,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
-	0x0afa10020,
-	0x00c000ed1,
+	0x0afa10024,
+	0x00c000ee0,
 	0x0afa1000c,
-	0x08fa60020,
+	0x08fa60024,
 	0x000000027,
 	0x01026000c,
 	0x000000027,
-	0x023c18340,
+	0x023c18373,
 	0x0afa10004,
-	0x00c00077d,
+	0x00c00078c,
 	0x0afa60008,
-	0x023c18348,
-	0x00c000689,
+	0x023c1837b,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
 	0x08fc38052,
-	0x023c285ce,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
 	0x020021000,
-	0x00c000ecc,
+	0x00c000edb,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c18352,
-	0x00c000689,
+	0x023c18385,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c285ce,
+	0x023bd0028,
+	0x023c28656,
 	0x0afa20004,
-	0x023c295ce,
+	0x023c29656,
 	0x0afa20008,
-	0x0afa10020,
-	0x00c000bfe,
+	0x0afa10024,
+	0x00c000c0d,
 	0x0afa1000c,
 	0x014200019,
 	0x000000027,
-	0x023c1835b,
+	0x023c1838e,
 	0x0afa10004,
-	0x08fa20020,
+	0x08fa20024,
 	0x000000027,
 	0x0afa20008,
-	0x083c285ce,
+	0x083c28656,
 	0x000000027,
 	0x0afa2000c,
-	0x083c285cf,
+	0x083c28657,
 	0x000000027,
 	0x0afa20010,
-	0x083c285d0,
+	0x083c28658,
 	0x000000027,
 	0x0afa20014,
-	0x083c285d1,
-	0x00c00077d,
+	0x083c28659,
+	0x00c00078c,
 	0x0afa20018,
-	0x023c1837e,
-	0x00c000689,
+	0x023c183b1,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x083c295ce,
+	0x023bd0028,
+	0x083c29656,
 	0x020030001,
 	0x010430008,
 	0x000000027,
-	0x023c18389,
-	0x00c000689,
+	0x023c183bc,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c18392,
-	0x00c00077d,
+	0x023bd0028,
+	0x023c183c5,
+	0x00c00078c,
 	0x0afa10004,
 	0x020010002,
-	0x0a3c195ce,
+	0x0a3c19656,
 	0x020020076,
-	0x0a3c295da,
-	0x023c295ce,
+	0x0a3c29662,
+	0x023c29656,
 	0x0afa20004,
-	0x023c285ce,
-	0x00c000861,
+	0x023c28656,
+	0x00c000870,
 	0x0afa20008,
 	0x08fc38052,
-	0x023c285ce,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
-	0x0afa10020,
-	0x00c000ed1,
+	0x0afa10024,
+	0x00c000ee0,
 	0x0afa1000c,
-	0x08fa30020,
+	0x08fa30024,
 	0x000000027,
 	0x010230008,
 	0x000000027,
-	0x023c1839d,
-	0x00c000689,
+	0x023c183d0,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
 	0x08fc38052,
-	0x023c285ce,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
 	0x020021000,
-	0x00c000ecc,
+	0x00c000edb,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c183ab,
-	0x00c000689,
+	0x023c183de,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c285ce,
+	0x023bd0028,
+	0x023c28656,
 	0x0afa20004,
-	0x023c295ce,
+	0x023c29656,
 	0x0afa20008,
-	0x00c000bfe,
+	0x00c000c0d,
 	0x0afa1000c,
 	0x014200008,
 	0x000000027,
-	0x023c183b8,
-	0x00c000689,
+	0x023c183eb,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x083c295ce,
+	0x023bd0028,
+	0x083c29656,
 	0x020030003,
 	0x010430008,
 	0x000000027,
-	0x023c183c7,
-	0x00c000689,
+	0x023c183fa,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x087c295d2,
+	0x023bd0028,
+	0x087c2965a,
 	0x000000027,
 	0x01040000d,
 	0x000000027,
-	0x023c183d4,
+	0x023c18407,
 	0x0afa10004,
-	0x087c295d2,
-	0x00c00077d,
+	0x087c2965a,
+	0x00c00078c,
 	0x0afa20008,
-	0x023c183de,
-	0x00c000689,
+	0x023c18411,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c183eb,
-	0x00c00077d,
+	0x023bd0028,
+	0x023c1841e,
+	0x00c00078c,
 	0x0afa10004,
-	0x023c185ce,
+	0x023c18656,
 	0x0afa10004,
-	0x023c183f3,
+	0x023c18426,
 	0x0afa10008,
-	0x08fc28002,
-	0x00c0007c7,
-	0x0afa2000c,
-	0x023c285ce,
+	0x08fa2001c,
+	0x000000027,
+	0x08c430008,
+	0x00c0007d6,
+	0x0afa3000c,
+	0x023c28656,
 	0x0afa20004,
 	0x020020001,
 	0x0afa20008,
 	0x0200201b6,
-	0x00c000eb3,
+	0x00c000ec2,
 	0x0afa2000c,
 	0x004210004,
-	0x0afa1001c,
-	0x023c183f9,
-	0x00c00069c,
+	0x0afa10020,
+	0x023c1842c,
+	0x00c0006ac,
 	0x0afa10004,
-	0x023c185ce,
+	0x023c18656,
 	0x0afa10004,
-	0x023c18400,
+	0x023c18433,
 	0x0afa10008,
 	0x08fc28052,
-	0x00c0007c7,
+	0x00c0007d6,
 	0x0afa2000c,
-	0x023c285ce,
-	0x00c000849,
+	0x023c28656,
+	0x00c000858,
 	0x0afa20004,
 	0x0afa10018,
-	0x023c385ce,
-	0x00c000849,
+	0x023c38656,
+	0x00c000858,
 	0x0afa30004,
 	0x0afa10014,
-	0x08fa3001c,
-	0x023c285ce,
+	0x08fa30020,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
 	0x08fa30014,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa3000c,
 	0x08fa30018,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c18403,
-	0x00c00069c,
+	0x023c18436,
+	0x00c0006ac,
 	0x0afa10004,
-	0x08fa2001c,
-	0x00c000eae,
+	0x08fa20020,
+	0x00c000ebd,
 	0x0afa20004,
-	0x023c28409,
+	0x023c2843c,
 	0x0afa20004,
 	0x020020001,
 	0x0afa20008,
 	0x0200201b6,
-	0x00c000eb3,
+	0x00c000ec2,
 	0x0afa2000c,
 	0x004210004,
-	0x0afa1001c,
-	0x023c18411,
-	0x00c00069c,
+	0x0afa10020,
+	0x023c18444,
+	0x00c0006ac,
 	0x0afa10004,
-	0x023c185ce,
+	0x023c18656,
 	0x0afa10004,
-	0x023c18418,
+	0x023c1844b,
 	0x0afa10008,
 	0x08fc28052,
-	0x00c0007c7,
+	0x00c0007d6,
 	0x0afa2000c,
-	0x023c285ce,
-	0x00c000849,
+	0x023c28656,
+	0x00c000858,
 	0x0afa20004,
 	0x0afa10018,
-	0x023c385ce,
-	0x00c000849,
+	0x023c38656,
+	0x00c000858,
 	0x0afa30004,
 	0x0afa10014,
-	0x08fa3001c,
-	0x023c285ce,
+	0x08fa30020,
+	0x023c28656,
 	0x0afa30004,
 	0x0afa20008,
 	0x08fa30014,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa3000c,
 	0x08fa30018,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c1841b,
-	0x00c00069c,
+	0x023c1844e,
+	0x00c0006ac,
 	0x0afa10004,
-	0x08fa2001c,
-	0x00c000eae,
+	0x08fa20020,
+	0x00c000ebd,
 	0x0afa20004,
-	0x023c18421,
-	0x00c00077d,
+	0x023c18454,
+	0x00c00078c,
 	0x0afa10004,
-	0x023c2842a,
+	0x023c2845d,
 	0x0afa20004,
-	0x023c2842c,
+	0x023c2845f,
 	0x0afa20008,
-	0x00c000ea9,
+	0x00c000eb8,
 	0x0afa0000c,
 	0x004210004,
 	0x000000027,
-	0x023c1842e,
-	0x00c00069c,
+	0x023c18461,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fc38052,
-	0x023c28433,
+	0x023c28466,
 	0x0afa30004,
 	0x0afa20008,
 	0x020020006,
 	0x0afa2000c,
-	0x023c28435,
-	0x00c000ec2,
+	0x023c28468,
+	0x00c000ed1,
 	0x0afa20010,
 	0x004210004,
 	0x000000027,
-	0x023c18436,
-	0x00c00069c,
+	0x023c18469,
+	0x00c0006ac,
 	0x0afa10004,
-	0x023c1843c,
-	0x00c00077d,
+	0x023c1846f,
+	0x00c00078c,
 	0x0afa10004,
 	0x08fc28052,
-	0x00c000eae,
+	0x00c000ebd,
 	0x0afa20004,
-	0x08fa20028,
+	0x08fa2002c,
 	0x000000027,
 	0x010400010,
 	0x000000027,
-	0x023c18445,
+	0x023c18478,
 	0x0afa10004,
-	0x023c18450,
+	0x023c18483,
 	0x0afa10008,
-	0x023c18455,
+	0x023c18488,
 	0x0afa1000c,
-	0x00c000855,
+	0x00c000864,
 	0x0afa00010,
-	0x023c18468,
-	0x00c00069c,
+	0x023c1849b,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c18458,
+	0x023bd0028,
+	0x023c1848b,
 	0x0afa10004,
-	0x023c18463,
+	0x023c18496,
 	0x0afa10008,
-	0x00c000855,
+	0x00c000864,
 	0x0afa0000c,
-	0x023c18468,
-	0x00c00069c,
+	0x023c1849b,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c282b3,
+	0x023bd0028,
+	0x023c282c2,
 	0x0afa20004,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa60008,
 	0x004210008,
 	0x0afc1801a,
-	0x023c182bc,
-	0x00c000689,
+	0x023c182cb,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
 	0x0afa10004,
-	0x023c282cd,
+	0x023c282dc,
 	0x0afa20008,
 	0x02002000d,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa2000c,
 	0x004210008,
 	0x000000027,
-	0x023c182db,
-	0x00c000689,
+	0x023c182ea,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
 	0x08fc3801a,
-	0x023c282e9,
+	0x023c282f8,
 	0x0afa30004,
 	0x0afa20008,
 	0x02002000c,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa2000c,
 	0x004210008,
 	0x000000027,
-	0x023c182f6,
-	0x00c000689,
+	0x023c18305,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c28303,
+	0x023bd0028,
+	0x08fc3801a,
+	0x023c28312,
+	0x0afa30004,
+	0x0afa20008,
+	0x02002000c,
+	0x00c000ee0,
+	0x0afa2000c,
+	0x004210008,
+	0x000000027,
+	0x023c1831f,
+	0x00c000699,
+	0x0afa10004,
+	0x08fa20000,
+	0x000000027,
+	0x000400008,
+	0x023bd0028,
+	0x023c2832c,
 	0x0afa20004,
 	0x020020002,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa20008,
 	0x004210008,
 	0x0afc18052,
-	0x023c1830d,
-	0x00c000689,
+	0x023c1833b,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c2831f,
+	0x023bd0028,
+	0x023c2834d,
 	0x0afa20004,
 	0x020020002,
-	0x00c000ec7,
+	0x00c000ed6,
 	0x0afa20008,
 	0x004210008,
 	0x0afc18016,
-	0x023c18328,
-	0x00c000689,
+	0x023c1835b,
+	0x00c000699,
 	0x0afa10004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
+	0x023bd0028,
 	0x08fc4802e,
-	0x00c000849,
+	0x00c000858,
 	0x0afa40004,
 	0x0afa10018,
 	0x08fc38016,
@@ -623,45 +653,31 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa30008,
 	0x08fa30018,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa3000c,
-	0x00421fe53,
+	0x00421fe41,
 	0x000000027,
 	0x08fc2802e,
-	0x00c000689,
+	0x00c000699,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
-	0x023bd0024,
-	0x023c18277,
-	0x0afa10004,
-	0x0afa60008,
-	0x023c1808e,
-	0x0afa1000c,
-	0x020010038,
-	0x00c0006f4,
-	0x0afa10010,
-	0x023c1808e,
-	0x0afc18002,
-	0x00c0006b1,
-	0x0afa10004,
-	0x0080004a6,
-	0x000013025,
+	0x023bd0028,
 	0x023bdffac,
 	0x0afbf0000,
 	0x0afa00004,
 	0x023a10014,
-	0x00c000eb8,
+	0x00c000ec7,
 	0x0afa10008,
 	0x020010002,
 	0x0afa10004,
-	0x023c18473,
+	0x023c184a6,
 	0x0afa10008,
 	0x08fa20058,
 	0x023a10014,
 	0x0afa2000c,
-	0x00c0007a2,
+	0x00c0007b1,
 	0x0afa10010,
 	0x08fa20000,
 	0x000000027,
@@ -671,18 +687,18 @@ ulong bootcode[]={
 	0x0afbf0000,
 	0x0afa00004,
 	0x023a10014,
-	0x00c000eb8,
+	0x00c000ec7,
 	0x0afa10008,
 	0x020010002,
 	0x0afa10004,
-	0x023c18481,
+	0x023c184b4,
 	0x0afa10008,
 	0x08fa20058,
 	0x023a10014,
 	0x0afa2000c,
-	0x00c0007a2,
+	0x00c0007b1,
 	0x0afa10010,
-	0x00c000761,
+	0x00c000770,
 	0x0afa00004,
 	0x08fa20000,
 	0x000000027,
@@ -691,62 +707,61 @@ ulong bootcode[]={
 	0x023bdfff0,
 	0x0afbf0000,
 	0x08fa30014,
-	0x023c2848f,
+	0x023c284c2,
 	0x0afa30004,
-	0x00c0007e0,
+	0x00c0007ef,
 	0x0afa20008,
-	0x010200025,
+	0x010200024,
 	0x000000027,
 	0x08fa30014,
-	0x023c28491,
+	0x023c284c4,
 	0x0afa30004,
-	0x00c0007e0,
+	0x00c0007ef,
 	0x0afa20008,
-	0x01020001e,
+	0x01020001d,
 	0x000000027,
-	0x023c58056,
+	0x023c5857e,
 	0x08ca30000,
 	0x000000027,
-	0x010600015,
+	0x010600014,
 	0x000000027,
 	0x0afa5000c,
 	0x08ca40000,
 	0x000000027,
 	0x0afa40004,
 	0x08fa30014,
-	0x00c0007e0,
+	0x00c0007ef,
 	0x0afa30008,
 	0x08fa5000c,
-	0x014200006,
+	0x014200005,
 	0x000000027,
-	0x08ca10004,
 	0x08fa20000,
-	0x000000027,
-	0x000400008,
 	0x023bd0010,
-	0x024a50008,
+	0x000400008,
+	0x000050825,
+	0x024a5000c,
 	0x08ca30000,
 	0x000000027,
-	0x01460ffed,
+	0x01460ffee,
 	0x000000027,
 	0x08fa20000,
 	0x023bd0010,
 	0x000400008,
 	0x000000825,
-	0x023c58056,
+	0x023c5857e,
 	0x08ca30000,
 	0x000000027,
 	0x01060000e,
 	0x000000027,
-	0x023c18496,
+	0x023c184c9,
 	0x0afa10004,
 	0x0afa5000c,
 	0x08ca30000,
-	0x00c00077d,
+	0x00c00078c,
 	0x0afa30008,
 	0x08fa2000c,
 	0x000000027,
-	0x024450008,
+	0x02445000c,
 	0x08ca30000,
 	0x000000027,
 	0x01460fff4,
@@ -757,29 +772,29 @@ ulong bootcode[]={
 	0x000000825,
 	0x023bdffec,
 	0x0afbf0000,
-	0x023c1849a,
+	0x023c184cd,
 	0x0afa10004,
 	0x08fa20018,
 	0x000000027,
 	0x0afa20008,
 	0x08fa2001c,
-	0x00c00077d,
+	0x00c00078c,
 	0x0afa2000c,
 	0x0afa00004,
 	0x08fa30020,
 	0x000000027,
 	0x0afa30008,
 	0x08fa30024,
-	0x00c000ecc,
+	0x00c000edb,
 	0x0afa3000c,
 	0x014200003,
 	0x000012825,
-	0x0080006f6,
+	0x008000705,
 	0x000000027,
 	0x004210006,
 	0x0afa10010,
-	0x023c184a3,
-	0x00c00069c,
+	0x023c184d6,
+	0x00c0006ac,
 	0x0afa10004,
 	0x08fa50010,
 	0x000000027,
@@ -790,7 +805,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20004,
 	0x08fa2001c,
-	0x00c000809,
+	0x00c000818,
 	0x0afa20008,
 	0x08fa50010,
 	0x08fa20000,
@@ -809,7 +824,7 @@ ulong bootcode[]={
 	0x000002025,
 	0x028810021,
 	0x010200011,
-	0x023c5854a,
+	0x023c585d2,
 	0x000040880,
 	0x000250821,
 	0x08c210000,
@@ -834,7 +849,7 @@ ulong bootcode[]={
 	0x000001825,
 	0x028610021,
 	0x01020000d,
-	0x023c4854a,
+	0x023c485d2,
 	0x000030880,
 	0x000240821,
 	0x08c210000,
@@ -855,10 +870,10 @@ ulong bootcode[]={
 	0x000000027,
 	0x014200003,
 	0x000000027,
-	0x00c000761,
+	0x00c000770,
 	0x0afa00004,
 	0x023c2803a,
-	0x00c000761,
+	0x00c000770,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
@@ -866,7 +881,7 @@ ulong bootcode[]={
 	0x023bd0008,
 	0x023bdfff0,
 	0x0afbf0000,
-	0x023c5854a,
+	0x023c585d2,
 	0x020030020,
 	0x004600010,
 	0x000000027,
@@ -882,11 +897,11 @@ ulong bootcode[]={
 	0x00080f809,
 	0x0ac200000,
 	0x08fa3000c,
-	0x023c5854a,
-	0x008000765,
+	0x023c585d2,
+	0x008000774,
 	0x02463ffff,
 	0x08fa20014,
-	0x00c000ea4,
+	0x00c000eb3,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
@@ -902,14 +917,14 @@ ulong bootcode[]={
 	0x023a21020,
 	0x0afa3000c,
 	0x024420004,
-	0x00c000efd,
+	0x00c000f0c,
 	0x0afa20010,
 	0x023a6001c,
 	0x020020001,
 	0x0afa20004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
@@ -921,7 +936,7 @@ ulong bootcode[]={
 	0x014400006,
 	0x0afc1800a,
 	0x020010001,
-	0x00c000752,
+	0x00c000761,
 	0x0afa10004,
 	0x08fa50014,
 	0x000000027,
@@ -939,14 +954,14 @@ ulong bootcode[]={
 	0x023a21024,
 	0x0afa3000c,
 	0x024420004,
-	0x00c000efd,
+	0x00c000f0c,
 	0x0afa20010,
 	0x08fa31020,
 	0x023a6001c,
 	0x0afa30004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000ed1,
+	0x00c000ee0,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
@@ -958,7 +973,7 @@ ulong bootcode[]={
 	0x014400006,
 	0x0afc1800a,
 	0x020010001,
-	0x00c000752,
+	0x00c000761,
 	0x0afa10004,
 	0x08fa50014,
 	0x000000027,
@@ -978,7 +993,7 @@ ulong bootcode[]={
 	0x023a20024,
 	0x0afa3000c,
 	0x024420004,
-	0x00c000efd,
+	0x00c000f0c,
 	0x0afa20010,
 	0x000012825,
 	0x08fa10014,
@@ -1101,7 +1116,7 @@ ulong bootcode[]={
 	0x08fa30010,
 	0x000000027,
 	0x0afa30004,
-	0x00c00134d,
+	0x00c00135c,
 	0x0afa00008,
 	0x08fa30010,
 	0x08fa20000,
@@ -1114,7 +1129,7 @@ ulong bootcode[]={
 	0x023a30010,
 	0x0afa20004,
 	0x024630004,
-	0x00c000ebd,
+	0x00c000ecc,
 	0x0afa30008,
 	0x08fa20000,
 	0x000000027,
@@ -1157,10 +1172,10 @@ ulong bootcode[]={
 	0x038220003,
 	0x01040000a,
 	0x000000027,
-	0x023c180ca,
+	0x023c18092,
 	0x0afa10004,
 	0x080820000,
-	0x00c00077d,
+	0x00c00078c,
 	0x0afa20008,
 	0x08fa20000,
 	0x023bd0014,
@@ -1203,7 +1218,7 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x024810008,
 	0x0afa10008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa10010,
 	0x02002001c,
@@ -1214,7 +1229,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024210024,
 	0x0afa10008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa2000c,
 	0x08fa10010,
 	0x08fa2001c,
@@ -1233,7 +1248,7 @@ ulong bootcode[]={
 	0x03822000d,
 	0x010400003,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084810002,
 	0x000000027,
@@ -1324,7 +1339,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x02482000c,
 	0x0afa20008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa20010,
 	0x000000027,
@@ -1353,7 +1368,7 @@ ulong bootcode[]={
 	0x038220012,
 	0x010400003,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084820002,
 	0x024a10002,
@@ -1366,7 +1381,7 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x02481000c,
 	0x0afa10008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa60018,
 	0x08fa10010,
@@ -1425,7 +1440,7 @@ ulong bootcode[]={
 	0x038220016,
 	0x010400003,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084810002,
 	0x000000027,
@@ -1466,7 +1481,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08c81000c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa1000c,
 	0x08fa20018,
 	0x08fa10010,
@@ -1507,7 +1522,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa10008,
 	0x08c82000c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa2000c,
 	0x08fa10018,
 	0x08fa20010,
@@ -1611,7 +1626,7 @@ ulong bootcode[]={
 	0x03822001b,
 	0x01040fe89,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084820002,
 	0x000000027,
@@ -1636,7 +1651,7 @@ ulong bootcode[]={
 	0x03822001f,
 	0x01040fe70,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084810002,
 	0x024a20002,
@@ -1649,7 +1664,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024820008,
 	0x0afa20008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa20010,
 	0x000000027,
@@ -1679,7 +1694,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024820008,
 	0x0afa20008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa20010,
 	0x000000027,
@@ -1726,7 +1741,7 @@ ulong bootcode[]={
 	0x038220023,
 	0x010400003,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084820002,
 	0x000000027,
@@ -1746,7 +1761,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024820008,
 	0x0afa20008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa20010,
 	0x000000027,
@@ -1797,7 +1812,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024820008,
 	0x0afa20008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa20010,
 	0x000000027,
@@ -1818,7 +1833,7 @@ ulong bootcode[]={
 	0x038220027,
 	0x01040ff00,
 	0x000000027,
-	0x008000886,
+	0x008000895,
 	0x000000027,
 	0x084820002,
 	0x000000027,
@@ -1860,7 +1875,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08c81000c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa1000c,
 	0x08fa20018,
 	0x08fa10010,
@@ -1902,7 +1917,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa10008,
 	0x08c82000c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa2000c,
 	0x08fa10018,
 	0x08fa20010,
@@ -1925,7 +1940,7 @@ ulong bootcode[]={
 	0x08fa10018,
 	0x000000027,
 	0x0afa10008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa2000c,
 	0x08fa30018,
 	0x08fa10010,
@@ -2084,10 +2099,10 @@ ulong bootcode[]={
 	0x038410003,
 	0x01020000a,
 	0x000000027,
-	0x023c280d8,
+	0x023c280a0,
 	0x0afa20004,
 	0x080a10000,
-	0x00c00077d,
+	0x00c00078c,
 	0x0afa10008,
 	0x08fa20000,
 	0x023bd0014,
@@ -2118,7 +2133,7 @@ ulong bootcode[]={
 	0x080210000,
 	0x000000027,
 	0x0a0a1000c,
-	0x008000c34,
+	0x008000c43,
 	0x024840001,
 	0x090820000,
 	0x090810001,
@@ -2130,7 +2145,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa10010,
 	0x08fa2001c,
@@ -2140,10 +2155,10 @@ ulong bootcode[]={
 	0x0afa40010,
 	0x0afa40008,
 	0x02002001c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa2000c,
 	0x08fa10010,
-	0x008000c34,
+	0x008000c43,
 	0x02424001c,
 	0x03841000b,
 	0x010200023,
@@ -2154,7 +2169,7 @@ ulong bootcode[]={
 	0x03841000d,
 	0x010200003,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090810000,
 	0x090820001,
@@ -2167,7 +2182,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000021200,
 	0x000220825,
-	0x008000c34,
+	0x008000c43,
 	0x0a4a10004,
 	0x090820000,
 	0x090810001,
@@ -2180,7 +2195,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000010a00,
 	0x000411025,
-	0x008000c34,
+	0x008000c43,
 	0x0a4a2000a,
 	0x090810000,
 	0x090820001,
@@ -2205,7 +2220,7 @@ ulong bootcode[]={
 	0x000021600,
 	0x000220825,
 	0x024840004,
-	0x008000c34,
+	0x008000c43,
 	0x0aca10010,
 	0x090820000,
 	0x090810001,
@@ -2217,10 +2232,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa10010,
-	0x008000c34,
+	0x008000c43,
 	0x02424001c,
 	0x02441ffed,
 	0x01c20003c,
@@ -2239,7 +2254,7 @@ ulong bootcode[]={
 	0x038410012,
 	0x010200003,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090820000,
 	0x090810001,
@@ -2251,7 +2266,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa5001c,
 	0x08fa10010,
@@ -2271,7 +2286,7 @@ ulong bootcode[]={
 	0x024810004,
 	0x024240001,
 	0x080210000,
-	0x008000c34,
+	0x008000c43,
 	0x0a0a10028,
 	0x090820000,
 	0x090810001,
@@ -2282,7 +2297,7 @@ ulong bootcode[]={
 	0x024810002,
 	0x024240001,
 	0x080210000,
-	0x008000c34,
+	0x008000c43,
 	0x0a0a10028,
 	0x038410014,
 	0x01020003b,
@@ -2293,7 +2308,7 @@ ulong bootcode[]={
 	0x038410016,
 	0x010200003,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090820000,
 	0x090810001,
@@ -2321,7 +2336,7 @@ ulong bootcode[]={
 	0x0aca2000c,
 	0x0aca40010,
 	0x08ca2000c,
-	0x008000c34,
+	0x008000c43,
 	0x000822021,
 	0x090810000,
 	0x090820001,
@@ -2343,7 +2358,7 @@ ulong bootcode[]={
 	0x0aca1000c,
 	0x0aca40010,
 	0x08ca1000c,
-	0x008000c34,
+	0x008000c43,
 	0x000812021,
 	0x090820000,
 	0x090810001,
@@ -2368,7 +2383,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000010a00,
 	0x000411025,
-	0x008000c34,
+	0x008000c43,
 	0x0aca2000c,
 	0x090820000,
 	0x090810001,
@@ -2387,7 +2402,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000010a00,
 	0x000411025,
-	0x008000c34,
+	0x008000c43,
 	0x0aca2000c,
 	0x02441ffe0,
 	0x01c200059,
@@ -2411,14 +2426,14 @@ ulong bootcode[]={
 	0x03841001b,
 	0x01020ff02,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090810000,
 	0x090820001,
 	0x024840002,
 	0x000021200,
 	0x000220825,
-	0x008000c34,
+	0x008000c43,
 	0x0a4a10002,
 	0x03841001d,
 	0x010200018,
@@ -2429,7 +2444,7 @@ ulong bootcode[]={
 	0x03841001f,
 	0x01020fef0,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090810000,
 	0x090820001,
@@ -2441,10 +2456,10 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa20010,
-	0x008000c34,
+	0x008000c43,
 	0x024440040,
 	0x090820000,
 	0x090810001,
@@ -2462,10 +2477,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa10010,
-	0x008000c34,
+	0x008000c43,
 	0x024240040,
 	0x090810000,
 	0x090820001,
@@ -2478,7 +2493,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000021200,
 	0x000220825,
-	0x008000c34,
+	0x008000c43,
 	0x0a4a10004,
 	0x02441ffdc,
 	0x01c200045,
@@ -2494,7 +2509,7 @@ ulong bootcode[]={
 	0x038410023,
 	0x010200003,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090820000,
 	0x090810001,
@@ -2512,10 +2527,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa6000c,
 	0x08fa10010,
-	0x008000c34,
+	0x008000c43,
 	0x02424001c,
 	0x090810000,
 	0x090820001,
@@ -2528,7 +2543,7 @@ ulong bootcode[]={
 	0x024840002,
 	0x000021200,
 	0x000220825,
-	0x008000c34,
+	0x008000c43,
 	0x0a4a10008,
 	0x090820000,
 	0x090810001,
@@ -2546,10 +2561,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40010,
 	0x0afa40008,
-	0x00c001406,
+	0x00c001415,
 	0x0afa7000c,
 	0x08fa10010,
-	0x008000c34,
+	0x008000c43,
 	0x024240040,
 	0x038410025,
 	0x010200027,
@@ -2560,7 +2575,7 @@ ulong bootcode[]={
 	0x038410027,
 	0x01020ff43,
 	0x000000027,
-	0x008000c25,
+	0x008000c34,
 	0x000000027,
 	0x090810000,
 	0x090820001,
@@ -2590,7 +2605,7 @@ ulong bootcode[]={
 	0x024440001,
 	0x0aca40010,
 	0x08ca2000c,
-	0x008000c34,
+	0x008000c43,
 	0x000822021,
 	0x090820000,
 	0x090810001,
@@ -2614,7 +2629,7 @@ ulong bootcode[]={
 	0x024240001,
 	0x0aca40010,
 	0x08ca1000c,
-	0x008000c34,
+	0x008000c43,
 	0x000812021,
 	0x023bdffec,
 	0x0afbf0000,
@@ -2625,7 +2640,7 @@ ulong bootcode[]={
 	0x0afa40010,
 	0x0afa40008,
 	0x02001001c,
-	0x00c001406,
+	0x00c001415,
 	0x0afa1000c,
 	0x08fa4001c,
 	0x08fa20010,
@@ -2774,8 +2789,8 @@ ulong bootcode[]={
 	0x003e00008,
 	0x023bd0004,
 	0x023bdfffc,
-	0x08fc780c6,
-	0x023c684c6,
+	0x08fc7808e,
+	0x023c684fe,
 	0x083a2000b,
 	0x000000027,
 	0x03041007f,
@@ -2798,13 +2813,13 @@ ulong bootcode[]={
 	0x000021603,
 	0x000460821,
 	0x024e40001,
-	0x0afc480c6,
+	0x0afc4808e,
 	0x0a0270000,
 	0x000051600,
 	0x000021603,
 	0x000460821,
 	0x080220000,
-	0x023c3811e,
+	0x023c380e6,
 	0x000020880,
 	0x08fa2000c,
 	0x000230821,
@@ -2818,7 +2833,7 @@ ulong bootcode[]={
 	0x0200c000a,
 	0x08fa70040,
 	0x000004825,
-	0x08fc18112,
+	0x08fc180da,
 	0x000000027,
 	0x0afa10018,
 	0x08fc18012,
@@ -2826,7 +2841,7 @@ ulong bootcode[]={
 	0x0afa10014,
 	0x08fab0034,
 	0x000000027,
-	0x0afcb8112,
+	0x0afcb80da,
 	0x08fa20038,
 	0x000000027,
 	0x02441ffff,
@@ -2850,7 +2865,7 @@ ulong bootcode[]={
 	0x0a1600000,
 	0x08fa10018,
 	0x000000027,
-	0x0afc18112,
+	0x0afc180da,
 	0x08fa10014,
 	0x000000027,
 	0x0afc18012,
@@ -2865,14 +2880,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x0000b0825,
 	0x0256b0001,
-	0x0afcb8112,
+	0x0afcb80da,
 	0x0a0250000,
 	0x08fc2800e,
 	0x000000027,
 	0x024410001,
 	0x014ac0003,
 	0x0afc1800e,
-	0x008000f10,
+	0x008000f1f,
 	0x0afc9800e,
 	0x020030009,
 	0x014a3ffd3,
@@ -2882,7 +2897,7 @@ ulong bootcode[]={
 	0x024410007,
 	0x0201cfff8,
 	0x0003c0824,
-	0x008000f10,
+	0x008000f1f,
 	0x0afc1800e,
 	0x000095825,
 	0x000061025,
@@ -2918,18 +2933,18 @@ ulong bootcode[]={
 	0x0afa8000c,
 	0x0afab0024,
 	0x0afab0010,
-	0x023c184c6,
+	0x023c184fe,
 	0x030a2007f,
 	0x000220821,
 	0x080220000,
-	0x023c3811e,
+	0x023c380e6,
 	0x000020880,
 	0x000230821,
 	0x08c220000,
 	0x000000027,
 	0x00040f809,
 	0x000000027,
-	0x08fcb8112,
+	0x08fcb80da,
 	0x08faa002c,
 	0x08fa6003c,
 	0x000004825,
@@ -2944,9 +2959,9 @@ ulong bootcode[]={
 	0x024c60001,
 	0x0afa6003c,
 	0x080250000,
-	0x008000f5b,
+	0x008000f6a,
 	0x000000027,
-	0x008000f10,
+	0x008000f1f,
 	0x000e13821,
 	0x000060825,
 	0x024c60001,
@@ -2965,7 +2980,7 @@ ulong bootcode[]={
 	0x080230000,
 	0x000000027,
 	0x000032825,
-	0x008000f5b,
+	0x008000f6a,
 	0x024e70004,
 	0x028a20030,
 	0x01440ffc1,
@@ -2974,7 +2989,7 @@ ulong bootcode[]={
 	0x00065102a,
 	0x010400003,
 	0x000000027,
-	0x008000f5b,
+	0x008000f6a,
 	0x000000027,
 	0x005010002,
 	0x000000027,
@@ -2987,7 +3002,7 @@ ulong bootcode[]={
 	0x024c60001,
 	0x0afa6003c,
 	0x080230000,
-	0x008000f98,
+	0x008000fa7,
 	0x000032825,
 	0x02003002d,
 	0x014a30007,
@@ -3007,7 +3022,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x011a0ff99,
 	0x000000027,
-	0x008000f58,
+	0x008000f67,
 	0x0012a5023,
 	0x0014c0018,
 	0x000000812,
@@ -3017,7 +3032,7 @@ ulong bootcode[]={
 	0x024c60001,
 	0x0afa6003c,
 	0x080230000,
-	0x008000fb7,
+	0x008000fc6,
 	0x000032825,
 	0x023bdffb4,
 	0x0afbf0000,
@@ -3078,7 +3093,7 @@ ulong bootcode[]={
 	0x08fa20054,
 	0x02001ffff,
 	0x0afa20008,
-	0x00c001060,
+	0x00c00106f,
 	0x0afa1000c,
 	0x08fa1001c,
 	0x08fa20000,
@@ -3094,15 +3109,15 @@ ulong bootcode[]={
 	0x000000027,
 	0x01cc00003,
 	0x000000027,
-	0x008000ffc,
+	0x00800100b,
 	0x000000027,
-	0x008000ff1,
+	0x008001000,
 	0x024a5ffff,
 	0x000106825,
-	0x008000fef,
+	0x008000ffe,
 	0x001c63023,
 	0x08cc60000,
-	0x008000fea,
+	0x008000ff9,
 	0x0afa5001c,
 	0x08cc30000,
 	0x0afa5001c,
@@ -3110,13 +3125,13 @@ ulong bootcode[]={
 	0x000063403,
 	0x000061400,
 	0x000021403,
-	0x008000fea,
+	0x008000ff9,
 	0x000023025,
 	0x08cc60000,
-	0x008000fea,
+	0x008000ff9,
 	0x0afa5001c,
 	0x08cc60000,
-	0x008000fea,
+	0x008000ff9,
 	0x0afa5001c,
 	0x038430006,
 	0x010600028,
@@ -3124,7 +3139,7 @@ ulong bootcode[]={
 	0x038430009,
 	0x010600003,
 	0x000000027,
-	0x008000fe8,
+	0x008000ff7,
 	0x000000027,
 	0x08cc70000,
 	0x000000027,
@@ -3145,7 +3160,7 @@ ulong bootcode[]={
 	0x028a20002,
 	0x010400003,
 	0x0a0260000,
-	0x008000ffc,
+	0x00800100b,
 	0x000000027,
 	0x000e9001a,
 	0x005000005,
@@ -3156,16 +3171,16 @@ ulong bootcode[]={
 	0x000000027,
 	0x01ce00003,
 	0x000000027,
-	0x008000ffc,
+	0x00800100b,
 	0x000000027,
-	0x00800103f,
+	0x00800104e,
 	0x024a5ffff,
 	0x08cc30000,
 	0x0afa5001c,
 	0x000033400,
 	0x000063403,
 	0x030c1ffff,
-	0x008000fea,
+	0x008000ff9,
 	0x000013025,
 	0x023bdfff0,
 	0x08fab0014,
@@ -3175,7 +3190,7 @@ ulong bootcode[]={
 	0x08fca8012,
 	0x08fa9001c,
 	0x08fc8800e,
-	0x08fc68112,
+	0x08fc680da,
 	0x000002825,
 	0x0000b3825,
 	0x000070825,
@@ -3198,7 +3213,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000060825,
 	0x024c60001,
-	0x0afc68112,
+	0x0afc680da,
 	0x0a02c0000,
 	0x025080001,
 	0x024a50001,
@@ -3218,14 +3233,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x000060825,
 	0x024c60001,
-	0x0afc68112,
+	0x0afc680da,
 	0x0a0270000,
 	0x025080001,
 	0x014ef0005,
 	0x0afc8800e,
 	0x0000e4025,
 	0x0afce800e,
-	0x008001086,
+	0x008001095,
 	0x02529ffff,
 	0x020030009,
 	0x014e3fffc,
@@ -3234,7 +3249,7 @@ ulong bootcode[]={
 	0x0201cfff8,
 	0x0003c4024,
 	0x02529ffff,
-	0x008001086,
+	0x008001095,
 	0x0afc8800e,
 	0x005a10011,
 	0x000000027,
@@ -3247,7 +3262,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000060825,
 	0x024c60001,
-	0x0afc68112,
+	0x0afc680da,
 	0x0a02c0000,
 	0x025080001,
 	0x024a50001,
@@ -3262,7 +3277,7 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x0afa00008,
 	0x02001ffff,
-	0x00c001060,
+	0x00c00106f,
 	0x0afa1000c,
 	0x08fa20000,
 	0x023bd0010,
@@ -3280,7 +3295,7 @@ ulong bootcode[]={
 	0x08fa2001c,
 	0x02001ffff,
 	0x0afa20008,
-	0x00c001060,
+	0x00c00106f,
 	0x0afa1000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -3300,7 +3315,7 @@ ulong bootcode[]={
 	0x08fa30028,
 	0x000000027,
 	0x0afa30010,
-	0x00c000fcc,
+	0x00c000fdb,
 	0x0afa20014,
 	0x08fa20000,
 	0x000000027,
@@ -3336,7 +3351,7 @@ ulong bootcode[]={
 	0x08fa30028,
 	0x000000027,
 	0x0afa30010,
-	0x00c000fcc,
+	0x00c000fdb,
 	0x0afa20014,
 	0x08fa20000,
 	0x000000027,
@@ -3353,7 +3368,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08fa2001c,
-	0x00c001060,
+	0x00c00106f,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0010,
@@ -3377,21 +3392,21 @@ ulong bootcode[]={
 	0x08fa30028,
 	0x000000027,
 	0x0afa30010,
-	0x00c000fcc,
+	0x00c000fdb,
 	0x0afa20014,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0018,
 	0x023bdfffc,
-	0x08fc48112,
+	0x08fc480da,
 	0x08fc28012,
 	0x000000027,
 	0x00082102b,
 	0x010400005,
 	0x000000027,
 	0x024830001,
-	0x0afc38112,
+	0x0afc380da,
 	0x020030025,
 	0x0a0830000,
 	0x023bd0004,
@@ -3434,7 +3449,7 @@ ulong bootcode[]={
 	0x023a1002c,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c00137f,
+	0x00c00138e,
 	0x0afa1000c,
 	0x0c7c18032,
 	0x0c7c08036,
@@ -3449,7 +3464,7 @@ ulong bootcode[]={
 	0x000023043,
 	0x0afa60028,
 	0x000060823,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x0c7a50094,
 	0x0c7a40098,
@@ -3461,7 +3476,7 @@ ulong bootcode[]={
 	0x08fa2002c,
 	0x000000027,
 	0x000220823,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x08fae00a8,
 	0x000007825,
@@ -3483,7 +3498,7 @@ ulong bootcode[]={
 	0x08fa2002c,
 	0x000000027,
 	0x000220823,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x08fae00a8,
 	0x023ad0068,
@@ -3493,7 +3508,7 @@ ulong bootcode[]={
 	0x0c7a40034,
 	0x000000027,
 	0x046202202,
-	0x008001190,
+	0x00800119f,
 	0x000007825,
 	0x0c7c5801e,
 	0x0c7c48022,
@@ -3510,7 +3525,7 @@ ulong bootcode[]={
 	0x08fa2002c,
 	0x000000027,
 	0x000220823,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x08fae00a8,
 	0x023ad0068,
@@ -3520,7 +3535,7 @@ ulong bootcode[]={
 	0x0c7a40034,
 	0x000000027,
 	0x046202202,
-	0x0080011a8,
+	0x0080011b7,
 	0x000007825,
 	0x005410002,
 	0x000000027,
@@ -3555,7 +3570,7 @@ ulong bootcode[]={
 	0x0200affff,
 	0x0afaa00a0,
 	0x0200e0065,
-	0x00800115e,
+	0x00800116d,
 	0x0afae00a8,
 	0x0000f4025,
 	0x00106102a,
@@ -3604,7 +3619,7 @@ ulong bootcode[]={
 	0x024e70001,
 	0x02462fff6,
 	0x0a0220001,
-	0x008001203,
+	0x008001212,
 	0x024c6ffff,
 	0x010e00007,
 	0x0200c0001,
@@ -3672,7 +3687,7 @@ ulong bootcode[]={
 	0x020020030,
 	0x0a0220000,
 	0x024e7ffff,
-	0x00800124a,
+	0x008001259,
 	0x024c60001,
 	0x019000013,
 	0x000000027,
@@ -3692,7 +3707,7 @@ ulong bootcode[]={
 	0x0258c0001,
 	0x0a0230000,
 	0x02508ffff,
-	0x00800125b,
+	0x00800126a,
 	0x024c60001,
 	0x020030067,
 	0x011c30046,
@@ -3712,7 +3727,7 @@ ulong bootcode[]={
 	0x08fa2009c,
 	0x02001ffff,
 	0x0afa20008,
-	0x00c001060,
+	0x00c00106f,
 	0x0afa1000c,
 	0x08fa20000,
 	0x023bd0090,
@@ -3764,7 +3779,7 @@ ulong bootcode[]={
 	0x000001010,
 	0x024420030,
 	0x0a0220000,
-	0x00800127b,
+	0x00800128a,
 	0x024c60001,
 	0x024c7ffff,
 	0x004e00006,
@@ -3784,11 +3799,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01107ffad,
 	0x000073025,
-	0x008001275,
+	0x008001284,
 	0x024c60001,
-	0x0080012c0,
+	0x0080012cf,
 	0x02508ffff,
-	0x0080012b8,
+	0x0080012c7,
 	0x024e7ffff,
 	0x08fa3002c,
 	0x02001ffff,
@@ -3798,9 +3813,9 @@ ulong bootcode[]={
 	0x0000f3825,
 	0x08fa2002c,
 	0x0200e0068,
-	0x008001237,
+	0x008001246,
 	0x001425823,
-	0x0080011cb,
+	0x0080011da,
 	0x0254affff,
 	0x023bdffe4,
 	0x0afbf0000,
@@ -3820,7 +3835,7 @@ ulong bootcode[]={
 	0x08fa3002c,
 	0x000000027,
 	0x0afa30014,
-	0x00c001146,
+	0x00c001155,
 	0x0afa20018,
 	0x08fa20000,
 	0x000000027,
@@ -3844,7 +3859,7 @@ ulong bootcode[]={
 	0x08fa3002c,
 	0x000000027,
 	0x0afa30014,
-	0x00c001146,
+	0x00c001155,
 	0x0afa20018,
 	0x08fa20000,
 	0x000000027,
@@ -3868,7 +3883,7 @@ ulong bootcode[]={
 	0x08fa3002c,
 	0x000000027,
 	0x0afa30014,
-	0x00c001146,
+	0x00c001155,
 	0x0afa20018,
 	0x08fa20000,
 	0x000000027,
@@ -3881,7 +3896,7 @@ ulong bootcode[]={
 	0x004610008,
 	0x000000027,
 	0x000030823,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x08fa20000,
 	0x023bd0014,
@@ -3891,7 +3906,7 @@ ulong bootcode[]={
 	0x01040000b,
 	0x000000027,
 	0x000031080,
-	0x023c180ea,
+	0x023c180b2,
 	0x000411021,
 	0x08c420000,
 	0x000000027,
@@ -3903,12 +3918,12 @@ ulong bootcode[]={
 	0x000032043,
 	0x0afa40010,
 	0x000641023,
-	0x00c001323,
+	0x00c001332,
 	0x0afa20004,
 	0x0e7a10008,
 	0x0e7a0000c,
 	0x08fa10010,
-	0x00c001323,
+	0x00c001332,
 	0x0afa10004,
 	0x0c7a30008,
 	0x0c7a2000c,
@@ -4069,7 +4084,7 @@ ulong bootcode[]={
 	0x00065102a,
 	0x014400013,
 	0x000000027,
-	0x08fc18116,
+	0x08fc180de,
 	0x08fa30008,
 	0x000a10807,
 	0x0201cffff,
@@ -4091,7 +4106,7 @@ ulong bootcode[]={
 	0x00065102a,
 	0x01440fff3,
 	0x000000027,
-	0x08fc3811a,
+	0x08fc380e2,
 	0x024a1ffea,
 	0x000230807,
 	0x0201cffff,
@@ -4099,7 +4114,7 @@ ulong bootcode[]={
 	0x08fa3000c,
 	0x000000027,
 	0x000610824,
-	0x0080013ee,
+	0x0080013fd,
 	0x0afa1000c,
 	0x023bdfffc,
 	0x08fa30010,
@@ -4210,7 +4225,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0a0c8ffff,
 	0x024c6ffff,
-	0x00800146d,
+	0x00800147c,
 	0x024e7ffff,
 	0x000000000,
 	0x000000000,
@@ -4219,7 +4234,6 @@ ulong bootcode[]={
 	0x000000000,
 	0x000000000,
 	0x000000000,
-	0x000000000,
 	0x040240000,
 	0x000000000,
 	0x02a2a2a00,
@@ -4234,20 +4248,6 @@ ulong bootcode[]={
 	0x061747573,
 	0x000000000,
 	0x000000000,
-	0x000006194,
-	0x00000619e,
-	0x0000061a9,
-	0x0000061ae,
-	0x0000061c3,
-	0x0000061ca,
-	0x0000061df,
-	0x0000061e5,
-	0x0000061fa,
-	0x000006202,
-	0x000006217,
-	0x00000621b,
-	0x000000000,
-	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -4284,19 +4284,19 @@ ulong bootcode[]={
 	0x000000000,
 	0x0001fffff,
 	0x07fffffff,
-	0x0000042e4,
-	0x000004314,
-	0x00000435c,
-	0x0000043ac,
-	0x0000043bc,
-	0x0000043ec,
-	0x00000443c,
-	0x000004480,
-	0x000004490,
-	0x0000044e0,
-	0x000004b6c,
-	0x000004bcc,
-	0x000004c2c,
+	0x000004320,
+	0x000004350,
+	0x000004398,
+	0x0000043e8,
+	0x0000043f8,
+	0x000004428,
+	0x000004478,
+	0x0000044bc,
+	0x0000044cc,
+	0x00000451c,
+	0x000004ba8,
+	0x000004c08,
+	0x000004c68,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -4319,205 +4319,233 @@ ulong bootcode[]={
 	0x073006269,
 	0x074636f6e,
 	0x06e656374,
-	0x000726f73,
-	0x07300636f,
-	0x06e6e6563,
-	0x074203032,
-	0x030373031,
-	0x030303565,
-	0x066660062,
+	0x000626974,
+	0x021626f6f,
+	0x074657300,
+	0x0726f7373,
+	0x000636f6e,
+	0x06e656374,
+	0x020303230,
+	0x037303130,
+	0x030356566,
+	0x066006e6f,
+	0x06e657421,
+	0x0726f7373,
+	0x000626f6f,
+	0x074657300,
+	0x0636f6e6e,
+	0x065637420,
+	0x030383030,
+	0x036393032,
+	0x030323035,
+	0x0006e6f6e,
+	0x065742162,
 	0x06f6f7465,
-	0x07300636f,
-	0x06e6e6563,
-	0x074203038,
-	0x030303639,
-	0x030323032,
-	0x030350068,
+	0x073006865,
+	0x06c697800,
+	0x0636f6e6e,
+	0x065637420,
+	0x030383030,
+	0x036393032,
+	0x030343237,
+	0x0006e6f6e,
+	0x065742168,
 	0x0656c6978,
+	0x000737069,
+	0x06e646c65,
 	0x000636f6e,
 	0x06e656374,
 	0x020303830,
 	0x030363930,
-	0x032303432,
-	0x037007370,
-	0x0696e646c,
-	0x06500636f,
-	0x06e6e6563,
-	0x074203038,
-	0x030303639,
-	0x030323032,
-	0x064660072,
-	0x037300063,
-	0x06f6e6e65,
-	0x063742030,
-	0x038303032,
-	0x062303432,
-	0x036356400,
-	0x023632f63,
-	0x06f6e7300,
-	0x023632f63,
-	0x06f6e7300,
-	0x023632f63,
-	0x06f6e7300,
-	0x023652f73,
-	0x079736e61,
-	0x06d650073,
-	0x079736e61,
-	0x06d650073,
-	0x079736e61,
-	0x06d650062,
-	0x06974626f,
-	0x06f746573,
-	0x0002f6d69,
-	0x070732f39,
-	0x000736572,
-	0x076657200,
-	0x0626f6f74,
-	0x03a202573,
-	0x020756e6b,
-	0x06e6f776e,
-	0x00a006269,
-	0x074636f6e,
-	0x06e656374,
-	0x00023332f,
-	0x062697433,
+	0x032303264,
+	0x066006e6f,
+	0x06e657421,
+	0x07370696e,
+	0x0646c6500,
+	0x072373000,
+	0x0636f6e6e,
+	0x065637420,
+	0x030383030,
+	0x032623034,
+	0x032363564,
+	0x0006e6f6e,
+	0x065742172,
+	0x037300023,
+	0x0632f636f,
+	0x06e730023,
+	0x0632f636f,
+	0x06e730023,
+	0x0632f636f,
+	0x06e730023,
+	0x0652f7379,
+	0x0736e616d,
+	0x065007379,
+	0x0736e616d,
+	0x065007379,
+	0x0736e616d,
+	0x065006269,
+	0x074626f6f,
+	0x074657300,
+	0x02f6d6970,
+	0x0732f3900,
+	0x073657276,
+	0x065720062,
+	0x06f6f743a,
+	0x020257320,
+	0x0756e6b6e,
+	0x06f776e0a,
+	0x000626974,
+	0x0636f6e6e,
+	0x065637400,
+	0x023332f62,
+	0x069743300,
+	0x06f70656e,
+	0x0696e6720,
+	0x023332f62,
+	0x069743300,
+	0x0236c2f31,
+	0x02f63746c,
 	0x0006f7065,
 	0x06e696e67,
-	0x02023332f,
-	0x062697433,
-	0x000236c2f,
+	0x020236c2f,
 	0x0312f6374,
-	0x06c006f70,
-	0x0656e696e,
-	0x06720236c,
-	0x02f312f63,
-	0x0746c0063,
-	0x06f6e6e65,
-	0x063742030,
-	0x078393030,
-	0x000636f6e,
-	0x06e656374,
-	0x020307839,
-	0x030300070,
+	0x06c00636f,
+	0x06e6e6563,
+	0x074203078,
+	0x039303000,
+	0x0636f6e6e,
+	0x065637420,
+	0x030783930,
+	0x030007075,
+	0x07368206e,
+	0x06f657468,
+	0x065720070,
 	0x075736820,
 	0x06e6f6574,
 	0x068657200,
-	0x070757368,
-	0x0206e6f65,
-	0x074686572,
-	0x000236e2f,
-	0x0322f6461,
-	0x07461006f,
-	0x070656e69,
-	0x06e672023,
-	0x06e2f322f,
+	0x0636f6e66,
+	0x06967206e,
+	0x06f6e6574,
+	0x000636f6e,
+	0x066696720,
+	0x06e6f6e65,
+	0x07400236e,
+	0x06e6f6e65,
+	0x0742f322f,
 	0x064617461,
-	0x000236e2f,
+	0x0006f7065,
+	0x06e696e67,
+	0x020236e2f,
+	0x0322f6461,
+	0x074610023,
+	0x06e6e6f6e,
+	0x065742f32,
+	0x02f63746c,
+	0x0006f7065,
+	0x06e696e67,
+	0x020236e2f,
 	0x0322f6374,
-	0x06c006f70,
-	0x0656e696e,
-	0x06720236e,
-	0x02f322f63,
-	0x0746c006e,
-	0x06f702e2e,
-	0x02e006e20,
-	0x03d202564,
-	0x00a007772,
-	0x069746520,
-	0x06e6f7000,
-	0x072656164,
-	0x0206e6f70,
+	0x06c006e6f,
+	0x0702e2e2e,
 	0x0006e203d,
-	0x02025643b,
-	0x020627566,
-	0x0203d2025,
+	0x02025640a,
+	0x000777269,
+	0x07465206e,
+	0x06f700072,
+	0x065616420,
+	0x06e6f7000,
+	0x06e203d20,
+	0x025643b20,
+	0x062756620,
+	0x03d20252e,
+	0x032782025,
 	0x02e327820,
 	0x0252e3278,
 	0x020252e32,
-	0x07820252e,
-	0x032780a00,
-	0x0666f726d,
-	0x06174206e,
-	0x06f70006e,
-	0x06f742052,
-	0x06e6f7000,
+	0x0780a0066,
+	0x06f726d61,
+	0x074206e6f,
+	0x070006e6f,
+	0x07420526e,
+	0x06f700073,
+	0x065737369,
+	0x06f6e2e2e,
+	0x02e007772,
+	0x069746520,
 	0x073657373,
-	0x0696f6e2e,
-	0x02e2e0077,
-	0x072697465,
+	0x0696f6e00,
+	0x072656164,
 	0x020736573,
 	0x073696f6e,
-	0x000726561,
-	0x064207365,
-	0x07373696f,
-	0x06e00666f,
-	0x0726d6174,
-	0x020736573,
+	0x000666f72,
+	0x06d617420,
+	0x073657373,
+	0x0696f6e00,
+	0x06e6f7420,
+	0x052736573,
 	0x073696f6e,
-	0x0006e6f74,
-	0x020527365,
-	0x07373696f,
-	0x06e006572,
-	0x0726f7220,
-	0x025643b00,
-	0x072656d6f,
-	0x074652065,
-	0x072726f72,
-	0x000706f73,
-	0x0742e2e2e,
-	0x00023732f,
-	0x025730063,
-	0x072656174,
-	0x065002564,
-	0x000777269,
-	0x074650023,
-	0x0732f626f,
-	0x06f740063,
-	0x072656174,
-	0x065002564,
-	0x000777269,
-	0x07465006d,
-	0x06f756e74,
+	0x000657272,
+	0x06f722025,
+	0x0643b0072,
+	0x0656d6f74,
+	0x065206572,
+	0x0726f7200,
+	0x0706f7374,
 	0x02e2e2e00,
-	0x02f002f00,
-	0x062696e64,
-	0x0002f0000,
-	0x06d6f756e,
-	0x074007375,
-	0x063636573,
-	0x0730a002f,
-	0x06d697073,
-	0x02f696e69,
-	0x07400696e,
-	0x06974002d,
-	0x06d002f6d,
+	0x023732f25,
+	0x073006372,
+	0x065617465,
+	0x000256400,
+	0x077726974,
+	0x065002373,
+	0x02f626f6f,
+	0x074006372,
+	0x065617465,
+	0x000256400,
+	0x077726974,
+	0x065006d6f,
+	0x0756e742e,
+	0x02e2e002f,
+	0x0002f0062,
+	0x0696e6400,
+	0x02f00006d,
+	0x06f756e74,
+	0x000737563,
+	0x063657373,
+	0x00a002f6d,
 	0x06970732f,
 	0x0696e6974,
 	0x000696e69,
-	0x074002f6d,
-	0x06970732f,
+	0x074002d6d,
+	0x0002f6d69,
+	0x070732f69,
+	0x06e697400,
 	0x0696e6974,
-	0x000626f6f,
-	0x0743a2025,
-	0x0733a2025,
-	0x0730a0062,
-	0x06f6f743a,
-	0x02025733a,
-	0x02025730a,
-	0x0003f0068,
-	0x0656c7000,
+	0x0002f6d69,
+	0x070732f69,
+	0x06e697400,
+	0x0626f6f74,
+	0x03a202573,
+	0x03a202573,
+	0x00a00626f,
+	0x06f743a20,
+	0x025733a20,
 	0x025730a00,
-	0x025735b25,
-	0x0735d3a20,
-	0x00063616e,
-	0x027742072,
-	0x065616420,
-	0x023632f63,
-	0x06f6e733b,
-	0x020706c65,
-	0x061736520,
-	0x07265626f,
-	0x06f740000,
+	0x03f006865,
+	0x06c700025,
+	0x0730a0025,
+	0x0735b2573,
+	0x05d3a2000,
+	0x063616e27,
+	0x074207265,
+	0x061642023,
+	0x0632f636f,
+	0x06e733b20,
+	0x0706c6561,
+	0x073652072,
+	0x065626f6f,
+	0x074000000,
+	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -4550,9 +4578,29 @@ ulong bootcode[]={
 	0x000070000,
 	0x008000000,
 	0x000000000,
+	0x00000615c,
+	0x000006166,
+	0x000006171,
+	0x00000617c,
+	0x000006181,
+	0x000006196,
+	0x0000061a1,
+	0x0000061a8,
+	0x0000061bd,
+	0x0000061ca,
+	0x0000061d0,
+	0x0000061e5,
+	0x0000061f1,
+	0x0000061f9,
+	0x00000620e,
+	0x00000621c,
+	0x000006220,
+	0x000006235,
+	0x000000000,
+	0x000000000,
 	0x000000000,
-	0x00004720,
+	0x000047e0,
 	0x0,
-	0x00004720,
+	0x000047e0,
 	0x0,
 };
diff --git a/power/dat.h b/power/dat.h
index 4ded1c5c557da090fb7015fa2c24bb1416940220..09f20b5aa62a7bb3f7fa0402ac85f7efe13a34fd 100644
--- a/power/dat.h
+++ b/power/dat.h
@@ -438,6 +438,7 @@ struct Queue {
 #define QHUNGUP	0x1	/* flag bit meaning the stream has been hung up */
 #define QINUSE	0x2
 #define QHIWAT	0x4	/* queue has gone past the high water mark */	
+#define QDEBUG	0x8
 
 /*
  *  a stream head