mirror of
https://github.com/hsoft/collapseos.git
synced 2024-12-25 04:28:05 +11:00
019d05f64c
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.
54 lines
1.6 KiB
Makefile
54 lines
1.6 KiB
Makefile
CFSPACK = ../cfspack/cfspack
|
|
TARGETS = shell/shell zasm/zasm runbin/runbin
|
|
KERNEL = ../../kernel
|
|
APPS = ../../apps
|
|
ZASMBIN = zasm/zasm
|
|
ZASMSH = ../zasm.sh
|
|
SHELLAPPS = $(addprefix cfsin/, zasm ed basic)
|
|
CFSIN_CONTENTS = $(SHELLAPPS) cfsin/user.h
|
|
|
|
.PHONY: all
|
|
all: $(TARGETS) $(CFSIN_CONTENTS)
|
|
|
|
# -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/kernel-bin.h: zasm/kernel.bin
|
|
./bin2c.sh KERNEL < $< | tee $@ > /dev/null
|
|
|
|
zasm/zasm-bin.h: zasm/zasm.bin
|
|
./bin2c.sh USERSPACE < $< | tee $@ > /dev/null
|
|
|
|
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)
|
|
runbin/runbin: runbin/runbin.c libz80/libz80.o
|
|
$(TARGETS):
|
|
$(CC) $< libz80/libz80.o -o $@
|
|
|
|
libz80/libz80.o: libz80/z80.c
|
|
$(MAKE) -C libz80/codegen opcodes
|
|
$(CC) -Wall -ansi -g -c -o libz80/libz80.o libz80/z80.c
|
|
|
|
$(CFSPACK):
|
|
$(MAKE) -C ../cfspack
|
|
|
|
# -o in sync with USER_CODE in shell/user.h
|
|
$(SHELLAPPS): $(ZASMBIN)
|
|
$(ZASMSH) -o 42 $(KERNEL) $(APPS) shell/user.h < $(APPS)/$(notdir $@)/glue.asm > $@
|
|
|
|
cfsin/user.h: shell/user.h
|
|
cp $< $@
|
|
|
|
.PHONY: updatebootstrap
|
|
updatebootstrap: $(ZASMBIN) $(INCCFS)
|
|
$(ZASMSH) $(KERNEL) < zasm/glue.asm > zasm/kernel.bin
|
|
$(ZASMSH) $(KERNEL) $(APPS) zasm/user.h < $(APPS)/zasm/glue.asm > zasm/zasm.bin
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
rm -f $(TARGETS) $(SHELLAPPS) {zasm,shell}/*-bin.h
|