izaya/collapseos
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10864afa96
collapseos/tools/emul/Makefile

61 lines
1.9 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-16 12:07:57 -04:00
CFSPACK = ../cfspack/cfspack
basic: add fls command Also, add the new `bshell` emulated tool. BASIC is on its way to replace the shell.
2019-11-24 10:24:15 -05:00
TARGETS = shell/shell bshell/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-19 11:19:41 -04:00
KERNEL = ../../kernel
zasm emul: get rid of the kernel/user distinction Made things complicated for nothing.
2019-05-19 09:14:40 -04:00
APPS = ../../apps
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04: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-02 19:54:37 -04:00
ZASMSH = ../zasm.sh
basic: add fls command Also, add the new `bshell` emulated tool. BASIC is on its way to replace the shell.
2019-11-24 10:24:15 -05:00
SHELLAPPS = $(addprefix cfsin/, zasm ed)
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 09:25:47 -04:00
CFSIN_CONTENTS = $(SHELLAPPS) cfsin/user.h
Move apps/zasm/emul to tools/emul
2019-05-09 14:09:40 -04:00
Add tools/emul
2019-05-09 12:58:41 -04: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 09:25:47 -04:00
all: $(TARGETS) $(CFSIN_CONTENTS)
Add tools/emul
2019-05-09 12:58:41 -04:00
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
# -o in sync with SHELL_CODE in shell/glue.asm
shell/shell.bin: $(APPS)/shell/glue.asm $(ZASMBIN)
$(ZASMSH) -o 07 $(KERNEL) shell/user.h $(APPS) < $< | tee $@ > /dev/null
shell/kernel-bin.h: shell/glue.asm shell/shell.bin $(ZASMBIN)
$(ZASMSH) $(KERNEL) shell/shell.bin < $< | ./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-19 12:57:59 -04:00
basic: add fls command Also, add the new `bshell` emulated tool. BASIC is on its way to replace the shell.
2019-11-24 10:24:15 -05:00
bshell/shell.bin: bshell/glue.asm $(ZASMBIN)
$(ZASMSH) $(KERNEL) bshell/user.h $(APPS) < $< | tee $@ > /dev/null
bshell/shell-bin.h: bshell/shell.bin
./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 08:12:44 -04:00
zasm/kernel-bin.h: zasm/kernel.bin
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04: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 08:12:44 -04:00
zasm/zasm-bin.h: zasm/zasm.bin
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04:00
./bin2c.sh USERSPACE < $< | tee $@ > /dev/null
Add tools/emul
2019-05-09 12:58:41 -04: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 08:12:44 -04:00
shell/shell: shell/shell.c libz80/libz80.o shell/kernel-bin.h
basic: add fls command Also, add the new `bshell` emulated tool. BASIC is on its way to replace the shell.
2019-11-24 10:24:15 -05:00
bshell/shell: bshell/shell.c libz80/libz80.o bshell/shell-bin.h
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 08:12:44 -04:00
$(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 09:33:20 -04:00
runbin/runbin: runbin/runbin.c libz80/libz80.o
Move apps/zasm/emul to tools/emul
2019-05-09 14:09:40 -04:00
$(TARGETS):
zasm: add support for .fill directive
2019-05-20 08:20:00 -04:00
$(CC) $< libz80/libz80.o -o $@
Add tools/emul
2019-05-09 12:58:41 -04:00
libz80/libz80.o: libz80/z80.c
Make tools/emul *BSD-friendly
2019-07-11 21:21:54 -04:00
$(MAKE) -C libz80/codegen opcodes
zasm: add support for .fill directive
2019-05-20 08:20:00 -04:00
$(CC) -Wall -ansi -g -c -o libz80/libz80.o libz80/z80.c
Add tools/emul
2019-05-09 12:58:41 -04: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-16 12:07:57 -04:00
$(CFSPACK):
Make tools/emul *BSD-friendly
2019-07-11 21:21:54 -04:00
$(MAKE) -C ../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-12 11:20:31 -04:00
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
# -o in sync with USER_CODE in shell/user.h
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 08:32:25 -04:00
$(SHELLAPPS): $(ZASMBIN)
Make the shell a userspace app That's my mega-commit you've all been waiting for. The code for the shell share more routines with userspace apps than with kernel units, because, well, its behavior is that of a userspace app, not a device driver. This created a weird situation with libraries and jump tables. Some routine belonging to the `kernel/` directory felt weird there. And then comes `apps/basic`, which will likely share even more code with the shell. I was seeing myself creating huge jump tables to reuse code from the shell. It didn't feel right. Moreover, we'll probably want basic-like apps to optionnally replace the shell. So here I am with this huge change in the project structure. I didn't test all recipes on hardware yet, I will do later. I might have broken some... But now, the structure feels better and the line between what belongs to `kernel` and what belongs to `apps` feels clearer.
2019-11-15 15:37:49 -05:00
$(ZASMSH) -o 42 $(KERNEL) $(APPS) shell/user.h < $(APPS)/$(notdir $@)/glue.asm > $@
tools/emul: make shell's cfsin always have all apps compiled in it
2019-06-03 08:32:25 -04:00
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 09:25:47 -04:00
cfsin/user.h: shell/user.h
cp $< $@
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04: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-02 15:50:59 -04: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-02 19:54:37 -04: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 08:12:44 -04:00
$(ZASMSH) $(KERNEL) $(APPS) zasm/user.h < $(APPS)/zasm/glue.asm > zasm/zasm.bin
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04:00
Add tools/emul
2019-05-09 12:58:41 -04:00
.PHONY: clean
clean:
basic: add fls command Also, add the new `bshell` emulated tool. BASIC is on its way to replace the shell.
2019-11-24 10:24:15 -05:00
rm -f $(TARGETS) $(SHELLAPPS) zasm/*-bin.h shell/*-bin.h
Reference in New Issue Copy Permalink