izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-24 03:48:06 +11:00
Code Issues Releases Wiki Activity

ed: check addr bounds

Browse Source
This commit is contained in:
Virgil Dupras 2019-07-14 09:04:51 -04:00
parent c811d5330c
commit 50d0dc982c
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/ed/cmd.asm
View File

@ -153,17 +153,3 @@ cmdParse:
pop bc
ret
; Make (IX) point to addr 1
cmdAddr1:
ld ix, CMD_ADDR1
ret
; Make (IX) point to addr 2
cmdAddr2:
ld ix, CMD_ADDR2
ret
; Set A to CMD_TYPE
cmdType:
ld a, (CMD_TYPE)
ret

44
apps/ed/main.asm
View File

@ -88,22 +88,17 @@ edMain:
call stdioGetLine
call cmdParse
jr nz, .error
call cmdType
ld a, (CMD_TYPE)
cp 'q'
ret z
jr z, .doQuit
jr .doPrint
.doQuit:
xor a
ret
.doPrint:
call cmdAddr1
call edResolveAddr
ex de, hl ; DE: addr1
call cmdAddr2
call edResolveAddr
ld (ED_CURLINE), hl
ex de, hl ; HL: addr1, DE: addr2
call cpHLDE
jr z, .doPrintLoop ; DE == HL, ok
jr nc, .error ; DE < HL, not good
call edReadAddrs
jr nz, .error
.doPrintLoop:
push hl
call bufGetLine
@ -112,9 +107,12 @@ edMain:
call printcrlf
pop hl
call cpHLDE
jr nc, .mainLoop
jr z, .doPrintEnd
inc hl
jr .doPrintLoop
.doPrintEnd:
ld (ED_CURLINE), hl
jr .mainLoop
.error:
ld a, '?'
call stdioPutC
@ -140,3 +138,23 @@ edResolveAddr:
pop de
ret
; Read absolute addr1 in HL and addr2 in DE. Also, check bounds and set Z if
; both addresses are within bounds, unset if not.
edReadAddrs:
ld ix, CMD_ADDR2
call edResolveAddr
ex de, hl
ld hl, (BUF_LINECNT)
ex de, hl ; HL: addr2 DE: cnt
call cpHLDE
jp nc, unsetZ ; HL (addr2) >= DE (cnt). no good
ex de, hl ; DE: addr2
ld ix, CMD_ADDR1
call edResolveAddr
ex de, hl ; HL: addr2, DE: addr1
call cpHLDE
jp c, unsetZ ; HL (addr2) < DE (addr1). no good
ex de, hl ; HL: addr1, DE: addr2
cp a ; ensure Z
ret