izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-23 18:28:06 +11:00
Code Issues 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
; Found!
; 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
jr .end
.notfound:

4
tools/emul/Makefile
View File

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

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

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