diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 7f589a8d..0f4328a6 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/STABLE.32MB.po b/.Floppies/STABLE.32MB.po index f643febf..51a4ecc9 100644 Binary files a/.Floppies/STABLE.32MB.po and b/.Floppies/STABLE.32MB.po differ diff --git a/.Floppies/STABLE.800.po b/.Floppies/STABLE.800.po index a32b75bb..13dfa95c 100644 Binary files a/.Floppies/STABLE.800.po and b/.Floppies/STABLE.800.po differ diff --git a/BIN/CSH.S.CORE.txt b/BIN/CSH.S.CORE.txt index bec7db40..17744c3a 100644 --- a/BIN/CSH.S.CORE.txt +++ b/BIN/CSH.S.CORE.txt @@ -316,14 +316,12 @@ CSH.DIR.INCLUDE >STZ.G PathBuf >LDA.G hIncludeBuf bne .90 - >PUSHW pData - >PUSHBI O.RDONLY - >PUSHBI S.FI.T.TXT - >PUSHWZ Aux type - >SYSCALL LoadTxtFile + + + >LDYA pData + jsr CS.RUN.LoadFile bcs .99 - txa >STA.G hIncludeBuf rts @@ -456,11 +454,6 @@ CSH.AddSymbol >LDA.G CSH.hSymbols >PUSHWI ZPVarDef >PUSHWI 6 >SYSCALL SListAddData -* bcs .9 - -* lda #'*' -* jsr DEBUG.VAR - .9 rts .99 lda #CSH.E.OOM @@ -528,8 +521,6 @@ CSH.SetVarValueFromStack cpy ZPVarSizeOf bne .1 -* lda #'>' -* jsr DEBUG.VAR clc rts @@ -929,20 +920,6 @@ CSH.GetVarSize txa lda #2 rts *-------------------------------------- -DEBUG.VAR >SYSCALL PutChar - >PUSHW L.MSG.DBGVAR - >PUSHW ZPVarID - >PUSHW ZPVarType - >PUSHW ZPVarSizeOf - >PUSHW ZPVarDataPtr - ldy #3 -.1 >PUSHB (ZPVarDataPtr),y - dey - bpl .1 - >PUSHBI 12 - >SYSCALL PrintF - rts -*-------------------------------------- MAN SAVE usr/src/bin/csh.s.core LOAD usr/src/bin/csh.s diff --git a/BIN/CSH.S.txt b/BIN/CSH.S.txt index be43796f..c6a8002c 100644 --- a/BIN/CSH.S.txt +++ b/BIN/CSH.S.txt @@ -66,7 +66,6 @@ L.MSG.USAGE .DA MSG.USAGE L.MSG.ECHOCRLF .DA MSG.ECHOCRLF L.MSG.DEBUG .DA MSG.DEBUG L.MSG.ERR .DA MSG.ERR -L.MSG.DBGVAR .DA MSG.DBGVAR L.ENV.INCLUDE .DA ENV.INCLUDE .INB usr/src/bin/csh.r .DA 0 @@ -150,18 +149,11 @@ CS.RUN.ARGS inc ArgIndex .4 >LDA.G hFileBuf bne .90 - >PUSHW ZPPtr1 - >PUSHBI O.RDONLY - >PUSHBI S.FI.T.TXT - >PUSHWZ Aux type - >SYSCALL LoadTxtFile + >LDYA ZPPtr1 + jsr CS.RUN.LoadFile bcs .9 - txa >STA.G hFileBuf - >SYSCALL GetMemPtr - >STYA ZPFileBuf - >STYA ZPFileBufPtr bra CS.RUN.ARGS .7 >LDA.G hFileBuf @@ -178,6 +170,22 @@ CS.RUN.ARGS inc ArgIndex sec QUIT Process rts *-------------------------------------- +CS.RUN.LoadFile >PUSHYA + >PUSHBI O.RDONLY + >PUSHBI S.FI.T.TXT + >PUSHWZ Aux type + >SYSCALL LoadTxtFile + bcs .9 + + phx + txa + >SYSCALL GetMemPtr + >STYA ZPFileBuf + >STYA ZPFileBufPtr + pla + +.9 rts +*-------------------------------------- CS.DOEVENT sec rts *-------------------------------------- @@ -309,7 +317,6 @@ MSG.USAGE .AS "Usage : CSH