This commit is contained in:
Anatoliy Belyanskiy 2023-09-08 22:40:45 +10:00
parent c1bad465f8
commit 6224d9fcb6
9 changed files with 58 additions and 57 deletions

View File

@ -1 +1 @@
48 49

View File

@ -259,7 +259,7 @@ EX_PAT1: LD A,(HL)
JR Z,PATH_YEP JR Z,PATH_YEP
CP ":" CP ":"
JR Z,DRIVE_YEP JR Z,DRIVE_YEP
CP #21 CP "!"
JR C,NAME_YEP JR C,NAME_YEP
CP "?" CP "?"
JR Z,GLOBP1 JR Z,GLOBP1

View File

@ -1 +1 @@
254 255

View File

@ -303,7 +303,7 @@ A8286: ex af,af'
ld hl,BATLIST ; ª®¬ ­¤ë "pause","rem" + dos-ª®¬ ­¤ë ld hl,BATLIST ; ª®¬ ­¤ë "pause","rem" + dos-ª®¬ ­¤ë
; de=struct_input_line+5, c=¤«¨­  áâப¨ (¡¥§ ª®­æ. ¯à®¡¥«®¢) ; de=struct_input_line+5, c=¤«¨­  áâப¨ (¡¥§ ª®­æ. ¯à®¡¥«®¢)
; ¢ë¯®«­. ª®¬ ­¤ã ¨«¨ § ¯ãáâ¨âì ä ©« ; ¢ë¯®«­. ª®¬ ­¤ã ¨«¨ § ¯ãáâ¨âì ä ©«
jp A8312 jp COMP004
@ -354,7 +354,7 @@ EVALSTR: ld a,(hl)
ld (.TVAR_PNT),de ld (.TVAR_PNT),de
jr nz,.TVAR1 jr nz,.TVAR1
inc hl inc hl
ld a,(hl) ld a,(hl) ;!FIXIT ï ¢ console.asm ¨á¯à ¢«ï« ¡ £ á ¯ à ¬¥â஬ %A ­ ¯à¨¬¥à. ’ãâ ¬®¨ ¯à ¢ª¨ ¨«¨ ‚ á¨«ï?
cp "9"+1 cp "9"+1
jr c,.TVAR0 jr c,.TVAR0
.TVAR2: ld a,"%" ; > "9" .TVAR2: ld a,"%" ; > "9"

View File

@ -139,7 +139,7 @@ MSG0: db 0
db "Volume Serial Number is %2",0Dh,0Ah db "Volume Serial Number is %2",0Dh,0Ah
db 0Dh,0Ah,"Directory of %3",0Dh,0Ah,0Ah,0 db 0Dh,0Ah,"Directory of %3",0Dh,0Ah,0Ah,0
; 1 ; 1
db "Estex DSS version %1. Console version %2.",CR,LF,0 ;R13 db "Estex DSS version %1. Shell version %2.",CR,LF,0 ;R13
; 2 ; 2
db "Current date: %1",0Dh,0Ah,0 ;2 db "Current date: %1",0Dh,0Ah,0 ;2
db "Current time: %1",0Dh,0Ah,0 ;3 db "Current time: %1",0Dh,0Ah,0 ;3

View File

