izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-10 02:48:05 +11:00
Code Issues Releases Wiki Activity
7c893dada1
collapseos/apps/shell/blkdev.asm

119 lines
2.0 KiB
NASM
Raw Normal View History

blockdev: make "seek" print out its resulting position Also, extract commands into blockdev_cmds to avoid making blockdev dependent on stdio.
2019-04-23 12:54:23 +10:00
; *** REQUIREMENTS ***
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
; blkSelPtr
; blkSel
; blkSeek
; blkTell
blockdev: make "seek" print out its resulting position Also, extract commands into blockdev_cmds to avoid making blockdev dependent on stdio.
2019-04-23 12:54:23 +10:00
blkBselCmd:
.db "bsel", 0b001, 0, 0
ld a, (hl) ; argument supplied
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
push de
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
call blkSelPtr
blockdev: make "seek" print out its resulting position Also, extract commands into blockdev_cmds to avoid making blockdev dependent on stdio.
2019-04-23 12:54:23 +10:00
call blkSel
zasm: use blkdev IDs as input and output This will soon allow use to seek and tell on input, which is necessary for a second pass which is necessary for forward symbol references. This require making `blkSel` a bit more flexible. Rather than having one global selected blkdev, each app can select its own, in its own memory space.
2019-05-11 08:20:43 +10:00
pop de
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-16 07:37:49 +11:00
jr nz, .error
blockdev: make "seek" print out its resulting position Also, extract commands into blockdev_cmds to avoid making blockdev dependent on stdio.
2019-04-23 12:54:23 +10:00
xor a
ret
.error:
ld a, BLOCKDEV_ERR_OUT_OF_BOUNDS
ret
blkSeekCmd:
.db "seek", 0b001, 0b011, 0b001
; First, the mode
ld a, (hl)
inc hl
push af ; save mode for later
; HL points to two bytes that contain out address. Seek expects HL
; to directly contain that address.
ld a, (hl)
ex af, af'
inc hl
ld a, (hl)
ld l, a
ex af, af'
ld h, a
pop af ; bring mode back
shell: make seek cmd init DE to 0 So that blkdev not supporting 32-bit aren't messed up.
2019-05-31 04:54:28 +10:00
ld de, 0 ; DE is used for seek > 64K which we don't support
blockdev: make "seek" print out its resulting position Also, extract commands into blockdev_cmds to avoid making blockdev dependent on stdio.
2019-04-23 12:54:23 +10:00
call blkSeek
call blkTell
ld a, h
call printHex
ld a, l
call printHex
call printcrlf
xor a
ret
blockdev: fix load command over-loading a byte Calling `load` would always read one more byte than specified. Also, make `0` mean `0x100`.
2019-06-17 22:19:03 +10:00
; Load the specified number of bytes (max 0x100, 0 means 0x100) from IO and
; write them in the current memory pointer (which doesn't change). If the
; blkdev hits end of stream before we reach our specified number of bytes, we
; stop loading.
blkdev: make load command stop and the end of the stream This allows us to reliably and easily load a file until the end of it.
2019-06-03 01:18:06 +10:00
;
; Returns a SHELL_ERR_IO_ERROR only if we couldn't read any byte (if the first
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
; call to GetB failed)
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
;
; Example: load 42
blkLoadCmd:
.db "load", 0b001, 0, 0
blkLoad:
push bc
push hl
ld a, (hl)
ld b, a
ld hl, (SHELL_MEM_PTR)
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
call blkGetB
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
jr nz, .ioError
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
jr .intoLoop ; we'v already called blkGetB. don't call it
blockdev: fix bug recently introduced in load cmd It would always load one byte less than told... This time it's right on the money :)
2019-06-17 23:54:30 +10:00
; again.
blkdev: make load command stop and the end of the stream This allows us to reliably and easily load a file until the end of it.
2019-06-03 01:18:06 +10:00
.loop:
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
call blkGetB
blockdev: fix bug recently introduced in load cmd It would always load one byte less than told... This time it's right on the money :)
2019-06-17 23:54:30 +10:00
.intoLoop:
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
ld (hl), a
inc hl
blkdev: make load command stop and the end of the stream This allows us to reliably and easily load a file until the end of it.
2019-06-03 01:18:06 +10:00
jr nz, .loopend
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
djnz .loop
blkdev: make load command stop and the end of the stream This allows us to reliably and easily load a file until the end of it.
2019-06-03 01:18:06 +10:00
.loopend:
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
; success
xor a
jr .end
.ioError:
ld a, SHELL_ERR_IO_ERROR
.end:
pop hl
pop bc
ret
blockdev: fix load command over-loading a byte Calling `load` would always read one more byte than specified. Also, make `0` mean `0x100`.
2019-06-17 22:19:03 +10:00
; Load the specified number of bytes (max 0x100, 0 means 0x100) from the current
; memory pointer and write them to I/O. Memory pointer doesn't move. This puts
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
; chars to blkPutB. Raises error if not all bytes could be written.
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
;
; Example: save 42
blkSaveCmd:
.db "save", 0b001, 0, 0
blkSave:
push bc
push hl
ld a, (hl)
ld b, a
ld hl, (SHELL_MEM_PTR)
.loop:
ld a, (hl)
inc hl
Rename blockdev's API routines to GetB/PutB The goal is to avoid mixing those routines with "character devices" (acia, vpd, kbd) which aren't block devices and have routines that have different expectations. This is a first step to fixing #64.
2019-10-31 07:59:35 +11:00
call blkPutB
Fix error handling when writing to files in emulated shell
2019-06-06 06:13:15 +10:00
jr nz, .ioError
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
djnz .loop
Fix error handling when writing to files in emulated shell
2019-06-06 06:13:15 +10:00
.loopend:
; success
xor a
jr .end
.ioError:
ld a, SHELL_ERR_IO_ERROR
shell/stdio: decouple from blkdev (again) Move load/save to blkdev_cmds and add a new "poke" builtin shell cmd that is the mirror of "peek" and strictly uses stdio (no blkdev involved). This allows us to slim the minimal OS size but, more importantly, change the behavior of "load" so that we don't expect GetC to block until Z is set. This way, using "load X" with X being larger than the blkdev size won't block forever. This also brings our RC2014 minimal kernel below the 1K mark again.
2019-06-03 00:50:18 +10:00
.end:
pop hl
pop bc
ret
Reference in New Issue Copy Permalink