izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2025-04-05 06:38:40 +11:00
Code Issues Releases Wiki Activity

parseArgs: return number of arguments

Browse Source
This commit is contained in:
Valentin Lenhart 2019-10-20 20:25:48 +02:00
parent 8a696a1e23
commit c3ad620ba8
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/at28w/main.asm
View File

@ -14,7 +14,8 @@ at28wMain:
ld de, .argspecs ld de, .argspecs
ld ix, AT28W_MAXBYTES ld ix, AT28W_MAXBYTES
call parseArgs call parseArgs
jr z, at28wInner cp 0xff
jr nz, at28wInner
; bad args ; bad args
ld a, SHELL_ERR_BAD_ARGS ld a, SHELL_ERR_BAD_ARGS
ret ret

3
apps/zasm/main.asm
View File

@ -27,7 +27,8 @@ zasmMain:
ld de, .argspecs ld de, .argspecs
ld ix, ZASM_RAMSTART ld ix, ZASM_RAMSTART
call parseArgs call parseArgs
jr z, .goodargs cp 0xff
jr nz, .goodargs
; bad args ; bad args
ld hl, 0 ld hl, 0
ld de, 0 ld de, 0

19
kernel/parse.asm
View File

@ -90,12 +90,13 @@ parseArgs:
ld (ix+1), a ld (ix+1), a
ld (ix+2), a ld (ix+2), a
ld b, PARSE_ARG_MAXCOUNT ld b, PARSE_ARG_MAXCOUNT
.loop:
ld a, (hl) ld a, (hl)
; is this the end of the line? ; is this the end of the line?
or a ; cp 0 or a ; cp 0
jr z, .endofargs jr z, .noargs
.loop:
; Get the specs ; Get the specs
ld a, (de) ld a, (de)
bit 0, a ; do we have an arg? bit 0, a ; do we have an arg?
@ -108,6 +109,7 @@ parseArgs:
; it a day. Little endian, remember ; it a day. Little endian, remember
ld (ix), l ld (ix), l
ld (ix+1), h ld (ix+1), h
dec b
jr .success ; directly to success: skip endofargs checks jr .success ; directly to success: skip endofargs checks
.notAString: .notAString:
@ -134,6 +136,12 @@ parseArgs:
jr nz, .error jr nz, .error
inc hl inc hl
.nospacecheck: .nospacecheck:
ld a, (hl)
; is this the end of the line?
or a ; cp 0
jr z, .endofargs
djnz .loop djnz .loop
; If we get here, it means that our next char *has* to be a null char ; If we get here, it means that our next char *has* to be a null char
ld a, (hl) ld a, (hl)
@ -142,6 +150,8 @@ parseArgs:
jr .error jr .error
.endofargs: .endofargs:
dec b
.noargs:
; We encountered our null char. Let's verify that we either have no ; We encountered our null char. Let's verify that we either have no
; more args or that they are optional ; more args or that they are optional
ld a, (de) ld a, (de)
@ -151,10 +161,11 @@ parseArgs:
jr z, .error ; if unset, arg is not optional. error jr z, .error ; if unset, arg is not optional. error
; success ; success
.success: .success:
xor a ld a, PARSE_ARG_MAXCOUNT
sbc a, b
jr .end jr .end
.error: .error:
inc a ld a, 0xff
.end: .end:
pop ix pop ix
pop hl pop hl

4
kernel/shell.asm
View File

@ -155,8 +155,8 @@ shellParse:
; We're ready to parse args ; We're ready to parse args
ld ix, SHELL_CMD_ARGS ld ix, SHELL_CMD_ARGS
call parseArgs call parseArgs
or a ; cp 0 cp 0xff
jr nz, .parseerror jr z, .parseerror
; Args parsed, now we can load the routine address and call it. ; Args parsed, now we can load the routine address and call it.
; let's have DE point to the jump line ; let's have DE point to the jump line