izaya/collapseos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the shell emulator be built by zasm

Browse Source
This commit is contained in:
Virgil Dupras 2019-05-20 07:29:19 -04:00
parent fa3b86a5c1
commit c586c0d63c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/fs_cmds.asm
View File

@ -76,7 +76,7 @@ fopnCmd:
jr nz, .notfound jr nz, .notfound
; Found! ; Found!
; FS_PTR points to the file we want to open ; FS_PTR points to the file we want to open
ex hl, de ; HL now points to the file handle. ex de, hl ; HL now points to the file handle.
call fsOpen call fsOpen
jr .end jr .end
.notfound: .notfound:

4
tools/emul/Makefile
View File

@ -7,8 +7,8 @@ ZASMBIN = zasm/zasm
.PHONY: all .PHONY: all
all: $(TARGETS) all: $(TARGETS)
shell/kernel.h: shell/shell_.asm shell/kernel.h: shell/shell_.asm $(ZASMBIN)
scas -o - -I $(KERNEL) $< | ./bin2c.sh KERNEL | tee $@ > /dev/null $(ZASMBIN) < $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
zasm/kernel.h: zasm/kernel.bin zasm/kernel.h: zasm/kernel.bin
./bin2c.sh KERNEL < $< | tee $@ > /dev/null ./bin2c.sh KERNEL < $< | tee $@ > /dev/null

24
tools/emul/shell/shell_.asm
View File

@ -1,18 +1,18 @@
; named shell_.asm to avoid infinite include loop. ; named shell_.asm to avoid infinite include loop.
RAMSTART .equ 0x4000 .equ RAMSTART 0x4000
RAMEND .equ 0x5000 .equ RAMEND 0x5000
STDIO_PORT .equ 0x00 .equ STDIO_PORT 0x00
FS_DATA_PORT .equ 0x01 .equ FS_DATA_PORT 0x01
FS_SEEKL_PORT .equ 0x02 .equ FS_SEEKL_PORT 0x02
FS_SEEKH_PORT .equ 0x03 .equ FS_SEEKH_PORT 0x03
jp init jp init
#include "core.asm" #include "core.asm"
#include "parse.asm" #include "parse.asm"
BLOCKDEV_RAMSTART .equ RAMSTART .equ BLOCKDEV_RAMSTART RAMSTART
BLOCKDEV_COUNT .equ 4 .equ BLOCKDEV_COUNT 4
#include "blockdev.asm" #include "blockdev.asm"
; List of devices ; List of devices
.dw emulGetC, emulPutC, 0, 0 .dw emulGetC, emulPutC, 0, 0
@ -22,7 +22,7 @@ BLOCKDEV_COUNT .equ 4
#include "blockdev_cmds.asm" #include "blockdev_cmds.asm"
STDIO_RAMSTART .equ BLOCKDEV_RAMEND .equ STDIO_RAMSTART BLOCKDEV_RAMEND
#include "stdio.asm" #include "stdio.asm"
.equ FS_RAMSTART STDIO_RAMEND .equ FS_RAMSTART STDIO_RAMEND
@ -30,8 +30,8 @@ STDIO_RAMSTART .equ BLOCKDEV_RAMEND
#include "fs.asm" #include "fs.asm"
#include "fs_cmds.asm" #include "fs_cmds.asm"
SHELL_RAMSTART .equ FS_RAMEND .equ SHELL_RAMSTART FS_RAMEND
SHELL_EXTRA_CMD_COUNT .equ 7 .equ SHELL_EXTRA_CMD_COUNT 7
#include "shell.asm" #include "shell.asm"
.dw blkBselCmd, blkSeekCmd, fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd .dw blkBselCmd, blkSeekCmd, fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd