diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 02f6093a..6a112eba 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/EDIT.S.BUF.txt b/BIN/EDIT.S.BUF.txt index 93c5a109..70a027c5 100644 --- a/BIN/EDIT.S.BUF.txt +++ b/BIN/EDIT.S.BUF.txt @@ -37,12 +37,12 @@ BUF.InsertClipboard lda (pData),y clc adc BufLen - sta (pData),y + sta BufLen iny lda (pData),y adc BufLen+1 - sta (pData),y + sta BufLen+1 .8 clc .9 rts diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt index 7235fc19..0019c869 100644 --- a/BIN/MEM.S.txt +++ b/BIN/MEM.S.txt @@ -27,7 +27,7 @@ CS.START cld .DA 0 .DA CS.END-CS.START CS .DA DS.END-DS.START DS - .DA #16 SS + .DA #64 SS .DA #ZS.END-ZS.START Zero Page Size .DA 0 *-------------------------------------- diff --git a/BIN/SH.S.CL.txt b/BIN/SH.S.CL.txt index 751141de..7f7ed903 100644 --- a/BIN/SH.S.CL.txt +++ b/BIN/SH.S.CL.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF *-------------------------------------- CL.Init >LDYAI 256 diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt index 27418406..ee3e0caf 100644 --- a/BIN/SH.S.CMD.txt +++ b/BIN/SH.S.CMD.txt @@ -358,7 +358,7 @@ CMD.ECHO stz ZPPtr1 echo -N bcs .2 cmp #'N' - bne .99 + bne CMD.ECHO.CSYN lda #$ff eor ZPPtr1 @@ -387,17 +387,17 @@ CMD.ECHO stz ZPPtr1 echo -N >PUSHBI 0 >LDYA L.MSG.ECHOCRLF >SYSCALL printf - rts +.9 rts .8 clc rts -.99 lda #E.CSYN +CMD.ECHO.CSYN lda #E.CSYN sec -.9 rts + rts *-------------------------------------- CMD.GETKEY lda (ZPArgVBufPtr) - beq .99 + beq CMD.ECHO.CSYN ldy #S.PS.hStdIn lda (pPS),y @@ -405,25 +405,45 @@ CMD.GETKEY lda (ZPArgVBufPtr) bcs .9 tay - bne .1 + beq .1 + +.10 lda #'0' + >STA.G M32.BUF + iny + lda #0 + sta (pData),y + bra .8 + +.1 >SYSCALL getchar + bcs .9 + cmp #'[' + bne .4 >SYSCALL getchar bcs .9 - -.1 >PUSHA + + ldx #EscChars.Cnt-1 + +.2 cmp EscChars,x + beq .3 + dex + bpl .2 + bra .10 + +.3 lda EscChars.Remap,x + +.4 >PUSHA >PUSHBI 1 >PUSHW L.FMT.GETKEY >LEA.G M32.BUF >SYSCALL sprintf bcs .9 - >PUSHEA.G M32.BUF +.8 >PUSHEA.G M32.BUF >LDYA ZPArgVBufPtr >SYSCALL SetEnv .9 rts - -.99 jmp CMD.Exec.CSYN *-------------------------------------- CMD.READ lda (ZPArgVBufPtr) beq .9 diff --git a/BIN/SH.S.EXP.txt b/BIN/SH.S.EXP.txt index fe31caba..35f5651f 100644 --- a/BIN/SH.S.EXP.txt +++ b/BIN/SH.S.EXP.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF *-------------------------------------- EXP.GET jsr CORE.ArgV.Next diff --git a/BIN/SH.S.HIS.txt b/BIN/SH.S.HIS.txt index 7fbd493e..3774f556 100644 --- a/BIN/SH.S.HIS.txt +++ b/BIN/SH.S.HIS.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF *-------------------------------------- HIS.Init >LDYAI HISTORY.MAX Get a buffer for History diff --git a/BIN/SH.S.IO.txt b/BIN/SH.S.IO.txt index 89209916..1e13dc95 100644 --- a/BIN/SH.S.IO.txt +++ b/BIN/SH.S.IO.txt @@ -1,6 +1,5 @@ NEW -PREFIX -AUTO 4,1 + AUTO 3,1 .LIST OFF *-------------------------------------- IO.Reset jsr IO.Reset.In diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt index 41fc7202..dd0bbb50 100644 --- a/BIN/SH.S.txt +++ b/BIN/SH.S.txt @@ -702,6 +702,7 @@ EXP.OP.LOGIC .AZ "AND" *-------------------------------------- EscChars .AS 'DBAC' EscChars.Cnt .EQ *-EscChars +EscChars.Remap .DA #C.BS,#C.VT,#C.LF,#C.FS NOD.Template .AZ "/DEV/PIPE%h" M32.Printf .AZ "%L" *-------------------------------------- @@ -753,9 +754,11 @@ IO.hIn .BS 1 IO.hOut .BS 1 IO.hErr .BS 1 IO.hPipe .BS 1 + +*M32.BUF .BS 12 -1234567890\0 +M32.BUF .EQ * IO.NodBuf .BS 12 /DEV/PIPExx\0 *-------------------------------------- -M32.BUF .BS 12 -1234567890\0 DS.END .ED *-------------------------------------- MAN diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index bb1c092c..3f2e31d4 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -738,26 +738,22 @@ CS.QUIT jsr LeaveSubDir >SYSCALL fclose .1 ldy #hDstFullPath - jsr CS.QUIT.FREE + jsr .7 ldy #hDstFilename - jsr CS.QUIT.FREE + jsr .7 .FIN ldy #hSrcFullPath - jsr CS.QUIT.FREE + jsr .7 ldy #hFilter - jsr CS.QUIT.FREE - - clc - rts -*-------------------------------------- -CS.QUIT.FREE lda (pData),y + +.7 lda (pData),y beq .9 >SYSCALL FreeMem .9 rts *-------------------------------------- MAN SAVE USR/SRC/BIN/X.CPMVRM.S -LOAD USR/SRC/BIN/MV.S +LOAD USR/SRC/BIN/CP.S ASM diff --git a/SYS/KERNEL.S.TERM.txt b/SYS/KERNEL.S.TERM.txt index b4153803..91a44302 100644 --- a/SYS/KERNEL.S.TERM.txt +++ b/SYS/KERNEL.S.TERM.txt @@ -362,7 +362,7 @@ DRV.TERM.COUT.FS inc sta (ZPDCBPtr),y cmp #80 - bne DRV.TERM.COUT.FS.8 + bcc DRV.TERM.COUT.FS.8 ldy #S.DCB.TTY.bLINEWRAP lda (ZPDCBPtr),y @@ -1113,25 +1113,17 @@ DRV.TERM.CURBLNK.1 bne DRV.TERM.CURBLNK.OFF jsr GetCharAtCurPos + bcs DRV.TERM.CURBLNK.RTS Out of screen + and #$80 eor #" " bra DRV.TERM.CURBLNK.SET DRV.TERM.CURBLNK.OFF jsr GetCharAtCurPos + bcs DRV.TERM.CURBLNK.RTS Out of screen DRV.TERM.CURBLNK.SET - pha - ldy #S.DCB.TTY.CV - lda (ZPDCBPtr),y - tax - dey - lda (ZPDCBPtr),y - tay CH - - jsr DRV.TERM.SETUP.L1X.SCR - - pla jsr SetCharAtY.SCR ldy #S.DCB.TTY.bCURON diff --git a/SYS/KERNEL.S.TERMLC.txt b/SYS/KERNEL.S.TERMLC.txt index 5398e687..45efae29 100644 --- a/SYS/KERNEL.S.TERMLC.txt +++ b/SYS/KERNEL.S.TERMLC.txt @@ -239,12 +239,18 @@ SetCharAtYX.8 rts *-------------------------------------- GetCharAtCurPos ldy #S.DCB.TTY.CV lda (ZPDCBPtr),y + cmp #24 + bcs .9 Out of screen + tax jsr DRV.TERM.SETUP.L1X ldy #S.DCB.TTY.CH lda (ZPDCBPtr),y + cmp #80 + bcs .9 Out of screen + tay sta SETREADAUX @@ -257,7 +263,9 @@ GetCharAtCurPos ldy #S.DCB.TTY.CV * clc adc #40 remap $00-$1F uppercase -.8 rts +.8 clc + +.9 rts *-------------------------------------- DRV.TERM.SETUP.L1X ldy #S.FD.DEV.BUFPTR