diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 20bb5a7d..002b3c64 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 9802c919..50617918 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt index 5b49ae91..6980d0cd 100644 --- a/BIN/EDIT.S.CTRL.txt +++ b/BIN/EDIT.S.CTRL.txt @@ -627,7 +627,7 @@ Prompt.Save cmp #3 >SYSCALL FreeMem.A .11 >LDYA pData - >SYSCALL NewPStrYA + >SYSCALL NewStr.YA txa ldy #hFileName diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 3f453299..baad78ba 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -30,9 +30,10 @@ CS.START cld .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 .DA 0 - .DA CS.END-CS.START Code Length To Relocate - .DA DS.END-DS.START Data Segment to Allocate - .DA 0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS + .DA #16 SS + .DA #10 ZP .DA 0 *-------------------------------------- * Relocation Table diff --git a/BIN/MD.S.txt b/BIN/MD.S.txt index 0241f1b7..a096d4a5 100644 --- a/BIN/MD.S.txt +++ b/BIN/MD.S.txt @@ -11,8 +11,6 @@ AUTO 6 .INB /A2OSX.BUILD/INC/MACROS.I .INB /A2OSX.BUILD/INC/A2OSX.I *-------------------------------------- -ZPPTR1 .EQ ZPBIN -*-------------------------------------- * File Header (16 Bytes) *-------------------------------------- CS.START cld @@ -20,9 +18,10 @@ CS.START cld .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 .DA 0 - .DA CS.END-CS.START Code Length To Relocate - .DA 0 - .DA 0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS + .DA #16 SS + .DA 0 ZP .DA 0 *-------------------------------------- * Relocation Table @@ -45,7 +44,8 @@ CS.RUN >SYSCALL GetArgC >SYSCALL GetFullPath.YA bcs .9 - stx hFullPath + txa + >STA.G hFullPath >SYSCALL MKDir.YA bcs .9 @@ -60,7 +60,7 @@ CS.RUN >SYSCALL GetArgC CS.DOEVENT sec rts *-------------------------------------- -CS.QUIT lda hFullPath +CS.QUIT >LDA.G hFullPath beq .8 >SYSCALL FreeMem.A @@ -68,7 +68,13 @@ CS.QUIT lda hFullPath rts *-------------------------------------- CS.END +*-------------------------------------- + .DUMMY + .OR 0 +DS.START hFullPath .BS 1 +DS.END + .ED *-------------------------------------- MAN SAVE /A2OSX.SRC/BIN/MD.S diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt index 177a55ca..ddca8572 100644 --- a/BIN/MEM.S.txt +++ b/BIN/MEM.S.txt @@ -24,9 +24,10 @@ CS.START cld .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 .DA 0 - .DA CS.END-CS.START Code Length To Relocate - .DA DS.END-DS.START Data Segment to Allocate - .DA 0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS + .DA #16 SS + .DA #4 ZP .DA 0 *-------------------------------------- * Relocation Table diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt index 3af9a40d..5dabfac1 100644 --- a/BIN/MEMDUMP.S.txt +++ b/BIN/MEMDUMP.S.txt @@ -24,9 +24,10 @@ CS.START cld .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 .DA 0 - .DA CS.END-CS.START Code Length To Relocate - .DA DS.END-DS.START Data Segment to Allocate - .DA 0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS + .DA #16 SS + .DA #4 ZP .DA 0 *-------------------------------------- * Relocation Table diff --git a/README.md b/README.md index 19d777f2..ad4a9b05 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ note : '$VAR' does NOT expand Variable | MEM | Working | Old dump behavior is now MEMDUMP. New MEM command displays MEMSTAT (Main, Aux & Kernel Memory) | 0.9.1 | | LSDEV | Working | | 0.9.1 | | PS | Working | | 0.9.1 | -| MD | Working | | 0.9 | +| MD | Working | | 0.9.1 | | LS | Working | -A : Do Not Print . & .. | 0.9 | | | | -L : long listing with size/date... | | | | | -R : Recurse subdirectories | | diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index 3f83bc97..8158cba2 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -179,8 +179,8 @@ CS.RUN.ToggleSlotA rts *-------------------------------------- CS.RUN.Load >LEA.G StatBuf - ldy #hFileName - lda (pData),y + >PUSHYA + >LDA.G hFileName >SYSCALL GetMemPtr.A >PUSHYA >SYSCALL Stat @@ -346,7 +346,7 @@ MSG.TOPBAR.OK >CSTR "KCONFIG File Successfully Loaded. \e[0m" MSG.TOPBAR.KO >CSTR "Invalid/missing KCONFIG File. \e[0m" MSG.STATUSBAR >CSTR "\e[7m\e[24;1HCtrl-Q:Quit,Ctrl-S:Save,Ctrl-T:Toggle Time,Ctrl-C:Toggle CHRoot,1-7:En/Dis Slot \e[0m" MSG.KCONF >CSTR "\e[2;1H------ Actual Kernel Configuration ------\r\n" -MSG.FCONF >CSTR "\e[13;1H------ KCONFIG File Configuration ------\r\n" +MSG.FCONF >CSTR "\e[13;1H------ KCONFIG File Configuration -------\r\n" MSG.HZ >CSTR " Machine Timing : %d0 Hz\r\n" MSG.CHROOT >CSTR " CHRoot to /RAMx : %s\r\n" MSG.ENABLED >CSTR "Enabled " diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt index 174138aa..f9cf802e 100644 --- a/SBIN/SHELL.S.CMD.txt +++ b/SBIN/SHELL.S.CMD.txt @@ -13,6 +13,11 @@ CMD.Init >LDYAI CmdLine.MAX+1 >STA.G hCmdBuf .9 rts *-------------------------------------- +CMD.Quit >LDA.G hCmdBuf + beq .9 + >SYSCALL FreeMem.A +.9 rts +*-------------------------------------- * ZPCMDBuf : Remove extra SPACE & comment *-------------------------------------- Cmd.Parse >LDYA ZPCMDBuf diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index 7a85a53d..0ae7bd61 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -425,9 +425,8 @@ CS.CHARIN.CTRL cpx #13 CR rts *-------------------------------------- CS.QUIT jsr HIS.Quit - jsr CSH.Quit - + jsr CMD.Quit clc rts *-------------------------------------- @@ -489,7 +488,7 @@ CmdLine.DEL >LDA.G CmdBuflen tay lda #0 - sta (pData),y + sta (ZPCMDBuf),y lda #8 >SYSCALL PutChar.A