Kernel version 0.9 : ***new media dated 2017-04-04

-bugfix in SHELL batch mode, CP, FORMAT, ENV processing
-CHTYP Command running.
-Now, A2OSX.BOOT media is built from MAKEBOOT script from A2OSX.BUILD
This commit is contained in:
Rémy GIBERT 2017-04-04 15:07:58 +02:00
parent 9099848c6a
commit 92c34d5fde
10 changed files with 52 additions and 102 deletions

View File

@ -194,8 +194,26 @@ CS.RUN.FILE jsr CS.RUN.GetFilePath
>SYSCALL PPrintFYA
bcs .9
ldy #HexFileType
>PUSHB (pData),y
>PUSHWI UsrBuf256
>SYSCALL ChTyp
jsr CS.RUN.CheckErr
ldy #bRecurse
lda (pData),y
bpl .8
ldy #1
lda (ZPFileName),y
cmp #'.'
beq .8
>LDYA ZPFileName
jsr EnterSubDirYA
rts
.8 jsr GetNextEntry
clc
.9 rts
@ -332,8 +350,8 @@ OptionList >PSTR "CR"
OptionVars .DA #bContinue,#bRecurse
*--------------------------------------
MSG.USAGE >PSTR "Usage : CHTYP [File *,? wildcards allowed] [File type : 0HH, SYS,TXT....]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n"
MSG.OK >PSTR " [Ok]\r\n"
MSG.ERR >PSTR " [%h]\r\n"
MSG.OK >PSTR "[Ok]\r\n"
MSG.ERR >PSTR "[%h]\r\n"
MSG.FILE >PSTR "CHTYP File:%S..."
STAT .BS S.STAT
ArgCount .BS 1

View File

@ -561,7 +561,7 @@ CS.RUN.CopyEnd ldy #hSrcFile
*--------------------------------------
CS.RUN.CheckErr bcs .1
>LDYA L.MSG.OK
>SYSCALL CPrintFYA
>SYSCALL PPrintFYA
rts
.1 ldy #RC
@ -635,5 +635,3 @@ CS.QUIT jsr LeaveSubDir
*--------------------------------------
MAN
SAVE /A2OSX.SRC/BIN/X.CPMVRM.S
LOAD /A2OSX.SRC/BIN/CP.S
ASM

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -9,32 +9,10 @@ AUTO 6
*--------------------------------------
Cmd.ExecYA stz Cmd.Exec.Mode
pha
phy
lda #'<'
>SYSCALL PutCA
ply
pla
pha
phy
>SYSCALL PPrintFYA
lda #'>'
>SYSCALL PutCA
lda #13
>SYSCALL PutCA
lda #10
>SYSCALL PutCA
ply
pla
Cmd.ExecYA.1 >SYSCALL ExpandPStrYA
>STYA ZPPtr1
phx
ldy #1
ldx #0 ARGS len
@ -72,17 +50,6 @@ Cmd.ExecYA.1 >SYSCALL ExpandPStrYA
pla
>SYSCALL FreeMemA
lda #'|'
>SYSCALL PutCA
>LDYA L.ARGS
>SYSCALL PPrintFYA
lda #'|'
>SYSCALL PutCA
lda #13
>SYSCALL PutCA
lda #10
>SYSCALL PutCA
>LDYA L.CMDS
>STYA ZPPtr2
@ -111,6 +78,8 @@ Cmd.ExecYA.1 >SYSCALL ExpandPStrYA
sta (pPS),y
rts
.5 jmp (J.INTCMDS,x)
.4 inx
inx
@ -122,21 +91,6 @@ Cmd.ExecYA.1 >SYSCALL ExpandPStrYA
inc ZPPtr2+1
bra .1
.5 phx
lda #'{'
>SYSCALL PutCA
>LDYA L.ARGS
>SYSCALL PPrintFYA
lda #'}'
>SYSCALL PutCA
lda #13
>SYSCALL PutCA
lda #10
>SYSCALL PutCA
plx
jmp (J.INTCMDS,x)
*--------------------------------------
Cmd.Exec.EXT ldy #1
lda CMD,y

View File

@ -400,15 +400,6 @@ PrintPrompt >LDYA L.ENV.PS1
* Remove extra SPACE & comment
*--------------------------------------
CmdBuffer.Normalize
>LDYA pData
>SYSCALL PPrintFYA
lda #'\'
>SYSCALL PutCA
lda #13
>SYSCALL PutCA
lda #10
>SYSCALL PutCA
>LDYA pData
>STYA ZPPtr1
@ -449,16 +440,7 @@ CmdBuffer.Normalize
.8 tya
sta (pData)
.9 >LDYA pData
>SYSCALL PPrintFYA
lda #'%'
>SYSCALL PutCA
lda #13
>SYSCALL PutCA
lda #10
>SYSCALL PutCA
rts
.9 rts
CmdBuffer.Normalize.Next
txa

