# HG changeset patch
# User boisy
# Date 1061148601 0
# Node ID 1aae5bde55a0b60da62f4fb87320ba3fa4f87900
# Parent  b6969b0ae23d40421f6f2a451e9cf6d620a13f86
Fixed bugs as per Rodney's suggestion

diff -r b6969b0ae23d -r 1aae5bde55a0 level2/modules/kernel/ffreehb.asm
--- a/level2/modules/kernel/ffreehb.asm	Sun Aug 17 16:33:10 2003 +0000
+++ b/level2/modules/kernel/ffreehb.asm	Sun Aug 17 19:30:01 2003 +0000
@@ -14,7 +14,7 @@
          ldd   #$FFFF         -1'
 L0A56    pshs  d
 
-* Move to next block - SHOULD OPTOMIZE WITH W
+* Move to next block - SHOULD OPTIMIZE WITH W
 L0A58    clra                 # free blocks found so far=0
          ldb   2,s            Get block #
          addb  ,s             Add block increment (point to next block)
@@ -42,6 +42,7 @@
          puls  d,x,pc         Restore reg, error code & return
 
 * F$FreeLB entry point (WHERE DOES THIS EVER GET CALLED FROM???)
+* Rodney says: "it's called via os9p1 syscall vector in line 393"
 FSFreeLB ldb   R$B,u          Get block count
          ldy   R$Y,u          Get ptr to DAT Image
          bsr   L0A4B          Go find block #'s
@@ -56,7 +57,7 @@
          negb                 Negate so it is a positive # again
          bra   L0A56          Go into main find loop
 
-* F$FreLB entry point
+* F$FreeLB entry point
 FFreeLB  ldd   R$D,u
          ldx   R$X,u
          ldu   R$U,u
@@ -66,6 +67,7 @@
          leay  a,y
          IFNE  H6309
          clra
+* Rodney claims this is a bug...
          lslb
          tfr   d,w
          tfm   u+,y+
diff -r b6969b0ae23d -r 1aae5bde55a0 level2/modules/kernel/fsleep.asm
--- a/level2/modules/kernel/fsleep.asm	Sun Aug 17 16:33:10 2003 +0000
+++ b/level2/modules/kernel/fsleep.asm	Sun Aug 17 19:30:01 2003 +0000
@@ -64,8 +64,8 @@
          ELSE
          nega
          negb
+         sbca  #0
          ENDC
-         sbca  #0
          std   R$X,y
 L074F    puls  y,x
          IFNE  H6309
diff -r b6969b0ae23d -r 1aae5bde55a0 level2/modules/kernel/krn.asm
--- a/level2/modules/kernel/krn.asm	Sun Aug 17 16:33:10 2003 +0000
+++ b/level2/modules/kernel/krn.asm	Sun Aug 17 19:30:01 2003 +0000
@@ -58,16 +58,15 @@
          aim   #$FE,<D.TINIT  map type 0
          lde   <D.TINIT   'nother 2 bytes saved if GRFDRV does a 'tfr cc,e'
          ste   >DAT.Task   and we can use A here, instead of E
-         clr   <D.SSTskN
          ELSE
          pshs  a
          lda   <D.TINIT
          anda  #$FE
          sta   <D.TINIT
          sta   >DAT.Task
-         clr   <D.SSTskN
          puls  a
          ENDC
+         clr   <D.SSTskN
          tfr   x,s
          tfr   a,cc
          rts   
diff -r b6969b0ae23d -r 1aae5bde55a0 level2/modules/kernel/krnp2.asm
--- a/level2/modules/kernel/krnp2.asm	Sun Aug 17 16:33:10 2003 +0000
+++ b/level2/modules/kernel/krnp2.asm	Sun Aug 17 19:30:01 2003 +0000
@@ -189,8 +189,6 @@
          lda    #(EXEC.+READ.) get file mode
          os9    I$ChgDir    change to it
          bcc    L004F       went ok, go on
- tfr b,a
- jsr <D.BtBug
          os9    F$Boot      try & load boot file
          bcc    L003A       go try again
 L004F    ldu    <D.Init     get pointer to init
@@ -235,7 +233,8 @@
          ENDC
          os9    F$Fork      fork it
          bcc    L0093       if no error, go execute it
-         jmp    <D.Crash    otherwise crash the system
+*         jmp    <D.Crash    otherwise crash the system
+         bra    L009B       crash machine
 L0093    os9    F$NProc     let it take over
 
 L0096    fcs    /OS9p3/
@@ -270,15 +269,15 @@
          fdb    FSTime-*-2
          fcb    F$SchBit
          fdb    FSchBit-*-2
-         fcb    F$SchBit+$80
+         fcb    F$SchBit+SysState
          fdb    FSSchBit-*-2
          fcb    F$AllBit
          fdb    FAllBit-*-2
-         fcb    F$AllBit+$80
+         fcb    F$AllBit+SysState
          fdb    FSAllBit-*-2
          fcb    F$DelBit
          fdb    FDelBit-*-2
-         fcb    F$DelBit+$80
+         fcb    F$DelBit+SysState
          fdb    FSDelBit-*-2
          fcb    F$GPrDsc
          fdb    FGPrDsc-*-2
@@ -286,7 +285,7 @@
          fdb    FGBlkMp-*-2
          fcb    F$GModDr
          fdb    FGModDr-*-2
-         IFEQ   NitrOS9
+         IFEQ   H6309
          fcb    F$CpyMem
          fdb    FCpyMem-*-2
          fcb    F$DelRAM