izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-27 15:18:05 +11:00
Code Issues Releases Wiki Activity

tools/emul: clean up the place a bit

Browse Source
This commit is contained in:
Virgil Dupras 2019-05-17 07:23:59 -04:00
parent 2f0dd5d668
commit def6c2123d
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/emul/Makefile
View File

@ -1,30 +1,30 @@
TARGETS = shell zasm TARGETS = shell/shell zasm/zasm
KERNEL_HEADERS = shell-kernel.h zasm-kernel.h KERNEL_HEADERS = shell/kernel.h zasm/kernel.h
USER_HEADERS = zasm-user.h USER_HEADERS = zasm/user.h
CFSPACK = ../cfspack/cfspack CFSPACK = ../cfspack/cfspack
.PHONY: all .PHONY: all
all: $(TARGETS) all: $(TARGETS)
shell-kernel.h: shell_.asm shell/kernel.h: shell/shell_.asm
zasm-kernel.h: zasm_glue.asm zasm/kernel.h: zasm/glue.asm
$(KERNEL_HEADERS): $(KERNEL_HEADERS):
scas -o - -I ../../parts/z80 $< | ./bin2c.sh KERNEL | tee $@ > /dev/null scas -o - -I ../../parts/z80 $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
zasm-user.h: zasm_user.asm zasm/user.h: zasm/user.asm
scas -o - -I ../../apps/zasm $< | ./bin2c.sh USERSPACE | tee $@ > /dev/null scas -o - -I ../../apps/zasm $< | ./bin2c.sh USERSPACE | tee $@ > /dev/null
zasm-includes.cfs: ../../parts/z80 $(CFSPACK) zasm/includes.cfs: ../../parts/z80 $(CFSPACK)
cp -rf $< zasm-includes cp -rf $< zasm/includes
rm zasm-includes/README.md rm zasm/includes/README.md
$(CFSPACK) zasm-includes > $@ $(CFSPACK) zasm/includes > $@
rm -rf zasm-includes rm -rf zasm/includes
zasm-includes.h: zasm-includes.cfs zasm/includes.h: zasm/includes.cfs
./bin2c.sh FSDEV < $< | tee $@ > /dev/null ./bin2c.sh FSDEV < $< | tee $@ > /dev/null
shell: shell.c libz80/libz80.o shell-kernel.h $(CFSPACK) shell/shell: shell/shell.c libz80/libz80.o shell/kernel.h $(CFSPACK)
zasm: zasm.c libz80/libz80.o zasm-kernel.h zasm-user.h zasm-includes.h zasm/zasm: zasm/zasm.c libz80/libz80.o zasm/kernel.h zasm/user.h zasm/includes.h
$(TARGETS): $(TARGETS):
cc $< libz80/libz80.o -o $@ cc $< libz80/libz80.o -o $@
@ -37,4 +37,4 @@ $(CFSPACK):
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(TARGETS) $(KERNEL_HEADERS) $(USER_HEADERS) zasm-includes.* rm -f $(TARGETS) $(KERNEL_HEADERS) $(USER_HEADERS) zasm/includes.*

4
tools/emul/shell.c → tools/emul/shell/shell.c
View File

@ -1,8 +1,8 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <termios.h> #include <termios.h>
#include "libz80/z80.h" #include "../libz80/z80.h"
#include "shell-kernel.h" #include "kernel.h"
/* Collapse OS shell with filesystem /* Collapse OS shell with filesystem
* *

0
tools/emul/shell_.asm → tools/emul/shell/shell_.asm
View File

0
tools/emul/zasm_glue.asm → tools/emul/zasm/glue.asm
View File

0
tools/emul/zasm_user.asm → tools/emul/zasm/user.asm
View File

8
tools/emul/zasm.c → tools/emul/zasm/zasm.c
View File

@ -1,9 +1,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "libz80/z80.h" #include "../libz80/z80.h"
#include "zasm-kernel.h" #include "kernel.h"
#include "zasm-user.h" #include "user.h"
#include "zasm-includes.h" #include "includes.h"
/* zasm reads from a specified blkdev, assemble the file and writes the result /* zasm reads from a specified blkdev, assemble the file and writes the result
* in another specified blkdev. In our emulator layer, we use stdin and stdout * in another specified blkdev. In our emulator layer, we use stdin and stdout

2
tools/tests/zasm/runtests.sh
View File

@ -5,7 +5,7 @@ set -e
TMPFILE=$(mktemp) TMPFILE=$(mktemp)
SCAS=scas SCAS=scas
PARTS=../../../parts/z80 PARTS=../../../parts/z80
ZASM=../../emul/zasm ZASM=../../emul/zasm/zasm
ASMFILE=../../../apps/zasm/instr.asm ASMFILE=../../../apps/zasm/instr.asm
cmpas() { cmpas() {