diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index fd34c828..4910a90e 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/CHMOD.S.txt b/BIN/CHMOD.S.txt index 51c067c0..ce451049 100644 --- a/BIN/CHMOD.S.txt +++ b/BIN/CHMOD.S.txt @@ -73,9 +73,9 @@ CS.RUN >INC.G ArgIndex dex bpl .2 -.9 >PUSHBI 0 - >LDYA L.MSG.USAGE - >SYSCALL printf +.9 >PUSHW L.MSG.USAGE + >PUSHBI 0 + >SYSCALL printf2 lda #E.SYN sec .99 rts @@ -168,12 +168,14 @@ CS.RUN.DIR >LDA.G bRecurse lda (ZPFileName) cmp #'.' beq .8 + jsr CS.RUN.GetFilePath + >PUSHW L.MSG.DIR >PUSHW ZPFullPath >PUSHBI 2 - >LDYA L.MSG.DIR - >SYSCALL printf + >SYSCALL printf2 bcs .9 + >PUSHW ZPMode >LDYA ZPFullPath >SYSCALL chmod @@ -187,12 +189,15 @@ CS.RUN.DIR >LDA.G bRecurse *-------------------------------------- CS.RUN.FILE jsr FilterMatch bcs .8 no match, skip.... + jsr CS.RUN.GetFilePath + + >PUSHW L.MSG.FILE >PUSHW ZPFullPath >PUSHBI 2 - >LDYA L.MSG.FILE - >SYSCALL printf + >SYSCALL printf2 bcs .9 + >PUSHW ZPMode >LDYA ZPFullPath >SYSCALL chmod @@ -241,10 +246,12 @@ CS.RUN.CheckErr bcs .1 >SYSCALL puts rts .1 pha + >PUSHW L.MSG.ERR + pla + pha >PUSHA >PUSHBI 1 - >LDYA L.MSG.ERR - >SYSCALL printf + >SYSCALL printf2 >LDA.G bContinue eor #$80 asl diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 8de73c53..7a2b08a3 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -64,9 +64,9 @@ CS.INIT dex bne .2 -.99 >PUSHBI 0 - >LDYA L.MSG.USAGE - >SYSCALL printf +.99 >PUSHW L.MSG.USAGE + >PUSHBI 0 + >SYSCALL printf2 lda #E.SYN sec rts @@ -156,11 +156,12 @@ CS.RUN.DEV rts *-------------------------------------- CS.RUN.FILE jsr CS.RUN.GetFilePath + >PUSHW L.MSG.FILE >PUSHW ZPFullPath >PUSHBI 2 - >LDYA L.MSG.FILE - >SYSCALL printf + >SYSCALL printf2 bcs .9 + ldy #HexFileType >PUSHB (pData),y @@ -184,10 +185,12 @@ CS.RUN.CheckErr bcs .1 >SYSCALL puts rts .1 pha + >PUSHW L.MSG.ERR + pla + pha >PUSHA >PUSHBI 1 - >LDYA L.MSG.ERR - >SYSCALL printf + >SYSCALL printf2 >LDA.G bContinue eor #$80 asl diff --git a/BIN/CSH.S.txt b/BIN/CSH.S.txt index d4d1db2a..50d9ccc8 100644 --- a/BIN/CSH.S.txt +++ b/BIN/CSH.S.txt @@ -76,10 +76,10 @@ CS.INIT.RTS rts * Called until exit with CS * if RUN exits with CC, RN entered again *-------------------------------------- -CS.RUN >PUSHWI K.VER +CS.RUN >PUSHW L.MSG.GREETINGS + >PUSHWI K.VER >PUSHBI 2 - >LDYA L.MSG.GREETINGS - >SYSCALL printf + >SYSCALL printf2 bcs CS.INIT.RTS jsr CS.RUN.ARGS @@ -165,9 +165,9 @@ CS.RUN.ARGS inc ArgIndex clc .9 rts -.90 >PUSHBI 0 - >LDYA L.MSG.USAGE - >SYSCALL printf +.90 >PUSHW L.MSG.USAGE + >PUSHBI 0 + >SYSCALL printf2 lda #E.SYN sec QUIT Process @@ -240,10 +240,10 @@ PrintErrMsg lda ZPhMacro rts *-------------------------------------- -PrintDebugMsg >PUSHW pStack +PrintDebugMsg >PUSHW L.MSG.DEBUG + >PUSHW pStack >PUSHBI 2 - >LDYA L.MSG.DEBUG - >SYSCALL printf + >SYSCALL printf2 rts *-------------------------------------- PrintTraceMsg >STYA ZPPtr3 diff --git a/SBIN/INSDRV.S.txt b/SBIN/INSDRV.S.txt index 22951e1f..30f5a7e7 100644 --- a/SBIN/INSDRV.S.txt +++ b/SBIN/INSDRV.S.txt @@ -40,13 +40,17 @@ CS.RUN ldy #S.PS.ARGC lda (pPs),y cmp #1 bcc .9 + + >PUSHW L.MSG.LOAD + lda #1 get PTR to ARG[1] (Driver name) >SYSCALL ArgV >PUSHYA >PUSHBI 2 - >LDYA L.MSG.LOAD - >SYSCALL printf + >SYSCALL printf2 + bcs .99 + lda #1 get PTR to ARG[1] (Driver name) >SYSCALL ArgV diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt index 1d505f7b..c80e541e 100644 --- a/SBIN/LOGIN.S.txt +++ b/SBIN/LOGIN.S.txt @@ -388,10 +388,9 @@ CS.RUN.GetLine sta ZPGetLineMax clc .9 rts *-------------------------------------- -CS.RUN.StrOut pha +CS.RUN.StrOut >PUSHYA >PUSHBI 0 - pla - >SYSCALL printf + >SYSCALL printf2 rts *-------------------------------------- CS.RUN.DumpFile pha diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index 1357962a..fa75be65 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -164,19 +164,20 @@ CS.RUN.CLIENT >SLEEP give some time for TCPIP SYN/ACK >SYSCALL GetMemPtr >STYA ZPSktPtr - ldx #3 - ldy #S.SOCKET.REM.ADDR+3 - -.3 >PUSHB (ZPSktPtr),y - dey - dex - bpl .3 + >PUSHW L.MSG.INCOMING >PUSHB hClientSocket + ldx #3 + ldy #S.SOCKET.REM.ADDR + +.3 >PUSHB (ZPSktPtr),y + iny + dex + bpl .3 + >PUSHBI 5 - >LDYA L.MSG.INCOMING - >SYSCALL printf + >SYSCALL printf2 >PUSHB hClientSocket >PUSHBI 1 @@ -202,10 +203,12 @@ CS.RUN.CLIENT >SLEEP give some time for TCPIP SYN/ACK >SYSCALL execl bcc .8 + pha + >PUSHW L.MSG.EXECERR + pla >PUSHA >PUSHBI 1 - >LDYA L.MSG.EXECERR - >SYSCALL printf + >SYSCALL printf2 .8 clc .9 rts diff --git a/SYS/KERNEL.S.MD5.txt b/SYS/KERNEL.S.MD5.txt index eba580bc..fbda882d 100644 --- a/SYS/KERNEL.S.MD5.txt +++ b/SYS/KERNEL.S.MD5.txt @@ -70,12 +70,13 @@ K.MD5Init sta SETREADAUX K.MD5Update >PULLW ZPDataLen get LEN >PULLW TXTPTR get DATA >PULLA - >SYSCALL2 GetMemPtr get MD5 Context - >STYA ZPCtxPtr sta SETREADAUX sta SETWRITEAUX + >SYSCALL2 GetMemPtr get MD5 Context + >STYA ZPCtxPtr + jsr MD5X.Update sta CLRREADAUX @@ -94,12 +95,13 @@ K.MD5Update >PULLW ZPDataLen get LEN K.MD5Finalize >PULLW FORPNT >PULLA sta .8+1 - >SYSCALL2 GetMemPtr - >STYA ZPCtxPtr get MD5 Context sta SETREADAUX sta SETWRITEAUX + >SYSCALL2 GetMemPtr + >STYA ZPCtxPtr get MD5 Context + jsr MD5X.Finalize .8 lda #$ff SELF MODIFIED diff --git a/SYS/KERNEL.S.MD5X.txt b/SYS/KERNEL.S.MD5X.txt index ca5f61fd..1a8951b5 100644 --- a/SYS/KERNEL.S.MD5X.txt +++ b/SYS/KERNEL.S.MD5X.txt @@ -100,7 +100,6 @@ MD5X.Init >LDYAI S.MD5 iny cpy #S.MD5 bne .2 - txa @@ -179,7 +178,9 @@ MD5X.Finalize ldy #S.MD5.FINALIZED lda (ZPCtxPtr),y bne .11 + jsr MD5ExtraChunk + .11 ldy #S.MD5.ABCD0 .1 lda (ZPCtxPtr),y