diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index d4414561..1a34af5c 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 ad1aabed..a645b3d2 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/A2osX.S.txt b/A2osX.S.txt index e12b31c3..753a1320 100644 --- a/A2osX.S.txt +++ b/A2osX.S.txt @@ -299,7 +299,7 @@ EnumKM ldx #0 .DA MLICLOSE01 rts -.98 cmp #MLI.ERR.EOF +.98 cmp #MLI.E.EOF beq .8 pha jsr .8 diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index 75485c3b..099acbb8 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -67,7 +67,7 @@ CS.RUN >SYSCALL GetArgC >SYSCALL SSCANF bcc CS.RUN.QUERY - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts *-------------------------------------- diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt index 2bcbb2d2..5f7c866e 100644 --- a/BIN/CAT.S.txt +++ b/BIN/CAT.S.txt @@ -63,7 +63,7 @@ CS.INIT .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -142,7 +142,7 @@ CS.RUN >SYSCALL GetChar bcc CS.RUN.PRINT - cmp #MLI.ERR.EOF + cmp #MLI.E.EOF bne .9 jsr CS.RUN.CLOSE diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 7a06de6c..86038689 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -69,7 +69,7 @@ CS.INIT .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index cb23cdc9..f93d33a5 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -76,7 +76,7 @@ CS.RUN.ADD cmp #3 sec we do not want to stay in memory rts -.9 lda #SYSMGR.ERRSYN +.9 lda #K.E.SYN sec .99 rts diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index ee4e21f3..2dff5f21 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -69,7 +69,7 @@ CS.INIT ldy #S.PS.ARGC .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index afa16705..9cb583cf 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -111,10 +111,10 @@ CS.RUN.DUMPDEV sta DevID lda ZPDevStatPtr clc - adc #S.DEVSTAT.IDSTRING + adc #S.DEVSTAT.IDS tay lda ZPDevStatPtr+1 - adc /S.DEVSTAT.IDSTRING + adc /S.DEVSTAT.IDS >PUSHYA >PUSHB DevID diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 7c4dd98e..b432aab5 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -70,7 +70,7 @@ CS.INIT dex bne .2 - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index 403f671a..aa5f929e 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -157,14 +157,14 @@ DumpStatus >LDA.G DEV.S lda ZPPTR2 clc - adc #S.DEVSTAT.IDSTRING + adc #S.DEVSTAT.IDS tay lda ZPPTR2+1 adc #0 >PUSHYA - ldy #S.DEVSTAT.SUBTYPE + ldy #S.DEVSTAT.ST >PUSHB (ZPPTR2),y dey >PUSHB (ZPPTR2),y diff --git a/BIN/MD.S.txt b/BIN/MD.S.txt index ccaaa108..7ba82e88 100644 --- a/BIN/MD.S.txt +++ b/BIN/MD.S.txt @@ -54,7 +54,7 @@ CS.RUN lda #1 sec .9 rts -.99 lda #SYSMGR.ERRSYN +.99 lda #K.E.SYN sec rts *-------------------------------------- diff --git a/BIN/NFSMOUNT.S.txt b/BIN/NFSMOUNT.S.txt index f4eef477..cfb3fa2c 100644 --- a/BIN/NFSMOUNT.S.txt +++ b/BIN/NFSMOUNT.S.txt @@ -65,7 +65,7 @@ CS.INIT >SYSCALL GetArgC .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts *-------------------------------------- diff --git a/BIN/NSCUTIL.S.txt b/BIN/NSCUTIL.S.txt index d7a8de5f..c74a6ed1 100644 --- a/BIN/NSCUTIL.S.txt +++ b/BIN/NSCUTIL.S.txt @@ -62,7 +62,7 @@ CS.RUN.READ jsr NSC.Init >LDYA L.MSG.READ.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -143,7 +143,7 @@ CS.RUN.SET lda #1 sec we do not want to stay in memory rts -.9 lda #SYSMGR.ERRSYN +.9 lda #K.E.SYN sec rts *-------------------------------------- diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index c15a463d..02d114ec 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -68,7 +68,7 @@ CS.RUN >LIBCALL hLIBTCPIP,LIBTCPIP.GET.IPCFG is TCPIP loaded ? >LDYA L.MSG.IPKO >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -96,7 +96,7 @@ CS.RUN.IPOK >SYSCALL GetArgC .9 >LDYA L.MSG.USAGE .99 >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -141,7 +141,7 @@ CS.RUN.OPENSKT ldx #3 >LDYA L.MSG.SKTKO >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index 48278764..df9cdd34 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -75,7 +75,7 @@ CS.INIT >SYSCALL GetArgC .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts *-------------------------------------- diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index 1e7af253..6b9a1186 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -74,7 +74,7 @@ CS.INIT .99 >LDYA L.MSG.USAGE >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -266,7 +266,7 @@ CS.RUN >SYSCALL GetChar .5 jsr CS.RUN.BuildFilePath jmp CS.RUN.FILE -.6 lda #MLI.ERR.UNSUPST +.6 lda #MLI.E.UNSUPST sec .9 rts *-------------------------------------- @@ -632,7 +632,7 @@ CS.RUN.Copy stz .90+1 >PUSHB (pData),y >SYSCALL FRead bcc .1 - cmp #MLI.ERR.EOF + cmp #MLI.E.EOF bne .9 lda #0 bra .9 diff --git a/BIN/X.FILEENUM.S.txt b/BIN/X.FILEENUM.S.txt index 8bd8c11e..d5344045 100644 --- a/BIN/X.FILEENUM.S.txt +++ b/BIN/X.FILEENUM.S.txt @@ -126,7 +126,7 @@ InitSrcDirYA >SYSCALL RealPath.YA clc rts -.91 lda #MLI.ERR.FNOTFND +.91 lda #MLI.E.FNOTFND .9 pha >LDA.G hFullPath diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index fbf8868c..e1d8bbc5 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -64,7 +64,7 @@ Dev.Detect >STYA Args >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -83,7 +83,7 @@ Dev.Detect >STYA Args >STYA ZPTmpPTR jsr DecodeMac bcc .4 - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index e6a1d6a5..5a84d482 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -98,7 +98,7 @@ Dev.Detect >LDYA L.MSG.DETECT >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -217,7 +217,7 @@ READBLOCK >STYA ZPTmpPtr1 clc rts -.9 lda #MLI.ERR.EOF +.9 lda #MLI.E.EOF sec rts *-------------------------------------- diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt index af732352..1e41681d 100644 --- a/DRV/PIC.DRV.S.txt +++ b/DRV/PIC.DRV.S.txt @@ -65,7 +65,7 @@ Dev.Detect >STYA ARGS >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV Not Found in any slot, exiting + lda #MLI.E.NODEV Not Found in any slot, exiting sec rts diff --git a/DRV/SSC.DRV.S.txt b/DRV/SSC.DRV.S.txt index ec9502a5..3def6ec0 100644 --- a/DRV/SSC.DRV.S.txt +++ b/DRV/SSC.DRV.S.txt @@ -67,7 +67,7 @@ Dev.Detect >STYA ARGS >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV Not Found in any slot, exiting + lda #MLI.E.NODEV Not Found in any slot, exiting sec rts diff --git a/DRV/SSC.I.DRV.S.txt b/DRV/SSC.I.DRV.S.txt index 5133d492..eba87877 100644 --- a/DRV/SSC.I.DRV.S.txt +++ b/DRV/SSC.I.DRV.S.txt @@ -70,7 +70,7 @@ Dev.Detect >STYA ARGS >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV Not Found in any slot, exiting + lda #MLI.E.NODEV Not Found in any slot, exiting sec rts diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 97f43e26..c8194e17 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -89,7 +89,7 @@ Dev.Detect >STYA Args >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -119,7 +119,7 @@ Dev.Detect >STYA Args .4 jsr DecodeMac bcc .8 - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 660dcd4f..d27876e7 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -73,7 +73,7 @@ Dev.Detect >STYA ARGS >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -113,7 +113,7 @@ Dev.Detect >STYA ARGS .4 jsr DecodeMac bcc .8 - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index 718135f0..520637b2 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -88,7 +88,7 @@ Dev.Detect >STYA Args >LDYA L.MSG.DETECT.KO >SYSCALL PrintF.YA - lda #MLI.ERR.NODEV + lda #MLI.E.NODEV sec rts @@ -118,7 +118,7 @@ Dev.Detect >STYA Args .4 jsr DecodeMac bcc .8 - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index dddbb520..0dea9b2b 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -208,16 +208,15 @@ SYS.Sleep .EQ $E0 * Lib ERROR CODES : $80->$BF * Kernel ERROR CODES : $C0->$FF *-------------------------------------- -MEMMGR.ERROOM .EQ $FF Out Of Memory Error -MEMMGR.ERROOH .EQ $FE Out Of Handle Error +K.E.OOM .EQ $FF Out Of Memory Error +K.E.OOH .EQ $FE Out Of Handle Error *-------------------------------------- -TSKMGR.ERROOH .EQ $DF Out Of Handle Error -TSKMGR.ERRNSP .EQ $DD No Such Process Error +K.E.NSP .EQ $DD No Such Process Error *-------------------------------------- -SYSMGR.ERRSYN .EQ $CF Syntax Error -SYSMGR.ERRENVF .EQ $CE Env is Full -SYSMGR.ERRIBIN .EQ $CD Invalid BIN format -SYSMGR.ERRFTB .EQ $CC File Too Big Error +K.E.SYN .EQ $CF Syntax Error +K.E.ENVF .EQ $CE Env is Full +K.E.IBIN .EQ $CD Invalid BIN format +K.E.FTB .EQ $CC File Too Big Error *-------------------------------------- * MEM STRUCT *-------------------------------------- @@ -313,7 +312,7 @@ S.DEVSTAT.S.WENABL .EQ %00000100 S.DEVSTAT.S.IRQ .EQ %00000010 S.DEVSTAT.S.OPENED .EQ %00000001 S.DEVSTAT.SIZE .EQ 1 3 bytes -S.DEVSTAT.IDSTRING .EQ 4 1 (LEN) + 16 MAX +S.DEVSTAT.IDS .EQ 4 1 (LEN) + 16 MAX S.DEVSTAT.T .EQ 21 S.DEVSTAT.T.RAM .EQ $00 Memory Expansion Card (RAM disk) S.DEVSTAT.T.3.5 .EQ $01 3.5" disk @@ -337,10 +336,10 @@ S.DEVSTAT.T.NET .EQ $12 Network board S.DEVSTAT.T.XY .EQ $13 X,Y Pointing Device S.DEVSTAT.T.CHAR .EQ $14 S.DEVSTAT.T.GFX .EQ $15 -S.DEVSTAT.SUBTYPE .EQ 22 -S.DEVSTAT.SUBTYPE.EXT .EQ $80 -S.DEVSTAT.SUBTYPE.DSKSW .EQ $40 -S.DEVSTAT.SUBTYPE.NOREM .EQ $20 +S.DEVSTAT.ST .EQ 22 +S.DEVSTAT.ST.EXT .EQ $80 +S.DEVSTAT.ST.DSKSW .EQ $40 +S.DEVSTAT.ST.NOREM .EQ $20 S.DEVSTAT.VERSION .EQ 23 S.DEVSTAT .EQ 25 *-------------------------------------- @@ -370,7 +369,7 @@ S.PS.PC .EQ 14 S.PS.ARGC .EQ 16 S.PS.hARGS .EQ 17 -S.PS.Context .EQ 24 24 Bytes +S.PS.ZP .EQ 24 24 Bytes * S.PS .EQ 48 *-------------------------------------- diff --git a/INC/KERNEL.I.txt b/INC/KERNEL.I.txt index 3deb6e8b..cd473fbf 100644 --- a/INC/KERNEL.I.txt +++ b/INC/KERNEL.I.txt @@ -50,10 +50,16 @@ TXTPTR .EQ $B8 *-------------------------------------- * ROM Entry Point *-------------------------------------- -ROM.SETFAC .EQ 10 Set FAC from INDEX -ROM.GETFAC .EQ 12 Get FAC at FORPNT -ROM.FIN .EQ 14 -ROM.FOUT .EQ 16 +ROM.FSUB .EQ 0 +ROM.FADD .EQ 2 +ROM.LOG .EQ 4 +ROM.FMULT .EQ 6 +ROM.SETARG.AY .EQ 8 +ROM.FDIV .EQ 10 +ROM.SETFAC.AY .EQ 12 +ROM.GETFAC .EQ 14 Get FAC at FORPNT +ROM.FIN .EQ 16 +ROM.FOUT .EQ 18 *-------------------------------------- * Memory Map *-------------------------------------- diff --git a/INC/MLI.ERR.I.txt b/INC/MLI.ERR.I.txt index 7eba3955..f00ff227 100644 --- a/INC/MLI.ERR.I.txt +++ b/INC/MLI.ERR.I.txt @@ -6,29 +6,29 @@ AUTO 6 .LIST OFF *-------------------------------------- *$00 - No Error -MLI.ERR.BADCALL .EQ $01 Bad Call Number -*MLI.ERR.BADCNT .EQ $04 Bad Parameter Count -*MLI.ERR.IRQFULL .EQ $25 Interrupt Table Full -MLI.ERR.IO .EQ $27 I/O Error -MLI.ERR.NODEV .EQ $28 No Device Connected -MLI.ERR.WRTPROT .EQ $2B Write Protected -MLI.ERR.DSKSWIT .EQ $2E Disk Switched -MLI.ERR.OFFLINE .EQ $2F Device Offline -MLI.ERR.INVPATH .EQ $40 Invalid Pathname -MLI.ERR.FCBFULL .EQ $42 Maximum Number of Files Open -MLI.ERR.BADREF .EQ $43 Invalid Reference Number -MLI.ERR.PNOTFND .EQ $44 Directory Not Found -MLI.ERR.VNOTFND .EQ $45 Volume Not Found -MLI.ERR.FNOTFND .EQ $46 File Not Found -MLI.ERR.DUPFILE .EQ $47 Duplicate File Name -MLI.ERR.VOLFULL .EQ $48 Volume Full -MLI.ERR.DIRFULL .EQ $49 Directory Full -MLI.ERR.INCFF .EQ $4A Incompatible File Format -MLI.ERR.UNSUPST .EQ $4B Unsupported Storage Type -MLI.ERR.EOF .EQ $4C End of File, No More Data -MLI.ERR.BEYEOF .EQ $4D Beyond EOF -MLI.ERR.LOCKED .EQ $4E File Access Error, File Locked -MLI.ERR.OPEN .EQ $50 File Already Open +MLI.E.BADCALL .EQ $01 Bad Call Number +*MLI.E.BADCNT .EQ $04 Bad Parameter Count +*MLI.E.IRQFULL .EQ $25 Interrupt Table Full +MLI.E.IO .EQ $27 I/O Error +MLI.E.NODEV .EQ $28 No Device Connected +MLI.E.WRTPROT .EQ $2B Write Protected +MLI.E.DSKSWIT .EQ $2E Disk Switched +MLI.E.OFFLINE .EQ $2F Device Offline +MLI.E.INVPATH .EQ $40 Invalid Pathname +MLI.E.FCBFULL .EQ $42 Maximum Number of Files Open +MLI.E.BADREF .EQ $43 Invalid Reference Number +MLI.E.PNOTFND .EQ $44 Directory Not Found +MLI.E.VNOTFND .EQ $45 Volume Not Found +MLI.E.FNOTFND .EQ $46 File Not Found +MLI.E.DUPFILE .EQ $47 Duplicate File Name +MLI.E.VOLFULL .EQ $48 Volume Full +MLI.E.DIRFULL .EQ $49 Directory Full +MLI.E.INCFF .EQ $4A Incompatible File Format +MLI.E.UNSUPST .EQ $4B Unsupported Storage Type +MLI.E.EOF .EQ $4C End of File, No More Data +MLI.E.BEYEOF .EQ $4D Beyond EOF +MLI.E.LOCKED .EQ $4E File Access Error, File Locked +MLI.E.OPEN .EQ $50 File Already Open *$51 - Directory Structure Damaged *$53 - Invalid Parameter *$55 - Too Many Volumes diff --git a/LIB/LIBMATH.S.txt b/LIB/LIBMATH.S.txt index e7eed196..b60f5773 100644 --- a/LIB/LIBMATH.S.txt +++ b/LIB/LIBMATH.S.txt @@ -36,9 +36,7 @@ CS.START cld .DA TAN .DA 0 *-------------------------------------- -COS >PULLW INDEX - >ROMCALL SETFAC - >ROMCALL COS +COS *-------------------------------------- SIN *-------------------------------------- diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index 7e95f4a8..cdd91af5 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -446,7 +446,7 @@ SKT.Write.TCP ldy #S.SOCKET.TCP.STATUS sec rts -.91 lda #MLI.ERR.IO +.91 lda #MLI.E.IO sec .99 rts */-------------------------------------- @@ -610,7 +610,7 @@ SKT.Read.I jsr SKT.GetA.I sec rts -.91 lda #MLI.ERR.IO +.91 lda #MLI.E.IO sec rts diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt index cbd65858..b412bc3b 100644 --- a/SBIN/HTTPD.S.txt +++ b/SBIN/HTTPD.S.txt @@ -80,7 +80,7 @@ CS.RUN jsr Init.Timeout .99 >LDYA L.MSG.TCPIPERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -128,7 +128,7 @@ CS.RUN.INIT ldx #3 .9 >LDYA L.MSG.SKTERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/SBIN/NFSD.S.txt b/SBIN/NFSD.S.txt index 6b516b32..83e6d43e 100644 --- a/SBIN/NFSD.S.txt +++ b/SBIN/NFSD.S.txt @@ -74,7 +74,7 @@ CS.RUN jsr Init.Timeout .99 >LDYA L.MSG.TCPIPERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -124,7 +124,7 @@ CS.RUN.INIT ldx #3 .9 >LDYA L.MSG.SKTERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt index 795bb62c..2e899918 100644 --- a/SBIN/SHELL.S.CMD.txt +++ b/SBIN/SHELL.S.CMD.txt @@ -191,7 +191,7 @@ Cmd.Exec.EXT jsr Cmd.Exec.Split bra * -.9 lda #SYSMGR.ERRSYN +.9 lda #K.E.SYN sec .99 jmp Cmd.Exec.Done *-------------------------------------- @@ -331,7 +331,7 @@ Cmd.Exec.CD lda (ZPPTR2) clc .9 jmp Cmd.Exec.Done *-------------------------------------- -Cmd.Exec.ERRSYN lda #SYSMGR.ERRSYN +Cmd.Exec.ERRSYN lda #K.E.SYN sec jmp Cmd.Exec.Done *-------------------------------------- diff --git a/SBIN/SHELL.S.CSH.txt b/SBIN/SHELL.S.CSH.txt index 2ec6dfed..3eeb6ea1 100644 --- a/SBIN/SHELL.S.CSH.txt +++ b/SBIN/SHELL.S.CSH.txt @@ -345,6 +345,86 @@ CSH.TYPE >STA.G CSH.ACCT sec .99 rts *-------------------------------------- +CSH.ExpEval jsr CSH.ZeroACC + dec A=0 + >STA.G CSH.EXPBOP1 + + jsr CSH.GetCharNB + bcs .9 + +.10 jsr CSH.IsLetter Fnc or Var ? + bcs .2 + + jsr CSH.GetVar + bcs .1 + + jsr CSH.LoadACCFromVar + bcs .9 + bra .11 + +.1 bra .9 TO DO : Functions + +.2 jsr CSH.IsDigit10 number ? + bcs .9 + + jsr CSH.GetNumInACC + bcs .9 + +.11 jsr CSH.GetCharNB + bcs .9 + + cmp #')' + beq .8 + cmp #';' + beq .8 + + jsr CSH.IsOPChar + bcs .9 + + >LDYA L.CSH.BOPS + jsr CSH.LookupOP + bcs .9 + + >LDA.G CSH.EXPBOP1 previous OP... + bpl .5 go check precedence + + txa + >STA.G CSH.EXPBOP1 + jsr CSH.ACC2ARG + jsr CSH.GetCharNB + bcc .10 go check for an ARG + +.9 lda #CSH.E.SYNTAX + sec +.99 rts + +.5 txa + >STA.G CSH.EXPBOP2 + >CMP.G CSH.EXPBOP1 + bcs .3 + +* new OP has precedence, stack ACC + + + + bra .10 + +* Old OP has precedence, compute ACC=ARG ACC +.3 >LDA.G CSH.EXPBOP1 + jsr CSA.Compute + bcs .9 + jsr CSH.GetCharNB + bcc .10 + bra .9 + +.8 >LDA.G CSH.EXPBOP1 + bmi .80 + + jmp CSA.Compute + +.80 clc + rts +*-------------------------------------- CSH.SavePtr >LDYA ZPCSHBufPtr >STYA.G CSH.BufPtrSave rts @@ -408,83 +488,6 @@ CSH.Lookup phy Y = len sec rts *-------------------------------------- -CSH.ExpEval jsr CSH.ZeroACC - >STA.G CSH.EXPBOP1 A=0 - - jsr CSH.GetCharNB - bcs .9 - -.10 jsr CSH.IsLetter Fnc or Var ? - bcs .2 - - jsr CSH.GetVar - bcs .1 - - jsr CSH.LoadACCFromVar - bcs .9 - bra .11 - -.1 bra .9 TO DO : Functions - -.2 jsr CSH.IsDigit10 number ? - bcs .9 - - jsr CSH.GetNumInACC - bcs .9 - -.11 jsr CSH.GetCharNB - bcs .9 - - cmp #')' - beq .8 - cmp #';' - beq .8 - - jsr CSH.IsOPChar - bcs .9 - - >LDYA L.CSH.BOPS - jsr CSH.LookupOP - bcs .9 - - >LDA.G CSH.EXPBOP1 previous OP... - bne .5 go check precedence - - txa - >STA.G CSH.EXPBOP1 - jsr CSH.ACC2ARG - jsr CSH.GetCharNB - bcc .10 - -.9 lda #CSH.E.SYNTAX - sec -.99 rts - -.5 txa - >STA.G CSH.EXPBOP2 - >CMP.G CSH.EXPBOP1 - bcs .3 - -* new OP has precedence, stack ACC - - - - bra .10 - -* Old OP has precedence, compute ACC=ARG ACC -.3 >LDA.G CSH.EXPBOP1 - jsr CSA.Compute - bcs .9 - jsr CSH.GetCharNB - bcc .10 - bra .9 -.8 clc - rts -*-------------------------------------- -CSA.Compute tax - >DEBUG - jmp (J.CSH.BOPS,x) -*-------------------------------------- CSH.GetNumInACC >LDA.G CSH.ACCT cmp #CSH.TYPE.FLOAT bcc .1 @@ -516,7 +519,20 @@ CSH.ZeroACC lda #0 rts *-------------------------------------- -CSH.ACC2ARG +CSH.ACC2ARG >LEA.G CSH.ACCT + >STYA ZPPtr1 + + >LEA.G CSH.ARGT + >STYA ZPPtr2 + + ldy #5 + +.1 lda (ZPPtr1),y + sta (ZPPtr2),y + dey + bpl .1 + + rts *-------------------------------------- * Vars... *-------------------------------------- @@ -732,7 +748,13 @@ CSH.IsACC0 >LDA.G CSH.ACCT .9 sec rts *-------------------------------------- -CSH.BOPS.ADD +CSA.Compute tax + jmp (J.CSH.BOPS,x) +*-------------------------------------- +CSH.BOPS.ADD + + + CSH.BOPS.SUB CSH.BOPS.MUL CSH.BOPS.DIV @@ -866,7 +888,7 @@ CSH.GetChar lda (ZPCSHBufPtr) clc rts -.9 lda #MLI.ERR.EOF +.9 lda #MLI.E.EOF sec rts *--------------------------------------- diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index a2d818a0..6674ab7d 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -234,7 +234,7 @@ CS.RUN.READ lda #0 reset Buffer CS.RUN.BATCH jsr CSH.Run bcc .7 - cmp #MLI.ERR.EOF + cmp #MLI.E.EOF beq .9 pha diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index 6a1942cf..03e5f575 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -80,7 +80,7 @@ CS.RUN jsr Init.Timeout .99 >LDYA L.MSG.TCPIPERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts @@ -111,7 +111,7 @@ CS.RUN.INIT ldx #3 .9 >LDYA L.MSG.SKTERR >SYSCALL PrintF.YA - lda #SYSMGR.ERRSYN + lda #K.E.SYN sec rts diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 27891ff1..4de56905 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -201,7 +201,7 @@ K.FileSearch.I >PULLW .4+1 Filename .98 lda #$ff SELF MODIFIED : Discard Expanded hSrch list jsr K.FreeMem.A - lda #MLI.ERR.FNOTFND + lda #MLI.E.FNOTFND sec .99 rts *-------------------------------------- @@ -390,11 +390,11 @@ BIN.InstallDRV ldy #H.BIN.DRV.CODE.O cmp #K.DEV.MAX bne .10 No Device Handle Left - lda #MEMMGR.ERROOH + lda #K.E.OOH sec rts -.9 lda #MEMMGR.ERROOM +.9 lda #K.E.OOM sec rts @@ -506,7 +506,7 @@ BIN.RelocateEXE ldy #H.BIN.T+1 cmp /H.BIN.T.DRV65 beq .1 - lda #SYSMGR.ERRIBIN + lda #K.E.IBIN sec rts diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt index 647aeac9..add92911 100644 --- a/SYS/KERNEL.S.CORE.txt +++ b/SYS/KERNEL.S.CORE.txt @@ -360,7 +360,7 @@ CORE.GetPSStatus.A dey bne .1 -.9 lda #TSKMGR.ERRNSP +.9 lda #K.E.NSP sec rts @@ -428,7 +428,7 @@ CORE.DestroyEvent CORE.PSSelect0 >LDYAI CORE.S.PS0 Select PS0 >STYA pPs - >LDYA CORE.S.PS0+S.PS.Context+4 + >LDYA CORE.S.PS0+S.PS.ZP+4 >STYA pStack rts */-------------------------------------- @@ -454,7 +454,7 @@ K.Sleep pla get PC LO ora #S.PS.F.SLEEP sta (pPs) *-------------------------------------- -CORE.PSLeave ldy #S.PS.Context+23 +CORE.PSLeave ldy #S.PS.ZP+23 ldx #23 .1 lda pCode,x @@ -466,7 +466,7 @@ CORE.PSLeave ldy #S.PS.Context+23 clc No error, rts back to Kernel *-------------------------------------- -CORE.PSEnter ldy #S.PS.Context+23 +CORE.PSEnter ldy #S.PS.ZP+23 ldx #23 .1 lda (pPs),y diff --git a/SYS/KERNEL.S.DEV.txt b/SYS/KERNEL.S.DEV.txt index 87ad448e..1a32add2 100644 --- a/SYS/KERNEL.S.DEV.txt +++ b/SYS/KERNEL.S.DEV.txt @@ -75,7 +75,7 @@ K.GetDevByName.YA cpx DevMgr.Count bne .1 -K.GetDevDNF lda #MLI.ERR.NODEV CS from cpx/beq +K.GetDevDNF lda #MLI.E.NODEV CS from cpx/beq rts */-------------------------------------- * # GetDevStatus.A diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt index dc2fc722..4bd3ecd4 100644 --- a/SYS/KERNEL.S.ENV.txt +++ b/SYS/KERNEL.S.ENV.txt @@ -304,7 +304,7 @@ K.SetEnvPtr1Ptr2 clc rts -.99 lda #SYSMGR.ERRENVF +.99 lda #K.E.ENVF * sec rts */-------------------------------------- diff --git a/SYS/KERNEL.S.FIO.txt b/SYS/KERNEL.S.FIO.txt index ffa5eb7a..cf8eaa02 100644 --- a/SYS/KERNEL.S.FIO.txt +++ b/SYS/KERNEL.S.FIO.txt @@ -51,7 +51,7 @@ K.LoadFile clc bne .1 inc bne .1 - lda #SYSMGR.ERRFTB + lda #K.E.FTB bra .99 .1 jsr K.GetMem.YA @@ -133,7 +133,7 @@ K.LoadFile.GetSize >PUSHB K.LoadFile.hFile jmp K.FSeek -.98 lda #SYSMGR.ERRFTB +.98 lda #K.E.FTB .99 rts *-------------------------------------- K.LoadFile.bTXT .BS 1 diff --git a/SYS/KERNEL.S.GP.txt b/SYS/KERNEL.S.GP.txt index dadf205f..59189bc9 100644 --- a/SYS/KERNEL.S.GP.txt +++ b/SYS/KERNEL.S.GP.txt @@ -39,7 +39,7 @@ AUTO 6 *-------------------------------------- * BADCALL *-------------------------------------- - lda #MLI.ERR.BADCALL + lda #MLI.E.BADCALL sec rts *-------------------------------------- @@ -107,15 +107,22 @@ A2osX.ROMCALL1 phx bit $C000,x bit $C000,x rts - + .1 jmp (.2,x) + +* http://www.txbobsc.com/scsc/scdocumentor/E7A0.html + .2 .DA $E7A7 FSUB .DA $E7BE FADD +* .DA $E82E NORMALIZE.FAC.2 (L->F) .DA $E941 LOG .DA $E97F FMULT + .DA $E9E3 LOAD.ARG.FROM.YA .DA $EA66 FDIV - .DA $EAFD LOAD.FAC.FROM.INDEX + .DA $EAF9 LOAD.FAC.FROM.YA .DA $EB27 SETFOR +* .DA $EBB2 FCOMP +* .DA $EBF2 QINT (F->L) .DA $EC4A FIN .DA $ED36 FOUT.1 .DA $EE8D SQR diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 4218f58d..49917ec4 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -443,7 +443,7 @@ PS0Init ldx #S.DEV*2 NUL,SYS >LDYAI K.STACKTOP >STYA pStack - >STYA CORE.S.PS0+S.PS.Context+4 init Kernel Soft Stack + >STYA CORE.S.PS0+S.PS.ZP+4 init Kernel Soft Stack >LDYAI DEV.SYS >SYSCALL MkNod.YA @@ -838,7 +838,7 @@ DevMgrInit.AddDev clc rts -.9 lda #MEMMGR.ERROOH +.9 lda #K.E.OOH sec rts *-------------------------------------- diff --git a/SYS/KERNEL.S.MATH.txt b/SYS/KERNEL.S.MATH.txt new file mode 100644 index 00000000..b7d7aa68 --- /dev/null +++ b/SYS/KERNEL.S.MATH.txt @@ -0,0 +1,57 @@ +PR#3 +PREFIX /A2OSX.BUILD +LOMEM $A00 +INC 1 +AUTO 6 +*/-------------------------------------- +* # FAdd +* Return X+Y +* ## In: +* PUSHW = X (*Float) +* PUSHW = Y (*Float) +*\-------------------------------------- +K.FAdd ldx #ROM.FADD + .HS 2C BIT ABS +*/-------------------------------------- +* # FSub +* Return X-Y +* ## In: +* PUSHW = X (*Float) +* PUSHW = Y (*Float) +*\-------------------------------------- +K.FSub ldx #ROM.FSUB + + phx + + jsr MATH.PullFAC + jsr MATH.PullARG + + plx + jsr A2osX.ROMCALL + + + + +*-------------------------------------- +K.Cos jsr MATH.PullFAC +* >ROMCALL COS +*-------------------------------------- +*-------------------------------------- +*-------------------------------------- +MATH.PullFAC >PULLA + tay + >PULLA + >ROMCALL SETFAC.AY + rts +*-------------------------------------- +MATH.PullARG >PULLA + tay + >PULLA + >ROMCALL SETARG.AY + rts +*-------------------------------------- +*-------------------------------------- +MAN +SAVE /A2OSX.SRC/SYS/KERNEL.S.MATH +LOAD /A2OSX.SRC/SYS/KERNEL.S +ASM diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt index c550ff0b..2faa0f0d 100644 --- a/SYS/KERNEL.S.MEM.txt +++ b/SYS/KERNEL.S.MEM.txt @@ -222,11 +222,11 @@ MemMgr.AddSlot >STYA ZPMemMgrTmp1 save req size rts .98 pla discard new MemMgr.Free HI - lda #MemMgr.ERROOM + lda #K.E.OOM sec rts -.99 lda #MemMgr.ERROOH +.99 lda #K.E.OOH sec rts *-------------------------------------- diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index b3717ded..4687cbf7 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -72,7 +72,7 @@ PS.CreateChild ldx #0 .2 cpx #K.PS.MAX bne .3 - lda #TSKMGR.ERROOH + lda #K.E.OOH sec rts @@ -266,7 +266,7 @@ PS.Init jsr BIN.Load.YA Y,A=filename full path >STYA ZPPtr4 save PTR to Code Segment phy - ldy #S.PS.Context+1 + ldy #S.PS.ZP+1 sta (ZPPtr3),y save pCode HI... dey pla @@ -294,7 +294,7 @@ PS.Init jsr BIN.Load.YA Y,A=filename full path bcs .9 phy - ldy #S.PS.Context+3 + ldy #S.PS.ZP+3 sta (ZPPtr3),y save pData HI... dey pla @@ -308,7 +308,7 @@ PS.Init jsr BIN.Load.YA Y,A=filename full path .2 ldy #H.BIN.EXE.SS.SIZE lda (ZPPtr4),y Load SS.SIZE - ldy #S.PS.Context+4 + ldy #S.PS.ZP+4 sta (ZPPtr3),y save pStack LO... tay @@ -323,7 +323,7 @@ PS.Init jsr BIN.Load.YA Y,A=filename full path jsr K.GetMem bcs .9 - ldy #S.PS.Context+5 + ldy #S.PS.ZP+5 sta (ZPPtr3),y save pStack HI...(LO alredy set to Stack TOP) txa diff --git a/SYS/KERNEL.S.STAT.txt b/SYS/KERNEL.S.STAT.txt index b4100782..74e3f69f 100644 --- a/SYS/KERNEL.S.STAT.txt +++ b/SYS/KERNEL.S.STAT.txt @@ -163,7 +163,7 @@ K.MkNod.YA jsr K.GetDevByName.YA Ptr1=NAME clc .9 rts -.99 lda #MLI.ERR.IO +.99 lda #MLI.E.IO sec rts */-------------------------------------- diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt index 736c9a8b..5b059996 100644 --- a/SYS/KERNEL.S.STDIO.txt +++ b/SYS/KERNEL.S.STDIO.txt @@ -114,9 +114,9 @@ K.PutChar.A.FIFO clc rts -.9 lda #MLI.ERR.VOLFULL +.9 lda #MLI.E.VOLFULL .HS 2C bit abs -.99 lda #MLI.ERR.EOF +.99 lda #MLI.E.EOF sec rts *-------------------------------------- @@ -504,9 +504,9 @@ K.FSeek jsr PFT.CheckNodeSTK .9 rts -.98 lda #SYSMGR.ERRSYN +.98 lda #K.E.SYN .HS 2C bit abs -.99 lda #SYSMGR.ERRFTB +.99 lda #K.E.FTB sec rts */-------------------------------------- @@ -940,8 +940,10 @@ PrintF.U.1 bcc .8 unsigned, nothing to check PrintF.E sec Force "E+12" .HS 90 BCC PrintF.F clc - >PULLW INDEX - >ROMCALL SETFAC + >PULLA + tay + >PULLA + >ROMCALL SETFAC.AY ldy #3 In order not to trash A2osX.SaveSM,A2osX.SaveSX >ROMCALL FOUT @@ -1079,7 +1081,7 @@ STDIO.GetRefNum jsr K.GetMemPtr.A sta K.MLI.PARAMS+1 rts *-------------------------------------- -STDIO.IOERR lda #MLI.ERR.IO +STDIO.IOERR lda #MLI.E.IO sec rts *-------------------------------------- diff --git a/SYS/KERNEL.S.STDLIB.txt b/SYS/KERNEL.S.STDLIB.txt index b932d591..f48032e9 100644 --- a/SYS/KERNEL.S.STDLIB.txt +++ b/SYS/KERNEL.S.STDLIB.txt @@ -316,7 +316,7 @@ K.RealPath.YA >STYA ZPPtr1 .89 >LDYAI K.Buf256 jmp K.NewStr.YA -.90 lda #SYSMGR.ERRSYN +.90 lda #K.E.SYN sec rts *-------------------------------------- diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index 273f179a..68531f56 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -39,6 +39,7 @@ A2osX.D2 .PH $D000 .INB /A2OSX.SRC/SYS/KERNEL.S.PS .INB /A2OSX.SRC/SYS/KERNEL.S.ARG .INB /A2OSX.SRC/SYS/KERNEL.S.ENV + .INB /A2OSX.SRC/SYS/KERNEL.S.MATH .EP A2osX.E0 .PH $E000 .INB /A2OSX.SRC/SYS/KERNEL.S.JMP diff --git a/SYS/KM.RAMWORKS.S.txt b/SYS/KM.RAMWORKS.S.txt index c8187bbd..33e348f4 100644 --- a/SYS/KM.RAMWORKS.S.txt +++ b/SYS/KM.RAMWORKS.S.txt @@ -490,7 +490,7 @@ RWDRV.EXITOK lda #0 make A=0 clc rts -RWDRV.IOERR lda #MLI.ERR.IO Carry already set +RWDRV.IOERR lda #MLI.E.IO Carry already set rts *-------------------------------------- * X=Page(0/1 or LC),A=Bank diff --git a/SYS/KM.VSDRIVE.S.txt b/SYS/KM.VSDRIVE.S.txt index 1d0eb925..6089f452 100644 --- a/SYS/KM.VSDRIVE.S.txt +++ b/SYS/KM.VSDRIVE.S.txt @@ -417,7 +417,7 @@ DRV.DO.CMD.R ldy #3 Read Back and check 4 bytes DRV.DO.CMD.ERR1 pla pla -DRV.DO.CMD.ERR lda #MLI.ERR.IO +DRV.DO.CMD.ERR lda #MLI.E.IO sec rts *-------------------------------------- diff --git a/X.ERRORS.S.txt b/X.ERRORS.S.txt index 13799792..1178c3f4 100644 --- a/X.ERRORS.S.txt +++ b/X.ERRORS.S.txt @@ -5,24 +5,24 @@ INC 1 AUTO 6 .LIST OFF *-------------------------------------- -ERR.Codes .DA #MLI.ERR.IO - .DA #MLI.ERR.NODEV - .DA #MLI.ERR.WRTPROT - .DA #MLI.ERR.DSKSWIT - .DA #MLI.ERR.OFFLINE - .DA #MLI.ERR.INVPATH - .DA #MLI.ERR.PNOTFND - .DA #MLI.ERR.VNOTFND - .DA #MLI.ERR.FNOTFND - .DA #MLI.ERR.DUPFILE - .DA #MLI.ERR.VOLFULL - .DA #MLI.ERR.DIRFULL - .DA #MLI.ERR.UNSUPST - .DA #MLI.ERR.EOF - .DA #MLI.ERR.LOCKED - .DA #MLI.ERR.OPEN +ERR.Codes .DA #MLI.E.IO + .DA #MLI.E.NODEV + .DA #MLI.E.WRTPROT + .DA #MLI.E.DSKSWIT + .DA #MLI.E.OFFLINE + .DA #MLI.E.INVPATH + .DA #MLI.E.PNOTFND + .DA #MLI.E.VNOTFND + .DA #MLI.E.FNOTFND + .DA #MLI.E.DUPFILE + .DA #MLI.E.VOLFULL + .DA #MLI.E.DIRFULL + .DA #MLI.E.UNSUPST + .DA #MLI.E.EOF + .DA #MLI.E.LOCKED + .DA #MLI.E.OPEN *-------------------------------------- - .DA #SYSMGR.ERRSYN + .DA #K.E.SYN *-------------------------------------- ERR.Count .EQ *-ERR.Codes *--------------------------------------