izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-08 22:38:05 +11:00
Code Issues Releases Wiki Activity
019d05f64c
collapseos/apps/shell/pgm.asm

52 lines
1.4 KiB
NASM
Raw Normal View History

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
; pgm - execute programs loaded from filesystem
;
; Implements a shell hook that searches the filesystem for a file with the same
; name as the cmd, loads that file in memory and executes it, sending the
; program a pointer to *unparsed* arguments in HL.
;
; We expect the loaded program to return a status code in A. 0 means success,
; non-zero means error. Programs should avoid having error code overlaps with
; the shell so that we know where the error comes from.
;
pgm: have its own file handle
2019-06-03 23:24:43 +10:00
; *** Requirements ***
; fs
;
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
; *** Defines ***
; PGM_CODEADDR: Memory address where to place the code we load.
pgm: have its own file handle
2019-06-03 23:24:43 +10:00
;
; *** Variables ***
.equ PGM_HANDLE PGM_RAMSTART
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
.equ PGM_RAMEND @+FS_HANDLE_SIZE
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
; Routine suitable to plug into SHELL_CMDHOOK. HL points to the full cmdline.
shell: allow cmds to be shorter than 4 chars
2019-07-22 05:57:55 +10:00
; which has been processed to replace the first ' ' with a null char.
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
pgmShellHook:
shell: allow cmds to be shorter than 4 chars
2019-07-22 05:57:55 +10:00
; (HL) is suitable for a direct fsFindFN call
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
call fsFindFN
jr nz, .noFile
shell: allow cmds to be shorter than 4 chars
2019-07-22 05:57:55 +10:00
; We have a file! Advance HL to args
xor a
call findchar
inc hl ; beginning of args
; Alright, ready to run!
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
jp .run
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
.noFile:
ld a, SHELL_ERR_IO_ERROR
ret
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
.run:
pgm: properly pass shell args in HL
2019-06-03 22:56:39 +10:00
push hl ; unparsed args
pgm: have its own file handle
2019-06-03 23:24:43 +10:00
ld ix, PGM_HANDLE
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
call fsOpen
pgm: adapt to recent blkdev change With fsGetC becoming a "random address" API, it broke pgm. This commit fixes it. To avoid adding the weight of a blkdev in pgm, I manage the read offset directly in pgm.
2019-06-06 04:45:38 +10:00
ld hl, 0 ; addr that we read in file handle
ld de, PGM_CODEADDR ; addr in mem we write to
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
.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 fsGetB ; we use Z at end of loop
pgm: adapt to recent blkdev change With fsGetC becoming a "random address" API, it broke pgm. This commit fixes it. To avoid adding the weight of a blkdev in pgm, I manage the read offset directly in pgm.
2019-06-06 04:45:38 +10:00
ld (de), a ; Z preserved
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
inc hl ; Z preserved in 16-bit
pgm: adapt to recent blkdev change With fsGetC becoming a "random address" API, it broke pgm. This commit fixes it. To avoid adding the weight of a blkdev in pgm, I manage the read offset directly in pgm.
2019-06-06 04:45:38 +10:00
inc de ; Z preserved in 16-bit
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
jr z, .loop
pgm: properly pass shell args in HL
2019-06-03 22:56:39 +10:00
pop hl ; recall args
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
; ready to jump!
jp PGM_CODEADDR
Reference in New Issue Copy Permalink