From b09e594f25ad22c7fe74aba4ee398e704498184c Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 30 Apr 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-04-30

---
 gnot/boot.c     |   15 +-
 gnot/boot.h     |  775 ++++++++++++++++++----------------
 port/devip.c    |    6 +
 port/proc.c     |    8 +-
 port/stip.c     |   10 +-
 port/sysproc.c  |    2 +-
 power/boot.c    |    6 +
 power/boot.h    | 1070 ++++++++++++++++++++++++-----------------------
 power/devbit3.c |    3 +
 power/mmu.c     |   62 +--
 10 files changed, 1053 insertions(+), 904 deletions(-)

diff --git a/gnot/boot.c b/gnot/boot.c
index 8152d5ce6b35e59e047680d96f502c057e81b392..692fecfa21ffef2235047dea71d391888f480f5d 100644
--- a/gnot/boot.c
+++ b/gnot/boot.c
@@ -21,7 +21,7 @@ int	cache(int);
 
 main(int argc, char *argv[])
 {
-	int fd, f;
+	int fd, f, i;
 	char buf[256];
 	Dir dir;
 
@@ -29,6 +29,19 @@ main(int argc, char *argv[])
 	open("#c/cons", OWRITE);
 	open("#c/cons", OWRITE);
 
+	i = create("#e/sysname", 1, 0666);
+	if(i < 0)
+		error("sysname");
+	if(write(i, argv[0], strlen(argv[0])) != strlen(argv[0]))
+		error("sysname");
+	close(i);
+	i = create("#e/terminal", 1, 0666);
+	if(i < 0)
+		error("terminal");
+	if(write(i, "at&t gnot 1", strlen("at&t gnot 1")) < 0)
+		error("terminal");
+	close(i);
+
 	bootparams();
 	dkconfig();
 	fd = dkdial();
diff --git a/gnot/boot.h b/gnot/boot.h
index 6e4406ed7b1490ecf665a094a24555aa9a16d141..bd1e378322a9620d3862a2c34a200c1a45bb8caf 100644
--- a/gnot/boot.h
+++ b/gnot/boot.h
@@ -1,7 +1,7 @@
 ulong bootcode[]={
 	0x000000107,
-	0x0000028b6,
-	0x000000564,
+	0x000002972,
+	0x0000005b4,
 	0x0000001e4,
 	0x000000000,
 	0x000002020,
@@ -13,181 +13,228 @@ ulong bootcode[]={
 	0x000142f2f,
 	0x00014610c,
 	0x02f006100,
-	0x008e64fef,
+	0x009a24fef,
 	0x0001c4e75,
-	0x04feffe84,
+	0x04feffe80,
 	0x042a7486e,
 	0x0820e6100,
-	0x00ab84878,
+	0x00b744878,
 	0x00001486e,
 	0x082166100,
-	0x00aac4878,
+	0x00b684878,
 	0x00001486e,
 	0x0821e6100,
-	0x00aa06100,
+	0x00b5c4878,
+	0x001b64878,
+	0x00001486e,
+	0x082266100,
+	0x00b2e4a80,
+	0x042e72f40,
+	0x0019a44df,
+	0x06c0a486e,
+	0x082316100,
+	0x008d2588f,
+	0x02f370161,
+	0x001ac6100,
+	0x00ade588f,
+	0x02f002f37,
+	0x0016101b0,
+	0x02f2f01a0,
+	0x061000b32,
+	0x02f002f37,
+	0x0016101bc,
+	0x061000ac0,
+	0x0588f221f,
+	0x0b280670a,
+	0x0486e8239,
+	0x061000898,
+	0x0588f2f2f,
+	0x001a46100,
+	0x00ad04878,
+	0x001b64878,
+	0x00001486e,
+	0x082416100,
+	0x00ac64a80,
+	0x042e72f40,
+	0x001b644df,
+	0x06c0a486e,
+	0x0824d6100,
+	0x0086a588f,
+	0x0486e8262,
+	0x061000a78,
+	0x0588f2f00,
+	0x0486e8256,
+	0x02f2f01bc,
+	0x061000ace,
+	0x04a806c0a,
+	0x0486e826e,
+	0x061000844,
+	0x0588f2f2f,
+	0x001c06100,
+	0x00a7c6100,
 	0x004706100,
 	0x0028e6100,
 	0x003942f00,
-	0x02f400194,
+	0x02f4001d0,
 	0x061000554,
-	0x02f2f0194,
+	0x02f2f01d0,
 	0x061000650,
-	0x02f2f0198,
+	0x02f2f01d4,
 	0x061000706,
-	0x02f40019c,
-	0x0486e8226,
+	0x02f4001d8,
+	0x0486e8277,
 	0x0610008d6,
-	0x0486e8234,
-	0x0486e822e,
-	0x0486f00a4,
+	0x0486e8285,
+	0x0486e827f,
+	0x0486f00dc,
 	0x061000996,
 	0x0487801b6,
 	0x048780001,
-	0x0486f00b0,
+	0x0486f00e8,
 	0x061000a30,
 	0x04a8042e7,
-	0x02f4001b6,
+	0x02f4001f2,
 	0x044df6c0a,
-	0x0486e823b,
+	0x0486e828c,
 	0x0610007d4,
 	0x0588f2f2f,
-	0x001b8486e,
-	0x08242486f,
-	0x000bc6100,
+	0x001f4486e,
+	0x08293486f,
+	0x000f46100,
 	0x00960486f,
-	0x000c06100,
+	0x000f86100,
 	0x009d2588f,
 	0x02f00486f,
-	0x000c42f2f,
-	0x001c86100,
+	0x000fc2f2f,
+	0x002046100,
 	0x00a282f00,
-	0x0486f00d0,
+	0x0486f0108,
 	0x0610009b8,
 	0x0588f221f,
 	0x0b280670a,
-	0x0486e8245,
+	0x0486e8296,
 	0x061000790,
 	0x0588f2f2f,
-	0x001cc6100,
+	0x002086100,
 	0x009c8486e,
-	0x08251486e,
-	0x0824b486f,
-	0x000d86100,
+	0x082a2486e,
+	0x0829c486f,
+	0x001106100,
 	0x009144878,
 	0x001b64878,
 	0x00001486e,
-	0x082586100,
+	0x082a96100,
 	0x009ae4a80,
 	0x042e72f40,
-	0x001ea44df,
+	0x0022644df,
 	0x06c0a486e,
-	0x082606100,
+	0x082b16100,
 	0x00752588f,
-	0x02f2f01ec,
-	0x0486e8267,
-	0x0486f00f0,
+	0x02f2f0228,
+	0x0486e82b8,
+	0x0486f0128,
 	0x0610008de,
-	0x0486f00f4,
+	0x0486f012c,
 	0x061000950,
 	0x0588f2f00,
-	0x0486f00f8,
-	0x02f2f01fc,
+	0x0486f0130,
+	0x02f2f0238,
 	0x0610009a6,
 	0x02f00486f,
-	0x001046100,
+	0x0013c6100,
 	0x00936588f,
 	0x0221fb280,
 	0x0670a486e,
-	0x0826a6100,
+	0x082bb6100,
 	0x0070e588f,
-	0x02f2f0200,
+	0x02f2f023c,
 	0x061000946,
 	0x042a7486e,
-	0x08272486e,
-	0x082706100,
+	0x082c3486e,
+	0x082c16100,
 	0x009264a80,
 	0x06c0a486e,
-	0x082746100,
+	0x082c56100,
 	0x006ea588f,
-	0x0486e8279,
+	0x0486e82ca,
 	0x0610007ae,
-	0x0486e8285,
-	0x0486e8284,
+	0x0486e82d6,
+	0x0486e82d5,
 	0x048780006,
-	0x0486e8282,
-	0x02f2f0228,
+	0x0486e82d3,
+	0x02f2f0264,
 	0x061000928,
 	0x04a806c0a,
-	0x0486e8286,
+	0x0486e82d7,
 	0x0610006bc,
 	0x0588f486e,
-	0x0828c6100,
+	0x082dd6100,
 	0x00780486f,
-	0x0012c486e,
-	0x082946100,
+	0x00164486e,
+	0x082e56100,
 	0x0091e4a80,
 	0x06c0a486e,
-	0x082986100,
+	0x082e96100,
 	0x0069a588f,
-	0x0486f00c0,
-	0x0486f0138,
+	0x0486f00f8,
+	0x0486f0170,
 	0x061001772,
 	0x048780001,
-	0x0486e829d,
+	0x0486e82ee,
 	0x0610008e6,
-	0x02f400244,
-	0x02f2f0130,
-	0x0486e82a5,
-	0x0486f014c,
+	0x02f400280,
+	0x02f2f0168,
+	0x0486e82f6,
+	0x0486f0184,
 	0x06100080a,
-	0x0486f0150,
+	0x0486f0188,
 	0x06100087c,
 	0x0588f2f00,
-	0x0486f0154,
-	0x02f2f0258,
+	0x0486f018c,
+	0x02f2f0294,
 	0x0610008d2,
-	0x02f2f025c,
+	0x02f2f0298,
 	0x06100088e,
-	0x0486e82a9,
+	0x0486e82fa,
 	0x061000712,
 	0x042a7486e,
-	0x082b5486e,
-	0x082b26100,
+	0x08306486e,
+	0x083036100,
 	0x0086642a7,
-	0x0486e82c1,
-	0x0486e82be,
+	0x0486e8312,
+	0x0486e830f,
 	0x061000858,
 	0x04aae801e,
 	0x0672042a7,
-	0x0486e82da,
-	0x0486e82d5,
-	0x0486e82c9,
+	0x0486e832b,
+	0x0486e8326,
+	0x0486e831a,
 	0x0610007de,
-	0x0486e8337,
+	0x0486e8388,
 	0x061000608,
-	0x04fef0298,
+	0x04fef02d4,
 	0x04e756100,
 	0x008584fef,
-	0x0010872ff,
+	0x0014072ff,
 	0x0b2806742,
 	0x04281b280,
 	0x0671842a7,
-	0x0486e8332,
-	0x0486e8326,
+	0x0486e8383,
+	0x0486e8377,
 	0x0610007ae,
 	0x04fef000c,
-	0x04feffee8,
+	0x04feffeb0,
 	0x060c642a7,
-	0x0486e8310,
-	0x0486e830d,
-	0x0486e8308,
-	0x0486e82fc,
+	0x0486e8361,
+	0x0486e835e,
+	0x0486e8359,
+	0x0486e834d,
 	0x06100078e,
-	0x0486e8318,
+	0x0486e8369,
 	0x0610005b8,
 	0x04fef0018,
 	0x060d6486e,
-	0x082dd6100,
+	0x0832e6100,
 	0x00678588f,
 	0x060ca598f,
 	0x0102e8022,
@@ -198,18 +245,18 @@ ulong bootcode[]={
 	0x000b27273,
 	0x0b200676a,
 	0x048780002,
-	0x0486e83a6,
+	0x0486e83f7,
 	0x0610007e2,
 	0x02f400008,
 	0x04aaf0008,
 	0x0508f6c0a,
-	0x0486e83ad,
+	0x0486e83fe,
 	0x061000568,
 	0x0588f486e,
-	0x083bc2f2f,
+	0x0840d2f2f,
 	0x000046100,
 	0x0052a486e,
-	0x083c72f2f,
+	0x084182f2f,
 	0x0000c6100,
 	0x0051e6100,
 	0x007a44fef,
@@ -225,33 +272,33 @@ ulong bootcode[]={
 	0x0588f60f2,
 	0x060ec4878,
 	0x00002486e,
-	0x083746100,
+	0x083c56100,
 	0x007782f40,
 	0x000084aaf,
 	0x000086c0a,
-	0x0486e8380,
+	0x0486e83d1,
 	0x061000500,
 	0x0588f486e,
-	0x083942f2f,
+	0x083e52f2f,
 	0x0000c6100,
 	0x004c2486e,
-	0x0839b2f2f,
+	0x083ec2f2f,
 	0x000146100,
 	0x004b64fef,
 	0x000186000,
 	0x0ff7a60be,
 	0x048780002,
-	0x0486e8343,
+	0x0486e8394,
 	0x061000736,
 	0x02f400008,
 	0x04aaf0008,
 	0x06c0a486e,
-	0x0834f6100,
+	0x083a06100,
 	0x004be588f,
-	0x0486e8363,
+	0x0486e83b4,
 	0x02f2f000c,
 	0x061000480,
-	0x0486e8369,
+	0x0486e83ba,
 	0x02f2f0014,
 	0x061000474,
 	0x04fef0018,
@@ -259,36 +306,36 @@ ulong bootcode[]={
 	0x04feffff0,
 	0x042af0004,
 	0x048780002,
-	0x0486e83dd,
+	0x0486e842e,
 	0x0610006ee,
 	0x04a8042e7,
 	0x02f400016,
 	0x044df6c0a,
-	0x0486e83e7,
+	0x0486e8438,
 	0x061000474,
 	0x0588f4878,
 	0x00002486e,
-	0x083f96100,
+	0x0844a6100,
 	0x006cc4a80,
 	0x042e72f40,
 	0x0001a44df,
 	0x06c0a486e,
-	0x084026100,
+	0x084536100,
 	0x00452588f,
-	0x0486e8646,
-	0x0486e8413,
-	0x0486e8566,
+	0x0486e8696,
+	0x0486e8464,
+	0x0486e85b6,
 	0x0610005de,
-	0x0486e8566,
+	0x0486e85b6,
 	0x061000650,
 	0x02f002f40,
 	0x00024486e,
-	0x085662f2f,
+	0x085b62f2f,
 	0x000306100,
 	0x006a4b0af,
 	0x0002c661e,
-	0x0486e8646,
-	0x0486e8446,
+	0x0486e8696,
+	0x0486e8497,
 	0x0610004e2,
 	0x02f2f003c,
 	0x06100064e,
@@ -297,10 +344,10 @@ ulong bootcode[]={
 	0x04e757005,
 	0x0b0af0030,
 	0x0660a486e,
-	0x0841e6100,
+	0x0846f6100,
 	0x003f2588f,
-	0x0486e8646,
-	0x0486e8426,
+	0x0486e8696,
+	0x0486e8477,
 	0x0610004b2,
 	0x02f2f0040,
 	0x06100061e,
@@ -312,17 +359,17 @@ ulong bootcode[]={
 	0x0518f42ae,
 	0x0801a42ae,
 	0x0801e42a7,
-	0x0486e8457,
+	0x0486e84a8,
 	0x06100061a,
 	0x04a806d74,
 	0x04878003f,
-	0x0486e870a,
+	0x0486e875a,
 	0x02f002f40,
 	0x000186100,
 	0x0060a2f2f,
 	0x000186100,
 	0x005d8207c,
-	0x000006708,
+	0x000006758,
 	0x048780020,
 	0x02f086100,
 	0x005662040,
@@ -345,7 +392,7 @@ ulong bootcode[]={
 	0x070012d40,
 	0x0801a60ea,
 	0x042a7486e,
-	0x084636100,
+	0x084b46100,
 	0x005984a80,
 	0x06d1e4878,
 	0x00001486e,
@@ -356,146 +403,146 @@ ulong bootcode[]={
 	0x061000556,
 	0x04fef0010,
 	0x042a7486e,
-	0x084716100,
+	0x084c26100,
 	0x0056c4a80,
 	0x06d204878,
 	0x00040486e,
-	0x086462f00,
+	0x086962f00,
 	0x02f400028,
 	0x06100055c,
 	0x02f2f0028,
 	0x06100052a,
 	0x04fef0030,
 	0x04e75486e,
-	0x0847f486e,
-	0x086466100,
+	0x084d0486e,
+	0x086966100,
 	0x004dc518f,
 	0x060ea598f,
-	0x0486e8483,
+	0x0486e84d4,
 	0x061000396,
 	0x01d7c0032,
-	0x085ca3d7c,
-	0x0ffff85ce,
-	0x0486e8566,
-	0x0486e85ca,
+	0x0861a3d7c,
+	0x0ffff861e,
+	0x0486e85b6,
+	0x0486e861a,
 	0x06100053a,
 	0x02f002f40,
 	0x00010486e,
-	0x085662f2f,
+	0x085b62f2f,
 	0x0001c6100,
 	0x0051cb0af,
 	0x00018670a,
-	0x0486e848a,
+	0x0486e84db,
 	0x061000290,
 	0x0588f4878,
 	0x00064486e,
-	0x085662f2f,
+	0x085b62f2f,
 	0x000286100,
 	0x004ea2200,
 	0x07002b081,
 	0x066080c2e,
-	0x0004f8566,
+	0x0004f85b6,
 	0x0677c4a81,
 	0x042e72f41,
 	0x0002644df,
 	0x06e0e486e,
-	0x084946100,
+	0x084e56100,
 	0x0025a222f,
 	0x00028588f,
 	0x02f01486e,
-	0x085ca486e,
-	0x085666100,
+	0x0861a486e,
+	0x085b66100,
 	0x00cdc4a80,
 	0x06638102e,
-	0x0856949c0,
+	0x085b949c0,
 	0x02f00102e,
-	0x0856849c0,
+	0x085b849c0,
 	0x02f00102e,
-	0x0856749c0,
+	0x085b749c0,
 	0x02f00102e,
-	0x0856649c0,
+	0x085b649c0,
 	0x02f002f2f,
 	0x00040486e,
-	0x0849d6100,
+	0x084ee6100,
 	0x002e4486e,
-	0x084c06100,
+	0x085116100,
 	0x0020e4fef,
 	0x0001c0c2e,
-	0x0003385ca,
+	0x00033861a,
 	0x0670a486e,
-	0x084cb6100,
+	0x0851c6100,
 	0x001fa588f,
 	0x04fef0034,
 	0x04e750c2e,
-	0x0004b8567,
+	0x0004b85b7,
 	0x06600ff7c,
 	0x048780064,
-	0x0486e8566,
+	0x0486e85b6,
 	0x02f2f0034,
 	0x061000444,
 	0x022004fef,
 	0x0000c6000,
 	0x0ff62598f,
-	0x0486e84d4,
+	0x0486e8525,
 	0x061000292,
 	0x01d7c0034,
-	0x085ca3d7c,
-	0x0ffff85ce,
-	0x0486e8566,
-	0x0486e85ca,
+	0x0861a3d7c,
+	0x0ffff861e,
+	0x0486e85b6,
+	0x0486e861a,
 	0x061000436,
 	0x02f002f40,
 	0x00010486e,
-	0x085662f2f,
+	0x085b62f2f,
 	0x0001c6100,
 	0x00418b0af,
 	0x00018670a,
-	0x0486e84df,
+	0x0486e8530,
 	0x06100018c,
 	0x0588f4878,
 	0x00064486e,
-	0x085662f2f,
+	0x085b62f2f,
 	0x000286100,
 	0x003e62f40,
 	0x000244aaf,
 	0x000246e0a,
-	0x0486e84ed,
+	0x0486e853e,
 	0x061000168,
 	0x0588f2f2f,
 	0x00024486e,
-	0x085ca486e,
-	0x085666100,
+	0x0861a486e,
+	0x085b66100,
 	0x00bec4a80,
 	0x0660a486e,
-	0x084fa6100,
+	0x0854b6100,
 	0x0014a588f,
 	0x00c2e0037,
-	0x085ca6618,
-	0x0486e85d0,
-	0x0486e8509,
+	0x0861a6618,
+	0x0486e8620,
+	0x0486e855a,
 	0x061000202,
-	0x0486e85d0,
+	0x0486e8620,
 	0x06100012c,
 	0x04fef000c,
 	0x00c2e0035,
-	0x085ca670a,
-	0x0486e8513,
+	0x0861a670a,
+	0x0486e8564,
 	0x061000118,
 	0x0588f4fef,
 	0x000344e75,
 	0x04feffff0,
 	0x042a7486e,
-	0x085206100,
+	0x085716100,
 	0x003684a80,
 	0x06c0a202f,
 	0x0001c4fef,
 	0x000184e75,
-	0x0486e8525,
+	0x0486e8576,
 	0x0610001ba,
 	0x0486f000c,
 	0x06100031a,
 	0x04a806c0a,
-	0x0486e852c,
+	0x0486e857d,
 	0x0610000d8,
 	0x0588f6100,
 	0x0032c4fef,
@@ -525,18 +572,18 @@ ulong bootcode[]={
 	0x002b44aae,
 	0x0801a6718,
 	0x042a7486e,
-	0x08543486e,
-	0x0853b486e,
-	0x085366100,
+	0x08594486e,
+	0x0858c486e,
+	0x085876100,
 	0x002284fef,
 	0x0002c60aa,
 	0x042a7486e,
-	0x08554486e,
-	0x0854c486e,
-	0x085476100,
+	0x085a5486e,
+	0x0859d486e,
+	0x085986100,
 	0x002104fef,
 	0x0002c6092,
-	0x0486e8531,
+	0x0486e8582,
 	0x06134588f,
 	0x06092598f,
 	0x02f2f000c,
@@ -555,7 +602,7 @@ ulong bootcode[]={
 	0x06100027c,
 	0x0486f0004,
 	0x02f2f004c,
-	0x0486e8557,
+	0x0486e85a8,
 	0x048780002,
 	0x06100011a,
 	0x042a76174,
@@ -564,9 +611,9 @@ ulong bootcode[]={
 	0x042817021,
 	0x0b0816f1e,
 	0x04ab61d20,
-	0x08686660e,
+	0x086d6660e,
 	0x02daf0008,
-	0x01d208686,
+	0x01d2086d6,
 	0x07001588f,
 	0x04e755281,
 	0x07021b081,
@@ -576,10 +623,10 @@ ulong bootcode[]={
 	0x000084282,
 	0x07021b082,
 	0x06f182036,
-	0x02d208686,
+	0x02d2086d6,
 	0x0b0886606,
 	0x042b62d20,
-	0x086865282,
+	0x086d65282,
 	0x07021b082,
 	0x06ee8588f,
 	0x04e754aaf,
@@ -591,10 +638,10 @@ ulong bootcode[]={
 	0x0518f7220,
 	0x04a816d22,
 	0x02eb61d20,
-	0x086864a97,
+	0x086d64a97,
 	0x067122f41,
 	0x0000442b6,
-	0x01d208686,
+	0x01d2086d6,
 	0x04eb70151,
 	0x0222f0004,
 	0x053814a81,
@@ -2714,13 +2761,13 @@ ulong bootcode[]={
 	0x03a202564,
 	0x00a000000,
 	0x000000000,
-	0x03ffe0000,
-	0x0408a0000,
-	0x03d260000,
-	0x040dc0000,
-	0x0402c0000,
-	0x040520000,
-	0x040700000,
+	0x040ba0000,
+	0x041460000,
+	0x03de20000,
+	0x041980000,
+	0x040e80000,
+	0x0410e0000,
+	0x0412c0000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -2749,90 +2796,98 @@ ulong bootcode[]={
 	0x02f636f6e,
 	0x073002363,
 	0x02f636f6e,
-	0x07300706f,
-	0x073742e2e,
-	0x02e002373,
-	0x02f257300,
-	0x0626f6f74,
-	0x065730063,
-	0x072656174,
-	0x065002564,
-	0x000777269,
-	0x074650023,
+	0x073002365,
+	0x02f737973,
+	0x06e616d65,
+	0x000737973,
+	0x06e616d65,
+	0x000737973,
+	0x06e616d65,
+	0x00023652f,
+	0x07465726d,
+	0x0696e616c,
+	0x000746572,
+	0x06d696e61,
+	0x06c006174,
+	0x026742067,
+	0x06e6f7420,
+	0x031006174,
+	0x026742067,
+	0x06e6f7420,
+	0x031007465,
+	0x0726d696e,
+	0x0616c0070,
+	0x06f73742e,
+	0x02e2e0023,
 	0x0732f2573,
 	0x000626f6f,
 	0x074657300,
-	0x023732f62,
-	0x06f6f7400,
 	0x063726561,
 	0x074650025,
 	0x064007772,
 	0x069746500,
-	0x02f002f00,
-	0x062696e64,
-	0x0006d6f75,
-	0x06e742e2e,
-	0x02e002f00,
-	0x000006d6f,
-	0x0756e7400,
-	0x074696d65,
-	0x02e2e2e00,
-	0x02f2e2e00,
-	0x073746174,
-	0x00023632f,
-	0x074696d65,
-	0x000256c64,
-	0x000737563,
-	0x063657373,
-	0x00a00236b,
-	0x0002f6e65,
-	0x0742f6e65,
-	0x07400236b,
-	0x0002f6e65,
-	0x0742f646b,
+	0x023732f25,
+	0x07300626f,
+	0x06f746573,
+	0x00023732f,
+	0x0626f6f74,
+	0x000637265,
+	0x061746500,
+	0x025640077,
+	0x072697465,
+	0x0002f002f,
+	0x00062696e,
+	0x064006d6f,
+	0x0756e742e,
+	0x02e2e002f,
+	0x00000006d,
+	0x06f756e74,
+	0x00074696d,
+	0x0652e2e2e,
+	0x0002f2e2e,
+	0x000737461,
+	0x074002363,
+	0x02f74696d,
+	0x06500256c,
+	0x064007375,
+	0x063636573,
+	0x0730a0023,
+	0x06b002f6e,
+	0x065742f6e,
+	0x065740023,
+	0x06b002f6e,
+	0x065742f64,
+	0x06b002f36,
+	0x038303230,
+	0x02f696e69,
+	0x07400696e,
+	0x06974002d,
+	0x06d006361,
+	0x06e277420,
+	0x073746172,
+	0x07420636f,
+	0x06e6e6563,
+	0x074696f6e,
+	0x020736572,
+	0x07665720a,
 	0x0002f3638,
 	0x03032302f,
 	0x0696e6974,
 	0x000696e69,
-	0x074002d6d,
-	0x00063616e,
-	0x027742073,
-	0x074617274,
-	0x020636f6e,
-	0x06e656374,
-	0x0696f6e20,
-	0x073657276,
-	0x065720a00,
+	0x074002d64,
+	0x0002f6269,
+	0x06e2f6373,
+	0x0002f3638,
+	0x03032302f,
+	0x062696e2f,
+	0x06373002f,
+	0x036383032,
+	0x0302f696e,
+	0x069740069,
+	0x06e697400,
 	0x02f363830,
 	0x032302f69,
 	0x06e697400,
-	0x0696e6974,
-	0x0002d6400,
-	0x02f62696e,
-	0x02f637300,
-	0x02f363830,
-	0x032302f62,
-	0x0696e2f63,
-	0x073002f36,
-	0x038303230,
-	0x02f696e69,
-	0x07400696e,
-	0x06974002f,
-	0x036383032,
-	0x0302f696e,
-	0x069740023,
-	0x0632f7273,
-	0x032333263,
-	0x0746c006f,
-	0x070656e69,
-	0x06e672023,
-	0x0632f7273,
-	0x032333263,
-	0x0746c0042,
-	0x039363030,
-	0x000707573,
-	0x068206173,
-	0x0796e6300,
 	0x023632f72,
 	0x073323332,
 	0x063746c00,
@@ -2841,123 +2896,135 @@ ulong bootcode[]={
 	0x023632f72,
 	0x073323332,
 	0x063746c00,
-	0x042313932,
-	0x030300070,
-	0x075736820,
-	0x06173796e,
-	0x063002369,
-	0x02f63746c,
+	0x042393630,
+	0x030007075,
+	0x073682061,
+	0x073796e63,
+	0x00023632f,
+	0x072733233,
+	0x03263746c,
 	0x0006f7065,
 	0x06e696e67,
-	0x02023692f,
-	0x063746c00,
+	0x02023632f,
+	0x072733233,
+	0x03263746c,
+	0x000423139,
+	0x032303000,
 	0x070757368,
-	0x020646b6d,
-	0x075780063,
-	0x06f6e6669,
-	0x067203120,
-	0x03136206e,
-	0x06f726573,
-	0x074617274,
-	0x000236b2f,
-	0x0322f6461,
-	0x07461006f,
-	0x070656e69,
-	0x06e672023,
-	0x06b2f322f,
-	0x064617461,
-	0x000236b2f,
-	0x0322f6374,
+	0x020617379,
+	0x06e630023,
+	0x0692f6374,
 	0x06c006f70,
 	0x0656e696e,
-	0x06720236b,
+	0x067202369,
+	0x02f63746c,
+	0x000707573,
+	0x06820646b,
+	0x06d757800,
+	0x0636f6e66,
+	0x069672031,
+	0x020313620,
+	0x06e6f7265,
+	0x073746172,
+	0x07400236b,
+	0x02f322f64,
+	0x061746100,
+	0x06f70656e,
+	0x0696e6720,
+	0x0236b2f32,
+	0x02f646174,
+	0x06100236b,
 	0x02f322f63,
-	0x0746c0063,
+	0x0746c006f,
+	0x070656e69,
+	0x06e672023,
+	0x06b2f322f,
+	0x063746c00,
+	0x0636f6e6e,
+	0x065637420,
+	0x025730064,
+	0x069616c69,
+	0x06e670065,
+	0x072726f72,
+	0x020646961,
+	0x06c696e67,
+	0x02025732c,
+	0x020726574,
+	0x07279696e,
+	0x067202e2e,
+	0x02e0a0063,
 	0x06f6e6e65,
-	0x063742025,
-	0x073006469,
-	0x0616c696e,
-	0x067006572,
-	0x0726f7220,
-	0x06469616c,
-	0x0696e6720,
-	0x025732c20,
-	0x072657472,
-	0x079696e67,
-	0x0202e2e2e,
-	0x00a00636f,
-	0x06e6e6563,
-	0x074656420,
-	0x0746f2025,
-	0x0730a0023,
-	0x0652f626f,
-	0x06f746c69,
-	0x06e650023,
-	0x0652f626f,
-	0x06f746465,
-	0x076696365,
-	0x00023652f,
-	0x0626f6f74,
-	0x073657276,
-	0x06572006e,
-	0x06673006e,
-	0x06f702e2e,
-	0x02e007772,
-	0x069746520,
-	0x06e6f7000,
-	0x072656164,
+	0x063746564,
+	0x020746f20,
+	0x025730a00,
+	0x023652f62,
+	0x06f6f746c,
+	0x0696e6500,
+	0x023652f62,
+	0x06f6f7464,
+	0x065766963,
+	0x065002365,
+	0x02f626f6f,
+	0x074736572,
+	0x076657200,
+	0x06e667300,
+	0x06e6f702e,
+	0x02e2e0077,
+	0x072697465,
 	0x0206e6f70,
-	0x0006e203d,
-	0x02025643b,
-	0x020627566,
-	0x0203d2025,
-	0x02e327820,
+	0x000726561,
+	0x064206e6f,
+	0x070006e20,
+	0x03d202564,
+	0x03b206275,
+	0x066203d20,
 	0x0252e3278,
 	0x020252e32,
 	0x07820252e,
-	0x032780a00,
-	0x0666f726d,
-	0x06174206e,
-	0x06f70006e,
-	0x06f742052,
+	0x032782025,
+	0x02e32780a,
+	0x000666f72,
+	0x06d617420,
 	0x06e6f7000,
-	0x073657373,
-	0x0696f6e2e,
-	0x02e2e0077,
-	0x072697465,
-	0x020736573,
+	0x06e6f7420,
+	0x0526e6f70,
+	0x000736573,
 	0x073696f6e,
-	0x000726561,
-	0x064207365,
+	0x02e2e2e00,
+	0x077726974,
+	0x065207365,
+	0x07373696f,
+	0x06e007265,
+	0x061642073,
+	0x065737369,
+	0x06f6e0066,
+	0x06f726d61,
+	0x074207365,
 	0x07373696f,
-	0x06e00666f,
-	0x0726d6174,
-	0x020736573,
+	0x06e006572,
+	0x0726f7220,
+	0x025733b00,
+	0x06e6f7420,
+	0x052736573,
 	0x073696f6e,
-	0x000657272,
-	0x06f722025,
-	0x0733b006e,
-	0x06f742052,
-	0x073657373,
-	0x0696f6e00,
-	0x02f636673,
-	0x000636673,
-	0x02e2e2e00,
-	0x070697065,
-	0x000666f72,
-	0x06b002f63,
-	0x066730062,
-	0x06f6f7463,
-	0x06673002d,
-	0x06673002f,
+	0x0002f6366,
+	0x073006366,
+	0x0732e2e2e,
+	0x000706970,
+	0x06500666f,
+	0x0726b002f,
 	0x063667300,
 	0x0626f6f74,
 	0x063667300,
-	0x02d730062,
-	0x06f6f743a,
-	0x02025733a,
-	0x02025730a,
-	0x000000000,
-	0x00002e3a,
+	0x02d667300,
+	0x02f636673,
+	0x000626f6f,
+	0x074636673,
+	0x0002d7300,
+	0x0626f6f74,
+	0x03a202573,
+	0x03a202573,
+	0x00a000000,
+	0x00002f46,
 	0x0,
 };
diff --git a/port/devip.c b/port/devip.c
index 9391bb7975347555be13942f5e70e55633ef918d..266c4f5ff13c5509a8a127f5ab97fa16b90c4751 100644
--- a/port/devip.c
+++ b/port/devip.c
@@ -595,12 +595,18 @@ void
 tcpstopen(Queue *q, Stream *s)
 {
 	Ipconv *ipc;
+	static int donekproc;
 
 	/* Start tcp service processes */
 	if(!Tcpoutput) {
 		Tcpoutput = WR(q);
+		/* This never goes away - we use this queue to send acks/rejects */
+		s->opens++;
+
+		/* Flow control and tcp timer processes */
 		kproc("tcpack", tcpackproc, 0);
 		kproc("tcpflow", tcpflow, &ipconv[s->dev]);
+
 	}
 
 	ipc = &ipconv[s->dev][s->id];
diff --git a/port/proc.c b/port/proc.c
index d775ac0f6e652dd7def2705d766c4d002471f31c..48d0cb31a872e7f2223e5cc3fe23720b4d512060 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -60,12 +60,13 @@ schedinit(void)		/* never returns */
 			ready(p);
 		else if(p->state == Moribund){
 			p->pid = 0;
-			unlock(&p->debug);
-			p->upage->ref--;
+			memset(p->pidonmach, 0, sizeof p->pidonmach);
 			/* procalloc already locked */
 			p->qnext = procalloc.free;
 			procalloc.free = p;
+			p->upage->ref--;
 			p->upage = 0;
+			unlock(&p->debug);
 			unlock(&procalloc);
 			p->state = Dead;
 		}
@@ -335,6 +336,9 @@ postnote(Proc *p, int dolock, char *n, int flag)
 	if(dolock)
 		lock(&p->debug);
 
+	if(p->upage == 0)
+		errors("noted process disappeared");
+
 	if(p != u->p){
 		k = kmap(p->upage);
 		up = (User*)VA(k);
diff --git a/port/stip.c b/port/stip.c
index 04738de475c4e34102316efa376c2721ac3c285e..5c3939e6f5c6c3e749e079a97664367611f6e70e 100644
--- a/port/stip.c
+++ b/port/stip.c
@@ -70,8 +70,10 @@ ipetheropen(Queue *q, Stream *s)
 	/* First open is by ipconfig and sets up channel
 	 * to ethernet
 	 */
-	if(!Etherq)
+	if(!Etherq) {
 		Etherq = WR(q);
+		s->opens++;		/* Hold this queue in place */
+	}
 
 	DPRINT("ipetheropen EQ %lux dev=%d id=%d RD %lux WR %lux\n",
 		Etherq, s->dev, s->id, RD(q), WR(q));
@@ -127,12 +129,6 @@ newipifc(uchar ptcl, void (*recvfun)(Ipconv *, Block *bp),
 static void
 ipetherclose(Queue *q)
 {
-	if(q == Etherq) {
-		print("stip: Clearing ether channel\n");
-		Etherq = 0;
-	}
-
-	DPRINT("ipetherclose RD %lux WR %lux\n", RD(q), WR(q));
 }
 
 void
diff --git a/port/sysproc.c b/port/sysproc.c
index efe8c10418818be2cf8aebf023e47d3cd20ae555..56cea0a72dd68599dc2a1b232102bab51bea451e 100644
--- a/port/sysproc.c
+++ b/port/sysproc.c
@@ -134,9 +134,9 @@ sysfork(ulong *arg)
 	memset(p->time, 0, sizeof(p->time));
 	p->time[TReal] = MACHP(0)->ticks;
 	memmove(p->text, u->p->text, NAMELEN);
-	ready(p);
 	flushmmu();
 	clearmmucache();
+	ready(p);
 	return pid;
 }
 
diff --git a/power/boot.c b/power/boot.c
index 656170507e0bb333253a37b7cf76ae632ae27e9e..c009b449a3d7009a3e9fd433b335f6abbb9391b7 100644
--- a/power/boot.c
+++ b/power/boot.c
@@ -66,6 +66,12 @@ main(int argc, char *argv[])
 	if(write(i, argv[0], strlen(argv[0])) != strlen(argv[0]))
 		error("sysname");
 	close(i);
+	i = create("#e/terminal", 1, 0666);
+	if(i < 0)
+		error("terminal");
+	if(write(i, "sgi power 4D", strlen("sgi power 4D")) < 0)
+		error("terminal");
+	close(i);
 
 	argv++;
 	argc--;	
diff --git a/power/boot.h b/power/boot.h
index 212b31921c763a43ab1dee4f52118e45534aae51..249b5dfed3fd6d07fbf80f30738323a242abe271 100644
--- a/power/boot.h
+++ b/power/boot.h
@@ -1,7 +1,7 @@
 ulong bootcode[]={
 	0x000000407,
-	0x000005260,
-	0x000000790,
+	0x0000052e0,
+	0x0000007c8,
 	0x000001190,
 	0x000000000,
 	0x000001020,
@@ -16,7 +16,7 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x00c000415,
 	0x0afa20008,
-	0x00c000942,
+	0x00c000961,
 	0x0afa10004,
 	0x008000411,
 	0x000000027,
@@ -25,40 +25,40 @@ ulong bootcode[]={
 	0x0afa00018,
 	0x023c2828d,
 	0x0afa20004,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa00008,
 	0x023c38295,
 	0x0afa30004,
 	0x020020001,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa20008,
 	0x023c3829d,
 	0x0afa30004,
 	0x020020001,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa20008,
 	0x023c282a5,
 	0x0afa20004,
 	0x020040001,
 	0x0afa40008,
 	0x0200201b6,
-	0x00c000a70,
+	0x00c000a8f,
 	0x0afa2000c,
 	0x004210004,
 	0x0afa1001c,
 	0x023c382b0,
-	0x00c0008d6,
+	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20028,
 	0x000000027,
 	0x08c420000,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa20004,
 	0x0afa10014,
 	0x08fa40028,
 	0x000000027,
 	0x08c840000,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa4001c,
@@ -70,17 +70,48 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa30008,
 	0x08fa40010,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa4000c,
 	0x08fa30014,
 	0x000000027,
 	0x010230004,
 	0x000000027,
 	0x023c282b8,
-	0x00c0008d6,
+	0x00c0008f5,
 	0x0afa20004,
 	0x08fa3001c,
-	0x00c000a6b,
+	0x00c000a8a,
+	0x0afa30004,
+	0x023c382c0,
+	0x0afa30004,
+	0x020040001,
+	0x0afa40008,
+	0x0200301b6,
+	0x00c000a8f,
+	0x0afa3000c,
+	0x004210004,
+	0x0afa1001c,
+	0x023c282cc,
+	0x00c0008f5,
+	0x0afa20004,
+	0x023c482e2,
+	0x00c000a68,
+	0x0afa40004,
+	0x0afa10014,
+	0x08fa4001c,
+	0x023c282d5,
+	0x0afa40004,
+	0x0afa20008,
+	0x08fa40014,
+	0x00c000ac1,
+	0x0afa4000c,
+	0x004210004,
+	0x000000027,
+	0x023c282ef,
+	0x00c0008f5,
+	0x0afa20004,
+	0x08fa3001c,
+	0x00c000a8a,
 	0x0afa30004,
 	0x08fa20028,
 	0x000000027,
@@ -107,75 +138,75 @@ ulong bootcode[]={
 	0x0afa30018,
 	0x024a50004,
 	0x0afa50028,
-	0x00800045a,
+	0x008000479,
 	0x024c6ffff,
 	0x023c28026,
 	0x0afa20004,
-	0x023c382c0,
-	0x00c000a09,
+	0x023c382f8,
+	0x00c000a28,
 	0x0afa30008,
-	0x023c29892,
+	0x023c298ca,
 	0x0afa20004,
-	0x023c382cb,
-	0x00c000a09,
+	0x023c38303,
+	0x00c000a28,
 	0x0afa30008,
 	0x08fa60028,
 	0x08fa20024,
 	0x020030001,
 	0x010430029,
-	0x023c59892,
+	0x023c598ca,
 	0x020030002,
 	0x010430019,
 	0x000000027,
 	0x08fa20018,
-	0x00c000733,
+	0x00c000752,
 	0x0afa20004,
 	0x08fc58006,
 	0x000000027,
 	0x018a00003,
 	0x000000027,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa50004,
 	0x08fc3801a,
 	0x000000027,
 	0x018600004,
 	0x000000027,
 	0x08fc2801a,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
 	0x0afc0801a,
 	0x0afc08006,
 	0x020020001,
-	0x00c000733,
+	0x00c000752,
 	0x0afa20004,
 	0x08fc58006,
-	0x008000485,
+	0x0080004a4,
 	0x000000027,
 	0x0afa50004,
 	0x08cc30000,
-	0x00c000a09,
+	0x00c000a28,
 	0x0afa30008,
 	0x023c28026,
 	0x0afa20004,
 	0x08fa30028,
 	0x000000027,
 	0x08c630004,
-	0x00c000a09,
+	0x00c000a28,
 	0x0afa30008,
-	0x008000480,
+	0x00800049f,
 	0x000000027,
 	0x0afa50004,
 	0x08cc30000,
-	0x00c000a09,
+	0x00c000a28,
 	0x0afa30008,
-	0x008000480,
+	0x00800049f,
 	0x000000027,
 	0x023bdfff4,
 	0x0afbf0000,
-	0x023c382d3,
+	0x023c3830b,
 	0x0afa30004,
 	0x020020002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa20008,
 	0x08fa20000,
 	0x000000027,
@@ -193,7 +224,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa30004,
 	0x08fa40028,
-	0x00c0009f3,
+	0x00c000a12,
 	0x0afa40008,
 	0x08fa50014,
 	0x0142000a5,
@@ -203,8 +234,8 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400008,
 	0x000000027,
-	0x023c382db,
-	0x00c00096d,
+	0x023c38313,
+	0x00c00098c,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
@@ -214,15 +245,15 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400048,
 	0x000000027,
-	0x023c28309,
+	0x023c28341,
 	0x0afa20004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x000000027,
-	0x023c38312,
-	0x00c0008c4,
+	0x023c3834a,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
@@ -230,54 +261,54 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x0afa10020,
 	0x0afa10004,
-	0x023c48323,
+	0x023c4835b,
 	0x0afa40008,
 	0x02003000d,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa3000c,
 	0x08fa50020,
 	0x00421000a,
 	0x000000027,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa50004,
-	0x023c38331,
-	0x00c0008c4,
+	0x023c38369,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c4833f,
+	0x023c48377,
 	0x0afa40008,
 	0x02003000c,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa3000c,
 	0x08fa50020,
 	0x00421000a,
 	0x000000027,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa50004,
-	0x023c3834c,
-	0x00c0008c4,
+	0x023c38384,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c48359,
+	0x023c48391,
 	0x0afa40008,
 	0x02003000c,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa3000c,
 	0x00421000b,
 	0x000000027,
 	0x08fa20020,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
-	0x023c38366,
-	0x00c0008c4,
+	0x023c3839e,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
@@ -285,33 +316,33 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x020020001,
 	0x0afc28042,
-	0x023c28373,
+	0x023c283ab,
 	0x0afa20004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10018,
-	0x023c38382,
-	0x00c0008c4,
+	0x023c383ba,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x023c38399,
+	0x023c383d1,
 	0x0afa30004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x00421000c,
 	0x0afa1001c,
 	0x08fa20018,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
-	0x023c283a7,
+	0x023c283df,
 	0x0afa20004,
-	0x00c0008c4,
+	0x00c0008e3,
 	0x02003ffff,
 	0x08fa20000,
 	0x023bd0024,
@@ -320,7 +351,7 @@ ulong bootcode[]={
 	0x08fa40014,
 	0x000000027,
 	0x08c840004,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa4001c,
@@ -332,37 +363,37 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08fa40010,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa4000c,
 	0x004210012,
 	0x000000027,
 	0x08fa2001c,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
 	0x08fa30018,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
 	0x08fa30014,
 	0x000000027,
 	0x08c630004,
 	0x000000027,
 	0x0afa30004,
-	0x00c0008c4,
+	0x00c0008e3,
 	0x02002ffff,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x023c283bd,
+	0x023c283f5,
 	0x0afc28022,
-	0x023c383c3,
+	0x023c383fb,
 	0x0afc38102,
 	0x08fa10018,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0024,
-	0x0080004b9,
+	0x0080004d8,
 	0x024a50008,
 	0x023bdffa8,
 	0x0afbf0000,
@@ -370,51 +401,51 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400038,
 	0x000000027,
-	0x023c283cb,
+	0x023c28403,
 	0x0afa20004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afc1801e,
-	0x023c383d2,
-	0x00c0008c4,
+	0x023c3840a,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
 	0x0afa10004,
-	0x023c483e1,
+	0x023c48419,
 	0x0afa40008,
 	0x02003000a,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa3000c,
 	0x08fc5801e,
 	0x00421000a,
 	0x000000027,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa50004,
-	0x023c383ec,
-	0x00c0008c4,
+	0x023c38424,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c483f7,
+	0x023c4842f,
 	0x0afa40008,
 	0x020030017,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa3000c,
 	0x00421000b,
 	0x000000027,
 	0x08fc2801e,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
-	0x023c3840f,
-	0x00c0008c4,
+	0x023c38447,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
@@ -423,35 +454,35 @@ ulong bootcode[]={
 	0x020020001,
 	0x0afc280c6,
 	0x0200307d0,
-	0x00c000a93,
+	0x00c000ab2,
 	0x0afa30004,
-	0x023c38427,
+	0x023c3845f,
 	0x0afa30004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10054,
-	0x023c28433,
-	0x00c0008c4,
+	0x023c2846b,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
-	0x023c28447,
+	0x023c2847f,
 	0x0afa20004,
 	0x020040002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x00421000c,
 	0x0afc1801a,
 	0x08fa30054,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
-	0x023c38452,
+	0x023c3848a,
 	0x0afa30004,
-	0x00c0008c4,
+	0x00c0008e3,
 	0x02002ffff,
 	0x08fa20000,
 	0x023bd0058,
@@ -459,13 +490,13 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x023a20014,
 	0x0afa20004,
-	0x023c38465,
+	0x023c3849d,
 	0x0afa30008,
 	0x08fa2005c,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa2000c,
 	0x023a40014,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fc4801a,
@@ -473,28 +504,28 @@ ulong bootcode[]={
 	0x0afa40004,
 	0x0afa20008,
 	0x08fa40010,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa4000c,
 	0x004210010,
 	0x000000027,
 	0x08fc2801a,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa20004,
 	0x08fa30054,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
 	0x02002ffff,
 	0x0afc2801a,
 	0x023a30014,
-	0x00c0008c4,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
-	0x023c28470,
+	0x023c284a8,
 	0x0afc28022,
-	0x023c38473,
+	0x023c384ab,
 	0x0afc38102,
 	0x08fa10054,
 	0x08fa20000,
@@ -504,7 +535,7 @@ ulong bootcode[]={
 	0x023bdff2c,
 	0x0afbf0000,
 	0x08fa300d8,
-	0x00c00056d,
+	0x00c00058c,
 	0x0afa30004,
 	0x004210005,
 	0x000000027,
@@ -513,32 +544,32 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa100d0,
-	0x00c000653,
+	0x00c000672,
 	0x0afa10004,
 	0x08fa500d0,
 	0x014200007,
 	0x000000027,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa50004,
 	0x08fa20000,
 	0x023bd00d4,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c48478,
+	0x023c484b0,
 	0x0afa40008,
 	0x0afa0000c,
-	0x023c2847d,
+	0x023c284b5,
 	0x0afa20010,
-	0x023c4847e,
-	0x00c000a84,
+	0x023c484b6,
+	0x00c000aa3,
 	0x0afa40014,
 	0x004210004,
 	0x000000027,
-	0x023c2847f,
-	0x00c0008d6,
+	0x023c284b7,
+	0x00c0008f5,
 	0x0afa20004,
-	0x00c000a7f,
+	0x00c000a9e,
 	0x000000027,
 	0x02003ffff,
 	0x01023002f,
@@ -546,7 +577,7 @@ ulong bootcode[]={
 	0x010200022,
 	0x000000027,
 	0x023a20018,
-	0x00c000a9d,
+	0x00c000abc,
 	0x0afa20004,
 	0x083a3002c,
 	0x000000027,
@@ -554,93 +585,93 @@ ulong bootcode[]={
 	0x000000027,
 	0x023a20018,
 	0x024420014,
-	0x00c0008d6,
+	0x00c0008f5,
 	0x0afa20004,
 	0x020030002,
 	0x0afa30004,
-	0x023c284cf,
-	0x00c000992,
+	0x023c28507,
+	0x00c0009b1,
 	0x0afa20008,
 	0x020030bb8,
-	0x00c000a93,
+	0x00c000ab2,
 	0x0afa30004,
 	0x020020002,
 	0x0afa20004,
-	0x023c384e0,
-	0x00c000992,
+	0x023c38518,
+	0x00c0009b1,
 	0x0afa30008,
-	0x023c284ef,
+	0x023c28527,
 	0x0afa20004,
 	0x020030002,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa30008,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd00d4,
-	0x023c38485,
+	0x023c384bd,
 	0x0afa30004,
-	0x023c2849e,
+	0x023c284d6,
 	0x0afa20008,
-	0x023c384a9,
+	0x023c384e1,
 	0x0afa3000c,
-	0x00c000a55,
+	0x00c000a74,
 	0x0afa00010,
-	0x023c284b9,
-	0x00c0008d6,
+	0x023c284f1,
+	0x00c0008f5,
 	0x0afa20004,
-	0x023c384ca,
-	0x00c0008d6,
+	0x023c38502,
+	0x00c0008f5,
 	0x0afa30004,
-	0x008000622,
+	0x008000641,
 	0x000000027,
 	0x023bdffe0,
 	0x0afbf0000,
-	0x023c284f9,
-	0x00c00096d,
+	0x023c28531,
+	0x00c00098c,
 	0x0afa20004,
 	0x020030032,
-	0x0a3c39792,
+	0x0a3c397ca,
 	0x02002ffff,
-	0x0a7c29796,
-	0x023c29792,
+	0x0a7c297ce,
+	0x023c297ca,
 	0x0afa20004,
-	0x023c48792,
-	0x00c000aa7,
+	0x023c487ca,
+	0x00c000ac6,
 	0x0afa40008,
 	0x08fa30024,
-	0x023c48792,
+	0x023c487ca,
 	0x0afa30004,
 	0x0afa40008,
 	0x0afa1001c,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa1000c,
 	0x08fa5001c,
 	0x000000027,
 	0x01025000c,
 	0x000000027,
-	0x023c28500,
+	0x023c28538,
 	0x0afa20004,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa50008,
-	0x023c28508,
-	0x00c0008c4,
+	0x023c28540,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
 	0x08fa20024,
-	0x023c48792,
+	0x023c487ca,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
-	0x00c000a8e,
+	0x00c000aad,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c38512,
-	0x00c0008c4,
+	0x023c3854a,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
@@ -649,166 +680,166 @@ ulong bootcode[]={
 	0x020030002,
 	0x014230003,
 	0x000000027,
-	0x008000677,
+	0x008000696,
 	0x000000027,
-	0x023c38792,
+	0x023c387ca,
 	0x0afa30004,
-	0x023c49792,
+	0x023c497ca,
 	0x0afa40008,
 	0x0afa1001c,
-	0x00c000ec2,
+	0x00c000ee1,
 	0x0afa1000c,
 	0x014200022,
 	0x000000027,
-	0x023c2851b,
+	0x023c28553,
 	0x0afa20004,
 	0x08fa3001c,
 	0x000000027,
 	0x0afa30008,
-	0x083c28792,
+	0x083c287ca,
 	0x000000027,
 	0x000021600,
 	0x000021603,
 	0x0afa2000c,
-	0x083c38793,
+	0x083c387cb,
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
 	0x0afa30010,
-	0x083c28794,
+	0x083c287cc,
 	0x000000027,
 	0x000021600,
 	0x000021603,
 	0x0afa20014,
-	0x083c38795,
+	0x083c387cd,
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa30018,
-	0x023c2853e,
-	0x00c0008c4,
+	0x023c28576,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c39792,
+	0x083c397ca,
 	0x020020033,
 	0x010620008,
 	0x000000027,
-	0x023c38549,
-	0x00c0008c4,
+	0x023c38581,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x087c29796,
+	0x087c297ce,
 	0x02003ffff,
 	0x010430008,
 	0x000000027,
-	0x023c28552,
-	0x00c0008c4,
+	0x023c2858a,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x023c3855d,
-	0x00c00096d,
+	0x023c38595,
+	0x00c00098c,
 	0x0afa30004,
 	0x020020034,
-	0x0a3c29792,
+	0x0a3c297ca,
 	0x02003ffff,
-	0x0a7c39796,
-	0x023c39792,
+	0x0a7c397ce,
+	0x023c397ca,
 	0x0afa30004,
-	0x023c48792,
-	0x00c000aa7,
+	0x023c487ca,
+	0x00c000ac6,
 	0x0afa40008,
 	0x08fa20024,
-	0x023c48792,
+	0x023c487ca,
 	0x0afa20004,
 	0x0afa40008,
 	0x0afa1001c,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa1000c,
 	0x08fa4001c,
 	0x000000027,
 	0x010240008,
 	0x000000027,
-	0x023c28568,
-	0x00c0008c4,
+	0x023c285a0,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
 	0x08fa20024,
-	0x023c48792,
+	0x023c487ca,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
-	0x00c000a8e,
+	0x00c000aad,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c38576,
-	0x00c0008c4,
+	0x023c385ae,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x023c38792,
+	0x023c387ca,
 	0x0afa30004,
-	0x023c49792,
+	0x023c497ca,
 	0x0afa40008,
-	0x00c000ec2,
+	0x00c000ee1,
 	0x0afa1000c,
 	0x014200008,
 	0x000000027,
-	0x023c28583,
-	0x00c0008c4,
+	0x023c285bb,
+	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x087c39796,
+	0x087c397ce,
 	0x02002ffff,
 	0x010620008,
 	0x000000027,
-	0x023c38592,
-	0x00c0008c4,
+	0x023c385ca,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c29792,
+	0x083c297ca,
 	0x020030037,
 	0x01443000d,
 	0x000000027,
 	0x020020002,
 	0x0afa20004,
-	0x023c3859d,
+	0x023c385d5,
 	0x0afa30008,
-	0x023c29792,
+	0x023c297ca,
 	0x024420008,
-	0x00c000992,
+	0x00c0009b1,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c39792,
+	0x083c397ca,
 	0x020020035,
 	0x010620008,
 	0x000000027,
-	0x023c385ad,
-	0x00c0008c4,
+	0x023c385e5,
+	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
@@ -825,12 +856,12 @@ ulong bootcode[]={
 	0x000000027,
 	0x01040000a,
 	0x000000027,
-	0x023c385ba,
+	0x023c385f2,
 	0x0afa30004,
 	0x023c28026,
 	0x0afa20008,
 	0x02003001c,
-	0x00c0008ea,
+	0x00c000909,
 	0x0afa3000c,
 	0x08fc68006,
 	0x000000027,
@@ -842,30 +873,30 @@ ulong bootcode[]={
 	0x0afc28006,
 	0x023c28026,
 	0x0afa20004,
-	0x023c485c1,
+	0x023c485f9,
 	0x0afa40008,
 	0x020020004,
-	0x00c0009cf,
+	0x00c0009ee,
 	0x0afa2000c,
 	0x014200144,
 	0x023c58026,
 	0x024a20004,
 	0x0afa20140,
-	0x00c0004ab,
+	0x00c0004ca,
 	0x0afa20004,
 	0x000013025,
 	0x004c00133,
 	0x0afc68006,
 	0x004c10008,
 	0x000000027,
-	0x023c285f2,
-	0x00c00096d,
+	0x023c2862a,
+	0x00c00098c,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x00c000653,
+	0x00c000672,
 	0x0afa60004,
 	0x014200005,
 	0x000000027,
@@ -873,167 +904,167 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c38601,
-	0x00c00096d,
+	0x023c38639,
+	0x00c00098c,
 	0x0afa30004,
-	0x023c28792,
+	0x023c287ca,
 	0x0afa20004,
-	0x023c38609,
+	0x023c38641,
 	0x0afa30008,
 	0x08fa20140,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa2000c,
-	0x023c28792,
+	0x023c287ca,
 	0x0afa20004,
 	0x020040001,
 	0x0afa40008,
 	0x0200201b6,
-	0x00c000a70,
+	0x00c000a8f,
 	0x0afa2000c,
 	0x004210004,
 	0x0afa10148,
-	0x023c3860f,
-	0x00c0008d6,
+	0x023c38647,
+	0x00c0008f5,
 	0x0afa30004,
-	0x023c28792,
+	0x023c287ca,
 	0x0afa20004,
-	0x023c38616,
+	0x023c3864e,
 	0x0afa30008,
 	0x08fc28006,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa2000c,
-	0x023c38792,
-	0x00c000a49,
+	0x023c387ca,
+	0x00c000a68,
 	0x0afa30004,
 	0x0afa10014,
-	0x023c48792,
-	0x00c000a49,
+	0x023c487ca,
+	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa40148,
-	0x023c38792,
+	0x023c387ca,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40010,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa4000c,
 	0x08fa30014,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28619,
-	0x00c0008d6,
+	0x023c28651,
+	0x00c0008f5,
 	0x0afa20004,
 	0x08fa30148,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
-	0x023c3861f,
+	0x023c38657,
 	0x0afa30004,
 	0x020040001,
 	0x0afa40008,
 	0x0200301b6,
-	0x00c000a70,
+	0x00c000a8f,
 	0x0afa3000c,
 	0x004210004,
 	0x0afa10148,
-	0x023c28627,
-	0x00c0008d6,
+	0x023c2865f,
+	0x00c0008f5,
 	0x0afa20004,
-	0x023c38792,
+	0x023c387ca,
 	0x0afa30004,
-	0x023c2862e,
+	0x023c28666,
 	0x0afa20008,
 	0x08fc38006,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa3000c,
-	0x023c28792,
-	0x00c000a49,
+	0x023c287ca,
+	0x00c000a68,
 	0x0afa20004,
 	0x0afa10014,
-	0x023c48792,
-	0x00c000a49,
+	0x023c487ca,
+	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa40148,
-	0x023c38792,
+	0x023c387ca,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40010,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa4000c,
 	0x08fa30014,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28631,
-	0x00c0008d6,
+	0x023c28669,
+	0x00c0008f5,
 	0x0afa20004,
 	0x08fa30148,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
-	0x023c28637,
-	0x00c00096d,
+	0x023c2866f,
+	0x00c00098c,
 	0x0afa20004,
-	0x023c28640,
+	0x023c28678,
 	0x0afa20004,
-	0x023c48642,
+	0x023c4867a,
 	0x0afa40008,
-	0x00c000a66,
+	0x00c000a85,
 	0x0afa0000c,
 	0x004210004,
 	0x000000027,
-	0x023c28644,
-	0x00c0008d6,
+	0x023c2867c,
+	0x00c0008f5,
 	0x0afa20004,
 	0x08fc28006,
-	0x023c48649,
+	0x023c48681,
 	0x0afa20004,
 	0x0afa40008,
 	0x020020006,
 	0x0afa2000c,
-	0x023c4864b,
+	0x023c48683,
 	0x0afa40010,
-	0x023c2864c,
-	0x00c000a84,
+	0x023c28684,
+	0x00c000aa3,
 	0x0afa20014,
 	0x004210004,
 	0x000000027,
-	0x023c3864d,
-	0x00c0008d6,
+	0x023c38685,
+	0x00c0008f5,
 	0x0afa30004,
-	0x023c28653,
-	0x00c00096d,
+	0x023c2868b,
+	0x00c00098c,
 	0x0afa20004,
-	0x023c2865b,
+	0x023c28693,
 	0x0afa20004,
 	0x023a40058,
-	0x00c000a98,
+	0x00c000ab7,
 	0x0afa40008,
 	0x004210004,
 	0x000000027,
-	0x023c2865f,
-	0x00c0008d6,
+	0x023c28697,
+	0x00c0008f5,
 	0x0afa20004,
 	0x023a30058,
 	0x0afa30004,
 	0x023a200cc,
-	0x00c001186,
+	0x00c0011a5,
 	0x0afa20008,
-	0x023c28664,
+	0x023c2869c,
 	0x0afa20004,
 	0x020040001,
-	0x00c000a89,
+	0x00c000aa8,
 	0x0afa40008,
 	0x0afa10148,
 	0x023a20058,
 	0x0afa20004,
-	0x023c3866c,
+	0x023c386a4,
 	0x0afa30008,
 	0x08fa2012c,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa2000c,
 	0x023a20058,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa20004,
 	0x0afa10014,
 	0x08fa20148,
@@ -1041,13 +1072,13 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa30008,
 	0x08fa20014,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa2000c,
 	0x08fa30148,
-	0x00c000a6b,
+	0x00c000a8a,
 	0x0afa30004,
-	0x023c28670,
-	0x00c00096d,
+	0x023c286a8,
+	0x00c00098c,
 	0x0afa20004,
 	0x08fc58022,
 	0x08fc38102,
@@ -1056,21 +1087,21 @@ ulong bootcode[]={
 	0x000000027,
 	0x023a20018,
 	0x0afa20004,
-	0x023c38679,
+	0x023c386b1,
 	0x0afa30008,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa5000c,
 	0x08fc38102,
 	0x023a20018,
 	0x0afa30004,
 	0x0afa20008,
-	0x00c000a66,
+	0x00c000a85,
 	0x0afa0000c,
 	0x08fc38102,
-	0x023c28681,
+	0x023c286b9,
 	0x0afa30004,
 	0x0afa20008,
-	0x00c000a66,
+	0x00c000a85,
 	0x0afa0000c,
 	0x08fc58022,
 	0x000000027,
@@ -1078,160 +1109,160 @@ ulong bootcode[]={
 	0x000000027,
 	0x023a20018,
 	0x0afa20004,
-	0x023c3868a,
+	0x023c386c2,
 	0x0afa30008,
-	0x00c0009b7,
+	0x00c0009d6,
 	0x0afa5000c,
-	0x023c3869a,
+	0x023c386d2,
 	0x0afa30004,
 	0x023a20018,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa20008,
 	0x023a30018,
 	0x0afa30004,
-	0x023c286bc,
+	0x023c286f4,
 	0x0afa20008,
-	0x00c000a66,
+	0x00c000a85,
 	0x0afa0000c,
 	0x08fa30154,
 	0x000000027,
 	0x010600010,
 	0x000000027,
-	0x023c286cd,
+	0x023c28705,
 	0x0afa20004,
-	0x023c386d8,
+	0x023c38710,
 	0x0afa30008,
-	0x023c286dd,
+	0x023c28715,
 	0x0afa2000c,
-	0x00c000a55,
+	0x00c000a74,
 	0x0afa00010,
-	0x023c38737,
-	0x00c0008d6,
+	0x023c3876f,
+	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x00c000a7f,
+	0x00c000a9e,
 	0x000000027,
 	0x02002ffff,
 	0x010220024,
 	0x000000027,
 	0x01020000e,
 	0x000000027,
-	0x023c38727,
+	0x023c3875f,
 	0x0afa30004,
-	0x023c28732,
+	0x023c2876a,
 	0x0afa20008,
-	0x00c000a55,
+	0x00c000a74,
 	0x0afa0000c,
-	0x023c38737,
-	0x00c0008d6,
+	0x023c3876f,
+	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c286ff,
+	0x023c28737,
 	0x0afa20004,
-	0x023c3870a,
+	0x023c38742,
 	0x0afa30008,
-	0x023c2870f,
+	0x023c28747,
 	0x0afa2000c,
-	0x023c38712,
+	0x023c3874a,
 	0x0afa30010,
-	0x00c000a55,
+	0x00c000a74,
 	0x0afa00014,
-	0x023c2871a,
-	0x00c0008d6,
+	0x023c28752,
+	0x00c0008f5,
 	0x0afa20004,
-	0x023c38737,
-	0x00c0008d6,
+	0x023c3876f,
+	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c386e0,
-	0x00c00096d,
+	0x023c38718,
+	0x00c00098c,
 	0x0afa30004,
-	0x023c38737,
-	0x00c0008d6,
+	0x023c3876f,
+	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c385d6,
-	0x00c00096d,
+	0x023c3860e,
+	0x00c00098c,
 	0x0afa30004,
 	0x0200203e8,
-	0x00c000a93,
+	0x00c000ab2,
 	0x0afa20004,
 	0x08fc68006,
 	0x08fa20144,
-	0x008000744,
+	0x008000763,
 	0x024450001,
 	0x0afa50004,
-	0x023c485c6,
+	0x023c485fe,
 	0x0afa40008,
 	0x020030004,
-	0x00c0009cf,
+	0x00c0009ee,
 	0x0afa3000c,
 	0x014200007,
 	0x023c58026,
 	0x024a30004,
 	0x0afa30140,
-	0x00c0005f6,
+	0x00c000615,
 	0x0afa30004,
-	0x008000757,
+	0x008000776,
 	0x000013025,
 	0x0afa50004,
-	0x023c485cb,
+	0x023c48603,
 	0x0afa40008,
 	0x020020003,
-	0x00c0009cf,
+	0x00c0009ee,
 	0x0afa2000c,
 	0x014200007,
 	0x023c58026,
 	0x024a20003,
 	0x0afa20140,
-	0x00c00056d,
+	0x00c00058c,
 	0x0afa20004,
-	0x008000757,
+	0x008000776,
 	0x000013025,
 	0x0afa50004,
-	0x023c485cf,
+	0x023c48607,
 	0x0afa40008,
 	0x020030006,
-	0x00c0009cf,
+	0x00c0009ee,
 	0x0afa3000c,
 	0x014200007,
 	0x023c58026,
 	0x024a30006,
 	0x0afa30140,
-	0x00c0004b6,
+	0x00c0004d5,
 	0x0afa30004,
-	0x008000757,
+	0x008000776,
 	0x000013025,
 	0x0afa50140,
-	0x00c0004b6,
+	0x00c0004d5,
 	0x0afa50004,
-	0x008000757,
+	0x008000776,
 	0x000013025,
 	0x023bdffac,
 	0x0afbf0000,
 	0x023a20014,
-	0x00c000a75,
+	0x00c000a94,
 	0x0afa20004,
 	0x020030002,
 	0x0afa30004,
-	0x023c28742,
+	0x023c2877a,
 	0x0afa20008,
 	0x08fa30058,
 	0x023a20014,
 	0x0afa3000c,
-	0x00c000992,
+	0x00c0009b1,
 	0x0afa20010,
 	0x08fa20000,
 	0x000000027,
@@ -1240,18 +1271,18 @@ ulong bootcode[]={
 	0x023bdffac,
 	0x0afbf0000,
 	0x023a30014,
-	0x00c000a75,
+	0x00c000a94,
 	0x0afa30004,
 	0x020020002,
 	0x0afa20004,
-	0x023c38750,
+	0x023c38788,
 	0x0afa30008,
 	0x08fa20058,
 	0x023a30014,
 	0x0afa2000c,
-	0x00c000992,
+	0x00c0009b1,
 	0x0afa30010,
-	0x00c000951,
+	0x00c000970,
 	0x0afa00004,
 	0x08fa20000,
 	0x000000027,
@@ -1259,28 +1290,28 @@ ulong bootcode[]={
 	0x023bd0054,
 	0x023bdfeec,
 	0x0afbf0000,
-	0x023c3875e,
+	0x023c38796,
 	0x0afa30004,
 	0x08fa20118,
 	0x000000027,
 	0x0afa20008,
 	0x08fa3011c,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa3000c,
 	0x0afa00004,
 	0x023a30010,
 	0x0afa30008,
 	0x08fa40120,
-	0x00c000a8e,
+	0x00c000aad,
 	0x0afa4000c,
 	0x014200003,
 	0x000012825,
-	0x0080008ec,
+	0x00800090b,
 	0x000000027,
 	0x004210006,
 	0x0afa10110,
-	0x023c28767,
-	0x00c0008d6,
+	0x023c2879f,
+	0x00c0008f5,
 	0x0afa20004,
 	0x08fa50110,
 	0x000000027,
@@ -1293,7 +1324,7 @@ ulong bootcode[]={
 	0x08fa3011c,
 	0x023a20010,
 	0x0afa30004,
-	0x00c000a09,
+	0x00c000a28,
 	0x0afa20008,
 	0x08fa50110,
 	0x000000027,
@@ -1305,7 +1336,7 @@ ulong bootcode[]={
 	0x000002825,
 	0x028a20021,
 	0x010400011,
-	0x023c6980e,
+	0x023c69846,
 	0x000051080,
 	0x000461021,
 	0x08c420000,
@@ -1330,7 +1361,7 @@ ulong bootcode[]={
 	0x000002025,
 	0x028820021,
 	0x01040000d,
-	0x023c5980e,
+	0x023c59846,
 	0x000041080,
 	0x000451021,
 	0x08c420000,
@@ -1351,10 +1382,10 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400003,
 	0x000000027,
-	0x00c000951,
+	0x00c000970,
 	0x0afa00004,
 	0x023c38046,
-	0x00c000951,
+	0x00c000970,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
@@ -1362,7 +1393,7 @@ ulong bootcode[]={
 	0x023bd0008,
 	0x023bdfff0,
 	0x0afbf0000,
-	0x023c6980e,
+	0x023c69846,
 	0x020040020,
 	0x004800010,
 	0x000000027,
@@ -1378,11 +1409,11 @@ ulong bootcode[]={
 	0x000a0f809,
 	0x0ac400000,
 	0x08fa4000c,
-	0x023c6980e,
-	0x008000955,
+	0x023c69846,
+	0x008000974,
 	0x02484ffff,
 	0x08fa30014,
-	0x00c000a61,
+	0x00c000a80,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
@@ -1398,14 +1429,14 @@ ulong bootcode[]={
 	0x023a41020,
 	0x0afa3000c,
 	0x024840004,
-	0x00c001245,
+	0x00c001264,
 	0x0afa40010,
 	0x023a6001c,
 	0x020020001,
 	0x0afa20004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
@@ -1417,7 +1448,7 @@ ulong bootcode[]={
 	0x014400006,
 	0x0afc38002,
 	0x023c2800a,
-	0x00c000951,
+	0x00c000970,
 	0x0afa20004,
 	0x08fa50014,
 	0x000000027,
@@ -1435,14 +1466,14 @@ ulong bootcode[]={
 	0x023a41024,
 	0x0afa3000c,
 	0x024840004,
-	0x00c001245,
+	0x00c001264,
 	0x0afa40010,
 	0x08fa21020,
 	0x023a6001c,
 	0x0afa20004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000aa2,
+	0x00c000ac1,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
@@ -1454,7 +1485,7 @@ ulong bootcode[]={
 	0x014400006,
 	0x0afc38002,
 	0x023c2800a,
-	0x00c000951,
+	0x00c000970,
 	0x0afa20004,
 	0x08fa50014,
 	0x000000027,
@@ -1474,7 +1505,7 @@ ulong bootcode[]={
 	0x023a40024,
 	0x0afa2000c,
 	0x024840004,
-	0x00c001245,
+	0x00c001264,
 	0x0afa40010,
 	0x08fa20014,
 	0x000000027,
@@ -1613,7 +1644,7 @@ ulong bootcode[]={
 	0x08fa20010,
 	0x000000027,
 	0x0afa20004,
-	0x00c001778,
+	0x00c001797,
 	0x0afa00008,
 	0x08fa30010,
 	0x08fa20000,
@@ -1626,7 +1657,7 @@ ulong bootcode[]={
 	0x023a30010,
 	0x0afa20004,
 	0x024630004,
-	0x00c000a7a,
+	0x00c000a99,
 	0x0afa30008,
 	0x08fa20000,
 	0x000000027,
@@ -1752,7 +1783,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000021600,
 	0x000021603,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa20008,
 	0x08fa20000,
 	0x023bd0014,
@@ -1774,7 +1805,7 @@ ulong bootcode[]={
 	0x038620039,
 	0x01040fff1,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a20008,
 	0x000000027,
@@ -1797,7 +1828,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030040,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1823,7 +1854,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1834,7 +1865,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420024,
 	0x0afa20008,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1845,7 +1876,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420040,
 	0x0afa20008,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1871,7 +1902,7 @@ ulong bootcode[]={
 	0x03862003d,
 	0x010400003,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a30002,
 	0x000000027,
@@ -1974,7 +2005,7 @@ ulong bootcode[]={
 	0x024a3000e,
 	0x0afa30008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -1993,7 +2024,7 @@ ulong bootcode[]={
 	0x038620041,
 	0x010400003,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a30002,
 	0x000000027,
@@ -2121,7 +2152,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa70018,
 	0x08fa20010,
@@ -2172,7 +2203,7 @@ ulong bootcode[]={
 	0x038620045,
 	0x010400003,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a30002,
 	0x000000027,
@@ -2197,7 +2228,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2341,7 +2372,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2364,7 +2395,7 @@ ulong bootcode[]={
 	0x038620049,
 	0x010400003,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a20002,
 	0x000000027,
@@ -2451,7 +2482,7 @@ ulong bootcode[]={
 	0x03862004d,
 	0x010400003,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a20002,
 	0x024c30002,
@@ -2467,7 +2498,7 @@ ulong bootcode[]={
 	0x024a30008,
 	0x0afa30008,
 	0x020020074,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2523,7 +2554,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030074,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2544,7 +2575,7 @@ ulong bootcode[]={
 	0x038620051,
 	0x01040fe1e,
 	0x000000027,
-	0x008000ad3,
+	0x008000af2,
 	0x000000027,
 	0x084a20002,
 	0x000000027,
@@ -2569,7 +2600,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2606,7 +2637,7 @@ ulong bootcode[]={
 	0x08fa30018,
 	0x000000027,
 	0x0afa30008,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2617,7 +2648,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x02463001c,
 	0x0afa30008,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2628,7 +2659,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024630038,
 	0x0afa30008,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa40018,
 	0x08fa30010,
@@ -2803,7 +2834,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
-	0x00c00096d,
+	0x00c00098c,
 	0x0afa30008,
 	0x08fa20000,
 	0x023bd0014,
@@ -2833,7 +2864,7 @@ ulong bootcode[]={
 	0x038430039,
 	0x01060ffe9,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -2842,17 +2873,17 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20008,
 	0x024c20008,
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
 	0x020020040,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x024650040,
 	0x090a20000,
 	0x090a30001,
@@ -2867,7 +2898,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2877,7 +2908,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2887,10 +2918,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x02465001c,
 	0x02443ffc2,
 	0x01c600063,
@@ -2906,7 +2937,7 @@ ulong bootcode[]={
 	0x03843003d,
 	0x010600003,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -2915,7 +2946,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -2932,7 +2963,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c2000c,
 	0x090a20000,
 	0x090a30001,
@@ -2973,7 +3004,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000efa,
+	0x008000f19,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -2988,10 +3019,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x02465001c,
 	0x03843003f,
 	0x01060003e,
@@ -3002,7 +3033,7 @@ ulong bootcode[]={
 	0x038430041,
 	0x010600003,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -3043,7 +3074,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000efa,
+	0x008000f19,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3055,7 +3086,7 @@ ulong bootcode[]={
 	0x024a30002,
 	0x024650001,
 	0x080630000,
-	0x008000efa,
+	0x008000f19,
 	0x0a0c3002a,
 	0x090a20000,
 	0x090a30001,
@@ -3096,7 +3127,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000efa,
+	0x008000f19,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3111,7 +3142,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa6001c,
 	0x08fa30010,
@@ -3135,7 +3166,7 @@ ulong bootcode[]={
 	0x024a30004,
 	0x024650001,
 	0x080630000,
-	0x008000efa,
+	0x008000f19,
 	0x0a0c3002a,
 	0x02443ffb6,
 	0x01c6000ce,
@@ -3156,7 +3187,7 @@ ulong bootcode[]={
 	0x038430045,
 	0x010600003,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -3177,7 +3208,7 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000efa,
+	0x008000f19,
 	0x000a32821,
 	0x090a20000,
 	0x090a30001,
@@ -3210,7 +3241,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,
@@ -3251,7 +3282,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000efa,
+	0x008000f19,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3288,7 +3319,7 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000efa,
+	0x008000f19,
 	0x000a32821,
 	0x038430047,
 	0x01060001b,
@@ -3299,7 +3330,7 @@ ulong bootcode[]={
 	0x038430049,
 	0x010600003,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -3308,7 +3339,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3317,7 +3348,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3334,7 +3365,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,
@@ -3343,7 +3374,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x02443ffb2,
 	0x01c600044,
@@ -3359,7 +3390,7 @@ ulong bootcode[]={
 	0x03843004d,
 	0x010600003,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -3374,10 +3405,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x024650074,
 	0x090a20000,
 	0x090a30001,
@@ -3386,7 +3417,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3395,7 +3426,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3410,10 +3441,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x024650074,
 	0x03843004f,
 	0x010600023,
@@ -3424,7 +3455,7 @@ ulong bootcode[]={
 	0x038430051,
 	0x01060fe92,
 	0x000000027,
-	0x008000eee,
+	0x008000f0d,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
@@ -3447,10 +3478,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000efa,
+	0x008000f19,
 	0x02465001c,
 	0x090a20000,
 	0x090a30001,
@@ -3459,7 +3490,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000efa,
+	0x008000f19,
 	0x0a4c20002,
 	0x023bdffec,
 	0x0afbf0000,
@@ -3470,7 +3501,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3480,7 +3511,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3490,7 +3521,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001831,
+	0x00c001850,
 	0x0afa3000c,
 	0x08fa5001c,
 	0x08fa20010,
@@ -3711,7 +3742,7 @@ ulong bootcode[]={
 	0x02002000a,
 	0x014a20003,
 	0x000000027,
-	0x008001256,
+	0x008001275,
 	0x0afc080d6,
 	0x020020009,
 	0x014a2ffd2,
@@ -3721,7 +3752,7 @@ ulong bootcode[]={
 	0x024630007,
 	0x0201cfff8,
 	0x0007c1824,
-	0x008001256,
+	0x008001275,
 	0x0afc380d6,
 	0x02007fc18,
 	0x0200bfc18,
@@ -3735,7 +3766,7 @@ ulong bootcode[]={
 	0x000052e03,
 	0x014a00003,
 	0x000000027,
-	0x008001256,
+	0x008001275,
 	0x024c6ffff,
 	0x02002002e,
 	0x014a20007,
@@ -3744,7 +3775,7 @@ ulong bootcode[]={
 	0x014e20002,
 	0x000000027,
 	0x000003825,
-	0x00800128f,
+	0x0080012ae,
 	0x000005825,
 	0x028a20031,
 	0x014400025,
@@ -3766,11 +3797,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x014a0ffe4,
 	0x000083825,
-	0x008001256,
+	0x008001275,
 	0x024c6ffff,
 	0x014a0ffe0,
 	0x000085825,
-	0x008001256,
+	0x008001275,
 	0x024c6ffff,
 	0x02002000a,
 	0x001020018,
@@ -3783,7 +3814,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000052e00,
 	0x000052e03,
-	0x0080012ab,
+	0x0080012ca,
 	0x02468ffd0,
 	0x020030030,
 	0x014a30006,
@@ -3791,7 +3822,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e30003,
 	0x000000027,
-	0x0080012aa,
+	0x0080012c9,
 	0x000000027,
 	0x02002002a,
 	0x014a20009,
@@ -3800,9 +3831,9 @@ ulong bootcode[]={
 	0x02002fc18,
 	0x014e20003,
 	0x025290004,
-	0x00800128f,
+	0x0080012ae,
 	0x000053825,
-	0x00800128f,
+	0x0080012ae,
 	0x000055825,
 	0x030a5007f,
 	0x0afa90044,
@@ -3835,9 +3866,9 @@ ulong bootcode[]={
 	0x000000027,
 	0x08fa40028,
 	0x000011023,
-	0x00800128f,
+	0x0080012ae,
 	0x000825025,
-	0x008001256,
+	0x008001275,
 	0x001214821,
 	0x023bdfff0,
 	0x0afbf0000,
@@ -3855,13 +3886,13 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40008,
 	0x08fa2001c,
-	0x00c0013f2,
+	0x00c001411,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0010,
-	0x00800130b,
+	0x00800132a,
 	0x000042023,
 	0x023bdffa8,
 	0x0afbf0000,
@@ -3953,7 +3984,7 @@ ulong bootcode[]={
 	0x02002fc18,
 	0x0afa30008,
 	0x0afa2000c,
-	0x00c001300,
+	0x00c00131f,
 	0x0afa70010,
 	0x08fa10028,
 	0x08fa20000,
@@ -3972,12 +4003,12 @@ ulong bootcode[]={
 	0x024a5ffff,
 	0x001651021,
 	0x020040030,
-	0x008001366,
+	0x008001385,
 	0x0a0440000,
 	0x024a5ffff,
 	0x001651021,
 	0x020040078,
-	0x008001382,
+	0x0080013a1,
 	0x0a0440000,
 	0x030e30040,
 	0x01060001e,
@@ -3999,27 +4030,27 @@ ulong bootcode[]={
 	0x000000027,
 	0x01d000003,
 	0x000000027,
-	0x008001357,
+	0x008001376,
 	0x000000027,
 	0x01d400003,
 	0x000000027,
-	0x008001357,
+	0x008001376,
 	0x000000027,
 	0x030e30040,
 	0x01460ffa1,
 	0x024a5ffff,
 	0x00149001b,
-	0x00800134d,
+	0x00800136c,
 	0x000003010,
 	0x00149001b,
-	0x008001393,
+	0x0080013b2,
 	0x000005012,
 	0x0200d0001,
-	0x008001345,
+	0x008001364,
 	0x0000a5023,
 	0x08caa0000,
 	0x020020004,
-	0x008001340,
+	0x00800135f,
 	0x0afa20028,
 	0x08ca30000,
 	0x000000027,
@@ -4031,15 +4062,15 @@ ulong bootcode[]={
 	0x000021403,
 	0x020030004,
 	0x0afa30028,
-	0x008001340,
+	0x00800135f,
 	0x000025025,
 	0x08caa0000,
 	0x020020004,
-	0x008001340,
+	0x00800135f,
 	0x0afa20028,
 	0x08caa0000,
 	0x020020004,
-	0x008001340,
+	0x00800135f,
 	0x0afa20028,
 	0x020020030,
 	0x01062000a,
@@ -4047,11 +4078,11 @@ ulong bootcode[]={
 	0x020020048,
 	0x010620003,
 	0x000000027,
-	0x00800133d,
+	0x00800135c,
 	0x000000027,
 	0x08ca80000,
 	0x020020004,
-	0x008001340,
+	0x00800135f,
 	0x0afa20028,
 	0x08ca20000,
 	0x000000027,
@@ -4061,14 +4092,14 @@ ulong bootcode[]={
 	0x03063ffff,
 	0x020020004,
 	0x0afa20028,
-	0x008001340,
+	0x00800135f,
 	0x000035025,
-	0x00800132d,
+	0x00800134c,
 	0x02009000a,
 	0x0200e0001,
-	0x00800132d,
+	0x00800134c,
 	0x020090010,
-	0x00800132d,
+	0x00800134c,
 	0x020090008,
 	0x020020075,
 	0x011220006,
@@ -4076,15 +4107,15 @@ ulong bootcode[]={
 	0x020020078,
 	0x01122fff7,
 	0x000000027,
-	0x00800132d,
+	0x00800134c,
 	0x000000027,
 	0x02009000a,
-	0x00800132d,
+	0x00800134c,
 	0x034e70020,
 	0x023bdfff0,
 	0x0afbf0000,
 	0x08fa30014,
-	0x00c000a49,
+	0x00c000a68,
 	0x0afa30004,
 	0x08fac0014,
 	0x08faa0018,
@@ -4109,7 +4140,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x01ce00003,
 	0x000000027,
-	0x008001402,
+	0x008001421,
 	0x000000027,
 	0x000c9202b,
 	0x010800005,
@@ -4127,7 +4158,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffe3,
 	0x000000027,
-	0x008001402,
+	0x008001421,
 	0x024e7ffff,
 	0x020020009,
 	0x01562fff9,
@@ -4138,7 +4169,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffd8,
 	0x0afc880d6,
-	0x008001402,
+	0x008001421,
 	0x024e7ffff,
 	0x02002fc18,
 	0x011420003,
@@ -4163,7 +4194,7 @@ ulong bootcode[]={
 	0x0a0640000,
 	0x025080001,
 	0x024a50001,
-	0x008001437,
+	0x008001456,
 	0x0afc880d6,
 	0x000aa202a,
 	0x01080ffba,
@@ -4178,7 +4209,7 @@ ulong bootcode[]={
 	0x0a0440000,
 	0x025080001,
 	0x024a50001,
-	0x008001446,
+	0x008001465,
 	0x0afc880d6,
 	0x023bdffec,
 	0x0afbf0000,
@@ -4193,7 +4224,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x0afa00008,
 	0x02002fc18,
-	0x00c0013f2,
+	0x00c001411,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4211,7 +4242,7 @@ ulong bootcode[]={
 	0x08fa3001c,
 	0x02002fc18,
 	0x0afa30008,
-	0x00c0013f2,
+	0x00c001411,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4231,7 +4262,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa3000c,
 	0x08fa20024,
-	0x00c001300,
+	0x00c00131f,
 	0x0afa20010,
 	0x08fa20000,
 	0x023bd0014,
@@ -4356,7 +4387,7 @@ ulong bootcode[]={
 	0x023a20034,
 	0x0e7a10004,
 	0x0e7a00008,
-	0x00c0017aa,
+	0x00c0017c9,
 	0x0afa2000c,
 	0x08fa20034,
 	0x04444f800,
@@ -4380,7 +4411,7 @@ ulong bootcode[]={
 	0x000023043,
 	0x0afa60030,
 	0x000061023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x0c7a30048,
 	0x0c7a2004c,
@@ -4392,7 +4423,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4415,7 +4446,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4424,7 +4455,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x008001534,
+	0x008001553,
 	0x023ae0078,
 	0x0c7c180da,
 	0x0c7c080de,
@@ -4441,7 +4472,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4450,7 +4481,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x00800154b,
+	0x00800156a,
 	0x023ae0078,
 	0x02003fc18,
 	0x015830002,
@@ -4485,7 +4516,7 @@ ulong bootcode[]={
 	0x0200cffff,
 	0x0afac00ac,
 	0x0200d0065,
-	0x0080014f8,
+	0x008001517,
 	0x0afad00b4,
 	0x0c7a70048,
 	0x0c7a6004c,
@@ -4499,7 +4530,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x02002ffff,
 	0x000431023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4521,7 +4552,7 @@ ulong bootcode[]={
 	0x000671823,
 	0x004600138,
 	0x0afa7002c,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa30004,
 	0x0c7a30040,
 	0x0c7a20044,
@@ -4530,7 +4561,7 @@ ulong bootcode[]={
 	0x046201083,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c00170d,
+	0x00c00172c,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4592,7 +4623,7 @@ ulong bootcode[]={
 	0x000042603,
 	0x02484fff6,
 	0x0a0440001,
-	0x0080015db,
+	0x0080015fa,
 	0x024c6ffff,
 	0x010e00007,
 	0x0200b0001,
@@ -4660,7 +4691,7 @@ ulong bootcode[]={
 	0x020030030,
 	0x0a0430000,
 	0x024e7ffff,
-	0x008001626,
+	0x008001645,
 	0x024c60001,
 	0x019000013,
 	0x000000027,
@@ -4680,7 +4711,7 @@ ulong bootcode[]={
 	0x0256b0001,
 	0x0a0430000,
 	0x02508ffff,
-	0x008001637,
+	0x008001656,
 	0x024c60001,
 	0x08fa300b0,
 	0x000000027,
@@ -4709,7 +4740,7 @@ ulong bootcode[]={
 	0x0afa30008,
 	0x0afa2000c,
 	0x08fa300b0,
-	0x00c001300,
+	0x00c00131f,
 	0x0afa30010,
 	0x08fa20000,
 	0x023bd00a0,
@@ -4765,19 +4796,19 @@ ulong bootcode[]={
 	0x000001810,
 	0x024630030,
 	0x0a0430000,
-	0x00800165e,
+	0x00800167d,
 	0x024c60001,
 	0x000061825,
 	0x001231021,
 	0x02003002b,
 	0x0a0430000,
-	0x00800167f,
+	0x00800169e,
 	0x024c60001,
 	0x000061025,
 	0x001221821,
 	0x020020065,
 	0x0a0620000,
-	0x008001675,
+	0x008001694,
 	0x024c60001,
 	0x020030067,
 	0x011a30006,
@@ -4785,7 +4816,7 @@ ulong bootcode[]={
 	0x020030068,
 	0x011a30003,
 	0x000000027,
-	0x008001658,
+	0x008001677,
 	0x000000027,
 	0x024c7ffff,
 	0x004e00006,
@@ -4805,11 +4836,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01107ff93,
 	0x000073025,
-	0x008001658,
+	0x008001677,
 	0x024c60001,
-	0x0080016bd,
+	0x0080016dc,
 	0x02508ffff,
-	0x0080016b5,
+	0x0080016d4,
 	0x024e7ffff,
 	0x08fa30034,
 	0x02002ffff,
@@ -4819,7 +4850,7 @@ ulong bootcode[]={
 	0x000003825,
 	0x08fa30034,
 	0x0200d0068,
-	0x008001613,
+	0x008001632,
 	0x001835023,
 	0x08fa200b0,
 	0x000000027,
@@ -4830,7 +4861,7 @@ ulong bootcode[]={
 	0x001221821,
 	0x02002002b,
 	0x0a0620000,
-	0x008001604,
+	0x008001623,
 	0x024c60001,
 	0x0c7c380da,
 	0x0c7c280de,
@@ -4840,7 +4871,7 @@ ulong bootcode[]={
 	0x0e7a60044,
 	0x0e7a70004,
 	0x0e7a60008,
-	0x00c00170d,
+	0x00c00172c,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4867,14 +4898,14 @@ ulong bootcode[]={
 	0x046222181,
 	0x0e7a70040,
 	0x0e7a60044,
-	0x0080015d2,
+	0x0080015f1,
 	0x000000027,
-	0x00800156e,
+	0x00800158d,
 	0x0258cffff,
 	0x020020001,
 	0x0afa20014,
 	0x025ad0020,
-	0x0080014f8,
+	0x008001517,
 	0x0afad00b4,
 	0x023bdffe8,
 	0x0afbf0000,
@@ -4891,7 +4922,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0017f8,
+	0x00c001817,
 	0x0afa2000c,
 	0x04620c032,
 	0x000000027,
@@ -4920,7 +4951,7 @@ ulong bootcode[]={
 	0x023a2001c,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0017f8,
+	0x00c001817,
 	0x0afa2000c,
 	0x0c7a1001c,
 	0x0c7a00020,
@@ -4936,7 +4967,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c00170d,
+	0x00c00172c,
 	0x000000027,
 	0x08fa20000,
 	0x023bd000c,
@@ -4949,7 +4980,7 @@ ulong bootcode[]={
 	0x004810008,
 	0x000000027,
 	0x000041023,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0014,
@@ -4970,12 +5001,12 @@ ulong bootcode[]={
 	0x000042843,
 	0x0afa50010,
 	0x000851823,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa30004,
 	0x0e7a10008,
 	0x0e7a0000c,
 	0x08fa20010,
-	0x00c00174f,
+	0x00c00176e,
 	0x0afa20004,
 	0x0c7a30008,
 	0x0c7a2000c,
@@ -5166,7 +5197,7 @@ ulong bootcode[]={
 	0x08fa4000c,
 	0x000000027,
 	0x000821024,
-	0x008001819,
+	0x008001838,
 	0x0afa2000c,
 	0x023bdfffc,
 	0x08fa30010,
@@ -5277,10 +5308,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x0a0c8ffff,
 	0x024c6ffff,
-	0x008001898,
+	0x0080018b7,
 	0x024e7ffff,
 	0x000000000,
 	0x000000000,
+	0x000000000,
 	0x07072696e,
 	0x074206572,
 	0x0726f7273,
@@ -5378,13 +5410,13 @@ ulong bootcode[]={
 	0x000010000,
 	0x002000000,
 	0x000000000,
-	0x000005154,
-	0x000005270,
-	0x000004c60,
-	0x00000534c,
-	0x0000051a0,
-	0x0000051e8,
-	0x000005238,
+	0x0000051d0,
+	0x0000052ec,
+	0x000004cdc,
+	0x0000053c8,
+	0x00000521c,
+	0x000005264,
+	0x0000052b4,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -5454,7 +5486,21 @@ ulong bootcode[]={
 	0x0736e616d,
 	0x065007379,
 	0x0736e616d,
-	0x065006269,
+	0x065002365,
+	0x02f746572,
+	0x06d696e61,
+	0x06c007465,
+	0x0726d696e,
+	0x0616c0073,
+	0x067692070,
+	0x06f776572,
+	0x020344400,
+	0x073676920,
+	0x0706f7765,
+	0x072203444,
+	0x000746572,
+	0x06d696e61,
+	0x06c006269,
 	0x07421626f,
 	0x06f746573,
 	0x0002f6d69,
@@ -5763,8 +5809,6 @@ ulong bootcode[]={
 	0x06f740000,
 	0x000000000,
 	0x000000000,
-	0x00005a10,
-	0x0,
-	0x00005a10,
+	0x00005ac8,
 	0x0,
 };
diff --git a/power/devbit3.c b/power/devbit3.c
index a21bab846cc034a76197144226126071d5968f0a..21631fc8b3460f94085e295949d8745c5b5dc96f 100644
--- a/power/devbit3.c
+++ b/power/devbit3.c
@@ -30,7 +30,9 @@ enum
 void
 bit3send(Bit3msg *bp, ulong cmd, void *addr, ulong count)
 {
+	int entry;
 
+	entry = MACHP(0)->ticks;
 	do; while(*BIT3ADDR);
 	bp->cmd = cmd;
 	bp->addr = (ulong)addr;
@@ -38,6 +40,7 @@ bit3send(Bit3msg *bp, ulong cmd, void *addr, ulong count)
 	*BIT3ADDR = bp;
 	wbflush();
 	do; while(*BIT3HOLD);
+	m->spinlock += entry - MACHP(0)->ticks;
 	*BIT3INTR = 0x20;
 
 }
diff --git a/power/mmu.c b/power/mmu.c
index d372635ce51cba6fd6250bdb3b4a4ca2cac9ba38..9ff970579b18b5c3d0bf145c827919ddaaf1f9c0 100644
--- a/power/mmu.c
+++ b/power/mmu.c
@@ -14,18 +14,15 @@ mapstack(Proc *p)
 	ulong tlbvirt, tlbphys;
 
 	tp = p->pidonmach[m->machno];
-	if(tp == 0){
+	if(tp == 0)
 		tp = newtlbpid(p);
-		p->pidonmach[m->machno] = tp;
-	}
 /*	if(p->upage->va != (USERADDR|(p->pid&0xFFFF)))
 		panic("mapstack %d 0x%lux 0x%lux", p->pid, p->upage->pa, p->upage->va);
 */
-	/* don't set m->pidhere[*tp] because we're only writing entry 0 */
+	/* don't set m->pidhere[tp] because we're only writing entry 0 */
 	tlbvirt = USERADDR | PTEPID(tp);
 	tlbphys = p->upage->pa | PTEWRITE | PTEVALID | PTEGLOBL;
 	puttlbx(0, tlbvirt, tlbphys);
-	putstlb(tlbvirt, tlbphys);
 	u = (User*)USERADDR;
 }
 
@@ -43,26 +40,25 @@ newtlbpid(Proc *p)
 	if(s >= NTLBPID)
 		s = 1;
 	i = s;
-	h = m->pidhere;
-	do{
-		i++;
-		if(i >= NTLBPID)
-			i = 1;
-	}while(h[i] && i != s);
+	for(h = m->pidhere; h[i] && i != s; i = (i == NTLBPID - 1 ? 1 : i + 1))
+		;
 	
 	if(i == s){
 		i++;
 		if(i >= NTLBPID)
 			i = 1;
 	}
+	
 	sp = m->pidproc[i];
+	m->lastpid = i;
+	m->pidproc[i] = p;
+	p->pidonmach[m->machno] = i;
 	if(sp){
 		if(sp->pidonmach[m->machno] == i)
 			sp->pidonmach[m->machno] = 0;
-		purgetlb(i);
+		if(h[i])
+			purgetlb(i);
 	}
-	m->lastpid = i;
-	m->pidproc[i] = p;
 	return i;
 }
 
@@ -79,10 +75,8 @@ putmmu(ulong tlbvirt, ulong tlbphys)
 */
 	p->state = MMUing;
 	tp = p->pidonmach[m->machno];
-	if(tp == 0){
+	if(tp == 0)
 		tp = newtlbpid(p);
-		p->pidonmach[m->machno] = tp;
-	}
 	tlbvirt |= PTEPID(tp);
 	putstlb(tlbvirt, tlbphys);
 	puttlb(tlbvirt, tlbphys);
@@ -91,33 +85,49 @@ putmmu(ulong tlbvirt, ulong tlbphys)
 	spllo();
 }
 
+#ifdef POPCNT
+void
+stlbpopcnt(void)
+{
+	Softtlb *entry, *etab;
+	
+	entry = m->stb;
+	etab = &entry[STLBSIZE];
+	for(; entry < etab; entry++)
+		if(entry->virt)
+			m->spinlock++;
+
+	m->spinlock /= 2;
+}
+#endif
+
 void
 purgetlb(int pid)
 {
 	Softtlb *entry, *etab;
 	char *p;
-	Proc *sp;
-	int i, rpid;
-
-	if(m->pidhere[pid] == 0)
-		return;
+	Proc *sp, **pidproc;
+	int i, rpid, mno;
 
 	m->tlbpurge++;
 	p = m->pidhere;
 	memset(m->pidhere, 0, sizeof m->pidhere);
-	for(i=TLBROFF; i<NTLB; i++)
-		if(TLBPID(gettlbvirt(i)) == pid)
-			puttlbx(i, KZERO | PTEPID(i), 0);
 	entry = m->stb;
 	etab = &entry[STLBSIZE];
+	mno = m->machno;
+	pidproc = m->pidproc;
 	for(; entry < etab; entry++){
 		rpid = TLBPID(entry->virt);
-		if(rpid == pid){
+		sp = pidproc[rpid];
+		if(rpid == pid || !sp || sp->pidonmach[mno] != rpid){
 			entry->phys = 0;
 			entry->virt = 0;
 		}else
 			p[rpid] = 1;
 	}
+	for(i=TLBROFF; i<NTLB; i++)
+		if(!p[TLBPID(gettlbvirt(i))])
+			puttlbx(i, KZERO | PTEPID(i), 0);
 }
 
 void