Merge remote-tracking branch 'origin/master'

scans/s3.s

@@ -220,7 +220,7 @@ wttyo:
    jms chkint1
    jms forall
    sna
-   jmp failr
+   jmp fallr
    lmq
    lac sfiles+1
    spa
@@ -231,14 +231,14 @@ wttyo:
    tls
    sad o12
    jms putcr
-   jmp failr
+   jmp fallr
 1:
    lacq
    dac char
    lac d2	"** written: d6 ttyout
    jms putchar
       skp
-   jmp failr
+   jmp fallr
    jms sleep; sfiles+1
    jms swap
    jmp wttyo
@@ -286,7 +286,7 @@ wdspo:
    jms chkint1
    jms forall
    jms dspput
-      jmp failr
+      jmp fallr
    jms sleep; sfiles+6
    jms swap
    jmp wdspo
@@ -310,7 +310,7 @@ rppti:
 wppto:
    jms forall
    sna
-   jmp failr
+   jmp fallr
    lmq
    lac sfiles+4
    spa
@@ -319,14 +319,14 @@ wppto:
    dac sfiles+4
    lacq
    psa
-   jmp failr
+   jmp fallr
 1:
    lacq
    dac char
    lac d5
    jms putchar
       skp
-   jmp failr
+   jmp fallr
    jms sleep; sfiles+4
    jms swap
    jmp wppto

scans/s4.s

@@ -27,7 +27,7 @@ alloc: 0
    jms copy; dskbuf+1; s.fblks+1; 9
    lac d10
    dac s.nfblks
-   jmp alloc-1
+   jmp alloc+1
 
 free: 0
    lmq
@@ -67,6 +67,7 @@ betwen: 0
    lmq cmq
    lac betwen i
    dac 9f+t
+   isz betwen
    lacq
    tad 9f+t i
    sma
@@ -133,7 +134,7 @@ putchar: 0
    lac 9f+t
    jms putq
    lac char
-   lac q2+1 ..
+   dac q2+1 ..
    isz putchar
    jmp putchar i
 t = t+1
@@ -199,16 +200,16 @@ putq: 0
    jmp putq i
 
 srcdbs: 0
-   lmq		"** written (printed chars obscured)
+   dac 9f+t+2   "* lmq
    -ndskbs
    dac 9f+t
    law dskbs	"* -1 dac 8 written
-   dac 9f+t+1
+   dac 9f+t+1	"* lacq
 1:
    lac 9f+t+2	"** crossed out
    sad 9f+t+1	"** isz 8 written
    jmp srcdbs i
-   law 65	"** crossed out
+   law 65	"** ??? crossed out
    tad 9f+t+1	"** crossed out isz 8 written
    isz 9f+t+1
    isz 9f+t
@@ -225,7 +226,7 @@ collapse: 0
 1:
    lac 9f+t+1	"** 9f+t+1 crossed out: 8 written in
    dac 0f+1
-   tad d2	"** crossed out: original obscured
+   tad d65	"** crossed out: d2-- original obscured
    dac 0f
    cma
    tad d1
@@ -257,7 +258,7 @@ dskrd: 0
       jmp 1f
    lac dskaddr
    jms dskio; 06000
-   jmp 1f
+   jmp 2f
 1:
    dzm 9f+t+1 i
    law 1
@@ -295,6 +296,9 @@ dskio: 0
    dac 9f+t
    lls 22
    xor 9f+t
+   xor 9f+t+1
+   xor o200000
+   dac 9f+t
    jms dsktrans; -64; dskbuf; 9f+t; dskio
    isz dskio
    jmp dskio i

scans/s5.s

@@ -11,7 +11,6 @@ dskswap: 0
    jms dsktrans; -4096; 4096; 9f+t; dskswap
    isz dskswap
    jmp dskswap i
-
 t = t+1
 
 access: 0
@@ -29,13 +28,13 @@ access: 0
    jms error
 
 fassign: 0
-   -1
+   -10
    dac 9f+t
 1:
    lac 9f+t
    tad d10
    jms fget
-      jms halt  " will not happen
+      jms halt " will not happen
    lac f.flags
    sma
    jmp 1f
@@ -89,7 +88,7 @@ forall: 0
    lrs 9
    and o777
    jmp forall i
-failr:
+fallr:
    lac u.base
    add o400000
    dac u.base
@@ -119,6 +118,8 @@ sleep: 0
    lac sleep i
    dac 9f+t
    lac 9f+t i
+   omq
+   dac 9f+t i
    isz sleep
    jmp sleep i
 t = t+1
@@ -160,7 +161,7 @@ icreat: 0
    xor o400000
    dac i.flags
    lac u.uid
-   dac u.uid
+   dac i.uid
    -1
    dac i.nlks
    dzm i.size
@@ -178,7 +179,7 @@ dspput: 0
    jmp 1f
    lmq
    sad o12
-   jmp dspnl
+   jms dspnl
    lac dsploc i
    sad o400000
    jmp dspleft
@@ -217,16 +218,16 @@ dspnl: 0
    jmp dspput i
 
 dspinit: 0
-   lac dspbuf+3
+   lac dspbufp3
    dac dsploc
