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

Make apps folder into a namespace

Browse Source 
To straighten out includes and to pave the way into zasm being part of
the same "include CFS" as parts, we make zasm includes namespaced.
This commit is contained in:
Virgil Dupras 2019-05-17 20:22:32 -04:00
parent 93e40aeb09
commit 28d5ebdc8a
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/zasm/main.asm
View File

@ -54,17 +54,17 @@
; *** Code *** ; *** Code ***
jp zasmMain jp zasmMain
#include "util_z.asm" #include "zasm/util.asm"
.equ IO_RAMSTART ZASM_RAMEND .equ IO_RAMSTART ZASM_RAMEND
#include "io.asm" #include "zasm/io.asm"
#include "tok.asm" #include "zasm/tok.asm"
#include "parse_z.asm" #include "zasm/parse.asm"
#include "expr.asm" #include "zasm/expr.asm"
#include "instr.asm" #include "zasm/instr.asm"
.equ DIREC_RAMSTART IO_RAMEND .equ DIREC_RAMSTART IO_RAMEND
#include "directive.asm" #include "zasm/directive.asm"
.equ SYM_RAMSTART DIREC_RAMEND .equ SYM_RAMSTART DIREC_RAMEND
#include "symbol.asm" #include "zasm/symbol.asm"
; Read file through blockdev ID in H and outputs its upcodes through blockdev ; Read file through blockdev ID in H and outputs its upcodes through blockdev
; ID in L. ; ID in L.

0
apps/zasm/parse_z.asm → apps/zasm/parse.asm
View File

0
apps/zasm/util_z.asm → apps/zasm/util.asm
View File

4
tools/emul/Makefile
View File

@ -12,11 +12,11 @@ $(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 $< | ./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 find zasm/includes -name *.md -delete
find zasm/includes -type f -exec sed -i -e 's/;.*//g' {} \; find zasm/includes -type f -exec sed -i -e 's/;.*//g' {} \;
$(CFSPACK) zasm/includes > $@ $(CFSPACK) zasm/includes > $@
rm -rf zasm/includes rm -rf zasm/includes

2
tools/emul/zasm/user.asm
View File

@ -25,7 +25,7 @@ fsTell .equ 0x2d
;call dumpSymTable ;call dumpSymTable
ret ret
#include "main.asm" #include "zasm/main.asm"
; *** Debug *** ; *** Debug ***
debugPrint: debugPrint:

4
tools/tests/unit/runtests.sh
View File

@ -5,12 +5,12 @@ set -o pipefail
SCAS=scas SCAS=scas
PARTS=../../../parts/z80 PARTS=../../../parts/z80
ZASMDIR=../../../apps/zasm APPS=../../../apps
RUNBIN=../../emul/runbin/runbin RUNBIN=../../emul/runbin/runbin
for fn in *.asm; do for fn in *.asm; do
echo "Running test ${fn}" echo "Running test ${fn}"
if ! ${SCAS} -I ${PARTS} -I ${ZASMDIR} -o - ${fn} | ${RUNBIN}; then if ! ${SCAS} -I ${PARTS} -I ${APPS} -o - ${fn} | ${RUNBIN}; then
echo "failed with code ${PIPESTATUS[1]}" echo "failed with code ${PIPESTATUS[1]}"
exit 1 exit 1
fi fi

8
tools/tests/unit/test_expr.asm
View File

@ -3,11 +3,11 @@ jp test
#include "core.asm" #include "core.asm"
#include "parse.asm" #include "parse.asm"
#include "util_z.asm" #include "zasm/util.asm"
#include "parse_z.asm" #include "zasm/parse.asm"
.equ SYM_RAMSTART RAMSTART .equ SYM_RAMSTART RAMSTART
#include "symbol.asm" #include "zasm/symbol.asm"
#include "expr.asm" #include "zasm/expr.asm"
; Pretend that we aren't in first pass ; Pretend that we aren't in first pass
zasmIsFirstPass: zasmIsFirstPass:

4
tools/tests/unit/test_parse_z.asm
View File

@ -2,8 +2,8 @@ jp test
#include "core.asm" #include "core.asm"
#include "parse.asm" #include "parse.asm"
#include "util_z.asm" #include "zasm/util.asm"
#include "parse_z.asm" #include "zasm/parse.asm"
; mocks. aren't used in tests ; mocks. aren't used in tests
zasmIsFirstPass: zasmIsFirstPass:

4
tools/tests/unit/test_symbol.asm
View File

@ -2,9 +2,9 @@
jp test jp test
#include "core.asm" #include "core.asm"
#include "util_z.asm" #include "zasm/util.asm"
.equ SYM_RAMSTART RAMSTART .equ SYM_RAMSTART RAMSTART
#include "symbol.asm" #include "zasm/symbol.asm"
testNum: .db 1 testNum: .db 1