mirror of
https://github.com/hsoft/collapseos.git
synced 2024-09-07 21:08:45 +10:00
73c3fc7947
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.
141 lines
2.1 KiB
NASM
141 lines
2.1 KiB
NASM
; named shell_.asm to avoid infinite include loop.
|
|
.equ RAMSTART 0x4000
|
|
.equ KERNEL_RAMEND 0x5000
|
|
.equ USERCODE 0x9000
|
|
.equ STDIO_PORT 0x00
|
|
.equ FS_DATA_PORT 0x01
|
|
.equ FS_SEEKL_PORT 0x02
|
|
.equ FS_SEEKH_PORT 0x03
|
|
.equ FS_SEEKE_PORT 0x04
|
|
|
|
jp init
|
|
|
|
; *** JUMP TABLE ***
|
|
jp printstr
|
|
|
|
#include "core.asm"
|
|
#include "parse.asm"
|
|
|
|
.equ BLOCKDEV_RAMSTART RAMSTART
|
|
.equ BLOCKDEV_COUNT 3
|
|
#include "blockdev.asm"
|
|
; List of devices
|
|
.dw fsdevGetC, fsdevPutC, fsdevSeek, fsdevTell
|
|
.dw stdoutGetC, stdoutPutC, stdoutSeek, stdoutTell
|
|
.dw stdinGetC, stdinPutC, stdinSeek, stdinTell
|
|
|
|
#include "blockdev_cmds.asm"
|
|
|
|
.equ STDIO_RAMSTART BLOCKDEV_RAMEND
|
|
#include "stdio.asm"
|
|
|
|
.equ FS_RAMSTART STDIO_RAMEND
|
|
.equ FS_HANDLE_COUNT 2
|
|
#include "fs.asm"
|
|
#include "fs_cmds.asm"
|
|
|
|
.equ SHELL_RAMSTART FS_RAMEND
|
|
.equ SHELL_EXTRA_CMD_COUNT 9
|
|
#include "shell.asm"
|
|
.dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
|
|
.dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd
|
|
|
|
.equ PGM_CODEADDR USERCODE
|
|
#include "pgm.asm"
|
|
|
|
init:
|
|
di
|
|
; setup stack
|
|
ld hl, KERNEL_RAMEND
|
|
ld sp, hl
|
|
ld hl, emulGetC
|
|
ld de, emulPutC
|
|
call stdioInit
|
|
call fsInit
|
|
ld a, 0 ; select fsdev
|
|
ld de, BLOCKDEV_GETC
|
|
call blkSel
|
|
call fsOn
|
|
call shellInit
|
|
ld hl, pgmShellHook
|
|
ld (SHELL_CMDHOOK), hl
|
|
jp shellLoop
|
|
|
|
emulGetC:
|
|
; Blocks until a char is returned
|
|
in a, (STDIO_PORT)
|
|
cp a ; ensure Z
|
|
ret
|
|
|
|
emulPutC:
|
|
out (STDIO_PORT), a
|
|
ret
|
|
|
|
fsdevGetC:
|
|
in a, (FS_DATA_PORT)
|
|
cp a ; ensure Z
|
|
ret
|
|
|
|
fsdevPutC:
|
|
out (FS_DATA_PORT), a
|
|
ret
|
|
|
|
fsdevSeek:
|
|
push af
|
|
ld a, l
|
|
out (FS_SEEKL_PORT), a
|
|
ld a, h
|
|
out (FS_SEEKH_PORT), a
|
|
ld a, e
|
|
out (FS_SEEKE_PORT), a
|
|
pop af
|
|
ret
|
|
|
|
fsdevTell:
|
|
push af
|
|
in a, (FS_SEEKL_PORT)
|
|
ld l, a
|
|
in a, (FS_SEEKH_PORT)
|
|
ld h, a
|
|
in a, (FS_SEEKE_PORT)
|
|
ld e, a
|
|
pop af
|
|
ret
|
|
|
|
.equ STDOUT_HANDLE FS_HANDLES
|
|
|
|
stdoutGetC:
|
|
ld ix, STDOUT_HANDLE
|
|
jp fsGetC
|
|
|
|
stdoutPutC:
|
|
ld ix, STDOUT_HANDLE
|
|
jp fsPutC
|
|
|
|
stdoutSeek:
|
|
ld ix, STDOUT_HANDLE
|
|
jp fsSeek
|
|
|
|
stdoutTell:
|
|
ld ix, STDOUT_HANDLE
|
|
jp fsTell
|
|
|
|
.equ STDIN_HANDLE FS_HANDLES+FS_HANDLE_SIZE
|
|
|
|
stdinGetC:
|
|
ld ix, STDIN_HANDLE
|
|
jp fsGetC
|
|
|
|
stdinPutC:
|
|
ld ix, STDIN_HANDLE
|
|
jp fsPutC
|
|
|
|
stdinSeek:
|
|
ld ix, STDIN_HANDLE
|
|
jp fsSeek
|
|
|
|
stdinTell:
|
|
ld ix, STDIN_HANDLE
|
|
jp fsTell
|
|
|