-   lac o300000
+   lac o400000
    dac dspbuf+3
    dzm dsplno
    jmp dspinit i
 
 movdsp: 0
    iof
-   caf
+   cdf
    dac dspbufp
    -1
    dac .dspb

scans/s6.s

@@ -1,5 +1,5 @@
 "** 01-s1.pdf page 34
-" S6
+" s6
 
 itrunc: 0
    -7
@@ -25,7 +25,7 @@ itrunc: 0
    sza
    jms free
    isz 9f+t+3
-   isz 9f+t+3
+   isz 9f+t+2
    jmp 2b
 3:
    lac 9f+t+1 i
@@ -82,9 +82,13 @@ namei: 0
    sad 8 i
    skp
    jmp 2f
+   lac d.name+3
+   sad 8 i
+   skp
+   jmp 2f
    lac d.i
    isz namei
-   jmp namei 1
+   jmp namei i
 2:
    isz di
    isz 9f+t
@@ -96,8 +100,9 @@ iget: 0
    dac ii
    cll; idiv; 5
    dac 9f+t
+   lacq
    tad d2
-   dac 9f+i+1
+   dac 9f+t+1
    jms dskrd
    lac 9f+t
    cll; mul; 12
@@ -158,7 +163,7 @@ dget: 0
    tad dskbufp
    dac 9f+t+2
    dac .+2
-   jms copy; ..; inode; 8
+   jms copy; ..; dnode; 8
    lac 9f+t
    tad d8
    jms betwen; d0; i.size
@@ -173,12 +178,12 @@ dput: 0
    jms dskrd
    lac 9f+t+2
    dac .+3
-   jms copy; inode; ..; 8
+   jms copy; dnode; ..; 8
    lac 9f+t+1
    jms dskwr
    jmp dput i
 
-t = t+3	"** first t not there (hole from hole punch?)
+t = t+3
 
 pget: 0
    lrss 6
@@ -204,7 +209,7 @@ pget: 0
    jms alloc
    dac 9f+t+1
    jms copy; i.dskps; dskbuf; 7
-   jms copyz; dskbuf+7; 64-7	"** NUMBER UNCLEAR
+   jms copyz; dskbuf+7; 64-7
    lac 9f+t+1
    jms dskwr
    lac 9f+t+1
@@ -215,7 +220,7 @@ pget: 0
    dac i.flags
 2:
    lac 9f+t
-   lrss 7
+   lrss 6
    jms betwen; d0; d6
       jms halt " file too big
    tad idskpp
@@ -238,6 +243,10 @@ pget: 0
    lac 9f+t+2
    jms dskrd
    lac 9f+t
+   dac 9f+t+1 i
+   lac 9f+t+2
+   jms dskwr
+   lac 9f+t
    jmp pget i
 t = t+3
 
@@ -306,11 +315,11 @@ cskp:
       jms betwen; d0; i.size
          dac i.size
       lac 9f+t+3
+      jms dskwr
    4:
 "** 01-s1.pdf page 38
       lac 9f+t+2
       jmp iread i
-
 3:
    lac 9f+t
    and o77
@@ -332,7 +341,7 @@ finac: 0
    jms error
    lac f.i
    jms iget
-   jms finac i
+   jmp finac i
 
 dacisize: 0
    dac i.size

scans/s7.s

@@ -314,7 +314,6 @@ wakeup: 0
    jmp 1b
    cla
    jmp wakeup i
-
 t = t+2
 
 putcr: 0
@@ -327,7 +326,7 @@ putcr: 0
    jmp putcr i
 
 intrp1:
-   lac d5
+   lac d6
    dac .int1
    lac d1
    jms getchar

scans/s8.s

@@ -25,6 +25,7 @@ ofilesp: u.ofiles
 idskpp: i.dskps
 dskbufp: dskbuf
 edspbuf: dspbuf+dspbsz
+dspbufp3: dspbuf+3
 fblksp: s.fblks
 dacq1: dac q1
 lacq1: lac q1
@@ -94,14 +95,14 @@ dm1: -1
 
 9: .=.+t
 c1: .=.+1
-q1: q2;q2+90
+q1: q2;q2+90  "** ?? 98 ??
    .=.+14
 q2:
    .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0
    .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0
    .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0
    .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0
-   .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0
+   .+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;.+2;0;0;0
 dsploc: .=.+1
 dsplno: .=.+1
 dspbuf:

scans/s9.s

@@ -9,10 +9,11 @@
    jms copyz; dskbuf; 64
 1:
    lac ii
-   jms dskio; 0700
+   jms dskio; 07000
    isz ii
    -710
    tad ii
+   sza
    jmp 1b
 
 " free rest of disk
@@ -80,11 +81,7 @@
    jms iwrite; 4096; ..
    jms iput
    cla
-   jms dskio
+   jms dskio; 07000	"** writing on listing
-
-
-
-; 07000	"** writing on listing
    jmp 1b
 
 getw: 0
@@ -92,6 +89,7 @@ getw: 0
    alss 12
    lmq
    jms getc
+   alss 6
    omq
    lmq
    jms getc