View File

@ -93,13 +93,12 @@ K.ExpandPStrYA stz K.ExpandPStr.hPStr Reset Intermediate string...
.5 dey last char was invalid...move back
.50 ldx K.ExpandPStr.Name
bne .51
jmp .1 var name is empty...start over
beq .51 var name is empty...start over
.51 phy save current index
phy save current index
jsr K.ExpandPStrGetValue
ply restore index in string...
jmp .10 reset start flag and continue
.51 jmp .10 reset start flag and continue
.8 ldx K.ExpandPStr.Name end of PSTR,are we in a var?
beq .80 no...exit...
@ -352,7 +351,7 @@ ENV.ExpandSysVar
bcs .1
and #$0F
jsr K.GetArgA
bcs .8
bcs .99
>STYA ZPPtr3
jmp ENV.AppendPtr3ToBuf
@ -368,7 +367,7 @@ ENV.ExpandSysVar
bpl .2
.9 sec
rts
.99 rts
.3 txa
asl
@ -391,17 +390,10 @@ ENV.SysVarsArgs lda #1
.1 lda (ZPPtr3)
beq ENV.SysVarsExit2
jsr ENV.AppendPtr3ToBuf
.2 jsr ENV.AppendPtr3ToBuf
.2 jsr ENV.NextEnvPtr3
lda (ZPPtr3)
sec
adc ZPPtr3
sta ZPPtr3
bcc .3
inc ZPPtr3+1
.3 lda (ZPPtr3)
beq ENV.SysVarsExit2
ldx KrnBuf256
@ -410,6 +402,8 @@ ENV.SysVarsArgs lda #1
stx KrnBuf256
lda #' '
sta KrnBuf256,x
jsr ENV.AppendPtr3ToBuf
bra .2
*--------------------------------------
ENV.SysVarsArgC jsr K.GetArgC Trash Ptr1

View File

@ -231,8 +231,8 @@ K.LoadFile.Len .BS 2
*/--------------------------------------
* # ChTyp
* ## In:
* PUSHB = TYPE ...
* PUSHW = PATH ...FOpen)
* PUSHB = TYPE
* PUSHW = PATH
*\--------------------------------------
K.ChTyp jsr PFT.CheckPathSTK
>PULLW K.MLI.PARAMS+1
@ -242,13 +242,13 @@ K.ChTyp jsr PFT.CheckPathSTK
.1 lda #$ff
sta K.MLI.PARAMS+S.FILEINFO.TYPE
>MLICALL MLIGETFILEINFO
>MLICALL MLISETFILEINFO
.9 rts
*/--------------------------------------
* # ChMod
* ## In:
* PUSHW = MODE ...
* PUSHW = PATH ...FOpen)
* PUSHW = MODE
* PUSHW = PATH
*\--------------------------------------
K.ChMod
sec
@ -256,8 +256,8 @@ K.ChMod
*/--------------------------------------
* # ChOwn
* ## In:
* PUSHW = UID ...
* PUSHW = PATH ...FOpen)
* PUSHW = UID
* PUSHW = PATH
*\--------------------------------------
K.ChOwn
sec
@ -265,8 +265,8 @@ K.ChOwn
*/--------------------------------------
* # ChGrp
* ## In:
* PUSHW = GID ...
* PUSHW = PATH ...FOpen)
* PUSHW = GID
* PUSHW = PATH
*\--------------------------------------
K.ChGrp
sec

View File

@ -6,17 +6,21 @@ PREFIX /A2OSX.BUILD
echo \fBuilding A2OSX.BOOT Media...
format S6D1 A2OSX.BOOT
cp PRODOS /A2OSX.BOOT
cp -R SYS /A2OSX.BOOT
cp -R DRV /A2OSX.BOOT
cp -R LIB /A2OSX.BOOT
cp -R SBIN /A2OSX.BOOT
md /A2OSX.BOOT/SYS
cp SYS/* /A2OSX.BOOT/SYS
md /A2OSX.BOOT/DRV
cp DRV/* /A2OSX.BOOT/DRV
md /A2OSX.BOOT/LIB
cp LIB/* /A2OSX.BOOT/LIB
md /A2OSX.BOOT/SBIN
cp SBIN/* /A2OSX.BOOT/SBIN
md /A2OSX.BOOT/BIN
cp BIN/* /A2OSX.BOOT/BIN
md /A2OSX.BOOT/ETC
md /A2OSX.BOOT/SRV
md /A2OSX.BOOT/USR
cp A2OSX.SYSTEM /A2OSX.BOOT
chtyp /A2OSX.BOOT/A2OSX.SYSTEM SYS
cp A2OSX.STARTUP /A2OSX.BOOT
MAN