@ -26,42 +26,42 @@ LF EQU 10
true EQU 1 true EQU 1
false EQU 0 false EQU 0
; Loader_length EQU 0 Loader_length EQU 0
; code_addr EQU shell code_addr EQU shell
; program_start EQU shell program_start EQU shell
; stack_point EQU #BFFE stack_point EQU #BFFE
; org_addr EQU #8000 + CLP_Buffer org_addr EQU #8000 + CLP_Buffer
;---------------------------------------------------------------------[] ;---------------------------------------------------------------------[]
; ;
work_buffer1 equ entry - (256+128) ; 2-© à ¡. ¡ãä¥à ; 128 bytes ;work_buffer1 equ entry - (256+128) ; 2-© à ¡. ¡ãä¥à ; 128 bytes
work_buffer2 equ entry - 256 ; 3-© à ¡. ¡ãä¥à ; 256 bytes ;work_buffer2 equ entry - 256 ; 3-© à ¡. ¡ãä¥à ; 256 bytes
org 7F00h ; org 7F00h
db "EX" ; exe ID ; db "EX" ; exe ID
db 45h ; exe ⨯ ; db 45h ; exe ⨯
db 0 ; exe ¢¥àá¨ï ; db 0 ; exe ¢¥àá¨ï
dw 512 ; 512, ¬«. ᬥé. ª®¤  ; dw 512 ; 512, ¬«. ᬥé. ª®¤ 
dw 0 ; áâ. ᬥé. ª®¤  ; dw 0 ; áâ. ᬥé. ª®¤ 
dw 0 ; end-beg, ¯¥à¢¨ç­ë© § £àã§ç¨ª ; dw 0 ; end-beg, ¯¥à¢¨ç­ë© § £àã§ç¨ª
dw 0,0,0 ; १¥à¢ ; dw 0,0,0 ; १¥à¢
dw entry ;  ¤à¥á § £à㧪¨ ª®¤  ; dw entry ;  ¤à¥á § £à㧪¨ ª®¤ 
dw shell ;  ¤à¥á ¯¥à¥¤ ç¨ ã¯à ¢«¥­¨ï ; dw shell ;  ¤à¥á ¯¥à¥¤ ç¨ ã¯à ¢«¥­¨ï
dw #BFFE ;  ¤à¥á á⥪  ; dw #BFFE ;  ¤à¥á á⥪ 
ds 490 ; १¥à¢ ; ds 490 ; १¥à¢
; ‚¥àá¨ï/Œ®¤¨ä¨ª æ¨ï/<2F>¨«¤ 襫«  ; ‚¥àá¨ï/Œ®¤¨ä¨ª æ¨ï/<2F>¨«¤ 襫« 
entry: db "0.01.003" ;!FIXIT ¯¥à¥­¥á⨠¢ ª®­¥æ ;entry: db "0.01.003" ;!FIXIT ¯¥à¥­¥á⨠¢ ª®­¥æ
; INCLUDE 'Shared_Includes/constants/EXE_Header.z80' INCLUDE 'Shared_Includes/constants/EXE_Header.z80'
; ORG org_addr ORG org_addr
;============================================================== ;==============================================================
; ’®çª  ¢å®¤  ¢ ˜¥«« ; ’®çª  ¢å®¤  ¢ ˜¥««
;============================================================== ;==============================================================
@ -158,7 +158,7 @@ run_shell_loop1:
or a or a
jr z,run_shell_loop1 ; ¯ãáâ ï jr z,run_shell_loop1 ; ¯ãáâ ï
; <20> àᨭ£ ¨ ¢ë¯®«­¥­¨¥ ª®¬ ­¤ ; <20> àᨭ£ ¨ ¢ë¯®«­¥­¨¥ ª®¬ ­¤
call A82E7 call COMP
jr run_shell_loop ; ­ § ¤ ¢ 横« jr run_shell_loop ; ­ § ¤ ¢ 横«
@ -519,7 +519,7 @@ T8C24: db "OFF",0
include "Commands/set.asm" ; § ¤ âì ¯¥à¥¬¥­­ãî ®ªà㦥­¨ï include "Commands/set.asm" ; § ¤ âì ¯¥à¥¬¥­­ãî ®ªà㦥­¨ï
include "Commands/reboot.asm" ; á®äâ à¥á¥â include "Commands/reboot.asm" ; á®äâ à¥á¥â
; ;
DISPLAY "Empty space for buffers from ",/H,$
;work_buffer1 equ $ ; 2-© à ¡. ¡ãä¥à ; 128 bytes work_buffer1 equ $ ; 2-© à ¡. ¡ãä¥à ; 128 bytes
;work_buffer2 equ work_buffer1+128 ; 3-© à ¡. ¡ãä¥à ; 256 bytes work_buffer2 equ work_buffer1+128 ; 3-© à ¡. ¡ãä¥à ; 256 bytes
; ;

