izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-21 04:28:06 +11:00
Code Issues Releases Wiki Activity
3b0029335a
collapseos/tools/emul/shell/shell_.asm

165 lines
2.5 KiB
NASM
Raw Normal View History

Add tools/emul
2019-05-10 02:58:41 +10:00
; named shell_.asm to avoid infinite include loop.
Make the shell emulator be built by zasm
2019-05-20 21:29:19 +10:00
.equ RAMSTART 0x4000
We can now assemble source files from within the shell!
2019-06-04 01:15:07 +10:00
; kernel ram is well under 0x100 bytes. We're giving us 0x200 bytes so that we
; never worry about the stack.
.equ KERNEL_RAMEND 0x4200
.equ USERCODE KERNEL_RAMEND
Make the shell emulator be built by zasm
2019-05-20 21:29:19 +10:00
.equ STDIO_PORT 0x00
.equ FS_DATA_PORT 0x01
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.equ FS_ADDR_PORT 0x02
Add tools/emul
2019-05-10 02:58:41 +10:00
Make the shell emulator be built by zasm
2019-05-20 21:29:19 +10:00
jp init
Add tools/emul
2019-05-10 02:58:41 +10:00
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
; *** JUMP TABLE ***
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 22:32:25 +10:00
jp strncmp
jp addDE
jp addHL
jp upcase
jp unsetZ
jp intoDE
jp intoHL
jp writeHLinDE
jp findchar
jp parseHex
jp parseHexPair
jp blkSel
fs: further adjust to previous blkdev refactoring Previous refacoring broke all seek/tell within fs. fs handles now lost the responsibility to keep track of current position. It's blkdev's job.
2019-06-05 10:45:01 +10:00
jp blkSet
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 22:32:25 +10:00
jp fsFindFN
jp fsOpen
jp fsGetC
jp cpHLDE
jp parseArgs
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
jp printstr
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
jp _blkGetC
jp _blkPutC
jp _blkSeek
jp _blkTell
apps/ed: first steps
2019-07-13 23:57:37 +10:00
jp printcrlf
apps/ed: print specified line
2019-07-14 04:01:20 +10:00
jp stdioPutC
apps/ed: first steps
2019-07-13 23:57:37 +10:00
jp stdioReadC
jp stdioGetLine
apps/ed: start implementing I/O
2019-07-14 01:29:06 +10:00
jp blkGetC
jp blkSeek
apps/ed: print specified line
2019-07-14 04:01:20 +10:00
jp blkTell
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
Add tools/emul
2019-05-10 02:58:41 +10:00
#include "core.asm"
Make userspace parse args the same way the shell does
2019-06-03 04:05:20 +10:00
#include "err.h"
Add the concept of unit tests Will be much much easier to tests new core routines without having to re-create their context first. Also, extract parse.asm from core.asm
2019-05-17 23:33:20 +10:00
#include "parse.asm"
Add tools/emul
2019-05-10 02:58:41 +10:00
Make the shell emulator be built by zasm
2019-05-20 21:29:19 +10:00
.equ BLOCKDEV_RAMSTART RAMSTART
We can now assemble source files from within the shell!
2019-06-04 01:15:07 +10:00
.equ BLOCKDEV_COUNT 4
Add tools/emul
2019-05-10 02:58:41 +10:00
#include "blockdev.asm"
; List of devices
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.dw fsdevGetC, fsdevPutC
.dw stdoutGetC, stdoutPutC
.dw stdinGetC, stdinPutC
.dw mmapGetC, mmapPutC
Add tools/emul
2019-05-10 02:58:41 +10:00
We can now assemble source files from within the shell!
2019-06-04 01:15:07 +10:00
.equ MMAP_START 0xe000
#include "mmap.asm"
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.equ STDIO_RAMSTART BLOCKDEV_RAMEND
stdio: de-macro-ize
2019-05-17 22:14:19 +10:00
#include "stdio.asm"
.equ FS_RAMSTART STDIO_RAMEND
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
.equ FS_HANDLE_COUNT 2
#include "fs.asm"
Make the shell emulator be built by zasm
2019-05-20 21:29:19 +10:00
.equ SHELL_RAMSTART FS_RAMEND
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
.equ SHELL_EXTRA_CMD_COUNT 9
Add tools/emul
2019-05-10 02:58:41 +10:00
#include "shell.asm"
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
.dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
.dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
blockdev: make selection structure opaque I'm about to change that structure and I don't want fs to be messed up by this. I'm proceeding step by step...
2019-06-04 23:56:36 +10:00
#include "blockdev_cmds.asm"
#include "fs_cmds.asm"
pgm: have its own file handle
2019-06-03 23:24:43 +10:00
.equ PGM_RAMSTART SHELL_RAMEND
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
.equ PGM_CODEADDR USERCODE
#include "pgm.asm"
blockdev: make selection structure opaque I'm about to change that structure and I don't want fs to be messed up by this. I'm proceeding step by step...
2019-06-04 23:56:36 +10:00
;.out PGM_RAMEND
We can now assemble source files from within the shell!
2019-06-04 01:15:07 +10:00
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
init:
di
; setup stack
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
ld hl, KERNEL_RAMEND
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
ld sp, hl
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, emulGetC
ld de, emulPutC
stdio: de-macro-ize
2019-05-17 22:14:19 +10:00
call stdioInit
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
call fsInit
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 a, 0 ; select fsdev
blockdev: make selection structure opaque I'm about to change that structure and I don't want fs to be messed up by this. I'm proceeding step by step...
2019-06-04 23:56:36 +10:00
ld de, BLOCKDEV_SEL
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
call blkSel
call fsOn
call shellInit
pgm: new kernel module The pgm module implements a shell hook so that when an unknown command is typed, we look into the mounted filesystem and look for a file with the same name as the command. If we find one, we load it in memory and run it.
2019-06-01 04:50:43 +10:00
ld hl, pgmShellHook
ld (SHELL_CMDHOOK), hl
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
jp shellLoop
Add tools/emul
2019-05-10 02:58:41 +10:00
emulGetC:
; Blocks until a char is returned
in a, (STDIO_PORT)
cp a ; ensure Z
ret
emulPutC:
out (STDIO_PORT), a
ret
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
fsdevGetC:
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
ld a, e
out (FS_ADDR_PORT), a
ld a, h
out (FS_ADDR_PORT), a
ld a, l
out (FS_ADDR_PORT), a
in a, (FS_ADDR_PORT)
or a
ret nz
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
in a, (FS_DATA_PORT)
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
cp a ; ensure Z
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
ret
fsdevPutC:
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
push af
Make blockdev pointers 32 bits This allows us to break through the 64K limit for includes CFS in zasm, a limit we were dangerously close to breaking. In fact, this commit makes us go over that limit. Right in time!
2019-05-29 05:56:39 +10:00
ld a, e
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
out (FS_ADDR_PORT), a
ld a, h
out (FS_ADDR_PORT), a
ld a, l
out (FS_ADDR_PORT), a
in a, (FS_ADDR_PORT)
Allow file-to-file compilation in the emulated shell
2019-06-06 09:51:19 +10:00
cp 2 ; only A > 1 means error
jr nc, .error ; A >= 2
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
pop af
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
out (FS_DATA_PORT), a
Fix error handling when writing to files in emulated shell
2019-06-06 06:13:15 +10:00
cp a ; ensure Z
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
ret
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
.error:
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
pop af
blockdev: make implementors "random access" This huge refactoring remove the Seek and Tell routine from blockdev implementation requirements and change GetC and PutC's API so that they take an address to read and write (through HL/DE) at each call. The "PTR" approach in blockdev implementation was very redundant from device to device and it made more sense to generalize. It's possible that future device aren't "random access", but we'll be able to add more device types later. Another important change in this commit is that the "blockdev handle" is now opaque. Previously, consumers of the API would happily call routines directly from one of the 4 offsets. We can't do that any more. This makes the API more solid for future improvements. This change forced me to change a lot of things in fs, but overall, things are now simpler. No more `FS_PTR`: the "device handle" now holds the active pointer. Lots, lots of changes, but it also feels a lot cleaner and solid.
2019-06-05 01:53:02 +10:00
jp unsetZ ; returns
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
.equ STDOUT_HANDLE FS_HANDLES
stdoutGetC:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, STDOUT_HANDLE
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
jp fsGetC
stdoutPutC:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, STDOUT_HANDLE
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
jp fsPutC
.equ STDIN_HANDLE FS_HANDLES+FS_HANDLE_SIZE
stdinGetC:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, STDIN_HANDLE
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
jp fsGetC
stdinPutC:
fs: adjust to DE->IX change in recipe/emul glue code
2019-06-03 00:18:03 +10:00
ld ix, STDIN_HANDLE
parts/z80/fs: add "fopn" command
2019-05-13 05:38:58 +10:00
jp fsPutC
Reference in New Issue Copy Permalink