mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-08 15:38:06 +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.
45 lines
702 B
NASM
45 lines
702 B
NASM
; *** Requirements ***
|
|
; BLOCKDEV_SIZE
|
|
; FS_HANDLE_SIZE
|
|
; _blkGetB
|
|
; _blkPutB
|
|
; _blkSeek
|
|
; _blkTell
|
|
; fsFindFN
|
|
; fsOpen
|
|
; fsGetB
|
|
; fsPutB
|
|
; fsSetSize
|
|
; printstr
|
|
; printcrlf
|
|
; stdioReadLine
|
|
; stdioPutC
|
|
;
|
|
.inc "user.h"
|
|
|
|
; *** Overridable consts ***
|
|
; Maximum number of lines allowed in the buffer.
|
|
.equ ED_BUF_MAXLINES 0x800
|
|
; Size of our scratchpad
|
|
.equ ED_BUF_PADMAXLEN 0x1000
|
|
|
|
; ******
|
|
|
|
.inc "err.h"
|
|
.inc "fs.h"
|
|
.inc "blkdev.h"
|
|
jp edMain
|
|
|
|
.inc "core.asm"
|
|
.inc "lib/util.asm"
|
|
.inc "lib/parse.asm"
|
|
.equ IO_RAMSTART USER_RAMSTART
|
|
.inc "ed/io.asm"
|
|
.equ BUF_RAMSTART IO_RAMEND
|
|
.inc "ed/buf.asm"
|
|
.equ CMD_RAMSTART BUF_RAMEND
|
|
.inc "ed/cmd.asm"
|
|
.equ ED_RAMSTART CMD_RAMEND
|
|
.inc "ed/main.asm"
|
|
USER_RAMSTART:
|