izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-12-27 04:58:05 +11:00
Code Issues Releases Wiki Activity
3e437747c2
collapseos/tools/emul/Makefile

58 lines
1.8 KiB
Makefile
Raw Normal View History

zasm emul: add tooling for includes fsdev On build, pack `parts/z80` into a CFS and embed it into the emulated zasm executable as an fsdev. This will allow for the upcoming include directive to have something to go to. For now, this is useless except for inflating the emulated zasm's size.
2019-05-17 02:07:57 +10:00
CFSPACK = ../cfspack/cfspack
zasm: includes CFS is now built on-the-fly by zasm.sh This makes for a much more usable zasm linux binary that doesn't have to be rebuilt every time apps or kernel change.
2019-06-03 09:54:37 +10:00
TARGETS = shell/shell zasm/zasm runbin/runbin
Move /parts/z80 to /kernel Let go of that "meta os" thing. it's not as meta as I made it sound like. It's a kernel.
2019-05-20 01:19:41 +10:00
KERNEL = ../../kernel
zasm emul: get rid of the kernel/user distinction Made things complicated for nothing.
2019-05-19 23:14:40 +10:00
APPS = ../../apps
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
ZASMBIN = zasm/zasm
zasm: includes CFS is now built on-the-fly by zasm.sh This makes for a much more usable zasm linux binary that doesn't have to be rebuilt every time apps or kernel change.
2019-06-03 09:54:37 +10:00
ZASMSH = ../zasm.sh
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 22:32:25 +10:00
SHELLAPPS = $(addprefix cfsin/, zasm)
tools/emul/shell: copy user.h in its cfsin This way, we can compile apps from within the shell that run on the shell.
2019-06-03 23:25:47 +10:00
CFSIN_CONTENTS = $(SHELLAPPS) cfsin/user.h
Move apps/zasm/emul to tools/emul
2019-05-10 04:09:40 +10:00
Add tools/emul
2019-05-10 02:58:41 +10:00
.PHONY: all
tools/emul/shell: copy user.h in its cfsin This way, we can compile apps from within the shell that run on the shell.
2019-06-03 23:25:47 +10:00
all: $(TARGETS) $(CFSIN_CONTENTS)
Add tools/emul
2019-05-10 02:58:41 +10:00
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
shell/kernel-bin.h: shell/shell_.asm $(ZASMBIN)
zasm: includes CFS is now built on-the-fly by zasm.sh This makes for a much more usable zasm linux binary that doesn't have to be rebuilt every time apps or kernel change.
2019-06-03 09:54:37 +10:00
$(ZASMSH) $(KERNEL) < $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
zasm emul: bring back kernel/user distinction It was a bad idea to remove it. Now that I'm introducing the concept of a per-app glue file, it becomes much easier to build emulated zasm as a userspace app.
2019-05-20 02:57:59 +10:00
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
zasm/kernel-bin.h: zasm/kernel.bin
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
./bin2c.sh KERNEL < $< | tee $@ > /dev/null
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
zasm/zasm-bin.h: zasm/zasm.bin
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
./bin2c.sh USERSPACE < $< | tee $@ > /dev/null
Add tools/emul
2019-05-10 02:58:41 +10:00
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
shell/shell: shell/shell.c libz80/libz80.o shell/kernel-bin.h
$(ZASMBIN): zasm/zasm.c libz80/libz80.o zasm/kernel-bin.h zasm/zasm-bin.h $(CFSPACK)
Add the concept of unit tests Will be much much easier to tests new core routines without having to re-create their context first. Also, extract parse.asm from core.asm
2019-05-17 23:33:20 +10:00
runbin/runbin: runbin/runbin.c libz80/libz80.o
Move apps/zasm/emul to tools/emul
2019-05-10 04:09:40 +10:00
$(TARGETS):
zasm: add support for .fill directive
2019-05-20 22:20:00 +10:00
$(CC) $< libz80/libz80.o -o $@
Add tools/emul
2019-05-10 02:58:41 +10:00
libz80/libz80.o: libz80/z80.c
make -C libz80/codegen opcodes
zasm: add support for .fill directive
2019-05-20 22:20:00 +10:00
$(CC) -Wall -ansi -g -c -o libz80/libz80.o libz80/z80.c
Add tools/emul
2019-05-10 02:58:41 +10:00
zasm emul: add tooling for includes fsdev On build, pack `parts/z80` into a CFS and embed it into the emulated zasm executable as an fsdev. This will allow for the upcoming include directive to have something to go to. For now, this is useless except for inflating the emulated zasm's size.
2019-05-17 02:07:57 +10:00
$(CFSPACK):
tools/emul/shell: add filesystem support With the help of the newly-introduced cfspack tool, we can mount a filesystem in our emulated shell and play around. Read-only for now. Unpacking incoming.
2019-05-13 01:20:31 +10:00
make -C ../cfspack
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 22:32:25 +10:00
$(SHELLAPPS): $(ZASMBIN)
$(ZASMSH) $(KERNEL) $(APPS) shell/user.h < $(APPS)/$(notdir $@)/glue.asm > $@
tools/emul/shell: copy user.h in its cfsin This way, we can compile apps from within the shell that run on the shell.
2019-06-03 23:25:47 +10:00
cfsin/user.h: shell/user.h
cp $< $@
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
.PHONY: updatebootstrap
Parametrize zasm linux bin's include CFS file ... instead of embedding it in the binary itself. Additionally, add a "zasm.sh" wrapper to faciliate zasm calls on a linux machine.
2019-06-03 05:50:59 +10:00
updatebootstrap: $(ZASMBIN) $(INCCFS)
zasm: includes CFS is now built on-the-fly by zasm.sh This makes for a much more usable zasm linux binary that doesn't have to be rebuilt every time apps or kernel change.
2019-06-03 09:54:37 +10:00
$(ZASMSH) $(KERNEL) < zasm/glue.asm > zasm/kernel.bin
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
$(ZASMSH) $(KERNEL) $(APPS) zasm/user.h < $(APPS)/zasm/glue.asm > zasm/zasm.bin
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
tools/emul: add "make rescue" command
2019-05-20 22:58:53 +10:00
# Sometimes, when developing zasm, stuff get messed up and it's hard to unmess
# because zasm's brake-up ends up in its bootstrap bins. Sure, we can revert
# from git, but if we're in the middle of some work, it's inconvenient. As long
# as we don't diverge from scas's syntax, it can come to the recue!
.PHONY: rescue
rescue:
scas -o zasm/kernel.bin -I $(KERNEL) zasm/glue.asm
tools/emul: re-organize .h files What used to be `tools/emul/user.h` was in fact specific to zasm, so I moved it there. To avoid name confusion, I renamed what used to be kernel.h and user.h to kernel-bin.h and user-bin.h.
2019-06-03 22:12:44 +10:00
scas -o zasm/zasm.bin -I $(APPS) -I $(KERNEL) -I zasm $(APPS)/zasm/glue.asm
tools/emul: add "make rescue" command
2019-05-20 22:58:53 +10:00
Add tools/emul
2019-05-10 02:58:41 +10:00
.PHONY: clean
clean:
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 22:32:25 +10:00
rm -f $(TARGETS) $(SHELLAPPS) {zasm,shell}/*-bin.h
Reference in New Issue Copy Permalink