From 7c67f179a300e4f26d5136cc32615d3c48503dc8 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 3 May 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-05-03

---
 gnot/boot.h     |  490 +++++++++++---------
 gnot/dat.h      |    2 +
 gnot/l.s        |    5 +-
 gnot/trap.c     |   23 +-
 port/devnonet.c |    1 +
 power/boot.h    | 1158 ++++++++++++++++++++++++++---------------------
 power/dat.h     |    1 +
 power/trap.c    |   10 +
 ss/faultsparc.c |    2 +-
 ss/trap.c       |    2 +
 10 files changed, 934 insertions(+), 760 deletions(-)

diff --git a/gnot/boot.h b/gnot/boot.h
index bd1e378322a9620d3862a2c34a200c1a45bb8caf..48575712650bda8a47619cddc28d92418d07e9e2 100644
--- a/gnot/boot.h
+++ b/gnot/boot.h
@@ -1,7 +1,7 @@
 ulong bootcode[]={
 	0x000000107,
-	0x000002972,
-	0x0000005b4,
+	0x000002a02,
+	0x0000005d4,
 	0x0000001e4,
 	0x000000000,
 	0x000002020,
@@ -17,22 +17,22 @@ ulong bootcode[]={
 	0x0001c4e75,
 	0x04feffe80,
 	0x042a7486e,
-	0x0820e6100,
+	0x0822e6100,
 	0x00b744878,
 	0x00001486e,
-	0x082166100,
+	0x082366100,
 	0x00b684878,
 	0x00001486e,
-	0x0821e6100,
+	0x0823e6100,
 	0x00b5c4878,
 	0x001b64878,
 	0x00001486e,
-	0x082266100,
+	0x082466100,
 	0x00b2e4a80,
 	0x042e72f40,
 	0x0019a44df,
 	0x06c0a486e,
-	0x082316100,
+	0x082516100,
 	0x008d2588f,
 	0x02f370161,
 	0x001ac6100,
@@ -46,28 +46,28 @@ ulong bootcode[]={
 	0x061000ac0,
 	0x0588f221f,
 	0x0b280670a,
-	0x0486e8239,
+	0x0486e8259,
 	0x061000898,
 	0x0588f2f2f,
 	0x001a46100,
 	0x00ad04878,
 	0x001b64878,
 	0x00001486e,
-	0x082416100,
+	0x082616100,
 	0x00ac64a80,
 	0x042e72f40,
 	0x001b644df,
 	0x06c0a486e,
-	0x0824d6100,
+	0x0826d6100,
 	0x0086a588f,
-	0x0486e8262,
+	0x0486e8282,
 	0x061000a78,
 	0x0588f2f00,
-	0x0486e8256,
+	0x0486e8276,
 	0x02f2f01bc,
 	0x061000ace,
 	0x04a806c0a,
-	0x0486e826e,
+	0x0486e828e,
 	0x061000844,
 	0x0588f2f2f,
 	0x001c06100,
@@ -82,10 +82,10 @@ ulong bootcode[]={
 	0x02f2f01d4,
 	0x061000706,
 	0x02f4001d8,
-	0x0486e8277,
+	0x0486e8297,
 	0x0610008d6,
-	0x0486e8285,
-	0x0486e827f,
+	0x0486e82a5,
+	0x0486e829f,
 	0x0486f00dc,
 	0x061000996,
 	0x0487801b6,
@@ -95,11 +95,11 @@ ulong bootcode[]={
 	0x04a8042e7,
 	0x02f4001f2,
 	0x044df6c0a,
-	0x0486e828c,
+	0x0486e82ac,
 	0x0610007d4,
 	0x0588f2f2f,
 	0x001f4486e,
-	0x08293486f,
+	0x082b3486f,
 	0x000f46100,
 	0x00960486f,
 	0x000f86100,
@@ -112,26 +112,26 @@ ulong bootcode[]={
 	0x0610009b8,
 	0x0588f221f,
 	0x0b280670a,
-	0x0486e8296,
+	0x0486e82b6,
 	0x061000790,
 	0x0588f2f2f,
 	0x002086100,
 	0x009c8486e,
-	0x082a2486e,
-	0x0829c486f,
+	0x082c2486e,
+	0x082bc486f,
 	0x001106100,
 	0x009144878,
 	0x001b64878,
 	0x00001486e,
-	0x082a96100,
+	0x082c96100,
 	0x009ae4a80,
 	0x042e72f40,
 	0x0022644df,
 	0x06c0a486e,
-	0x082b16100,
+	0x082d16100,
 	0x00752588f,
 	0x02f2f0228,
-	0x0486e82b8,
+	0x0486e82d8,
 	0x0486f0128,
 	0x0610008de,
 	0x0486f012c,
@@ -145,46 +145,46 @@ ulong bootcode[]={
 	0x00936588f,
 	0x0221fb280,
 	0x0670a486e,
-	0x082bb6100,
+	0x082db6100,
 	0x0070e588f,
 	0x02f2f023c,
 	0x061000946,
 	0x042a7486e,
-	0x082c3486e,
-	0x082c16100,
+	0x082e3486e,
+	0x082e16100,
 	0x009264a80,
 	0x06c0a486e,
-	0x082c56100,
+	0x082e56100,
 	0x006ea588f,
-	0x0486e82ca,
+	0x0486e82ea,
 	0x0610007ae,
-	0x0486e82d6,
-	0x0486e82d5,
+	0x0486e82f6,
+	0x0486e82f5,
 	0x048780006,
-	0x0486e82d3,
+	0x0486e82f3,
 	0x02f2f0264,
 	0x061000928,
 	0x04a806c0a,
-	0x0486e82d7,
+	0x0486e82f7,
 	0x0610006bc,
 	0x0588f486e,
-	0x082dd6100,
+	0x082fd6100,
 	0x00780486f,
 	0x00164486e,
-	0x082e56100,
+	0x083056100,
 	0x0091e4a80,
 	0x06c0a486e,
-	0x082e96100,
+	0x083096100,
 	0x0069a588f,
 	0x0486f00f8,
 	0x0486f0170,
-	0x061001772,
+	0x061001802,
 	0x048780001,
-	0x0486e82ee,
+	0x0486e830e,
 	0x0610008e6,
 	0x02f400280,
 	0x02f2f0168,
-	0x0486e82f6,
+	0x0486e8316,
 	0x0486f0184,
 	0x06100080a,
 	0x0486f0188,
@@ -195,22 +195,22 @@ ulong bootcode[]={
 	0x0610008d2,
 	0x02f2f0298,
 	0x06100088e,
-	0x0486e82fa,
+	0x0486e831a,
 	0x061000712,
 	0x042a7486e,
-	0x08306486e,
-	0x083036100,
+	0x08326486e,
+	0x083236100,
 	0x0086642a7,
-	0x0486e8312,
-	0x0486e830f,
+	0x0486e8332,
+	0x0486e832f,
 	0x061000858,
 	0x04aae801e,
 	0x0672042a7,
-	0x0486e832b,
-	0x0486e8326,
-	0x0486e831a,
+	0x0486e834b,
+	0x0486e8346,
+	0x0486e833a,
 	0x0610007de,
-	0x0486e8388,
+	0x0486e83a8,
 	0x061000608,
 	0x04fef02d4,
 	0x04e756100,
@@ -219,22 +219,22 @@ ulong bootcode[]={
 	0x0b2806742,
 	0x04281b280,
 	0x0671842a7,
-	0x0486e8383,
-	0x0486e8377,
+	0x0486e83a3,
+	0x0486e8397,
 	0x0610007ae,
 	0x04fef000c,
 	0x04feffeb0,
 	0x060c642a7,
-	0x0486e8361,
-	0x0486e835e,
-	0x0486e8359,
-	0x0486e834d,
+	0x0486e8381,
+	0x0486e837e,
+	0x0486e8379,
+	0x0486e836d,
 	0x06100078e,
-	0x0486e8369,
+	0x0486e8389,
 	0x0610005b8,
 	0x04fef0018,
 	0x060d6486e,
-	0x0832e6100,
+	0x0834e6100,
 	0x00678588f,
 	0x060ca598f,
 	0x0102e8022,
@@ -245,18 +245,18 @@ ulong bootcode[]={
 	0x000b27273,
 	0x0b200676a,
 	0x048780002,
-	0x0486e83f7,
+	0x0486e8417,
 	0x0610007e2,
 	0x02f400008,
 	0x04aaf0008,
 	0x0508f6c0a,
-	0x0486e83fe,
+	0x0486e841e,
 	0x061000568,
 	0x0588f486e,
-	0x0840d2f2f,
+	0x0842d2f2f,
 	0x000046100,
 	0x0052a486e,
-	0x084182f2f,
+	0x084382f2f,
 	0x0000c6100,
 	0x0051e6100,
 	0x007a44fef,
@@ -272,33 +272,33 @@ ulong bootcode[]={
 	0x0588f60f2,
 	0x060ec4878,
 	0x00002486e,
-	0x083c56100,
+	0x083e56100,
 	0x007782f40,
 	0x000084aaf,
 	0x000086c0a,
-	0x0486e83d1,
+	0x0486e83f1,
 	0x061000500,
 	0x0588f486e,
-	0x083e52f2f,
+	0x084052f2f,
 	0x0000c6100,
 	0x004c2486e,
-	0x083ec2f2f,
+	0x0840c2f2f,
 	0x000146100,
 	0x004b64fef,
 	0x000186000,
 	0x0ff7a60be,
 	0x048780002,
-	0x0486e8394,
+	0x0486e83b4,
 	0x061000736,
 	0x02f400008,
 	0x04aaf0008,
 	0x06c0a486e,
-	0x083a06100,
+	0x083c06100,
 	0x004be588f,
-	0x0486e83b4,
+	0x0486e83d4,
 	0x02f2f000c,
 	0x061000480,
-	0x0486e83ba,
+	0x0486e83da,
 	0x02f2f0014,
 	0x061000474,
 	0x04fef0018,
@@ -306,36 +306,36 @@ ulong bootcode[]={
 	0x04feffff0,
 	0x042af0004,
 	0x048780002,
-	0x0486e842e,
+	0x0486e844e,
 	0x0610006ee,
 	0x04a8042e7,
 	0x02f400016,
 	0x044df6c0a,
-	0x0486e8438,
+	0x0486e8458,
 	0x061000474,
 	0x0588f4878,
 	0x00002486e,
-	0x0844a6100,
+	0x0846a6100,
 	0x006cc4a80,
 	0x042e72f40,
 	0x0001a44df,
 	0x06c0a486e,
-	0x084536100,
+	0x084736100,
 	0x00452588f,
-	0x0486e8696,
-	0x0486e8464,
-	0x0486e85b6,
+	0x0486e86b6,
+	0x0486e8484,
+	0x0486e85d6,
 	0x0610005de,
-	0x0486e85b6,
+	0x0486e85d6,
 	0x061000650,
 	0x02f002f40,
 	0x00024486e,
-	0x085b62f2f,
+	0x085d62f2f,
 	0x000306100,
 	0x006a4b0af,
 	0x0002c661e,
-	0x0486e8696,
-	0x0486e8497,
+	0x0486e86b6,
+	0x0486e84b7,
 	0x0610004e2,
 	0x02f2f003c,
 	0x06100064e,
@@ -344,10 +344,10 @@ ulong bootcode[]={
 	0x04e757005,
 	0x0b0af0030,
 	0x0660a486e,
-	0x0846f6100,
+	0x0848f6100,
 	0x003f2588f,
-	0x0486e8696,
-	0x0486e8477,
+	0x0486e86b6,
+	0x0486e8497,
 	0x0610004b2,
 	0x02f2f0040,
 	0x06100061e,
@@ -359,17 +359,17 @@ ulong bootcode[]={
 	0x0518f42ae,
 	0x0801a42ae,
 	0x0801e42a7,
-	0x0486e84a8,
+	0x0486e84c8,
 	0x06100061a,
 	0x04a806d74,
 	0x04878003f,
-	0x0486e875a,
+	0x0486e877a,
 	0x02f002f40,
 	0x000186100,
 	0x0060a2f2f,
 	0x000186100,
 	0x005d8207c,
-	0x000006758,
+	0x000006778,
 	0x048780020,
 	0x02f086100,
 	0x005662040,
@@ -392,7 +392,7 @@ ulong bootcode[]={
 	0x070012d40,
 	0x0801a60ea,
 	0x042a7486e,
-	0x084b46100,
+	0x084d46100,
 	0x005984a80,
 	0x06d1e4878,
 	0x00001486e,
@@ -403,146 +403,146 @@ ulong bootcode[]={
 	0x061000556,
 	0x04fef0010,
 	0x042a7486e,
-	0x084c26100,
+	0x084e26100,
 	0x0056c4a80,
 	0x06d204878,
 	0x00040486e,
-	0x086962f00,
+	0x086b62f00,
 	0x02f400028,
 	0x06100055c,
 	0x02f2f0028,
 	0x06100052a,
 	0x04fef0030,
 	0x04e75486e,
-	0x084d0486e,
-	0x086966100,
+	0x084f0486e,
+	0x086b66100,
 	0x004dc518f,
 	0x060ea598f,
-	0x0486e84d4,
+	0x0486e84f4,
 	0x061000396,
 	0x01d7c0032,
-	0x0861a3d7c,
-	0x0ffff861e,
-	0x0486e85b6,
-	0x0486e861a,
-	0x06100053a,
+	0x0863a3d7c,
+	0x0ffff863e,
+	0x0486e85d6,
+	0x0486e863a,
+	0x0610005ea,
 	0x02f002f40,
 	0x00010486e,
-	0x085b62f2f,
+	0x085d62f2f,
 	0x0001c6100,
 	0x0051cb0af,
 	0x00018670a,
-	0x0486e84db,
+	0x0486e84fb,
 	0x061000290,
 	0x0588f4878,
 	0x00064486e,
-	0x085b62f2f,
+	0x085d62f2f,
 	0x000286100,
 	0x004ea2200,
 	0x07002b081,
 	0x066080c2e,
-	0x0004f85b6,
+	0x0004f85d6,
 	0x0677c4a81,
 	0x042e72f41,
 	0x0002644df,
 	0x06e0e486e,
-	0x084e56100,
+	0x085056100,
 	0x0025a222f,
 	0x00028588f,
 	0x02f01486e,
-	0x0861a486e,
-	0x085b66100,
-	0x00cdc4a80,
+	0x0863a486e,
+	0x085d66100,
+	0x00d7c4a80,
 	0x06638102e,
-	0x085b949c0,
+	0x085d949c0,
 	0x02f00102e,
-	0x085b849c0,
+	0x085d849c0,
 	0x02f00102e,
-	0x085b749c0,
+	0x085d749c0,
 	0x02f00102e,
-	0x085b649c0,
+	0x085d649c0,
 	0x02f002f2f,
 	0x00040486e,
-	0x084ee6100,
+	0x0850e6100,
 	0x002e4486e,
-	0x085116100,
+	0x085316100,
 	0x0020e4fef,
 	0x0001c0c2e,
-	0x00033861a,
+	0x00033863a,
 	0x0670a486e,
-	0x0851c6100,
+	0x0853c6100,
 	0x001fa588f,
 	0x04fef0034,
 	0x04e750c2e,
-	0x0004b85b7,
+	0x0004b85d7,
 	0x06600ff7c,
 	0x048780064,
-	0x0486e85b6,
+	0x0486e85d6,
 	0x02f2f0034,
 	0x061000444,
 	0x022004fef,
 	0x0000c6000,
 	0x0ff62598f,
-	0x0486e8525,
+	0x0486e8545,
 	0x061000292,
 	0x01d7c0034,
-	0x0861a3d7c,
-	0x0ffff861e,
-	0x0486e85b6,
-	0x0486e861a,
-	0x061000436,
+	0x0863a3d7c,
+	0x0ffff863e,
+	0x0486e85d6,
+	0x0486e863a,
+	0x0610004e6,
 	0x02f002f40,
 	0x00010486e,
-	0x085b62f2f,
+	0x085d62f2f,
 	0x0001c6100,
 	0x00418b0af,
 	0x00018670a,
-	0x0486e8530,
+	0x0486e8550,
 	0x06100018c,
 	0x0588f4878,
 	0x00064486e,
-	0x085b62f2f,
+	0x085d62f2f,
 	0x000286100,
 	0x003e62f40,
 	0x000244aaf,
 	0x000246e0a,
-	0x0486e853e,
+	0x0486e855e,
 	0x061000168,
 	0x0588f2f2f,
 	0x00024486e,
-	0x0861a486e,
-	0x085b66100,
-	0x00bec4a80,
+	0x0863a486e,
+	0x085d66100,
+	0x00c8c4a80,
 	0x0660a486e,
-	0x0854b6100,
+	0x0856b6100,
 	0x0014a588f,
 	0x00c2e0037,
-	0x0861a6618,
-	0x0486e8620,
-	0x0486e855a,
+	0x0863a6618,
+	0x0486e8640,
+	0x0486e857a,
 	0x061000202,
-	0x0486e8620,
+	0x0486e8640,
 	0x06100012c,
 	0x04fef000c,
 	0x00c2e0035,
-	0x0861a670a,
-	0x0486e8564,
+	0x0863a670a,
+	0x0486e8584,
 	0x061000118,
 	0x0588f4fef,
 	0x000344e75,
 	0x04feffff0,
 	0x042a7486e,
-	0x085716100,
+	0x085916100,
 	0x003684a80,
 	0x06c0a202f,
 	0x0001c4fef,
 	0x000184e75,
-	0x0486e8576,
+	0x0486e8596,
 	0x0610001ba,
 	0x0486f000c,
 	0x06100031a,
 	0x04a806c0a,
-	0x0486e857d,
+	0x0486e859d,
 	0x0610000d8,
 	0x0588f6100,
 	0x0032c4fef,
@@ -572,18 +572,18 @@ ulong bootcode[]={
 	0x002b44aae,
 	0x0801a6718,
 	0x042a7486e,
-	0x08594486e,
-	0x0858c486e,
-	0x085876100,
+	0x085b4486e,
+	0x085ac486e,
+	0x085a76100,
 	0x002284fef,
 	0x0002c60aa,
 	0x042a7486e,
-	0x085a5486e,
-	0x0859d486e,
-	0x085986100,
+	0x085c5486e,
+	0x085bd486e,
+	0x085b86100,
 	0x002104fef,
 	0x0002c6092,
-	0x0486e8582,
+	0x0486e85a2,
 	0x06134588f,
 	0x06092598f,
 	0x02f2f000c,
@@ -602,7 +602,7 @@ ulong bootcode[]={
 	0x06100027c,
 	0x0486f0004,
 	0x02f2f004c,
-	0x0486e85a8,
+	0x0486e85c8,
 	0x048780002,
 	0x06100011a,
 	0x042a76174,
@@ -611,9 +611,9 @@ ulong bootcode[]={
 	0x042817021,
 	0x0b0816f1e,
 	0x04ab61d20,
-	0x086d6660e,
+	0x086f6660e,
 	0x02daf0008,
-	0x01d2086d6,
+	0x01d2086f6,
 	0x07001588f,
 	0x04e755281,
 	0x07021b081,
@@ -623,10 +623,10 @@ ulong bootcode[]={
 	0x000084282,
 	0x07021b082,
 	0x06f182036,
-	0x02d2086d6,
+	0x02d2086f6,
 	0x0b0886606,
 	0x042b62d20,
-	0x086d65282,
+	0x086f65282,
 	0x07021b082,
 	0x06ee8588f,
 	0x04e754aaf,
@@ -638,10 +638,10 @@ ulong bootcode[]={
 	0x0518f7220,
 	0x04a816d22,
 	0x02eb61d20,
-	0x086d64a97,
+	0x086f64a97,
 	0x067122f41,
 	0x0000442b6,
-	0x01d2086d6,
+	0x01d2086f6,
 	0x04eb70151,
 	0x0222f0004,
 	0x053814a81,
@@ -657,7 +657,7 @@ ulong bootcode[]={
 	0x0d1fc0000,
 	0x010002f08,
 	0x0486f0014,
-	0x0610011c8,
+	0x061001258,
 	0x0220041ef,
 	0x000189288,
 	0x02f01486f,
@@ -683,7 +683,7 @@ ulong bootcode[]={
 	0x0d1fc0000,
 	0x010002f08,
 	0x0486f0014,
-	0x061001160,
+	0x0610011f0,
 	0x0220041ef,
 	0x000189288,
 	0x02f01486f,
@@ -708,7 +708,7 @@ ulong bootcode[]={
 	0x02f082f2f,
 	0x000144869,
 	0x010002f09,
-	0x0610010fc,
+	0x06100118c,
 	0x02d6f0010,
 	0x0801690af,
 	0x0001c4fef,
@@ -760,6 +760,50 @@ ulong bootcode[]={
 	0x070144e40,
 	0x04e757001,
 	0x04e404e75,
+	0x04feffff4,
+	0x02ebc0000,
+	0x0617442af,
+	0x000047003,
+	0x0b0af0004,
+	0x06f382f37,
+	0x00161001c,
+	0x02f2f0018,
+	0x02f2f0018,
+	0x061bc4a80,
+	0x042e72f40,
+	0x0001644df,
+	0x0662c486e,
+	0x0817a4878,
+	0x000026100,
+	0x0fe7052af,
+	0x000187003,
+	0x0b0af0018,
+	0x04fef0014,
+	0x06ec82faf,
+	0x000080161,
+	0x0001c2017,
+	0x04fef000c,
+	0x04e754a80,
+	0x06c0c203c,
+	0x00000618a,
+	0x04fef0018,
+	0x04e752f00,
+	0x02f2f0028,
+	0x02f2f0028,
+	0x061000832,
+	0x04a8042e7,
+	0x02f400022,
+	0x044df661a,
+	0x0486e8197,
+	0x048780002,
+	0x06100fe1a,
+	0x02f7c0000,
+	0x061ab0020,
+	0x04fef000c,
+	0x0609c2f80,
+	0x001610034,
+	0x042804fef,
+	0x000244e75,
 	0x0598f226f,
 	0x00008206f,
 	0x0000c10d1,
@@ -818,7 +862,7 @@ ulong bootcode[]={
 	0x0001c4869,
 	0x0000c2f08,
 	0x02f48000c,
-	0x061001c26,
+	0x061001c06,
 	0x0206f000c,
 	0x0701cd1c0,
 	0x04fef000c,
@@ -838,7 +882,7 @@ ulong bootcode[]={
 	0x048690006,
 	0x02f082f48,
 	0x0000c6100,
-	0x01bd8206f,
+	0x01bb8206f,
 	0x0000c7074,
 	0x0d1c04fef,
 	0x0000c6000,
@@ -851,7 +895,7 @@ ulong bootcode[]={
 	0x000744869,
 	0x000062f08,
 	0x02f48000c,
-	0x061001ba2,
+	0x061001b82,
 	0x0206f000c,
 	0x07074d1c0,
 	0x04fef000c,
@@ -925,7 +969,7 @@ ulong bootcode[]={
 	0x02f29000e,
 	0x02f082f48,
 	0x0000c6100,
-	0x01a7c206f,
+	0x01a5c206f,
 	0x0000c2037,
 	0x001620014,
 	0x0000ad1c0,
@@ -945,7 +989,7 @@ ulong bootcode[]={
 	0x02f29000e,
 	0x02f082f48,
 	0x0000c6100,
-	0x01a2c206f,
+	0x01a0c206f,
 	0x0000c2037,
 	0x001620014,
 	0x0000ad1c0,
@@ -1012,7 +1056,7 @@ ulong bootcode[]={
 	0x04869000c,
 	0x02f082f48,
 	0x0000c6100,
-	0x01920226f,
+	0x01900226f,
 	0x00014206f,
 	0x0000c701c,
 	0x0d1c02029,
@@ -1073,7 +1117,7 @@ ulong bootcode[]={
 	0x04869000c,
 	0x02f082f48,
 	0x0000c6100,
-	0x0182c206f,
+	0x0180c206f,
 	0x0000c701c,
 	0x0d1c04fef,
 	0x0000c6000,
@@ -1130,20 +1174,20 @@ ulong bootcode[]={
 	0x0001c4869,
 	0x000062f08,
 	0x02f48000c,
-	0x061001746,
+	0x061001726,
 	0x0701cd1af,
 	0x0000c4878,
 	0x0001c4877,
 	0x001620018,
 	0x000222f2f,
 	0x000146100,
-	0x0172c701c,
+	0x0170c701c,
 	0x0d1af0018,
 	0x04878001c,
 	0x048770162,
 	0x00024003e,
 	0x02f2f0020,
-	0x061001712,
+	0x0610016f2,
 	0x0206f0024,
 	0x0701cd1c0,
 	0x04fef0024,
@@ -1159,39 +1203,35 @@ ulong bootcode[]={
 	0x048690006,
 	0x02f082f48,
 	0x0000c6100,
-	0x016d4206f,
+	0x016b4206f,
 	0x0000c7040,
 	0x0d1c04fef,
 	0x0000c6000,
-	0x0f9f21011,
-	0x049c02f00,
-	0x0486e8176,
-	0x06100f7ea,
-	0x042804fef,
-	0x0000c4e75,
-	0x06000f9d8,
-	0x06000f9d4,
-	0x06000f9d0,
-	0x06000f9cc,
+	0x0f9f24280,
+	0x0588f4e75,
+	0x06000f9e8,
+	0x06000f9e4,
+	0x06000f9e0,
+	0x06000f9dc,
 	0x0598f206f,
 	0x0000c4878,
 	0x0001c2f2f,
 	0x0000c2f08,
 	0x02f48000c,
-	0x061001686,
+	0x061001676,
 	0x0701cd1af,
 	0x0000c4878,
 	0x0001c4877,
 	0x001620018,
 	0x0001c2f2f,
 	0x000146100,
-	0x0166c701c,
+	0x0165c701c,
 	0x0d1af0018,
 	0x04878001c,
 	0x048770162,
 	0x000240038,
 	0x02f2f0020,
-	0x061001652,
+	0x061001642,
 	0x0226f002c,
 	0x0206f0024,
 	0x0701cd1c0,
@@ -1339,7 +1379,7 @@ ulong bootcode[]={
 	0x02f082f48,
 	0x000084869,
 	0x0000c6100,
-	0x01404206f,
+	0x013f4206f,
 	0x0000c701c,
 	0x0d1c04fef,
 	0x0000c6000,
@@ -1358,7 +1398,7 @@ ulong bootcode[]={
 	0x000742f08,
 	0x02f480008,
 	0x048690006,
-	0x0610013b6,
+	0x0610013a6,
 	0x0206f000c,
 	0x07074d1c0,
 	0x04fef000c,
@@ -1372,7 +1412,7 @@ ulong bootcode[]={
 	0x02f082f48,
 	0x000084869,
 	0x000066100,
-	0x01380206f,
+	0x01370206f,
 	0x0000c7074,
 	0x0d1c04fef,
 	0x0000c6000,
@@ -1515,7 +1555,7 @@ ulong bootcode[]={
 	0x0001c2f08,
 	0x02f480008,
 	0x04869000c,
-	0x061001142,
+	0x061001132,
 	0x0226f0018,
 	0x0206f000c,
 	0x0701cd1c0,
@@ -1578,7 +1618,7 @@ ulong bootcode[]={
 	0x02f082f48,
 	0x000084869,
 	0x0000c6100,
-	0x01048206f,
+	0x01038206f,
 	0x0000c701c,
 	0x0d1c04fef,
 	0x0000c6000,
@@ -1636,20 +1676,20 @@ ulong bootcode[]={
 	0x0001c2f08,
 	0x02f480008,
 	0x048690006,
-	0x061000f5e,
+	0x061000f4e,
 	0x0701cd1af,
 	0x0000c4878,
 	0x0001c2f2f,
 	0x000104877,
 	0x001620020,
 	0x000226100,
-	0x00f44701c,
+	0x00f34701c,
 	0x0d1af0018,
 	0x04878001c,
 	0x02f2f001c,
 	0x048770162,
 	0x0002c003e,
-	0x061000f2a,
+	0x061000f1a,
 	0x0206f0024,
 	0x0701cd1c0,
 	0x04fef0024,
@@ -1665,20 +1705,16 @@ ulong bootcode[]={
 	0x02f082f48,
 	0x000084869,
 	0x000066100,
-	0x00eec206f,
+	0x00edc206f,
 	0x0000c7040,
 	0x0d1c04fef,
 	0x0000c6000,
-	0x0fa161011,
-	0x049c02f00,
-	0x0486e8184,
-	0x06100f002,
-	0x042804fef,
-	0x0000c4e75,
-	0x06000f9fc,
-	0x06000f9f8,
-	0x06000f9f4,
-	0x06000f9f0,
+	0x0fa164280,
+	0x0588f4e75,
+	0x06000fa0c,
+	0x06000fa08,
+	0x06000fa04,
+	0x06000fa00,
 	0x0598f206f,
 	0x000084878,
 	0x0001c2f08,
@@ -1794,7 +1830,7 @@ ulong bootcode[]={
 	0x019208076,
 	0x049c02daf,
 	0x000080d20,
-	0x081964280,
+	0x081b64280,
 	0x04e754fef,
 	0x0ffe4282f,
 	0x0002c246f,
@@ -1889,7 +1925,7 @@ ulong bootcode[]={
 	0x010362920,
 	0x0807649c0,
 	0x020760d20,
-	0x081964e90,
+	0x081b64e90,
 	0x0282f0040,
 	0x0246f003c,
 	0x0226f002c,
@@ -2044,7 +2080,7 @@ ulong bootcode[]={
 	0x070012640,
 	0x060d4518f,
 	0x02f2f000c,
-	0x06100eb7c,
+	0x06100eaec,
 	0x0266f0010,
 	0x0246e8012,
 	0x0262f0014,
@@ -2720,9 +2756,9 @@ ulong bootcode[]={
 	0x000050001,
 	0x000000200,
 	0x000000000,
-	0x000000634,
-	0x00630062c,
-	0x006280612,
+	0x000000624,
+	0x00620061c,
+	0x006180612,
 	0x005f005d8,
 	0x005d4056a,
 	0x004fe04d2,
@@ -2736,9 +2772,9 @@ ulong bootcode[]={
 	0x0015c0144,
 	0x0010e00d8,
 	0x000c00076,
-	0x0000c0610,
-	0x0060c0608,
-	0x0060405ee,
+	0x0000c0600,
+	0x005fc05f8,
+	0x005f405ee,
 	0x005cc05b4,
 	0x005b00546,
 	0x004d604aa,
@@ -2752,22 +2788,30 @@ ulong bootcode[]={
 	0x00172015a,
 	0x0012400ee,
 	0x000d6008c,
-	0x0001c6261,
-	0x064207479,
-	0x070653a20,
-	0x025640a00,
-	0x062616420,
-	0x074797065,
-	0x03a202564,
-	0x00a000000,
-	0x000000000,
-	0x040ba0000,
-	0x041460000,
-	0x03de20000,
-	0x041980000,
-	0x040e80000,
-	0x0410e0000,
-	0x0412c0000,
+	0x0001c454f,
+	0x046006765,
+	0x074533a20,
+	0x072656164,
+	0x020726574,
+	0x072790a00,
+	0x072656164,
+	0x020657272,
+	0x06f720067,
+	0x06574533a,
+	0x020726574,
+	0x072792062,
+	0x061642074,
+	0x07970650a,
+	0x000626164,
+	0x020747970,
+	0x065000000,
+	0x0414a0000,
+	0x041d60000,
+	0x03e720000,
+	0x042280000,
+	0x041780000,
+	0x0419e0000,
+	0x041bc0000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -3025,6 +3069,6 @@ ulong bootcode[]={
 	0x03a202573,
 	0x03a202573,
 	0x00a000000,
-	0x00002f46,
+	0x00002ff6,
 	0x0,
 };
diff --git a/gnot/dat.h b/gnot/dat.h
index 6b964909f86b50672d583fcfdfdfd667b4735338..bb3253261f38e4406d703b1e3e9ad8af1827aefc 100644
--- a/gnot/dat.h
+++ b/gnot/dat.h
@@ -211,6 +211,8 @@ struct User
 	short	notified;		/* sysnoted is due */
 	int	(*notify)(void*, char*);
 	void	*ureg;
+	ushort	svsr;
+	ushort	svvo;
 	/*
 	 *  machine dependent User stuff
 	 */
diff --git a/gnot/l.s b/gnot/l.s
index 42c22564996345ddecdc1ff8f03d904f15bfb22b..8fbf5fd62842ee9757922a8cf447f713d0e39be0 100644
--- a/gnot/l.s
+++ b/gnot/l.s
@@ -159,12 +159,11 @@ TEXT	fpcr(SB), $0
 
 TEXT	rfnote(SB), $0
 
-	MOVL	uregpp+0(FP), A0
-	MOVL	(A0), A7
+	MOVL	uregp+0(FP), A7
 	MOVL	((8+8)*BY2WD)(A7), A0
 	MOVL	A0, USP
 	MOVEM	(A7), $0x7FFF
-	ADDL	$((8+8+1)*BY2WD+BY2WD), A7
+	ADDL	$((8+8+1+1)*BY2WD), A7
 	MOVL	$-1, R0			/* note causes error in sys call */
 	RTE
 
diff --git a/gnot/trap.c b/gnot/trap.c
index bb1f777dc2d31fcd16051919c4fd45cc77e64203..d6074f40aec15f0767feb4bf9eeeae1801cacc5a 100644
--- a/gnot/trap.c
+++ b/gnot/trap.c
@@ -8,8 +8,8 @@
 #include	"errno.h"
 
 void	notify(Ureg*);
-void	noted(Ureg**);
-void	rfnote(Ureg**);
+void	noted(Ureg*);
+void	rfnote(Ureg*);
 
 char *regname[]={
 	"R0",
@@ -156,6 +156,8 @@ notify(Ureg *ur)
 	if(!u->notified){
 		if(!u->notify)
 			goto Die;
+		u->svvo = ur->vo;
+		u->svsr = ur->sr;
 		sp = ur->usp;
 		sp -= sizeof(Ureg);
 		u->ureg = (void*)sp;
@@ -179,18 +181,27 @@ notify(Ureg *ur)
  * Return user to state before notify()
  */
 void
-noted(Ureg **urp)
+noted(Ureg *ur)
 {
+	Ureg *nur;
+
+	nur = u->ureg;
+	validaddr(nur->pc, 1, 0);
+	validaddr(nur->usp, BY2WD, 0);
+	if(nur->sr!=u->svsr || nur->vo!=u->svvo){
+		pprint("bad noted ureg sr %ux vo %ux\n", nur->sr, nur->vo);
+		pexit("Suicide", 0);
+	}
 	lock(&u->p->debug);
 	if(!u->notified){
 		unlock(&u->p->debug);
 		return;
 	}
 	u->notified = 0;
-	memmove(*urp, u->ureg, sizeof(Ureg));
+	memmove(ur, u->ureg, sizeof(Ureg));
 	unlock(&u->p->debug);
 	splhi();
-	rfnote(urp);
+	rfnote(ur);
 }
 
 #undef	CHDIR	/* BUG */
@@ -288,7 +299,7 @@ syscall(Ureg *aur)
 	u->nerrlab = 0;
 	u->p->insyscall = 0;
 	if(r0 == NOTED)	/* ugly hack */
-		noted(&aur);	/* doesn't return */
+		noted(aur);	/* doesn't return */
 	if(u->nnote){
 		ur->r0 = ret;
 		notify(ur);
diff --git a/port/devnonet.c b/port/devnonet.c
index 4acb51329df4dec7f40de544c3263d07a2330d7c..cbecbe7470c745711b1ec092e403ed9eb4297277 100644
--- a/port/devnonet.c
+++ b/port/devnonet.c
@@ -1396,6 +1396,7 @@ nonetcksum(Block *bp, int offset)
 	hp->sum[1] = s>>8;
 	hp->sum[0] = s;
 	s &= 0xffff;
+if(0)
 	switch(s){
 	case 0xac9f:
 	case 0xc1a4:
diff --git a/power/boot.h b/power/boot.h
index 249b5dfed3fd6d07fbf80f30738323a242abe271..be088296a40331256cd14bb3e1f4b540452f15de 100644
--- a/power/boot.h
+++ b/power/boot.h
@@ -1,7 +1,7 @@
 ulong bootcode[]={
 	0x000000407,
-	0x0000052e0,
-	0x0000007c8,
+	0x000005460,
+	0x0000007e8,
 	0x000001190,
 	0x000000000,
 	0x000001020,
@@ -23,21 +23,21 @@ ulong bootcode[]={
 	0x023bdffe0,
 	0x0afbf0000,
 	0x0afa00018,
-	0x023c2828d,
+	0x023c282ad,
 	0x0afa20004,
 	0x00c000aa8,
 	0x0afa00008,
-	0x023c38295,
+	0x023c382b5,
 	0x0afa30004,
 	0x020020001,
 	0x00c000aa8,
 	0x0afa20008,
-	0x023c3829d,
+	0x023c382bd,
 	0x0afa30004,
 	0x020020001,
 	0x00c000aa8,
 	0x0afa20008,
-	0x023c282a5,
+	0x023c282c5,
 	0x0afa20004,
 	0x020040001,
 	0x0afa40008,
@@ -46,7 +46,7 @@ ulong bootcode[]={
 	0x0afa2000c,
 	0x004210004,
 	0x0afa1001c,
-	0x023c382b0,
+	0x023c382d0,
 	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20028,
@@ -76,13 +76,13 @@ ulong bootcode[]={
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c282b8,
+	0x023c282d8,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fa3001c,
 	0x00c000a8a,
 	0x0afa30004,
-	0x023c382c0,
+	0x023c382e0,
 	0x0afa30004,
 	0x020040001,
 	0x0afa40008,
@@ -91,15 +91,15 @@ ulong bootcode[]={
 	0x0afa3000c,
 	0x004210004,
 	0x0afa1001c,
-	0x023c282cc,
+	0x023c282ec,
 	0x00c0008f5,
 	0x0afa20004,
-	0x023c482e2,
+	0x023c48302,
 	0x00c000a68,
 	0x0afa40004,
 	0x0afa10014,
 	0x08fa4001c,
-	0x023c282d5,
+	0x023c282f5,
 	0x0afa40004,
 	0x0afa20008,
 	0x08fa40014,
@@ -107,7 +107,7 @@ ulong bootcode[]={
 	0x0afa4000c,
 	0x004210004,
 	0x000000027,
-	0x023c282ef,
+	0x023c2830f,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fa3001c,
@@ -142,19 +142,19 @@ ulong bootcode[]={
 	0x024c6ffff,
 	0x023c28026,
 	0x0afa20004,
-	0x023c382f8,
+	0x023c38318,
 	0x00c000a28,
 	0x0afa30008,
-	0x023c298ca,
+	0x023c298ea,
 	0x0afa20004,
-	0x023c38303,
+	0x023c38323,
 	0x00c000a28,
 	0x0afa30008,
 	0x08fa60028,
 	0x08fa20024,
 	0x020030001,
 	0x010430029,
-	0x023c598ca,
+	0x023c598ea,
 	0x020030002,
 	0x010430019,
 	0x000000027,
@@ -203,7 +203,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x023bdfff4,
 	0x0afbf0000,
-	0x023c3830b,
+	0x023c3832b,
 	0x0afa30004,
 	0x020020002,
 	0x00c000aa8,
@@ -234,7 +234,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400008,
 	0x000000027,
-	0x023c38313,
+	0x023c38333,
 	0x00c00098c,
 	0x0afa30004,
 	0x08fa20000,
@@ -245,14 +245,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400048,
 	0x000000027,
-	0x023c28341,
+	0x023c28361,
 	0x0afa20004,
 	0x020040002,
 	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x000000027,
-	0x023c3834a,
+	0x023c3836a,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -261,7 +261,7 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x0afa10020,
 	0x0afa10004,
-	0x023c4835b,
+	0x023c4837b,
 	0x0afa40008,
 	0x02003000d,
 	0x00c000ac1,
@@ -271,7 +271,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x00c000a8a,
 	0x0afa50004,
-	0x023c38369,
+	0x023c38389,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -279,7 +279,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c48377,
+	0x023c48397,
 	0x0afa40008,
 	0x02003000c,
 	0x00c000ac1,
@@ -289,7 +289,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x00c000a8a,
 	0x0afa50004,
-	0x023c38384,
+	0x023c383a4,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -297,7 +297,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c48391,
+	0x023c483b1,
 	0x0afa40008,
 	0x02003000c,
 	0x00c000ac1,
@@ -307,7 +307,7 @@ ulong bootcode[]={
 	0x08fa20020,
 	0x00c000a8a,
 	0x0afa20004,
-	0x023c3839e,
+	0x023c383be,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -316,21 +316,21 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x020020001,
 	0x0afc28042,
-	0x023c283ab,
+	0x023c283cb,
 	0x0afa20004,
 	0x020040002,
 	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10018,
-	0x023c383ba,
+	0x023c383da,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x023c383d1,
+	0x023c383f1,
 	0x0afa30004,
 	0x020040002,
 	0x00c000aa8,
@@ -340,7 +340,7 @@ ulong bootcode[]={
 	0x08fa20018,
 	0x00c000a8a,
 	0x0afa20004,
-	0x023c283df,
+	0x023c283ff,
 	0x0afa20004,
 	0x00c0008e3,
 	0x02003ffff,
@@ -384,10 +384,10 @@ ulong bootcode[]={
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x023c283f5,
+	0x023c28415,
 	0x0afc28022,
-	0x023c383fb,
-	0x0afc38102,
+	0x023c3841b,
+	0x0afc38122,
 	0x08fa10018,
 	0x08fa20000,
 	0x000000027,
@@ -401,14 +401,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400038,
 	0x000000027,
-	0x023c28403,
+	0x023c28423,
 	0x0afa20004,
 	0x020040002,
 	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afc1801e,
-	0x023c3840a,
+	0x023c3842a,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -416,7 +416,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa10004,
-	0x023c48419,
+	0x023c48439,
 	0x0afa40008,
 	0x02003000a,
 	0x00c000ac1,
@@ -426,7 +426,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x00c000a8a,
 	0x0afa50004,
-	0x023c38424,
+	0x023c38444,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -434,7 +434,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c4842f,
+	0x023c4844f,
 	0x0afa40008,
 	0x020030017,
 	0x00c000ac1,
@@ -444,7 +444,7 @@ ulong bootcode[]={
 	0x08fc2801e,
 	0x00c000a8a,
 	0x0afa20004,
-	0x023c38447,
+	0x023c38467,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -456,21 +456,21 @@ ulong bootcode[]={
 	0x0200307d0,
 	0x00c000ab2,
 	0x0afa30004,
-	0x023c3845f,
+	0x023c3847f,
 	0x0afa30004,
 	0x020040002,
 	0x00c000aa8,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10054,
-	0x023c2846b,
+	0x023c2848b,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
-	0x023c2847f,
+	0x023c2849f,
 	0x0afa20004,
 	0x020040002,
 	0x00c000aa8,
@@ -480,7 +480,7 @@ ulong bootcode[]={
 	0x08fa30054,
 	0x00c000a8a,
 	0x0afa30004,
-	0x023c3848a,
+	0x023c384aa,
 	0x0afa30004,
 	0x00c0008e3,
 	0x02002ffff,
@@ -490,7 +490,7 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x023a20014,
 	0x0afa20004,
-	0x023c3849d,
+	0x023c384bd,
 	0x0afa30008,
 	0x08fa2005c,
 	0x00c0009d6,
@@ -523,10 +523,10 @@ ulong bootcode[]={
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
-	0x023c284a8,
+	0x023c284c8,
 	0x0afc28022,
-	0x023c384ab,
-	0x0afc38102,
+	0x023c384cb,
+	0x0afc38122,
 	0x08fa10054,
 	0x08fa20000,
 	0x000000027,
@@ -556,17 +556,17 @@ ulong bootcode[]={
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c484b0,
+	0x023c484d0,
 	0x0afa40008,
 	0x0afa0000c,
-	0x023c284b5,
+	0x023c284d5,
 	0x0afa20010,
-	0x023c484b6,
+	0x023c484d6,
 	0x00c000aa3,
 	0x0afa40014,
 	0x004210004,
 	0x000000027,
-	0x023c284b7,
+	0x023c284d7,
 	0x00c0008f5,
 	0x0afa20004,
 	0x00c000a9e,
@@ -589,7 +589,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x020030002,
 	0x0afa30004,
-	0x023c28507,
+	0x023c28527,
 	0x00c0009b1,
 	0x0afa20008,
 	0x020030bb8,
@@ -597,10 +597,10 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x020020002,
 	0x0afa20004,
-	0x023c38518,
+	0x023c38538,
 	0x00c0009b1,
 	0x0afa30008,
-	0x023c28527,
+	0x023c28547,
 	0x0afa20004,
 	0x020030002,
 	0x00c000aa8,
@@ -609,38 +609,38 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd00d4,
-	0x023c384bd,
+	0x023c384dd,
 	0x0afa30004,
-	0x023c284d6,
+	0x023c284f6,
 	0x0afa20008,
-	0x023c384e1,
+	0x023c38501,
 	0x0afa3000c,
 	0x00c000a74,
 	0x0afa00010,
-	0x023c284f1,
+	0x023c28511,
 	0x00c0008f5,
 	0x0afa20004,
-	0x023c38502,
+	0x023c38522,
 	0x00c0008f5,
 	0x0afa30004,
 	0x008000641,
 	0x000000027,
 	0x023bdffe0,
 	0x0afbf0000,
-	0x023c28531,
+	0x023c28551,
 	0x00c00098c,
 	0x0afa20004,
 	0x020030032,
-	0x0a3c397ca,
+	0x0a3c397ea,
 	0x02002ffff,
-	0x0a7c297ce,
-	0x023c297ca,
+	0x0a7c297ee,
+	0x023c297ea,
 	0x0afa20004,
-	0x023c487ca,
-	0x00c000ac6,
+	0x023c487ea,
+	0x00c000b0e,
 	0x0afa40008,
 	0x08fa30024,
-	0x023c487ca,
+	0x023c487ea,
 	0x0afa30004,
 	0x0afa40008,
 	0x0afa1001c,
@@ -650,11 +650,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01025000c,
 	0x000000027,
-	0x023c28538,
+	0x023c28558,
 	0x0afa20004,
 	0x00c00098c,
 	0x0afa50008,
-	0x023c28540,
+	0x023c28560,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
@@ -662,7 +662,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x000000825,
 	0x08fa20024,
-	0x023c487ca,
+	0x023c487ea,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
@@ -670,7 +670,7 @@ ulong bootcode[]={
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c3854a,
+	0x023c3856a,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -682,84 +682,84 @@ ulong bootcode[]={
 	0x000000027,
 	0x008000696,
 	0x000000027,
-	0x023c387ca,
+	0x023c387ea,
 	0x0afa30004,
-	0x023c497ca,
+	0x023c497ea,
 	0x0afa40008,
 	0x0afa1001c,
-	0x00c000ee1,
+	0x00c000f35,
 	0x0afa1000c,
 	0x014200022,
 	0x000000027,
-	0x023c28553,
+	0x023c28573,
 	0x0afa20004,
 	0x08fa3001c,
 	0x000000027,
 	0x0afa30008,
-	0x083c287ca,
+	0x083c287ea,
 	0x000000027,
 	0x000021600,
 	0x000021603,
 	0x0afa2000c,
-	0x083c387cb,
+	0x083c387eb,
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
 	0x0afa30010,
-	0x083c287cc,
+	0x083c287ec,
 	0x000000027,
 	0x000021600,
 	0x000021603,
 	0x0afa20014,
-	0x083c387cd,
+	0x083c387ed,
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
 	0x00c00098c,
 	0x0afa30018,
-	0x023c28576,
+	0x023c28596,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c397ca,
+	0x083c397ea,
 	0x020020033,
 	0x010620008,
 	0x000000027,
-	0x023c38581,
+	0x023c385a1,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x087c297ce,
+	0x087c297ee,
 	0x02003ffff,
 	0x010430008,
 	0x000000027,
-	0x023c2858a,
+	0x023c285aa,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x023c38595,
+	0x023c385b5,
 	0x00c00098c,
 	0x0afa30004,
 	0x020020034,
-	0x0a3c297ca,
+	0x0a3c297ea,
 	0x02003ffff,
-	0x0a7c397ce,
-	0x023c397ca,
+	0x0a7c397ee,
+	0x023c397ea,
 	0x0afa30004,
-	0x023c487ca,
-	0x00c000ac6,
+	0x023c487ea,
+	0x00c000b0e,
 	0x0afa40008,
 	0x08fa20024,
-	0x023c487ca,
+	0x023c487ea,
 	0x0afa20004,
 	0x0afa40008,
 	0x0afa1001c,
@@ -769,7 +769,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x010240008,
 	0x000000027,
-	0x023c285a0,
+	0x023c285c0,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
@@ -777,7 +777,7 @@ ulong bootcode[]={
 	0x000400008,
 	0x000000825,
 	0x08fa20024,
-	0x023c487ca,
+	0x023c487ea,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
@@ -785,48 +785,48 @@ ulong bootcode[]={
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c385ae,
+	0x023c385ce,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x023c387ca,
+	0x023c387ea,
 	0x0afa30004,
-	0x023c497ca,
+	0x023c497ea,
 	0x0afa40008,
-	0x00c000ee1,
+	0x00c000f35,
 	0x0afa1000c,
 	0x014200008,
 	0x000000027,
-	0x023c285bb,
+	0x023c285db,
 	0x00c0008e3,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x087c397ce,
+	0x087c397ee,
 	0x02002ffff,
 	0x010620008,
 	0x000000027,
-	0x023c385ca,
+	0x023c385ea,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c297ca,
+	0x083c297ea,
 	0x020030037,
 	0x01443000d,
 	0x000000027,
 	0x020020002,
 	0x0afa20004,
-	0x023c385d5,
+	0x023c385f5,
 	0x0afa30008,
-	0x023c297ca,
+	0x023c297ea,
 	0x024420008,
 	0x00c0009b1,
 	0x0afa2000c,
@@ -834,11 +834,11 @@ ulong bootcode[]={
 	0x023bd0020,
 	0x000400008,
 	0x000000825,
-	0x083c397ca,
+	0x083c397ea,
 	0x020020035,
 	0x010620008,
 	0x000000027,
-	0x023c385e5,
+	0x023c38605,
 	0x00c0008e3,
 	0x0afa30004,
 	0x08fa20000,
@@ -856,7 +856,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x01040000a,
 	0x000000027,
-	0x023c385f2,
+	0x023c38612,
 	0x0afa30004,
 	0x023c28026,
 	0x0afa20008,
@@ -873,7 +873,7 @@ ulong bootcode[]={
 	0x0afc28006,
 	0x023c28026,
 	0x0afa20004,
-	0x023c485f9,
+	0x023c48619,
 	0x0afa40008,
 	0x020020004,
 	0x00c0009ee,
@@ -889,7 +889,7 @@ ulong bootcode[]={
 	0x0afc68006,
 	0x004c10008,
 	0x000000027,
-	0x023c2862a,
+	0x023c2864a,
 	0x00c00098c,
 	0x0afa20004,
 	0x08fa20000,
@@ -904,17 +904,17 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c38639,
+	0x023c38659,
 	0x00c00098c,
 	0x0afa30004,
-	0x023c287ca,
+	0x023c287ea,
 	0x0afa20004,
-	0x023c38641,
+	0x023c38661,
 	0x0afa30008,
 	0x08fa20140,
 	0x00c0009d6,
 	0x0afa2000c,
-	0x023c287ca,
+	0x023c287ea,
 	0x0afa20004,
 	0x020040001,
 	0x0afa40008,
@@ -923,26 +923,26 @@ ulong bootcode[]={
 	0x0afa2000c,
 	0x004210004,
 	0x0afa10148,
-	0x023c38647,
+	0x023c38667,
 	0x00c0008f5,
 	0x0afa30004,
-	0x023c287ca,
+	0x023c287ea,
 	0x0afa20004,
-	0x023c3864e,
+	0x023c3866e,
 	0x0afa30008,
 	0x08fc28006,
 	0x00c0009d6,
 	0x0afa2000c,
-	0x023c387ca,
+	0x023c387ea,
 	0x00c000a68,
 	0x0afa30004,
 	0x0afa10014,
-	0x023c487ca,
+	0x023c487ea,
 	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa40148,
-	0x023c387ca,
+	0x023c387ea,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40010,
@@ -952,13 +952,13 @@ ulong bootcode[]={
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28651,
+	0x023c28671,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fa30148,
 	0x00c000a8a,
 	0x0afa30004,
-	0x023c38657,
+	0x023c38677,
 	0x0afa30004,
 	0x020040001,
 	0x0afa40008,
@@ -967,26 +967,26 @@ ulong bootcode[]={
 	0x0afa3000c,
 	0x004210004,
 	0x0afa10148,
-	0x023c2865f,
+	0x023c2867f,
 	0x00c0008f5,
 	0x0afa20004,
-	0x023c387ca,
+	0x023c387ea,
 	0x0afa30004,
-	0x023c28666,
+	0x023c28686,
 	0x0afa20008,
 	0x08fc38006,
 	0x00c0009d6,
 	0x0afa3000c,
-	0x023c287ca,
+	0x023c287ea,
 	0x00c000a68,
 	0x0afa20004,
 	0x0afa10014,
-	0x023c487ca,
+	0x023c487ea,
 	0x00c000a68,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa40148,
-	0x023c387ca,
+	0x023c387ea,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40010,
@@ -996,61 +996,61 @@ ulong bootcode[]={
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28669,
+	0x023c28689,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fa30148,
 	0x00c000a8a,
 	0x0afa30004,
-	0x023c2866f,
+	0x023c2868f,
 	0x00c00098c,
 	0x0afa20004,
-	0x023c28678,
+	0x023c28698,
 	0x0afa20004,
-	0x023c4867a,
+	0x023c4869a,
 	0x0afa40008,
 	0x00c000a85,
 	0x0afa0000c,
 	0x004210004,
 	0x000000027,
-	0x023c2867c,
+	0x023c2869c,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fc28006,
-	0x023c48681,
+	0x023c486a1,
 	0x0afa20004,
 	0x0afa40008,
 	0x020020006,
 	0x0afa2000c,
-	0x023c48683,
+	0x023c486a3,
 	0x0afa40010,
-	0x023c28684,
+	0x023c286a4,
 	0x00c000aa3,
 	0x0afa20014,
 	0x004210004,
 	0x000000027,
-	0x023c38685,
+	0x023c386a5,
 	0x00c0008f5,
 	0x0afa30004,
-	0x023c2868b,
+	0x023c286ab,
 	0x00c00098c,
 	0x0afa20004,
-	0x023c28693,
+	0x023c286b3,
 	0x0afa20004,
 	0x023a40058,
 	0x00c000ab7,
 	0x0afa40008,
 	0x004210004,
 	0x000000027,
-	0x023c28697,
+	0x023c286b7,
 	0x00c0008f5,
 	0x0afa20004,
 	0x023a30058,
 	0x0afa30004,
 	0x023a200cc,
-	0x00c0011a5,
+	0x00c001205,
 	0x0afa20008,
-	0x023c2869c,
+	0x023c286bc,
 	0x0afa20004,
 	0x020040001,
 	0x00c000aa8,
@@ -1058,7 +1058,7 @@ ulong bootcode[]={
 	0x0afa10148,
 	0x023a20058,
 	0x0afa20004,
-	0x023c386a4,
+	0x023c386c4,
 	0x0afa30008,
 	0x08fa2012c,
 	0x00c0009d6,
@@ -1077,28 +1077,28 @@ ulong bootcode[]={
 	0x08fa30148,
 	0x00c000a8a,
 	0x0afa30004,
-	0x023c286a8,
+	0x023c286c8,
 	0x00c00098c,
 	0x0afa20004,
 	0x08fc58022,
-	0x08fc38102,
+	0x08fc38122,
 	0x000000027,
 	0x010600015,
 	0x000000027,
 	0x023a20018,
 	0x0afa20004,
-	0x023c386b1,
+	0x023c386d1,
 	0x0afa30008,
 	0x00c0009d6,
 	0x0afa5000c,
-	0x08fc38102,
+	0x08fc38122,
 	0x023a20018,
 	0x0afa30004,
 	0x0afa20008,
 	0x00c000a85,
 	0x0afa0000c,
-	0x08fc38102,
-	0x023c286b9,
+	0x08fc38122,
+	0x023c286d9,
 	0x0afa30004,
 	0x0afa20008,
 	0x00c000a85,
@@ -1109,18 +1109,18 @@ ulong bootcode[]={
 	0x000000027,
 	0x023a20018,
 	0x0afa20004,
-	0x023c386c2,
+	0x023c386e2,
 	0x0afa30008,
 	0x00c0009d6,
 	0x0afa5000c,
-	0x023c386d2,
+	0x023c386f2,
 	0x0afa30004,
 	0x023a20018,
 	0x00c00098c,
 	0x0afa20008,
 	0x023a30018,
 	0x0afa30004,
-	0x023c286f4,
+	0x023c28714,
 	0x0afa20008,
 	0x00c000a85,
 	0x0afa0000c,
@@ -1128,15 +1128,15 @@ ulong bootcode[]={
 	0x000000027,
 	0x010600010,
 	0x000000027,
-	0x023c28705,
+	0x023c28725,
 	0x0afa20004,
-	0x023c38710,
+	0x023c38730,
 	0x0afa30008,
-	0x023c28715,
+	0x023c28735,
 	0x0afa2000c,
 	0x00c000a74,
 	0x0afa00010,
-	0x023c3876f,
+	0x023c3878f,
 	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
@@ -1150,50 +1150,50 @@ ulong bootcode[]={
 	0x000000027,
 	0x01020000e,
 	0x000000027,
-	0x023c3875f,
+	0x023c3877f,
 	0x0afa30004,
-	0x023c2876a,
+	0x023c2878a,
 	0x0afa20008,
 	0x00c000a74,
 	0x0afa0000c,
-	0x023c3876f,
+	0x023c3878f,
 	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c28737,
+	0x023c28757,
 	0x0afa20004,
-	0x023c38742,
+	0x023c38762,
 	0x0afa30008,
-	0x023c28747,
+	0x023c28767,
 	0x0afa2000c,
-	0x023c3874a,
+	0x023c3876a,
 	0x0afa30010,
 	0x00c000a74,
 	0x0afa00014,
-	0x023c28752,
+	0x023c28772,
 	0x00c0008f5,
 	0x0afa20004,
-	0x023c3876f,
+	0x023c3878f,
 	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c38718,
+	0x023c38738,
 	0x00c00098c,
 	0x0afa30004,
-	0x023c3876f,
+	0x023c3878f,
 	0x00c0008f5,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0150,
-	0x023c3860e,
+	0x023c3862e,
 	0x00c00098c,
 	0x0afa30004,
 	0x0200203e8,
@@ -1204,7 +1204,7 @@ ulong bootcode[]={
 	0x008000763,
 	0x024450001,
 	0x0afa50004,
-	0x023c485fe,
+	0x023c4861e,
 	0x0afa40008,
 	0x020030004,
 	0x00c0009ee,
@@ -1218,7 +1218,7 @@ ulong bootcode[]={
 	0x008000776,
 	0x000013025,
 	0x0afa50004,
-	0x023c48603,
+	0x023c48623,
 	0x0afa40008,
 	0x020020003,
 	0x00c0009ee,
@@ -1232,7 +1232,7 @@ ulong bootcode[]={
 	0x008000776,
 	0x000013025,
 	0x0afa50004,
-	0x023c48607,
+	0x023c48627,
 	0x0afa40008,
 	0x020030006,
 	0x00c0009ee,
@@ -1257,7 +1257,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x020030002,
 	0x0afa30004,
-	0x023c2877a,
+	0x023c2879a,
 	0x0afa20008,
 	0x08fa30058,
 	0x023a20014,
@@ -1275,7 +1275,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x020020002,
 	0x0afa20004,
-	0x023c38788,
+	0x023c387a8,
 	0x0afa30008,
 	0x08fa20058,
 	0x023a30014,
@@ -1290,7 +1290,7 @@ ulong bootcode[]={
 	0x023bd0054,
 	0x023bdfeec,
 	0x0afbf0000,
-	0x023c38796,
+	0x023c387b6,
 	0x0afa30004,
 	0x08fa20118,
 	0x000000027,
@@ -1310,7 +1310,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x004210006,
 	0x0afa10110,
-	0x023c2879f,
+	0x023c287bf,
 	0x00c0008f5,
 	0x0afa20004,
 	0x08fa50110,
@@ -1336,7 +1336,7 @@ ulong bootcode[]={
 	0x000002825,
 	0x028a20021,
 	0x010400011,
-	0x023c69846,
+	0x023c69866,
 	0x000051080,
 	0x000461021,
 	0x08c420000,
@@ -1361,7 +1361,7 @@ ulong bootcode[]={
 	0x000002025,
 	0x028820021,
 	0x01040000d,
-	0x023c59846,
+	0x023c59866,
 	0x000041080,
 	0x000451021,
 	0x08c420000,
@@ -1393,7 +1393,7 @@ ulong bootcode[]={
 	0x023bd0008,
 	0x023bdfff0,
 	0x0afbf0000,
-	0x023c69846,
+	0x023c69866,
 	0x020040020,
 	0x004800010,
 	0x000000027,
@@ -1409,7 +1409,7 @@ ulong bootcode[]={
 	0x000a0f809,
 	0x0ac400000,
 	0x08fa4000c,
-	0x023c69846,
+	0x023c69866,
 	0x008000974,
 	0x02484ffff,
 	0x08fa30014,
@@ -1429,7 +1429,7 @@ ulong bootcode[]={
 	0x023a41020,
 	0x0afa3000c,
 	0x024840004,
-	0x00c001264,
+	0x00c0012c4,
 	0x0afa40010,
 	0x023a6001c,
 	0x020020001,
@@ -1466,7 +1466,7 @@ ulong bootcode[]={
 	0x023a41024,
 	0x0afa3000c,
 	0x024840004,
-	0x00c001264,
+	0x00c0012c4,
 	0x0afa40010,
 	0x08fa21020,
 	0x023a6001c,
@@ -1505,7 +1505,7 @@ ulong bootcode[]={
 	0x023a40024,
 	0x0afa2000c,
 	0x024840004,
-	0x00c001264,
+	0x00c0012c4,
 	0x0afa40010,
 	0x08fa20014,
 	0x000000027,
@@ -1644,7 +1644,7 @@ ulong bootcode[]={
 	0x08fa20010,
 	0x000000027,
 	0x0afa20004,
-	0x00c001797,
+	0x00c0017f7,
 	0x0afa00008,
 	0x08fa30010,
 	0x08fa20000,
@@ -1733,6 +1733,78 @@ ulong bootcode[]={
 	0x00000000c,
 	0x003e00008,
 	0x023bd0004,
+	0x023bdffe4,
+	0x0afbf0000,
+	0x023c280e2,
+	0x0afa20010,
+	0x000002825,
+	0x028a30003,
+	0x010600019,
+	0x0afa50014,
+	0x08fa20020,
+	0x000000027,
+	0x0afa20004,
+	0x08fa40024,
+	0x000000027,
+	0x0afa40008,
+	0x08fa2002c,
+	0x000000027,
+	0x08c420000,
+	0x00c000aad,
+	0x0afa2000c,
+	0x014200015,
+	0x0afa10018,
+	0x020030002,
+	0x0afa30004,
+	0x023c280e6,
+	0x00c0009b1,
+	0x0afa20008,
+	0x08fa30014,
+	0x000000027,
+	0x024650001,
+	0x028a30003,
+	0x01460ffe9,
+	0x0afa50014,
+	0x08fa3002c,
+	0x08fa20018,
+	0x000000027,
+	0x0ac620000,
+	0x08fa10010,
+	0x08fa20000,
+	0x000000027,
+	0x000400008,
+	0x023bd001c,
+	0x004210005,
+	0x000000027,
+	0x08fa20000,
+	0x023bd001c,
+	0x000400008,
+	0x023c180f8,
+	0x08fa30024,
+	0x000000027,
+	0x0afa30004,
+	0x08fa40028,
+	0x000000027,
+	0x0afa40008,
+	0x00c000f35,
+	0x0afa1000c,
+	0x014200009,
+	0x0afa10018,
+	0x020020002,
+	0x0afa20004,
+	0x023c38103,
+	0x00c0009b1,
+	0x0afa30008,
+	0x023c28119,
+	0x008000ae0,
+	0x0afa20010,
+	0x08fa3002c,
+	0x000000027,
+	0x0ac610000,
+	0x08fa20000,
+	0x023bd001c,
+	0x000400008,
+	0x000000825,
 	0x023bdffec,
 	0x0afbf0000,
 	0x08fa50018,
@@ -1741,7 +1813,7 @@ ulong bootcode[]={
 	0x024660001,
 	0x0a0640000,
 	0x084a30004,
-	0x000000027,
+	0x020020042,
 	0x0a0c30000,
 	0x084a30004,
 	0x000000027,
@@ -1753,38 +1825,32 @@ ulong bootcode[]={
 	0x000000027,
 	0x000031e00,
 	0x000031e03,
-	0x02462ffbe,
-	0x01c4001ad,
+	0x00043202a,
+	0x0148001ae,
 	0x024c60002,
-	0x01040017d,
+	0x01062017e,
 	0x000000027,
-	0x02462ffc6,
-	0x01c400080,
+	0x02002003a,
+	0x00043202a,
+	0x01480007b,
 	0x000000027,
-	0x01040004e,
+	0x010620049,
 	0x000000027,
-	0x02462ffcb,
-	0x01c40001f,
+	0x020020035,
+	0x00043202a,
+	0x014800017,
 	0x000000027,
-	0x010400016,
+	0x01062000e,
 	0x000000027,
-	0x038620032,
-	0x010400013,
+	0x020020032,
+	0x01062000b,
 	0x000000027,
-	0x038620033,
-	0x010400010,
-	0x000000027,
-	0x038620034,
-	0x01040000d,
+	0x020020033,
+	0x010620008,
 	0x000000027,
-	0x023c380e2,
-	0x0afa30004,
-	0x080a20000,
+	0x020020034,
+	0x010620005,
 	0x000000027,
-	0x000021600,
-	0x000021603,
-	0x00c00098c,
-	0x0afa20008,
 	0x08fa20000,
 	0x023bd0014,
 	0x000400008,
@@ -1796,17 +1862,19 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x038620037,
-	0x010400019,
-	0x000000027,
-	0x038620038,
-	0x010400006,
+	0x020020037,
+	0x01062001b,
 	0x000000027,
-	0x038620039,
-	0x01040fff1,
+	0x020020038,
+	0x010620008,
 	0x000000027,
-	0x008000af2,
+	0x020020039,
+	0x01062fff1,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a20008,
 	0x000000027,
 	0x0a0c20000,
@@ -1828,7 +1896,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030040,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1854,7 +1922,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1865,7 +1933,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420024,
 	0x0afa20008,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,
@@ -1876,7 +1944,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420040,
 	0x0afa20008,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -1888,22 +1956,25 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x02462ffc2,
-	0x01c40007d,
-	0x000000027,
-	0x010400063,
+	0x02002003e,
+	0x00043202a,
+	0x01480007f,
 	0x000000027,
-	0x03862003b,
-	0x010400032,
+	0x010620065,
 	0x000000027,
-	0x03862003c,
-	0x010400016,
+	0x02002003b,
+	0x010620034,
 	0x000000027,
-	0x03862003d,
-	0x010400003,
+	0x02002003c,
+	0x010620018,
 	0x000000027,
-	0x008000af2,
+	0x02002003d,
+	0x010620005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a30002,
 	0x000000027,
 	0x0a0c30000,
@@ -2005,7 +2076,7 @@ ulong bootcode[]={
 	0x024a3000e,
 	0x0afa30008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2015,17 +2086,19 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x03862003f,
-	0x01040004b,
+	0x02002003f,
+	0x01062004d,
 	0x000000027,
-	0x038620040,
-	0x010400034,
-	0x000000027,
-	0x038620041,
-	0x010400003,
+	0x020020040,
+	0x010620036,
 	0x000000027,
-	0x008000af2,
+	0x020020041,
+	0x010620005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a30002,
 	0x000000027,
 	0x0a0c30000,
@@ -2152,7 +2225,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa70018,
 	0x08fa20010,
@@ -2184,27 +2257,31 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x02462ffb6,
-	0x01c40011a,
-	0x000000027,
-	0x010400108,
+	0x02002004a,
+	0x00043202a,
+	0x01480011f,
 	0x000000027,
-	0x02462ffba,
-	0x01c4000c3,
+	0x01062010d,
 	0x000000027,
-	0x010400089,
+	0x020020046,
+	0x00043202a,
+	0x0148000c5,
 	0x000000027,
-	0x038620043,
-	0x010400058,
+	0x01062008b,
 	0x000000027,
-	0x038620044,
-	0x01040002b,
+	0x020020043,
+	0x01062005a,
 	0x000000027,
-	0x038620045,
-	0x010400003,
+	0x020020044,
+	0x01062002d,
 	0x000000027,
-	0x008000af2,
+	0x020020045,
+	0x010620005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a30002,
 	0x000000027,
 	0x0a0c30000,
@@ -2228,7 +2305,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2372,7 +2449,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,
@@ -2386,17 +2463,19 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x038620047,
-	0x010400029,
+	0x020020047,
+	0x01062002b,
 	0x000000027,
-	0x038620048,
-	0x010400016,
-	0x000000027,
-	0x038620049,
-	0x010400003,
+	0x020020048,
+	0x010620018,
 	0x000000027,
-	0x008000af2,
+	0x020020049,
+	0x010620005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a20002,
 	0x000000027,
 	0x0a0c20000,
@@ -2468,22 +2547,25 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x02462ffb2,
-	0x01c400060,
-	0x000000027,
-	0x010400044,
+	0x02002004e,
+	0x00043202a,
+	0x014800062,
 	0x000000027,
-	0x03862004b,
-	0x010400031,
+	0x010620046,
 	0x000000027,
-	0x03862004c,
-	0x01040001e,
+	0x02002004b,
+	0x010620033,
 	0x000000027,
-	0x03862004d,
-	0x010400003,
+	0x02002004c,
+	0x010620020,
 	0x000000027,
-	0x008000af2,
+	0x02002004d,
+	0x010620005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a20002,
 	0x024c30002,
 	0x0a0c20000,
@@ -2498,7 +2580,7 @@ ulong bootcode[]={
 	0x024a30008,
 	0x0afa30008,
 	0x020020074,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2554,7 +2636,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030074,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2566,17 +2648,19 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0014,
-	0x03862004f,
-	0x01040002c,
+	0x02002004f,
+	0x01062002e,
 	0x000000027,
-	0x038620050,
-	0x010400006,
-	0x000000027,
-	0x038620051,
-	0x01040fe1e,
+	0x020020050,
+	0x010620008,
 	0x000000027,
-	0x008000af2,
+	0x020020051,
+	0x01062fe15,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x084a20002,
 	0x000000027,
 	0x0a0c20000,
@@ -2600,7 +2684,7 @@ ulong bootcode[]={
 	0x024a2000e,
 	0x0afa20008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,
@@ -2637,7 +2721,7 @@ ulong bootcode[]={
 	0x08fa30018,
 	0x000000027,
 	0x0afa30008,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2648,7 +2732,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x02463001c,
 	0x0afa30008,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,
@@ -2659,7 +2743,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024630038,
 	0x0afa30008,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa40018,
 	0x08fa30010,
@@ -2791,7 +2875,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024640001,
 	0x080630000,
-	0x000000027,
+	0x024850002,
 	0x0a0c30000,
 	0x090820000,
 	0x090830001,
@@ -2801,41 +2885,35 @@ ulong bootcode[]={
 	0x000431025,
 	0x0a4c20004,
 	0x080c20000,
-	0x000000027,
+	0x020030042,
 	0x000021600,
 	0x000021603,
-	0x02443ffbe,
-	0x01c60016a,
-	0x024850002,
-	0x010600141,
+	0x00062202a,
+	0x01480016b,
 	0x000000027,
-	0x02443ffc6,
-	0x01c600070,
+	0x010430142,
 	0x000000027,
-	0x010600048,
+	0x02003003a,
+	0x00062202a,
+	0x01480006b,
 	0x000000027,
-	0x02443ffcb,
-	0x01c600027,
+	0x010430043,
 	0x000000027,
-	0x010600016,
+	0x020030035,
+	0x00062202a,
+	0x01480001f,
 	0x000000027,
-	0x038430032,
-	0x010600013,
+	0x01043000e,
 	0x000000027,
-	0x038430033,
-	0x010600010,
+	0x020030032,
+	0x01043000b,
 	0x000000027,
-	0x038430034,
-	0x01060000d,
+	0x020030033,
+	0x010430008,
 	0x000000027,
-	0x023c280f0,
-	0x0afa20004,
-	0x080c30000,
+	0x020030034,
+	0x010430005,
 	0x000000027,
-	0x000031e00,
-	0x000031e03,
-	0x00c00098c,
-	0x0afa30008,
 	0x08fa20000,
 	0x023bd0014,
 	0x000400008,
@@ -2855,17 +2933,19 @@ ulong bootcode[]={
 	0x023bd0014,
 	0x000400008,
 	0x000000825,
-	0x038430037,
-	0x010600012,
-	0x000000027,
-	0x038430038,
-	0x010600006,
+	0x020030037,
+	0x010430014,
 	0x000000027,
-	0x038430039,
-	0x01060ffe9,
+	0x020030038,
+	0x010430008,
 	0x000000027,
-	0x008000f0d,
+	0x020030039,
+	0x01043ffe9,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -2873,17 +2953,17 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20008,
 	0x024c20008,
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
 	0x020020040,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x024650040,
 	0x090a20000,
 	0x090a30001,
@@ -2898,7 +2978,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2908,7 +2988,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,
@@ -2918,27 +2998,30 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x02465001c,
-	0x02443ffc2,
-	0x01c600063,
-	0x000000027,
-	0x01060004f,
+	0x02003003e,
+	0x00062202a,
+	0x014800065,
 	0x000000027,
-	0x03843003b,
-	0x010600023,
+	0x010430051,
 	0x000000027,
-	0x03843003c,
-	0x01060000f,
+	0x02003003b,
+	0x010430025,
 	0x000000027,
-	0x03843003d,
-	0x010600003,
+	0x02003003c,
+	0x010430011,
 	0x000000027,
-	0x008000f0d,
+	0x02003003d,
+	0x010430005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -2946,7 +3029,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -2963,7 +3046,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c2000c,
 	0x090a20000,
 	0x090a30001,
@@ -3004,7 +3087,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000f19,
+	0x008000f67,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3019,22 +3102,24 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x02465001c,
-	0x03843003f,
-	0x01060003e,
-	0x000000027,
-	0x038430040,
-	0x01060002f,
+	0x02003003f,
+	0x010430040,
 	0x000000027,
-	0x038430041,
-	0x010600003,
+	0x020030040,
+	0x010430031,
 	0x000000027,
-	0x008000f0d,
+	0x020030041,
+	0x010430005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -3074,7 +3159,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000f19,
+	0x008000f67,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3086,7 +3171,7 @@ ulong bootcode[]={
 	0x024a30002,
 	0x024650001,
 	0x080630000,
-	0x008000f19,
+	0x008000f67,
 	0x0a0c3002a,
 	0x090a20000,
 	0x090a30001,
@@ -3127,7 +3212,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000f19,
+	0x008000f67,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3142,7 +3227,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa6001c,
 	0x08fa30010,
@@ -3166,29 +3251,33 @@ ulong bootcode[]={
 	0x024a30004,
 	0x024650001,
 	0x080630000,
-	0x008000f19,
+	0x008000f67,
 	0x0a0c3002a,
-	0x02443ffb6,
-	0x01c6000ce,
-	0x000000027,
-	0x0106000c3,
+	0x02003004a,
+	0x00062202a,
+	0x0148000d3,
 	0x000000027,
-	0x02443ffba,
-	0x01c600092,
+	0x0104300c8,
 	0x000000027,
-	0x01060006b,
+	0x020030046,
+	0x00062202a,
+	0x014800094,
 	0x000000027,
-	0x038430043,
-	0x01060003f,
+	0x01043006d,
 	0x000000027,
-	0x038430044,
-	0x01060001b,
+	0x020030043,
+	0x010430041,
 	0x000000027,
-	0x038430045,
-	0x010600003,
+	0x020030044,
+	0x01043001d,
 	0x000000027,
-	0x008000f0d,
+	0x020030045,
+	0x010430005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -3208,7 +3297,7 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000f19,
+	0x008000f67,
 	0x000a32821,
 	0x090a20000,
 	0x090a30001,
@@ -3241,7 +3330,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,
@@ -3282,7 +3371,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000f19,
+	0x008000f67,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,
@@ -3319,19 +3408,21 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000f19,
+	0x008000f67,
 	0x000a32821,
-	0x038430047,
-	0x01060001b,
-	0x000000027,
-	0x038430048,
-	0x01060000f,
+	0x020030047,
+	0x01043001d,
 	0x000000027,
-	0x038430049,
-	0x010600003,
+	0x020030048,
+	0x010430011,
 	0x000000027,
-	0x008000f0d,
+	0x020030049,
+	0x010430005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -3339,7 +3430,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3348,7 +3439,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3365,7 +3456,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,
@@ -3374,24 +3465,27 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
-	0x02443ffb2,
-	0x01c600044,
-	0x000000027,
-	0x010600030,
+	0x02003004e,
+	0x00062202a,
+	0x014800046,
 	0x000000027,
-	0x03843004b,
-	0x010600024,
+	0x010430032,
 	0x000000027,
-	0x03843004c,
-	0x010600018,
+	0x02003004b,
+	0x010430026,
 	0x000000027,
-	0x03843004d,
-	0x010600003,
+	0x02003004c,
+	0x01043001a,
 	0x000000027,
-	0x008000f0d,
+	0x02003004d,
+	0x010430005,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -3405,10 +3499,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x024650074,
 	0x090a20000,
 	0x090a30001,
@@ -3417,7 +3511,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3426,7 +3520,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
@@ -3441,22 +3535,24 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x020020074,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x024650074,
-	0x03843004f,
-	0x010600023,
+	0x02003004f,
+	0x010430025,
 	0x000000027,
-	0x038430050,
-	0x010600006,
-	0x000000027,
-	0x038430051,
-	0x01060fe92,
+	0x020030050,
+	0x010430008,
 	0x000000027,
-	0x008000f0d,
+	0x020030051,
+	0x01043fe89,
 	0x000000027,
+	0x08fa20000,
+	0x023bd0014,
+	0x000400008,
+	0x000000825,
 	0x090a20000,
 	0x090a30001,
 	0x0304200ff,
@@ -3478,10 +3574,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000f19,
+	0x008000f67,
 	0x02465001c,
 	0x090a20000,
 	0x090a30001,
@@ -3490,7 +3586,7 @@ ulong bootcode[]={
 	0x000031a00,
 	0x000431025,
 	0x024a50002,
-	0x008000f19,
+	0x008000f67,
 	0x0a4c20002,
 	0x023bdffec,
 	0x0afbf0000,
@@ -3501,7 +3597,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3511,7 +3607,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,
@@ -3521,7 +3617,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c001850,
+	0x00c0018b0,
 	0x0afa3000c,
 	0x08fa5001c,
 	0x08fa20010,
@@ -3655,7 +3751,7 @@ ulong bootcode[]={
 	0x000022e00,
 	0x000052e03,
 	0x014600004,
-	0x023c6810e,
+	0x023c6812e,
 	0x023bd0004,
 	0x003e00008,
 	0x020010001,
@@ -3673,7 +3769,7 @@ ulong bootcode[]={
 	0x000021603,
 	0x000461021,
 	0x080420000,
-	0x023c3818e,
+	0x023c381ae,
 	0x000021600,
 	0x000021603,
 	0x000021080,
@@ -3742,7 +3838,7 @@ ulong bootcode[]={
 	0x02002000a,
 	0x014a20003,
 	0x000000027,
-	0x008001275,
+	0x0080012d5,
 	0x0afc080d6,
 	0x020020009,
 	0x014a2ffd2,
@@ -3752,7 +3848,7 @@ ulong bootcode[]={
 	0x024630007,
 	0x0201cfff8,
 	0x0007c1824,
-	0x008001275,
+	0x0080012d5,
 	0x0afc380d6,
 	0x02007fc18,
 	0x0200bfc18,
@@ -3766,7 +3862,7 @@ ulong bootcode[]={
 	0x000052e03,
 	0x014a00003,
 	0x000000027,
-	0x008001275,
+	0x0080012d5,
 	0x024c6ffff,
 	0x02002002e,
 	0x014a20007,
@@ -3775,7 +3871,7 @@ ulong bootcode[]={
 	0x014e20002,
 	0x000000027,
 	0x000003825,
-	0x0080012ae,
+	0x00800130e,
 	0x000005825,
 	0x028a20031,
 	0x014400025,
@@ -3797,11 +3893,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x014a0ffe4,
 	0x000083825,
-	0x008001275,
+	0x0080012d5,
 	0x024c6ffff,
 	0x014a0ffe0,
 	0x000085825,
-	0x008001275,
+	0x0080012d5,
 	0x024c6ffff,
 	0x02002000a,
 	0x001020018,
@@ -3814,7 +3910,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x000052e00,
 	0x000052e03,
-	0x0080012ca,
+	0x00800132a,
 	0x02468ffd0,
 	0x020030030,
 	0x014a30006,
@@ -3822,7 +3918,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e30003,
 	0x000000027,
-	0x0080012c9,
+	0x008001329,
 	0x000000027,
 	0x02002002a,
 	0x014a20009,
@@ -3831,9 +3927,9 @@ ulong bootcode[]={
 	0x02002fc18,
 	0x014e20003,
 	0x025290004,
-	0x0080012ae,
+	0x00800130e,
 	0x000053825,
-	0x0080012ae,
+	0x00800130e,
 	0x000055825,
 	0x030a5007f,
 	0x0afa90044,
@@ -3845,10 +3941,10 @@ ulong bootcode[]={
 	0x0afaa0028,
 	0x0afaa0010,
 	0x0afa50014,
-	0x023c2810e,
+	0x023c2812e,
 	0x000451021,
 	0x080420000,
-	0x023c3818e,
+	0x023c381ae,
 	0x000021600,
 	0x000021603,
 	0x000021080,
@@ -3866,9 +3962,9 @@ ulong bootcode[]={
 	0x000000027,
 	0x08fa40028,
 	0x000011023,
-	0x0080012ae,
+	0x00800130e,
 	0x000825025,
-	0x008001275,
+	0x0080012d5,
 	0x001214821,
 	0x023bdfff0,
 	0x0afbf0000,
@@ -3886,13 +3982,13 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40008,
 	0x08fa2001c,
-	0x00c001411,
+	0x00c001471,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0010,
-	0x00800132a,
+	0x00800138a,
 	0x000042023,
 	0x023bdffa8,
 	0x0afbf0000,
@@ -3984,7 +4080,7 @@ ulong bootcode[]={
 	0x02002fc18,
 	0x0afa30008,
 	0x0afa2000c,
-	0x00c00131f,
+	0x00c00137f,
 	0x0afa70010,
 	0x08fa10028,
 	0x08fa20000,
@@ -4003,12 +4099,12 @@ ulong bootcode[]={
 	0x024a5ffff,
 	0x001651021,
 	0x020040030,
-	0x008001385,
+	0x0080013e5,
 	0x0a0440000,
 	0x024a5ffff,
 	0x001651021,
 	0x020040078,
-	0x0080013a1,
+	0x008001401,
 	0x0a0440000,
 	0x030e30040,
 	0x01060001e,
@@ -4030,27 +4126,27 @@ ulong bootcode[]={
 	0x000000027,
 	0x01d000003,
 	0x000000027,
-	0x008001376,
+	0x0080013d6,
 	0x000000027,
 	0x01d400003,
 	0x000000027,
-	0x008001376,
+	0x0080013d6,
 	0x000000027,
 	0x030e30040,
 	0x01460ffa1,
 	0x024a5ffff,
 	0x00149001b,
-	0x00800136c,
+	0x0080013cc,
 	0x000003010,
 	0x00149001b,
-	0x0080013b2,
+	0x008001412,
 	0x000005012,
 	0x0200d0001,
-	0x008001364,
+	0x0080013c4,
 	0x0000a5023,
 	0x08caa0000,
 	0x020020004,
-	0x00800135f,
+	0x0080013bf,
 	0x0afa20028,
 	0x08ca30000,
 	0x000000027,
@@ -4062,15 +4158,15 @@ ulong bootcode[]={
 	0x000021403,
 	0x020030004,
 	0x0afa30028,
-	0x00800135f,
+	0x0080013bf,
 	0x000025025,
 	0x08caa0000,
 	0x020020004,
-	0x00800135f,
+	0x0080013bf,
 	0x0afa20028,
 	0x08caa0000,
 	0x020020004,
-	0x00800135f,
+	0x0080013bf,
 	0x0afa20028,
 	0x020020030,
 	0x01062000a,
@@ -4078,11 +4174,11 @@ ulong bootcode[]={
 	0x020020048,
 	0x010620003,
 	0x000000027,
-	0x00800135c,
+	0x0080013bc,
 	0x000000027,
 	0x08ca80000,
 	0x020020004,
-	0x00800135f,
+	0x0080013bf,
 	0x0afa20028,
 	0x08ca20000,
 	0x000000027,
@@ -4092,14 +4188,14 @@ ulong bootcode[]={
 	0x03063ffff,
 	0x020020004,
 	0x0afa20028,
-	0x00800135f,
+	0x0080013bf,
 	0x000035025,
-	0x00800134c,
+	0x0080013ac,
 	0x02009000a,
 	0x0200e0001,
-	0x00800134c,
+	0x0080013ac,
 	0x020090010,
-	0x00800134c,
+	0x0080013ac,
 	0x020090008,
 	0x020020075,
 	0x011220006,
@@ -4107,10 +4203,10 @@ ulong bootcode[]={
 	0x020020078,
 	0x01122fff7,
 	0x000000027,
-	0x00800134c,
+	0x0080013ac,
 	0x000000027,
 	0x02009000a,
-	0x00800134c,
+	0x0080013ac,
 	0x034e70020,
 	0x023bdfff0,
 	0x0afbf0000,
@@ -4140,7 +4236,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x01ce00003,
 	0x000000027,
-	0x008001421,
+	0x008001481,
 	0x000000027,
 	0x000c9202b,
 	0x010800005,
@@ -4158,7 +4254,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffe3,
 	0x000000027,
-	0x008001421,
+	0x008001481,
 	0x024e7ffff,
 	0x020020009,
 	0x01562fff9,
@@ -4169,7 +4265,7 @@ ulong bootcode[]={
 	0x02003fc18,
 	0x010e3ffd8,
 	0x0afc880d6,
-	0x008001421,
+	0x008001481,
 	0x024e7ffff,
 	0x02002fc18,
 	0x011420003,
@@ -4194,7 +4290,7 @@ ulong bootcode[]={
 	0x0a0640000,
 	0x025080001,
 	0x024a50001,
-	0x008001456,
+	0x0080014b6,
 	0x0afc880d6,
 	0x000aa202a,
 	0x01080ffba,
@@ -4209,7 +4305,7 @@ ulong bootcode[]={
 	0x0a0440000,
 	0x025080001,
 	0x024a50001,
-	0x008001465,
+	0x0080014c5,
 	0x0afc880d6,
 	0x023bdffec,
 	0x0afbf0000,
@@ -4224,7 +4320,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x0afa00008,
 	0x02002fc18,
-	0x00c001411,
+	0x00c001471,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4242,7 +4338,7 @@ ulong bootcode[]={
 	0x08fa3001c,
 	0x02002fc18,
 	0x0afa30008,
-	0x00c001411,
+	0x00c001471,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,
@@ -4262,7 +4358,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa3000c,
 	0x08fa20024,
-	0x00c00131f,
+	0x00c00137f,
 	0x0afa20010,
 	0x08fa20000,
 	0x023bd0014,
@@ -4387,7 +4483,7 @@ ulong bootcode[]={
 	0x023a20034,
 	0x0e7a10004,
 	0x0e7a00008,
-	0x00c0017c9,
+	0x00c001829,
 	0x0afa2000c,
 	0x08fa20034,
 	0x04444f800,
@@ -4411,7 +4507,7 @@ ulong bootcode[]={
 	0x000023043,
 	0x0afa60030,
 	0x000061023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x0c7a30048,
 	0x0c7a2004c,
@@ -4423,7 +4519,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4446,7 +4542,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4455,7 +4551,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x008001553,
+	0x0080015b3,
 	0x023ae0078,
 	0x0c7c180da,
 	0x0c7c080de,
@@ -4472,7 +4568,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,
@@ -4481,7 +4577,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x00800156a,
+	0x0080015ca,
 	0x023ae0078,
 	0x02003fc18,
 	0x015830002,
@@ -4516,7 +4612,7 @@ ulong bootcode[]={
 	0x0200cffff,
 	0x0afac00ac,
 	0x0200d0065,
-	0x008001517,
+	0x008001577,
 	0x0afad00b4,
 	0x0c7a70048,
 	0x0c7a6004c,
@@ -4530,7 +4626,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x02002ffff,
 	0x000431023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4552,7 +4648,7 @@ ulong bootcode[]={
 	0x000671823,
 	0x004600138,
 	0x0afa7002c,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa30004,
 	0x0c7a30040,
 	0x0c7a20044,
@@ -4561,7 +4657,7 @@ ulong bootcode[]={
 	0x046201083,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c00172c,
+	0x00c00178c,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4623,7 +4719,7 @@ ulong bootcode[]={
 	0x000042603,
 	0x02484fff6,
 	0x0a0440001,
-	0x0080015fa,
+	0x00800165a,
 	0x024c6ffff,
 	0x010e00007,
 	0x0200b0001,
@@ -4691,7 +4787,7 @@ ulong bootcode[]={
 	0x020030030,
 	0x0a0430000,
 	0x024e7ffff,
-	0x008001645,
+	0x0080016a5,
 	0x024c60001,
 	0x019000013,
 	0x000000027,
@@ -4711,7 +4807,7 @@ ulong bootcode[]={
 	0x0256b0001,
 	0x0a0430000,
 	0x02508ffff,
-	0x008001656,
+	0x0080016b6,
 	0x024c60001,
 	0x08fa300b0,
 	0x000000027,
@@ -4740,7 +4836,7 @@ ulong bootcode[]={
 	0x0afa30008,
 	0x0afa2000c,
 	0x08fa300b0,
-	0x00c00131f,
+	0x00c00137f,
 	0x0afa30010,
 	0x08fa20000,
 	0x023bd00a0,
@@ -4796,19 +4892,19 @@ ulong bootcode[]={
 	0x000001810,
 	0x024630030,
 	0x0a0430000,
-	0x00800167d,
+	0x0080016dd,
 	0x024c60001,
 	0x000061825,
 	0x001231021,
 	0x02003002b,
 	0x0a0430000,
-	0x00800169e,
+	0x0080016fe,
 	0x024c60001,
 	0x000061025,
 	0x001221821,
 	0x020020065,
 	0x0a0620000,
-	0x008001694,
+	0x0080016f4,
 	0x024c60001,
 	0x020030067,
 	0x011a30006,
@@ -4816,7 +4912,7 @@ ulong bootcode[]={
 	0x020030068,
 	0x011a30003,
 	0x000000027,
-	0x008001677,
+	0x0080016d7,
 	0x000000027,
 	0x024c7ffff,
 	0x004e00006,
@@ -4836,11 +4932,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01107ff93,
 	0x000073025,
-	0x008001677,
+	0x0080016d7,
 	0x024c60001,
-	0x0080016dc,
+	0x00800173c,
 	0x02508ffff,
-	0x0080016d4,
+	0x008001734,
 	0x024e7ffff,
 	0x08fa30034,
 	0x02002ffff,
@@ -4850,7 +4946,7 @@ ulong bootcode[]={
 	0x000003825,
 	0x08fa30034,
 	0x0200d0068,
-	0x008001632,
+	0x008001692,
 	0x001835023,
 	0x08fa200b0,
 	0x000000027,
@@ -4861,7 +4957,7 @@ ulong bootcode[]={
 	0x001221821,
 	0x02002002b,
 	0x0a0620000,
-	0x008001623,
+	0x008001683,
 	0x024c60001,
 	0x0c7c380da,
 	0x0c7c280de,
@@ -4871,7 +4967,7 @@ ulong bootcode[]={
 	0x0e7a60044,
 	0x0e7a70004,
 	0x0e7a60008,
-	0x00c00172c,
+	0x00c00178c,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,
@@ -4898,14 +4994,14 @@ ulong bootcode[]={
 	0x046222181,
 	0x0e7a70040,
 	0x0e7a60044,
-	0x0080015f1,
+	0x008001651,
 	0x000000027,
-	0x00800158d,
+	0x0080015ed,
 	0x0258cffff,
 	0x020020001,
 	0x0afa20014,
 	0x025ad0020,
-	0x008001517,
+	0x008001577,
 	0x0afad00b4,
 	0x023bdffe8,
 	0x0afbf0000,
@@ -4922,7 +5018,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c001817,
+	0x00c001877,
 	0x0afa2000c,
 	0x04620c032,
 	0x000000027,
@@ -4951,7 +5047,7 @@ ulong bootcode[]={
 	0x023a2001c,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c001817,
+	0x00c001877,
 	0x0afa2000c,
 	0x0c7a1001c,
 	0x0c7a00020,
@@ -4967,7 +5063,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c00172c,
+	0x00c00178c,
 	0x000000027,
 	0x08fa20000,
 	0x023bd000c,
@@ -4980,7 +5076,7 @@ ulong bootcode[]={
 	0x004810008,
 	0x000000027,
 	0x000041023,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0014,
@@ -5001,12 +5097,12 @@ ulong bootcode[]={
 	0x000042843,
 	0x0afa50010,
 	0x000851823,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa30004,
 	0x0e7a10008,
 	0x0e7a0000c,
 	0x08fa20010,
-	0x00c00176e,
+	0x00c0017ce,
 	0x0afa20004,
 	0x0c7a30008,
 	0x0c7a2000c,
@@ -5167,7 +5263,7 @@ ulong bootcode[]={
 	0x00045202a,
 	0x014800013,
 	0x000000027,
-	0x08fc38106,
+	0x08fc38126,
 	0x08fa40008,
 	0x000a31807,
 	0x0201cffff,
@@ -5189,7 +5285,7 @@ ulong bootcode[]={
 	0x00065202a,
 	0x01480fff3,
 	0x000000027,
-	0x08fc3810a,
+	0x08fc3812a,
 	0x024a2ffea,
 	0x000431007,
 	0x0201cffff,
@@ -5197,7 +5293,7 @@ ulong bootcode[]={
 	0x08fa4000c,
 	0x000000027,
 	0x000821024,
-	0x008001838,
+	0x008001898,
 	0x0afa2000c,
 	0x023bdfffc,
 	0x08fa30010,
@@ -5308,7 +5404,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0a0c8ffff,
 	0x024c6ffff,
-	0x0080018b7,
+	0x008001917,
 	0x024e7ffff,
 	0x000000000,
 	0x000000000,
@@ -5346,16 +5442,16 @@ ulong bootcode[]={
 	0x005f5e100,
 	0x03b9aca00,
 	0x000000000,
-	0x000007204,
-	0x000007209,
-	0x00000721e,
-	0x000007225,
-	0x00000723a,
-	0x000007240,
-	0x000007255,
-	0x00000725d,
-	0x000007272,
-	0x000007276,
+	0x000007224,
+	0x000007229,
+	0x00000723e,
+	0x000007245,
+	0x00000725a,
+	0x000007260,
+	0x000007275,
+	0x00000727d,
+	0x000007292,
+	0x000007296,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -5367,14 +5463,22 @@ ulong bootcode[]={
 	0x000000000,
 	0x040240000,
 	0x000000000,
-	0x062616420,
-	0x074797065,
-	0x03a202564,
-	0x00a006261,
-	0x064207479,
-	0x070653a20,
-	0x025640a00,
-	0x000000000,
+	0x0454f4600,
+	0x067657453,
+	0x03a207265,
+	0x061642072,
+	0x065747279,
+	0x00a007265,
+	0x061642065,
+	0x072726f72,
+	0x000676574,
+	0x0533a2072,
+	0x065747279,
+	0x020626164,
+	0x020747970,
+	0x0650a0062,
+	0x061642074,
+	0x079706500,
 	0x000000000,
 	0x0001fffff,
 	0x07fffffff,
@@ -5410,13 +5514,13 @@ ulong bootcode[]={
 	0x000010000,
 	0x002000000,
 	0x000000000,
-	0x0000051d0,
-	0x0000052ec,
-	0x000004cdc,
-	0x0000053c8,
-	0x00000521c,
-	0x000005264,
-	0x0000052b4,
+	0x000005350,
+	0x00000546c,
+	0x000004e5c,
+	0x000005548,
+	0x00000539c,
+	0x0000053e4,
+	0x000005434,
 	0x000000000,
 	0x000000000,
 	0x000000000,
@@ -5809,6 +5913,6 @@ ulong bootcode[]={
 	0x06f740000,
 	0x000000000,
 	0x000000000,
-	0x00005ac8,
+	0x00005c68,
 	0x0,
 };
diff --git a/power/dat.h b/power/dat.h
index dfae05bcca3c1fe7d89e9af4f1fda8950602f3fa..ef9b000aa28e423069833e62ff49084f7cb5bb8c 100644
--- a/power/dat.h
+++ b/power/dat.h
@@ -218,6 +218,7 @@ struct User
 	short	notified;		/* sysnoted is due */
 	int	(*notify)(void*, char*);
 	void	*ureg;
+	ulong	svstatus;
 	/*
 	 *  machine dependent User stuff
 	 */
diff --git a/power/trap.c b/power/trap.c
index 7b645b746719b96cf4da4fcfa9582e4bfa49a6a7..15a6b5e6ac10c434175cfcda24baefdacde2a432 100644
--- a/power/trap.c
+++ b/power/trap.c
@@ -380,6 +380,7 @@ notify(Ureg *ur)
 	if(!u->notified){
 		if(!u->notify)
 			goto Die;
+		u->svstatus = ur->status;
 		sp = ur->usp;
 		sp -= sizeof(Ureg);
 		u->ureg = (void*)sp;
@@ -405,6 +406,15 @@ notify(Ureg *ur)
 void
 noted(Ureg **urp)
 {
+	Ureg *nur;
+
+	nur = u->ureg;
+	validaddr(nur->pc, 1, 0);
+	validaddr(nur->usp, BY2WD, 0);
+	if(nur->status!=u->svstatus){
+		pprint("bad noted ureg status %ux\n", nur->status);
+		pexit("Suicide", 0);
+	}
 	lock(&u->p->debug);
 	if(!u->notified){
 		unlock(&u->p->debug);
diff --git a/ss/faultsparc.c b/ss/faultsparc.c
index 55e4d919a7b3145435cca9e73433d3836480d0f8..1c9d679d23d3a5e35699e2a5710f584353273956 100644
--- a/ss/faultsparc.c
+++ b/ss/faultsparc.c
@@ -25,7 +25,7 @@ faultsparc(Ureg *ur)
 			read = 0;
 	}
 	spllo();
-/* print("fault: %s pc=0x%lux addr %lux %d\n", excname(tbr), ur->pc, addr, read); /**/
+print("fault: %s pc=0x%lux addr %lux %d\n", excname(tbr), ur->pc, addr, read); /**/
 	if(u == 0){
 		dumpregs(ur);
 		panic("fault u==0 pc=%lux addr=%lux", ur->pc, addr);
diff --git a/ss/trap.c b/ss/trap.c
index 525b5e76398780b7ea347016a67671d7e7405cc1..de013f5afc87dcde5620d64d825f12a89b23e791 100644
--- a/ss/trap.c
+++ b/ss/trap.c
@@ -214,6 +214,7 @@ notify(Ureg *ur)
 		unlock(&u->p->debug);
 		return;
 	}
+print("suicide: %s\n", u->note[0].msg);
 	if(u->note[0].flag!=NUser && (u->notified || u->notify==0)){
 		if(u->note[0].flag == NDebug)
 			pprint("suicide: %s\n", u->note[0].msg);
@@ -336,6 +337,7 @@ syscall(Ureg *aur)
 
 	u->nerrlab = 0;
 	ret = -1;
+print("syscall %s %d %d\n", u->p->text, u->p->pid, r7);
 	if(!waserror()){
 		if(r7 >= sizeof systab/BY2WD){
 			pprint("bad sys call number %d pc %lux\n", r7, ((Ureg*)UREGADDR)->pc);