diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index c4f508ef..facf4b52 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index b54e09bb..6055e17a 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 49faa758..1c53e16b 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -65,7 +65,8 @@ CS.INIT dex bne .2 -.99 >LDYA L.MSG.USAGE +.99 >PUSHBI 0 + >LDYA L.MSG.USAGE >SYSCALL printf lda #K.E.SYN sec @@ -180,6 +181,7 @@ CS.RUN.FILE jsr CS.RUN.GetFilePath >PUSHW ZPFullPath + >PUSHBI 2 >LDYA L.MSG.FILE >SYSCALL printf bcs .9 @@ -208,7 +210,7 @@ CS.RUN.FILE jsr CS.RUN.GetFilePath *-------------------------------------- CS.RUN.CheckErr bcs .1 >LDYA L.MSG.OK - >SYSCALL printf + >SYSCALL puts rts .1 pha @@ -218,6 +220,7 @@ CS.RUN.CheckErr bcs .1 pla >PUSHA + >PUSHBI 1 >LDYA L.MSG.ERR >SYSCALL printf @@ -345,7 +348,7 @@ OptionList >PSTR "CRcr" OptionVars .DA #bContinue,#bRecurse,#bContinue,#bRecurse *-------------------------------------- MSG.USAGE .AZ "Usage : CHTYP [File *,? wildcards allowed] [File type : 0xx (Hexadecimal byte),SYS,TXT....]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n" -MSG.OK .AZ "[OK]\r\n" +MSG.OK .AZ "[OK]" MSG.ERR .AZ "[%h]\r\n" MSG.FILE .AZ "CHTYP File:%S..." diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index a38c0ac1..a48d63c8 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -25,7 +25,7 @@ MSG.USAGE .AZ "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n -C : Cont MSG.DIR .AZ "CP Dir :%s to %s..." MSG.FILE .AZ "CP File:%s to %s..." MSG.OVERWRITE .AZ "Overwrite %s [Yes,No,All]?" -MSG.OK .AZ "[OK]\r\n" +MSG.OK .AZ "[OK]" MSG.ERR .AZ "[%h]\r\n" MSG.DONE .AZ "%D File(s) Copied.\r\n" *-------------------------------------- diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index 78deceb8..c08ee46d 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -88,7 +88,7 @@ CS.RUN.ADD cmp #2 CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache >STYA ZPPTR1 >LDYA L.MSG0 - >SYSCALL printf + >SYSCALL puts lda #K.DNSCACHE.SIZE >STA.G EntryCount @@ -97,6 +97,7 @@ CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache beq .2 ldy #S.DNSCACHE.TTL+4 + .6 dey lda (ZPPTR1),y >PUSHA @@ -104,6 +105,7 @@ CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache bne .6 ldy #S.DNSCACHE.IP+4 + .5 dey lda (ZPPTR1),y >PUSHA @@ -122,6 +124,7 @@ CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache >PUSHB (ZPPTR1) Entry Status + >PUSHBI 13 >LDYA L.MSG1 >SYSCALL printf @@ -150,7 +153,7 @@ CS.QUIT lda hLIBTCPIP CS.END LIBTCPIP .AZ "libtcpip.o" SSCANF.IP .AZ "%d.%d.%d.%d" -MSG0 .AZ "STS TR.ID Hostname IP Address TTL\r\n" +MSG0 .AZ "STS TR.ID Hostname IP Address TTL" MSG1 .AZ "$%h $%H %32s %03d.%03d.%03d.%03d %u\r\n" hLIBTCPIP .BS 1 *-------------------------------------- diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index cd830dd5..4f9d00eb 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -42,7 +42,6 @@ L.MSG0.L .DA MSG0.L L.MSG1.DEV .DA MSG1.DEV L.MSG1.DEV.ARP .DA MSG1.DEV.ARP L.MSG1.DEV.IP .DA MSG1.DEV.IP -L.MSG1.LINK .DA MSG1.LINK L.MSG1.LINK.OK .DA MSG1.LINK.OK L.MSG1.LINK.KO .DA MSG1.LINK.KO L.MSG1.LINKSPEED .DA MSG1.LINKSPEED @@ -65,7 +64,8 @@ CS.INIT >LDYA L.LIBTCPIP clc .9 rts *-------------------------------------- -CS.RUN >LDYA L.MSG0 +CS.RUN >PUSHBI 0 + >LDYA L.MSG0 >SYSCALL printf >LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG @@ -76,7 +76,7 @@ CS.RUN >LDYA L.MSG0 bne .1 >LDYA L.MSG0.NL - >SYSCALL printf + >SYSCALL puts jmp CS.RUN.DONE .1 >STA.G FD.ETH @@ -98,7 +98,7 @@ CS.RUN >LDYA L.MSG0 >SYSCALL IOCTL CS.RUN.DUMP >LDYA L.MSG0.L - >SYSCALL printf + >SYSCALL puts ldy #DCB.NIC+S.DCB.NIC.MAC+5 ldx #6 @@ -121,7 +121,7 @@ CS.RUN.DUMP >LDYA L.MSG0.L >PUSHYA >PUSHB.G FD.ETH - + >PUSHBI 11 >LDYA L.MSG1.DEV >SYSCALL printf @@ -131,7 +131,8 @@ CS.RUN.DUMP >LDYA L.MSG0.L lda #1 -.2 >PUSHA +.2 >PUSHA + >PUSHBI 1 >LDYA L.MSG1.DEV.ARP >SYSCALL printf @@ -143,11 +144,9 @@ CS.RUN.DUMP >LDYA L.MSG0.L lda #1 .3 >PUSHA + >PUSHBI 1 >LDYA L.MSG1.DEV.IP >SYSCALL printf - - >LDYA L.MSG1.LINK - >SYSCALL printf lda DCB.NIC+S.DCB.NIC.LINK and #S.DCB.NIC.LINK.OK @@ -160,6 +159,7 @@ CS.RUN.DUMP >LDYA L.MSG0.L CS.RUN.LINK >LDYA L.MSG1.LINK.OK >SYSCALL puts + >PUSHBI 0 >LDYA L.MSG1.LINKSPEED >SYSCALL printf @@ -184,7 +184,8 @@ CS.RUN.LINK >LDYA L.MSG1.LINK.OK .5 >LDYA L.MSG1.DPLX.FD .6 >SYSCALL puts -CS.RUN.DUMPIP >LDYA L.MSG2 +CS.RUN.DUMPIP >PUSHBI 0 + >LDYA L.MSG2 >SYSCALL printf lda (pIPCFG) and #S.IPCFG.STATUS.OK @@ -199,37 +200,49 @@ CS.RUN.DUMPIP >LDYA L.MSG2 ldy #S.IPCFG.DHCPSRVR+3 ldx #4 + .2 >PUSHB (pIPCFG),y dey dex bne .2 + + >PUSHBI 4 >LDYA L.MSG2.DHCPSRVR >SYSCALL printf ldy #S.IPCFG.IP+7 IP/MASK ldx #8 + .3 >PUSHB (pIPCFG),y dey dex bne .3 + + >PUSHBI 8 >LDYA L.MSG2.IP >SYSCALL printf ldy #S.IPCFG.GW+3 ldx #4 + .4 >PUSHB (pIPCFG),y dey dex bne .4 + + >PUSHBI 4 >LDYA L.MSG2.GW >SYSCALL printf ldy #S.IPCFG.DNS1+7 ldx #8 + .5 >PUSHB (pIPCFG),y dey dex bne .5 + + >PUSHBI 8 >LDYA L.MSG2.DNS >SYSCALL printf @@ -249,6 +262,7 @@ CS.RUN.DUMPIP >LDYA L.MSG2 adc #0 >PUSHYA + >PUSHBI 4 >LDYA L.MSG2.HOSTNAME >SYSCALL printf @@ -273,21 +287,21 @@ MSG0 .AZ "TCP/IP Status : " MSG0.L .AZ "Loaded\r\n" MSG0.NL .AZ "Not Loaded\r\n" *-------------------------------------- -MSG1.DEV .AS "\r\nDevice Configuration :\r\n" +MSG1.DEV .AS "Device Configuration :\r\n" .AS " FD.ETH : $%h\r\n" .AS " Device Name : %s\r\n" .AS " Device Type : %S\r\n" .AZ " HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" MSG1.DEV.ARP .AZ " ARP Offload : %d\r\n" -MSG1.DEV.IP .AZ " IP Offload : %d\r\n" -MSG1.LINK .AZ " Link Status : " +MSG1.DEV.IP .AS " IP Offload : %d\r\n" + .AZ " Link Status : " MSG1.LINK.OK .AZ "OK" MSG1.LINK.KO .AZ "Media Disconnected" MSG1.LINKSPEED .AZ " Link Speed : 1" MSG1.DPLX.FD .AZ " Mbit/s,Full Duplex" MSG1.DPLX.HD .AZ " Mbit/s,Half Duplex" *-------------------------------------- -MSG2 .AZ "\r\nIP Configuration : " +MSG2 .AZ "IP Configuration : " MSG2.C .AZ "Configured" MSG2.U .AZ "Not Configured" MSG2.DHCPSRVR .AZ " DHCP Server : %d.%d.%d.%d\r\n" diff --git a/BIN/MD5.S.txt b/BIN/MD5.S.txt index 952f3b23..9d402c41 100644 --- a/BIN/MD5.S.txt +++ b/BIN/MD5.S.txt @@ -37,9 +37,6 @@ CS.START cld .DA CS.QUIT L.LIBCRYPT .DA LIBCRYPT L.MSG.USAGE .DA MSG.USAGE -L.MSG.INIT .DA MSG.INIT -L.MSG.OK .DA MSG.OK -L.MSG.ERR .DA MSG.ERR .DA 0 *-------------------------------------- CS.INIT ldy #S.PS.ARGC @@ -68,7 +65,8 @@ CS.INIT ldy #S.PS.ARGC dex bne .2 -.99 >LDYA L.MSG.USAGE +.99 >PUSHBI 0 + >LDYA L.MSG.USAGE >SYSCALL printf lda #K.E.SYN sec @@ -108,27 +106,17 @@ CS.RUN.TEXT >LDA.G Arg >PUSHEA.G MD5Buf >LIBCALL hLIBCRYPT,LIBCRYPT.MD5 - bcs .9 + bcs CS.RUN.TEXT.RTS - >LEA.G MD5Buf - >SYSCALL printf - - lda #13 - >SYSCALL PutChar - lda #10 - >SYSCALL PutChar - - lda #0 - sec -.9 rts + jmp CS.RUN.PRINT +CS.RUN.TEXT.RTS rts *-------------------------------------- CS.RUN.FILE >LDA.G Arg >SYSCALL GetArg >SYSCALL RealPath - bcc .10 - rts - -.10 txa + bcs CS.RUN.TEXT.RTS + + txa >STA.G hFullPath >LDYAI FILEBUF.SIZE @@ -173,14 +161,9 @@ CS.RUN.FILE >LDA.G Arg >PUSHB.G hMD5Ctx >LIBCALL hLIBCRYPT,LIBCRYPT.MD5Finalize - >LEA.G MD5Buf - >SYSCALL printf +CS.RUN.PRINT >LEA.G MD5Buf + >SYSCALL puts - lda #13 - >SYSCALL PutChar - lda #10 - >SYSCALL PutChar - lda #0 sec rts @@ -193,7 +176,6 @@ CS.QUIT >LDA.G hFullPath >SYSCALL FreeMem - .1 >LDA.G hDataBuf beq .2 >SYSCALL FreeMem @@ -212,33 +194,12 @@ CS.QUIT >LDA.G hFullPath .8 clc rts *-------------------------------------- -A2CharAX pha - lsr - lsr - lsr - lsr - and #$0F - cmp #'9'+1 - bcc .1 - adc #6 -.1 tax - pla - and #$0F - ora #$30 - cmp #'9'+1 - bcc .8 - adc #6 -.8 rts -*-------------------------------------- CS.END *-------------------------------------- OptionList >PSTR "Dd" OptionVars .DA #bText,#bText *-------------------------------------- MSG.USAGE .AZ "Usage : MD5 [ -d input text | input file ]\r\n" -MSG.OK .AZ "[OK]\r\n" -MSG.ERR .AZ "[%h]\r\n" -MSG.INIT .AZ "Computing %s ..." *-------------------------------------- LIBCRYPT .AZ "libcrypt.o" hLIBCRYPT .BS 1 diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index 319823b5..4eab457b 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -25,7 +25,7 @@ MSG.USAGE .AZ "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n -C : Cont MSG.DIR .AZ "MV Dir :%S to %S..." MSG.FILE .AZ "MV File:%S to %S..." MSG.OVERWRITE .AZ "Overwrite %S [Yes,No,All]?" -MSG.OK .AZ "[OK]\r\n" +MSG.OK .AZ "[OK]" MSG.ERR .AZ "[%h]\r\n" MSG.DONE .AZ "%D File(s) Moved.\r\n" *-------------------------------------- diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index 89c5a1d5..1e349baf 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -61,7 +61,7 @@ CS.INIT >LDYA L.LIBTCPIP .9 rts *-------------------------------------- CS.RUN >LDYA L.MSG0 - >SYSCALL printf + >SYSCALL puts >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.GETTABLE >STYA ZPPTR1 @@ -99,6 +99,7 @@ CS.RUN >LDYA L.MSG0 tax >PUSHB L.MSG1+1,x >PUSHB L.MSG1,x + >PUSHBI 17 >LDYA L.MSG1 >SYSCALL printf @@ -130,7 +131,7 @@ CS.QUIT lda hLIBTCPIP *-------------------------------------- CS.END LIBTCPIP .AZ "libtcpip.o" -MSG0 .AZ "Proto Local Remote Options Status\r\n" +MSG0 .AZ "Proto Local Remote Options Status" MSG1 .AZ "%s %03d.%03d.%03d.%03d:%05D %03d.%03d.%03d.%03d:%05D %b %s\r\n" MSG1.UDP .AZ "UDP" MSG1.TCP .AZ "TCP" diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index 7bbf03ee..57de1341 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -27,7 +27,7 @@ CS.START cld .DA 0 .DA CS.END-CS.START Code Length To Relocate .DA DS.END-DS.START Data Segment to Allocate - .DA #16 SS + .DA #64 SS .DA #8 ZP .DA 0 *-------------------------------------- @@ -67,7 +67,7 @@ CS.RUN >LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG is TCPIP loaded ? bmi CS.RUN.IPOK >LDYA L.MSG.IPKO - >SYSCALL printf + >SYSCALL puts lda #K.E.SYN sec rts @@ -96,7 +96,7 @@ CS.RUN.IPOK ldy #S.PS.ARGC bra .99 .9 >LDYA L.MSG.USAGE -.99 >SYSCALL printf +.99 >SYSCALL puts lda #K.E.SYN sec rts @@ -115,6 +115,7 @@ CS.RUN.HOSTOK lda #1 dex bpl .1 + >PUSHBI 6 >LDYA L.MSG.HOSTOK >SYSCALL printf @@ -141,7 +142,7 @@ CS.RUN.OPENSKT ldx #3 bcc .2 >LDYA L.MSG.SKTKO - >SYSCALL printf + >SYSCALL puts lda #K.E.SYN sec rts @@ -238,14 +239,15 @@ CS.DOEVENT lda (pEvent) rts *-------------------------------------- CS.Print.UNREACH + ldx #4 ldy #DST.IP+3 - >PUSHB (pData),y DST.IP+3 + +.1 >PUSHB (pData),y dey - >PUSHB (pData),y DST.IP+2 - dey - >PUSHB (pData),y DST.IP+1 - dey - >PUSHB (pData),y DST.IP + dex + bne .1 + + >PUSHBI 4 >LDYA L.MSG.UNREACH >SYSCALL printf rts @@ -255,22 +257,24 @@ CS.Print.REPLY lda #TIMEOUT.MAX ldy #TimeOut sbc (pData),y - stz TimeOut.ms - stz TimeOut.ms+1 + >STZ.G TimeOut.ms + >STA.G TimeOut.ms+1 tay beq .3 -.1 lda TimeOut.ms +.1 >LDA.G TimeOut.ms clc adc #100 - sta TimeOut.ms + >STA.G TimeOut.ms bcc .2 - inc TimeOut + + >INC.G TimeOut.ms+1 .2 dey bne .1 -.3 >PUSHW TimeOut.ms +.3 >PUSHW.G TimeOut.ms + ldy #S.IP.TTL >PUSHB (ZPFrameBase),y @@ -279,15 +283,15 @@ CS.Print.REPLY lda #TIMEOUT.MAX dey >PUSHB (ZPFrameBase),y + ldx #4 ldy #S.IP.SRC+3 - >PUSHB (ZPFrameBase),y - dey - >PUSHB (ZPFrameBase),y - dey - >PUSHB (ZPFrameBase),y - dey - >PUSHB (ZPFrameBase),y +.4 >PUSHB (ZPFrameBase),y + dey + dex + bne .4 + + >PUSHBI 9 >LDYA L.MSG.REPLY >SYSCALL printf rts @@ -323,15 +327,15 @@ Wait.TimeOut sec *-------------------------------------- CS.END LIBTCPIP .AZ "libtcpip.o" -MSG.IPKO .AZ "TCP/IP Not Loaded/Configured.\r\n" -MSG.USAGE .AZ "Usage : PING \r\n" +MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." +MSG.USAGE .AZ "Usage : PING " MSG.UNKNOWN .AZ "%s: Unknown host\r\n" MSG.HOSTOK .AZ "PING %d.%d.%d.%d (%s)\r\n" -MSG.SKTKO .AZ "Failed to Open Socket.\r\n" +MSG.SKTKO .AZ "Failed to Open Socket." MSG.UNREACH .AZ "%d.%d.%d.%d: TimeOut/Host unreachable\r\n" MSG.REPLY .AZ "32 bytes from %d.%d.%d.%d, icmp_seq=%D, ttl=%d, time=%D ms\r\n" hLIBTCPIP .BS 1 -TimeOut.ms .BS 2 +*-------------------------------------- Socket .DA #S.SOCKET.SOCK.RAW .BS 1 .DA #S.IP.PROTOCOL.ICMP @@ -359,6 +363,7 @@ hFrame .BS 1 Identifier .BS 2 Sequence .BS 2 TimeOut .BS 1 +TimeOut.ms .BS 2 DS.END .ED *-------------------------------------- diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt index 579edae1..62f12b91 100644 --- a/BIN/PS.S.txt +++ b/BIN/PS.S.txt @@ -43,16 +43,13 @@ CS.RUN >LDYA pData >SYSCALL GetPSStat >LDYA L.MSG0 - >SYSCALL printf + >SYSCALL puts >PUSHB.G PS.KCPU - + >PUSHBI 1 >LDYA L.MSGK >SYSCALL printf - >LDA.G PS.Count - beq .8 - lda #1 >STA.G PS.Index @@ -89,6 +86,7 @@ CS.RUN >LDYA pData ldy #S.PS.PID lda (ZPPtr),y >PUSHA + >PUSHBI 8 >LDYA L.MSG1 >SYSCALL printf @@ -126,7 +124,7 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG0 .AZ "ID CPU\% Flags UID PID Command Line\r\n" +MSG0 .AZ "ID CPU% Flags UID PID Command Line" MSGK .AZ "000 %03d\% -------- 000 --- *KERNEL*\r\n" MSG1 .AZ "%03d %03d\% %s %03d %03d %s\r\n" MSG.FLAGS .AS "IRQDHSed" diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 7573aad7..ffcfcf55 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -24,7 +24,7 @@ OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#b MSG.USAGE .AZ "Usage : RM [File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n" MSG.DIR .AZ "RM Dir :%S..." MSG.FILE .AZ "RM File:%S..." -MSG.OK .AZ "[OK]\r\n" +MSG.OK .AZ "[OK]" MSG.ERR .AZ "[%h]\r\n" MSG.DONE .AZ "%D File(s) Removed.\r\n" *-------------------------------------- diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index 12472bdb..274aac3f 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -74,7 +74,7 @@ CS.INIT ldy #S.PS.ARGC rts .99 >LDYA L.MSG.USAGE - >SYSCALL printf + >SYSCALL puts lda #K.E.SYN sec rts @@ -95,6 +95,8 @@ CS.RUN jsr Init.Timeout lda #1 >SYSCALL GetArg >PUSHYA + + >PUSHBI 2 >LDYA L.MSG.UNKNOWN >SYSCALL printf sec @@ -157,6 +159,7 @@ CS.RUN jsr Init.Timeout .99 lda #1 >SYSCALL GetArg >PUSHYA + >PUSHBI 2 >LDYA L.MSG.TIMEOUT >SYSCALL printf sec @@ -207,7 +210,7 @@ DumpRPCFrame lda #S.UDP+24 sta ZPFrameBase+1 >LDYA L.MSG.DUMP0 - >SYSCALL printf + >SYSCALL puts .1 ldy #3 lda (ZPFrameBase),y Value follows? @@ -230,6 +233,7 @@ DumpRPCFrame lda #S.UDP+24 cpy #8 bne .7 + >PUSHBI 8 >LDYA L.MSG.DUMP1 >SYSCALL printf @@ -244,12 +248,14 @@ DumpRPCFrame lda #S.UDP+24 .9 rts *-------------------------------------- CS.END -LIBTCPIP >PSTR "libtcpip.o" -MSG.USAGE .AZ "Usage : RPCDUMP \r\n" -MSG.UNKNOWN .AZ "%S: Unknown host\r\n" -MSG.TIMEOUT .AZ "No response from %S\r\n" -MSG.DUMP0 .AZ "Program Ver Proto:Port\r\n" +LIBTCPIP .AZ "libtcpip.o" +hLIBTCPIP .BS 1 +MSG.USAGE .AZ "Usage : RPCDUMP " +MSG.UNKNOWN .AZ "%s: Unknown host\r\n" +MSG.TIMEOUT .AZ "No response from %s\r\n" +MSG.DUMP0 .AZ "Program Ver Proto:Port" MSG.DUMP1 .AZ "%10L %2d %2d:%D\r\n" +*-------------------------------------- Socket .DA #S.SOCKET.SOCK.DGRAM .BS 3 Socket.Src.Addr .BS 4 @@ -268,7 +274,6 @@ RPC.Request .BS 4 XID .HS 00000000 VERF .HS 00000000 RPC.Request.End .EQ * -hLIBTCPIP .BS 1 *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index 1625cf86..7590fd4b 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -65,7 +65,8 @@ CS.INIT dex bne .2 -.99 >LDYA L.MSG.USAGE +.99 >PUSHBI 0 + >LDYA L.MSG.USAGE >SYSCALL printf lda #K.E.SYN sec @@ -301,6 +302,8 @@ CS.RUN.LEAVE jsr LeaveSubDir exit this sub dir.... >PUSHB (pData),y dey >PUSHB (pData),y + + >PUSHBI 2 >LDYA L.MSG.DONE >SYSCALL printf @@ -476,6 +479,16 @@ CS.RUN.FILE.MSG clc ldy #hSrcFullPath jsr CS.RUN.GetPathY + .DO X.COPY.TO.DEST=1 + + >PUSHBI 4 + + .ELSE + + >PUSHBI 2 + + .FIN + >PUSHYA plp @@ -500,6 +513,7 @@ CS.RUN.OVERWRITE.MSG .1 ldy #hDstFullPath jsr CS.RUN.GetPathY >PUSHYA + >PUSHBI 2 >LDYA L.MSG.OVERWRITE >SYSCALL printf rts @@ -664,7 +678,7 @@ CS.RUN.CheckErr bcs .1 bmi .8 >LDYA L.MSG.OK - >SYSCALL printf + >SYSCALL puts rts .1 ldy #RC @@ -677,6 +691,7 @@ CS.RUN.CheckErr bcs .1 pla >PUSHA + >PUSHBI 1 >LDYA L.MSG.ERR >SYSCALL printf diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index b31cb846..4a09a3cf 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -47,7 +47,7 @@ L.MAC5 .DA DCB+S.DCB.NIC.MAC+5 Dev.Detect >STYA ARGS >LDYA L.MSG.DETECT - >SYSCALL printf + >SYSCALL puts ldx #$70 ldy #7 diff --git a/INC/MACROS.I.txt b/INC/MACROS.I.txt index 67be4a0d..073ce9bc 100644 --- a/INC/MACROS.I.txt +++ b/INC/MACROS.I.txt @@ -167,7 +167,7 @@ AUTO 4,1 .EM *-------------------------------------- .MA PUSHF.G - ldy #]1+5 + ldy #]1+5 :1 dey lda (pData),y >PUSHA @@ -330,6 +330,40 @@ AUTO 4,1 >PULLA sta ]1+1 .EM +*-------------------------------------- + .MA PUSHL + ldy #3 +:1 lda (pData),y + >PUSHA + dey + bpl :1 + .EM +*-------------------------------------- + .MA PULLL + ldy #0 +:1 >PULLA + sta (pData),y + iny + cpy #4 + bne :1 + .EM +*-------------------------------------- + .MA PUSHF + ldy #4 +:1 lda (pData),y + >PUSHA + dey + bpl :1 + .EM +*-------------------------------------- + .MA PULLF + ldy #0 +:1 >PULLA + sta (pData),y + iny + cpy #5 + bne :1 + .EM *-------------------------------------- .MA RET .DO ]1=1 diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt index 406ed992..b8bfebb4 100644 --- a/LIB/LIBTCPIP.S.CFG.txt +++ b/LIB/LIBTCPIP.S.CFG.txt @@ -15,7 +15,7 @@ CFG.Init >PUSHBI 0 bne CFG.Init >LDYA L.MSG.DEV.KO - >SYSCALL printf + >SYSCALL puts lda #MLI.E.NODEV .9 sec @@ -24,6 +24,7 @@ CFG.Init >PUSHBI 0 .1 sta IPCFG+S.IPCFG.hFD >PUSHW L.DEVNAME + >PUSHBI 2 >LDYA L.MSG.DEV.OK >SYSCALL printf @@ -36,6 +37,7 @@ CFG.EtcFiles >LDYAI 256 stx CFG.hBuf >PUSHW L.HOSTNAME + >PUSHBI 2 >LDYA L.MSG.CFG >SYSCALL printf @@ -62,6 +64,7 @@ CFG.EtcFiles >LDYAI 256 stx IPCFG+S.IPCFG.HOSTNAME+9 .4 >PUSHW L.TCPIP.CONF + >PUSHBI 2 >LDYA L.MSG.CFG >SYSCALL printf @@ -74,6 +77,7 @@ CFG.EtcFiles >LDYAI 256 sta IPCFG+S.IPCFG.STATUS .5 >PUSHW L.HOSTS + >PUSHBI 2 >LDYA L.MSG.CFG >SYSCALL printf @@ -328,7 +332,8 @@ CFG.DNS.ADD >STYA ZPTmpPtr1 >LDYA L.MSG.DNS.ADD bcc .8 >LDYA L.MSG.DNS.ERR -.8 >SYSCALL printf +.8 >PUSHBI 2 + >SYSCALL printf rts *-------------------------------------- @@ -367,16 +372,16 @@ CFG.Read.Close php plp rts *-------------------------------------- -CFG.Read.Result php - bcc .1 +CFG.Read.Result bcc .1 >PUSHA + >PUSHBI 1 >LDYA L.MSG.CFG.KO - bra .2 + >SYSCALL printf + sec + rts .1 >LDYA L.MSG.CFG.OK -.2 >SYSCALL printf - - plp + >SYSCALL puts rts *-------------------------------------- CFG.Read.GetS >PUSHWI 255 diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 8814a27d..2520fb44 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -259,11 +259,11 @@ GetDynPort inc DYNPORT.LAST CS.END *-------------------------------------- DEVNAME .AZ "/DEV/ETH1" -MSG.DEV.KO .AZ "TCPIPD:No Device Found, exiting.\r\n" +MSG.DEV.KO .AZ "TCPIPD:No Device Found, exiting." MSG.DEV.OK .AZ "TCPIPD:Bound To Device : %s\r\n" MSG.CFG .AZ "TCPIPD:Reading %s..." MSG.CFG.KO .AZ "Failed!!! [%h]\r\n" -MSG.CFG.OK .AZ "OK.\r\n" +MSG.CFG.OK .AZ "OK." MSG.DNS.ADD .AZ "Added static host %d.%d.%d.%d %s\r\n" MSG.DNS.ERR .AZ "***ERROR adding static host %d.%d.%d.%d %s\r\n" *-------------------------------------- diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index c51d43f5..793a5650 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -102,7 +102,7 @@ CS.INIT >LDYA L.LIBTCPIP .98 >LDYA L.MSG.CFG.ND bra .90 .99 >LDYA L.MSG.CFG.NA -.90 >SYSCALL printf +.90 >SYSCALL puts lda #0 sec rts @@ -117,7 +117,7 @@ CS.RUN >PUSHW L.Socket >STA.G hSocket >LDYA L.MSG.CFG1 - >SYSCALL printf + >SYSCALL puts jsr Init.Timeout @@ -154,6 +154,7 @@ CS.RUN.SREQ ldx #3 dex bpl .1 + >PUSHBI 4 >LDYA L.MSG.CFG2 >SYSCALL printf @@ -196,6 +197,7 @@ CS.RUN.OK lda #S.IPCFG.STATUS.OK dex bpl .2 + >PUSHBI 8 >LDYA L.MSG.CFG.OK >SYSCALL printf lda #0 Leave with NO ERROR @@ -204,6 +206,7 @@ CS.RUN.OK lda #S.IPCFG.STATUS.OK CS.RUN.KO pha >PUSHA + >PUSHBI 1 >LDYA L.MSG.CFG.KO >SYSCALL printf pla @@ -437,12 +440,12 @@ Wait.TimeOut ldy #TimeOut *-------------------------------------- CS.END LIBTCPIP .AZ "libtcpip.o" -MSG.CFG1 .AZ "DHCPCLNT:Searching for DHCP servers...\r\n" +MSG.CFG1 .AZ "DHCPCLNT:Searching for DHCP servers..." MSG.CFG2 .AZ "DHCPCLNT:Reply from DHCP Server at %d.%d.%d.%d, requesting...\r\n" MSG.CFG.KO .AZ "DHCPCLNT:Time Out [%h].\r\n" MSG.CFG.OK .AZ "DHCPCLNT:Success:[IP=%d.%d.%d.%d/%d.%d.%d.%d]\r\n" -MSG.CFG.ND .AZ "DHCPCLNT:No Device, exiting.\r\n" -MSG.CFG.NA .AZ "DHCPCLNT:TCPIP Already configured, exiting.\r\n" +MSG.CFG.ND .AZ "DHCPCLNT:No Device, exiting." +MSG.CFG.NA .AZ "DHCPCLNT:TCPIP Already configured, exiting." hLIBTCPIP .BS 1 IPCFG .BS S.IPCFG *-------------------------------------- diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index cb6d504b..805c5717 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -503,13 +503,31 @@ PrintF.E sec Force "E+12" .HS 90 BCC PrintF.F clc - jsr PrintF.GetFloatPtrYA - bcs .9 - >STYA INDEX + lda PrintF.GetByte+1 get current stack Ptr + tay + clc at least 5 bytes remaining ? + adc #5 + + cmp (pStack) + bcc .1 + bne .9 + +.1 tya + sec +1 + adc pStack + sta INDEX + + lda pStack+1 + sta INDEX+1 ldx #ROM.SETFAC jsr GP.ROMCALL + lda PrintF.GetByte+1 + clc + adc #5 + sta PrintF.GetByte+1 + ldy #3 In order not to trash A2osX.SaveSM,A2osX.SaveSX ldx #ROM.FOUT jsr GP.ROMCALL @@ -525,8 +543,10 @@ PrintF.F clc bne .2 .8 clc - -.9 rts + rts + +.9 sec + rts *-------------------------------------- PrintF.HH jsr PrintF.GetByte bcs PrintF.H.9 @@ -616,30 +636,6 @@ PrintF.SS ldy #$00 PSTR .8 clc .9 rts *-------------------------------------- -PrintF.GetFloatPtrYA - lda PrintF.GetByte+1 - clc - adc #5 - cmp (pStack) - bcc .9 - - pha Save new Ptr - - lda PrintF.GetByte+1 -* sec - adc pStack - tay - - pla - sta PrintF.GetByte+1 - - lda pStack+1 -* clc - rts - -.9 sec - rts -*-------------------------------------- PrintF.GetByte lda #$FF SELF MODIFIED LStack Ptr cmp (pStack) beq .9 CS diff --git a/TEST.S.txt b/TEST.S.txt index 2bd609c4..89ccfd7f 100644 --- a/TEST.S.txt +++ b/TEST.S.txt @@ -41,14 +41,8 @@ CS.START cld .DA CS.DOEVENT .DA CS.QUIT L.LIBPAK .DA LIBPAK -L.FLOAT1 .DA FLOAT1 -L.FLOAT2 .DA FLOAT2 -L.FLOAT3 .DA FLOAT3 -L.FLOAT4 .DA FLOAT4 -L.FLOAT5 .DA FLOAT5 -L.CONST1 .DA CONST1 -L.CONST2 .DA CONST2 -L.LONG1 .DA LONG1 +L.CONST.PI .DA CONST.PI +L.CONST.3 .DA CONST.3 L.MSG1 .DA MSG1 L.MSG2 .DA MSG2 L.MSG3 .DA MSG3 @@ -121,7 +115,7 @@ CS.RUN.Pak >PUSHWI 0 Aux type >PUSHW.G PAK.Stat+S.PAKSTAT.PASS2 >PUSHW.G PAK.Stat+S.PAKSTAT.PASS1 >PUSHW.G PAK.FileSize - + >PUSHBI 16 >LDYA L.MSG6 >SYSCALL printf *-------------------------------------- @@ -250,6 +244,7 @@ CS.RUN.Unpak lda ZPPakHdrPtr bra .42 .9 >PUSHW UNPAK.Ofs + >PUSHBI 2 >LDYA L.MSG.UnpakErr >SYSCALL printf @@ -315,6 +310,7 @@ DEBUG.S3 pha phx phy >PUSHA + >PUSHBI 1 >LDYA L.MSG.DEBUG.S3 >SYSCALL printf ply @@ -323,56 +319,62 @@ DEBUG.S3 pha rts *-------------------------------------- CS.RUN.Math >PUSHEA.G ENDPTR - >PUSHW L.CONST2 - >PUSHEA.G MYFLOAT2 + >LDYA L.CONST.PI >SYSCALL StrToF + >PULLF.G MYFLOAT.PI >PUSHEA.G ENDPTR - >PUSHW L.CONST1 - >PUSHEA.G MYFLOAT1 + >LDYA L.CONST.3 >SYSCALL StrToF + >PULLF.G MYFLOAT.3 - >PUSHEA.G MYFLOAT2 - >PUSHEA.G MYFLOAT1 - >PUSHW L.FLOAT5 - >PUSHW L.FLOAT4 - >PUSHW L.FLOAT3 - >PUSHW L.FLOAT2 - >PUSHW L.FLOAT1 + >PUSHF.G MYFLOAT.PI + >PUSHF.G MYFLOAT.3 + + >PUSHF FLOAT5 + >PUSHF FLOAT4 + >PUSHF FLOAT3 + >PUSHF FLOAT2 + >PUSHF FLOAT1 + >PUSHBI 35 >LDYA L.MSG1 >SYSCALL printf *-------------------------------------- - >PUSHEA.G MYFLOAT1 - >PUSHEA.G MYFLOAT2 - >LEA.G MYFLOAT3 + >PUSHF.G MYFLOAT.PI + >PUSHF.G MYFLOAT.3 >SYSCALL FDiv + >PULLF.G MYFLOAT3 - >PUSHEA.G MYFLOAT3 + >PUSHF.G MYFLOAT3 + >PUSHBI 5 >LDYA L.MSG2 >SYSCALL printf *-------------------------------------- - >PUSHEA.G MYFLOAT3 - >LEA.G MYFLOAT3 + >PUSHF.G MYFLOAT3 >SYSCALL Cos - - >PUSHEA.G MYFLOAT3 + >PULLF.G MYFLOAT3 + + >PUSHF.G MYFLOAT3 + >PUSHBI 5 >LDYA L.MSG3 >SYSCALL printf *-------------------------------------- - >PUSHW L.FLOAT1 - >LEA.G MYLONG + >PUSHF FLOAT1 >SYSCALL LRIntF - - >PUSHEA.G MYLONG + >PULLL.G MYLONG + + >PUSHL.G MYLONG + >PUSHBI 4 >LDYA L.MSG4 >SYSCALL printf *-------------------------------------- - >PUSHW L.LONG1 - >LEA.G MYFLOAT1 + >PUSHL LONG1 >SYSCALL Float - - >PUSHEA.G MYFLOAT1 +* >PULLF.G MYFLOAT3 + +* >PUSHF.G MYFLOAT3 + >PUSHBI 5 >LDYA L.MSG5 >SYSCALL printf lda #0 @@ -408,18 +410,19 @@ hLIBPAK .BS 1 MSG1 .AS "PrintF:%e, %e, %e\r\n" .AS "%e, %e\r\n" .AZ "StrToF:%e, %e\r\n" +MSG2 .AZ "PI/3=%e\r\n" +MSG3 .AZ "COS(PI/3)=%e\r\n" +MSG4 .AZ "Long=%L\r\n" +MSG5 .AZ "Float=%e\r\n" +CONST.PI .AZ "3.141592653" +CONST.3 .AZ "3" FLOAT1 .HS 9B3EBC1FFD 99,999,999.9 FLOAT2 .HS 9E6E6B27FD 999,999,999 FLOAT3 .HS 9E6E6B2800 1,000,000,000 FLOAT4 .HS 8100000000 1 FLOAT5 .HS 9080000000 -32768 -CONST1 .AZ "3.141592653" -CONST2 .AZ "3" LONG1 .DA >123456789 -MSG2 .AZ "PI/3=%e\r\n" -MSG3 .AZ "COS(PI/3)=%e\r\n" -MSG4 .AZ "Long=%L\r\n" -MSG5 .AZ "Float=%e\r\n" +*-------------------------------------- MSG6 .AS "Src Length : %D\r\n" .AS "Pass #1 : %D\r\n" .AS "Pass #2 : %D\r\n" @@ -434,8 +437,8 @@ MSG.DEBUG.S3 .AZ "S3:%h\r\n" .DUMMY .OR 0 DS.START -MYFLOAT1 .BS 5 -MYFLOAT2 .BS 5 +MYFLOAT.PI .BS 5 +MYFLOAT.3 .BS 5 MYFLOAT3 .BS 5 MYLONG .BS 4 ENDPTR .BS 2