View File

@ -6,7 +6,7 @@ D8374: dw 0
;------------------------------------------------------------- ;-------------------------------------------------------------
; <20> §¡®à ¨ ¢ë¯®«­¥­¨¥ ¢¢¥¤¥­­ëå ª®¬ ­¤ ¨ ¨¬¥­ ä ©«®¢ ; <20> §¡®à ¨ ¢ë¯®«­¥­¨¥ ¢¢¥¤¥­­ëå ª®¬ ­¤ ¨ ¨¬¥­ ä ©«®¢
;------------------------------------------------------------- ;-------------------------------------------------------------
A82E7: call EVALCMD ; (batch.asm) COMP: call EVALCMD ; (batch.asm)
ld hl,struct_input_line+5 ld hl,struct_input_line+5
dec hl dec hl
;ld hl,struct_input_line+4;; ;ld hl,struct_input_line+4;;
@ -14,15 +14,15 @@ A82E7: call EVALCMD ; (batch.asm)
ld b,0 ld b,0
inc hl ; struct_input_line+5 inc hl ; struct_input_line+5
;ld hl,work_buffer+256;; ;ld hl,work_buffer+256;;
A82F2: ld a,(hl) .loop: ld a,(hl)
cp " " cp " "
jr nz,A82FC jr nz,COMP01
inc hl inc hl
dec c dec c
jr nz,A82F2 jr nz,.loop
ret ret
; ;
A82FC: ld d,h COMP01: ld d,h
ld e,l ld e,l
add hl,bc add hl,bc
ld (hl),0 ld (hl),0
@ -31,28 +31,28 @@ A82FC: ld d,h
ex af,af' ex af,af'
ld a," " ld a," "
cpir cpir
jr nz,A830C jr nz,COMP005
inc c inc c
A830C: ex af,af' COMP005: ex af,af'
sub c sub c
ld c,a ld c,a
ld hl,CMDLIST ; ᯨ᮪ ª®¬ ­¤ „Ž‘-  ld hl,CMDLIST ; ᯨ᮪ ª®¬ ­¤ „Ž‘- 
; de=struct_input_line+5, c=¤«¨­  áâப¨ ; de=struct_input_line+5, c=¤«¨­  áâப¨
; ®â bat-®âà ¡®âª¨ ; ®â bat-®âà ¡®âª¨
A8312: push bc COMP004: push bc
push de push de
A8314: ld a,(de) COMP000: ld a,(de)
cp "a" cp "a"
jr c,A8321 jr c,COMP001
cp "z"+1 cp "z"+1
jr nc,A8321 jr nc,COMP001
and 5Fh ; a..z -> A..Z and #5F ; a..z -> A..Z
A8321: cp (hl) COMP001: cp (hl)
jr nz,COMP002 ; ­¥ ¤®á-ª®¬ ­¤ë jr nz,COMP002 ; ­¥ ¤®á-ª®¬ ­¤ë
inc hl inc hl
inc de inc de
dec c dec c
jr nz,A8314 jr nz,COMP000
xor a xor a
cp (hl) cp (hl)
jr nz,COMP002 jr nz,COMP002
@ -60,9 +60,9 @@ A8321: cp (hl)
pop bc pop bc
ld a,(de) ld a,(de)
cp " " cp " "
jr nz,A8338 jr nz,NOSPC
inc de inc de
A8338: inc hl NOSPC: inc hl
ld a,(hl) ld a,(hl)
inc hl inc hl
ld h,(hl) ld h,(hl)
@ -79,7 +79,7 @@ COMP002: xor a
pop bc pop bc
ld a,(hl) ld a,(hl)
or a or a
jr nz,A8312 ; ­ § ¤ ¢ 横«, ¥é¥ ­¥ ¤®è«¨ ª®­æ  ᯨ᪠ ¤®á-ª®¬ ­¤ jr nz,COMP004 ; ­ § ¤ ¢ 横«, ¥é¥ ­¥ ¤®è«¨ ª®­æ  ᯨ᪠ ¤®á-ª®¬ ­¤
ld h,d ld h,d
ld l,e ld l,e
; hl=struct_input_line+5 ; hl=struct_input_line+5
@ -89,17 +89,18 @@ COMP002: xor a
inc hl inc hl
ld a,(hl) ;+2 3-© ᨬ¢®« ld a,(hl) ;+2 3-© ᨬ¢®«
or a ; § ¤ ­ ¤¨áª ⨯  "x:" ? or a ; § ¤ ­ ¤¨áª ⨯  "x:" ?
jr nz,A8376 ; ­¥â, ¨¬¥¥¬ ¡®«ìè¥ 2-å ᨬ¢®«®¢ jr nz,RUN_EXT ; ­¥â, ¨¬¥¥¬ ¡®«ìè¥ 2-å ᨬ¢®«®¢
ld a,":" ; ¯®áâä¨ªá ¡ãª¢ë ¤¨áª  ld a,":" ; ¯®áâä¨ªá ¡ãª¢ë ¤¨áª 
cp c ; 2-© ᨬ¢®« cp c ; 2-© ᨬ¢®«
jr nz,A8376 ; § ¤ ­ ­¥ ¤¨áª jr nz,RUN_EXT ; § ¤ ­ ­¥ ¤¨áª
ld a,b ; 1-© ᨬ¢®« ld a,b ; 1-© ᨬ¢®«
cp "a" cp "a"
jr c,A8369 jr c,NOUP
cp "z"+1 cp "z"+1
jr nc,A8369 jr nc,NOUP
and 5Fh ; a..z -> A..Z and 5Fh ; a..z -> A..Z
A8369: sub "A" ; ­®¬¥à ¤¨áª  ;!!!!! âãâ ¢®ááâ ­ ¢«¨¢ ¥âáï ¤¨à¥ªâ®à¨ï ¨ ¬®£ãâ ¡ëâì £«îª¨ ­  ­®¢®¬ ï¤à¥
NOUP: sub "A" ; ­®¬¥à ¤¨áª 
ld c,Dss.ChDisk ; ᬥ­¨âì ⥪. ¤¨áª ld c,Dss.ChDisk ; ᬥ­¨âì ⥪. ¤¨áª
RST ToDSS RST ToDSS
jp c,print_err_message ; ¢ë¢®¤ á®®¡é¥­¨ï jp c,print_err_message ; ¢ë¢®¤ á®®¡é¥­¨ï
@ -119,7 +120,7 @@ A8369: sub "A" ;
jp save_disk_path ; Ok jp save_disk_path ; Ok
; § ¤ ­ ­¥ ¤¨áª ; § ¤ ­ ­¥ ¤¨áª
A8376: ex de,hl ; ¢®ááâ.  ¤à¥á ­ ç «  áâப¨ RUN_EXT: ex de,hl ; ¢®ááâ.  ¤à¥á ­ ç «  áâப¨
ld (D8374),hl ; struct_input_line+5 ld (D8374),hl ; struct_input_line+5
ld de,T8C1A ; ¡ãä¥à ld de,T8C1A ; ¡ãä¥à
ld bc,4*256 + Dss.EX_Path ; ¢ë¤¥«¨âì à áè. ä ©«  ld bc,4*256 + Dss.EX_Path ; ¢ë¤¥«¨âì à áè. ä ©« 

View File

@ -1 +1 @@
63 67

@ -1 +1 @@
Subproject commit 517e3de074aab733f683abb328a4ffc8e0a2b284 Subproject commit 7f4046e7fabff85738efcf2a7aa1dbbeca7af906