# HG changeset patch
# User boisy
# Date 1061125187 0
# Node ID 411c88ed62f6208b5f42f946772e608793f43e2a
# Parent  1e1377bd37c1906194fbd0925b7404761fbbc7bd
Fixed bug in os9p1, now boots in Level Two!  Also inc'ed rev (and in os9p2)

diff -r 1e1377bd37c1 -r 411c88ed62f6 level2/modules/kernel/krn.asm
--- a/level2/modules/kernel/krn.asm	Sat Aug 16 22:43:12 2003 +0000
+++ b/level2/modules/kernel/krn.asm	Sun Aug 17 12:59:47 2003 +0000
@@ -8,6 +8,7 @@
 * 19r6   Assembles to the os9p1 module that works on    BGP 02/08/21
 *        my NitrOS-9 system
 * 19r7   Added check for CRC feature bit in init module BGP 02/09/26
+* 19r8   Back-ported to OS-9 Level Two                  BGP 02/09/26
 
          nam   OS9p1
          ttl   OS-9 Level Two Kernel Part 1
@@ -17,7 +18,7 @@
          ENDC
 
 * defines for customizations
-Revision set   7          module revision
+Revision set   8          module revision
 Edition  set   19         module Edition
 Where    equ   $F000      absolute address of where OS9p1 starts in memory
 
@@ -31,10 +32,10 @@
          fcc   /0123456789ABCDEF/
          fcc   /0123456789ABCDEF/
          fcc   /0123456789ABCDEF/
-         fcc   /01234567/
+         fcc   /01234/ 567/
          ELSE
          fcc   /123456789ABCDEF/
-         fcc   /1234/ 5678/
+         fcc   /12345678/
          ENDC
 
 * Might as well have this here as just past the end of OS9p1...
@@ -278,11 +279,11 @@
          std    <D.BlkMap+2 save block map end pointer
 
 * [D] at this point will contain 1 of the following:
-* $0010 - 128k
-* $0020 - 256k
-* $0040 - 512k
-* $0080 - 1024k
-* $0100 - 2048k
+* $0210 - 128k
+* $0220 - 256k
+* $0240 - 512k
+* $0280 - 1024k
+* $0300 - 2048k
          bitb  #%00110000   block above 128K-256K?
          beq   L0170        yes, no need to mark block map
          tstb               2 meg?
@@ -468,14 +469,13 @@
          tfm   y-,u-
          leau  ,s         needed because the TFM is u-, not -u (post, not pre)
          ELSE
-         pshs  b
+* Note!  R$Size MUST BE an EVEN number of bytes for this to work!
          leau  R$Size,s  point to last byte of destination register stack
-         ldb   #R$Size
-Loop3    lda   ,-y
-         sta   ,-u
-         decb
+         lda   #R$Size/2
+Loop3    ldx   ,--y
+         stx   ,--u
+         deca
          bne   Loop3
-         puls  b
          ENDC
          andcc #^IntMasks
 * B=function code already from calling process: DON'T USE IT!
diff -r 1e1377bd37c1 -r 411c88ed62f6 level2/modules/kernel/krnp2.asm
--- a/level2/modules/kernel/krnp2.asm	Sat Aug 16 22:43:12 2003 +0000
+++ b/level2/modules/kernel/krnp2.asm	Sun Aug 17 12:59:47 2003 +0000
@@ -55,6 +55,7 @@
 *                 - Minor mods to F$STime
 *                 - Changed F$GModDr to BRA to similar code in F$GBlkMp
 *
+* 18r6  Back-ported to OS-9 Level Two from NitrOS-9 Level Two
 
          nam    OS9p2
          ttl    NitrOS-9 Kernel Part II
@@ -68,7 +69,7 @@
 
 TC9      set    false       "true" use TC-9 6309 trap vector
 Edition  equ    18
-Revision equ    5
+Revision equ    6
 *DAT.Free equ   $333E      --- remove this def later
 
          mod    eom,MName,Systm,ReEnt+Revision,OS9P2,$0100