mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-09 07:58:05 +11:00
019d05f64c
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.
36 lines
759 B
NASM
36 lines
759 B
NASM
; This repesents a full-featured shell, that is, a shell that includes all
|
|
; options it has to offer. For a minimal shell, use "gluem.asm"
|
|
.inc "user.h"
|
|
.inc "err.h"
|
|
.inc "ascii.h"
|
|
.inc "blkdev.h"
|
|
.inc "fs.h"
|
|
jp init
|
|
|
|
.inc "core.asm"
|
|
.inc "lib/util.asm"
|
|
.inc "lib/parse.asm"
|
|
.inc "lib/args.asm"
|
|
.equ SHELL_RAMSTART USER_RAMSTART
|
|
.equ SHELL_EXTRA_CMD_COUNT 9
|
|
.inc "shell/main.asm"
|
|
.dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd
|
|
.dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd
|
|
|
|
.equ STDIO_RAMSTART SHELL_RAMEND
|
|
.inc "lib/stdio.asm"
|
|
.inc "shell/blkdev.asm"
|
|
.inc "shell/fs.asm"
|
|
|
|
.equ PGM_RAMSTART STDIO_RAMEND
|
|
.equ PGM_CODEADDR USER_CODE
|
|
.inc "shell/pgm.asm"
|
|
|
|
init:
|
|
call shellInit
|
|
ld hl, pgmShellHook
|
|
ld (SHELL_CMDHOOK), hl
|
|
jp shellLoop
|
|
|
|
USER_RAMSTART:
|