diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 26c679ee..8796c5fe 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt index 24e88475..feaecc71 100644 --- a/SYS/KERNEL.S.IO.txt +++ b/SYS/KERNEL.S.IO.txt @@ -29,12 +29,12 @@ K.Open jsr PFT.YAToMLIPATH stz K.Open.AUXTYPE stz K.Open.AUXTYPE+1 -IO.Open.I ldx #5 $/DEV/ +IO.Open.I ldx #5 /DEV/ cpx K.MLI.PATH bcs IO.OPEN.REG .1 lda K.MLI.PATH,x - cmp IO.DEVDIR,x + cmp IO.DEVDIR-1,x bne IO.OPEN.REG dex bne .1 @@ -855,7 +855,7 @@ IO.MLIOPEN >LDYAI 1024 get a ProDOS IOBUF * clc .9 rts *-------------------------------------- -IO.DEVDIR .DA #5 >PSTR "/DEV/" +IO.DEVDIR .EQ * >PSTR "/DEV/" *-------------------------------------- STAT.FIFO .AS "/DEV/FIFO" *-------------------------------------- diff --git a/SYS/KERNEL.S.MATH.txt b/SYS/KERNEL.S.MATH.txt index c5530c90..a4e4df70 100644 --- a/SYS/KERNEL.S.MATH.txt +++ b/SYS/KERNEL.S.MATH.txt @@ -426,10 +426,7 @@ MATH.ACC322STR10 ldx #32 let's roll 32 bits -.3 asl ACC32 - rol ACC32+1 - rol ACC32+2 - rol ACC32+3 +.3 jsr MATH.ACC32.T2 ldy #4 diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt index b2384f7e..dbc6e172 100644 --- a/SYS/KERNEL.S.MEM.txt +++ b/SYS/KERNEL.S.MEM.txt @@ -750,6 +750,10 @@ MEM.AddYToPtr2 clc inc ZPPtr2+1 .8 rts *-------------------------------------- +MEM.GetCharPtr2 lda (ZPPtr2) + bne MEM.NextCharPtr2 + rts + MEM.PutCharPtr2 sta (ZPPtr2) MEM.NextCharPtr2 inc ZPPtr2 diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index 3fd095c2..e162d691 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -243,10 +243,10 @@ PrintF.hFILE .BS 1 *-------------------------------------- K.PrintF.GetFormat lda (pStack) - sta ZPPtr1 + sta ZPPtr2 ldy #1 lda (pStack),y - sta ZPPtr1+1 + sta ZPPtr2+1 lda pStack inc @@ -264,7 +264,7 @@ K.FPrintF sta PrintF.hFILE jsr K.PrintF.GetFormat bra K.PrintF.0 -K.PrintF >STYA ZPPtr1 format +K.PrintF >STYA ZPPtr2 format lda pStack sta pLocal @@ -281,7 +281,7 @@ K.PrintF.1 stz PrintF.Cnt stz PrintF.GetByte+1 -.1 jsr MEM.GetCharPtr1 +.1 jsr MEM.GetCharPtr2 bne .22 jmp .8 end of format.. @@ -293,7 +293,7 @@ K.PrintF.1 stz PrintF.Cnt ldy #0 -.2 lda (ZPPtr1),y +.2 lda (ZPPtr2),y beq .7 end of line... print % and exit iny @@ -334,13 +334,13 @@ K.PrintF.1 stz PrintF.Cnt adc K.PrintF.PadL sta K.PrintF.PadL - lda (ZPPtr1),y we have 2 digits, must get a letter, now + lda (ZPPtr2),y we have 2 digits, must get a letter, now beq .7 iny jsr K.PrintF.CheckTBL1 bcs .7 abort and print % -.6 jsr MEM.AddYToPtr1 skip all processed chars +.6 jsr MEM.AddYToPtr2 skip all processed chars txa asl @@ -355,7 +355,7 @@ K.PrintF.1 stz PrintF.Cnt .10 cmp #'\' bne .20 - jsr MEM.GetCharPtr1 + jsr MEM.GetCharPtr2 beq .99 ldx #PrintFTBL2.Cnt-1 @@ -367,14 +367,11 @@ K.PrintF.1 stz PrintF.Cnt cmp #'x' bne .1 - - >LDYA ZPPtr1 - >STYA ZPPtr2 jsr MATH.Hex2ACC32 bcs .99 - jsr MEM.AddYToPtr1 + jsr MEM.AddYToPtr2 .14 lda ACC32 bra .20 @@ -591,13 +588,13 @@ PrintF.SS ldy #$00 PSTR jsr PrintF.GetByte bcs .9 - sta ZPPtr2 + sta ZPPtr1 jsr PrintF.GetByte bcs .9 - sta ZPPtr2+1 + sta ZPPtr1+1 - lda (ZPPtr2) if CSTR:last char=0, if PSTR:len=0 + lda (ZPPtr1) if CSTR:last char=0, if PSTR:len=0 beq .8 sty .1+1 @@ -606,12 +603,12 @@ PrintF.SS ldy #$00 PSTR bne .11 CSTR tya PSTR - cmp (ZPPtr2) len check + cmp (ZPPtr1) len check beq .2 .11 iny - lda (ZPPtr2),y + lda (ZPPtr1),y beq .2 jsr PrintF.COut @@ -661,7 +658,7 @@ PrintF.H.1 tay and #$0F *-------------------------------------- PrintF.COutHex ora #$30 - cmp #$3A + cmp #'9'+1 bcc PrintF.COut adc #6 *--------------------------------------