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

77 lines
2.1 KiB
Makefile
Raw Normal View History

Remove runbin It's not used
2020-04-13 19:25:28 -04:00
TARGETS = forth/forth
Moved tools/bin2c to single-level with other tools.
2020-04-07 17:56:55 -04:00
BIN2C = ../tools/bin2c
forth: split forth source into multiple files
2020-03-17 21:44:32 -04:00
# Those Forth source files are in a particular order
emul: extract capture mark from icore into xstop.fs
2020-04-10 14:16:45 -04:00
BOOTSRCS = ./forth/conf.fs \
../forth/xcomp.fs \
./forth/xcomp.fs \
../forth/boot.fs \
../forth/z80c.fs \
../forth/icore.fs \
./forth/xstop.fs
Revert "Remove link.fs" Let's revisit the relinking approach, with LITA this time. This reverts commit 6652125d479562c871685e6d8e1248cfd3e802a6.
2020-04-11 13:31:17 -04:00
FORTHSRCS = core.fs cmp.fs print.fs str.fs parse.fs readln.fs fmt.fs z80a.fs \
link.fs
Add in-memory bootstrapping system This should help with the bootstrapping of non-emulated environment. For example, I have a problem with the RC2014: I can't send it bootstrap info until the ACIA is up. I need to find a way...
2020-04-03 08:31:30 -04:00
FORTHSRC_PATHS = ${FORTHSRCS:%=../forth/%} forth/run.fs
Make makefiles and shell scripts portable It's no longer required to use `gmake` under OpenBSD and shell scripts no longer require bash.
2019-12-09 09:36:38 -05:00
OBJS = emul.o libz80/libz80.o
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
SLATEST = ../tools/slatest
Add stripfc tool
2020-04-04 10:27:21 -04:00
STRIPFC = ../tools/stripfc
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
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
all: $(TARGETS)
Add tools/emul
2019-05-09 12:58:41 -04:00
Add stripfc tool
2020-04-04 10:27:21 -04:00
$(STRIPFC):
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
$(SLATEST):
Merge remote-tracking branch 'origin/master' into forth
2020-04-07 19:32:30 -04:00
$(BIN2C):
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
$(MAKE) -C ../tools
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
emul: build boot binary in one pass ... instead of building boot.fs, and then z80c.fs/icore.fs in separate passes. This strengten xcomp by making it support 2 completely separate dicts (that is, the X dict is *not* connected to the system dict. The chain now stops at EXIT def in boot.fs).
2020-04-10 09:55:58 -04:00
# z80c.bin is not in the prerequisites because it's a bootstrap
# binary that should be updated manually through make updatebootstrap.
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
forth/forth0.bin: $(SLATEST)
emul: build boot binary in one pass ... instead of building boot.fs, and then z80c.fs/icore.fs in separate passes. This strengten xcomp by making it support 2 completely separate dicts (that is, the X dict is *not* connected to the system dict. The chain now stops at EXIT def in boot.fs).
2020-04-10 09:55:58 -04:00
cp forth/z80c.bin $@
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
$(SLATEST) $@
boot: make HERE point to RAMEND instead of CURRENT The former was only used in the peculiar context of "/emul". The regular case is actually HERE pointing to RAMEND on boot.
2020-04-13 11:35:47 -04:00
cat forth/pre.fs forth/emul.fs >> $@
emul: add forth target
2020-03-09 22:26:02 -04:00
Merge remote-tracking branch 'origin/master' into forth
2020-04-07 19:32:30 -04:00
forth/forth0-bin.h: forth/forth0.bin $(BIN2C)
Replace bin2c.sh with a more portable implementation. `xxd' is not available on all systems, and on others does not support the `-i' flag. Since bin2c.sh relied on a tool that I can't seem to find a compatible version of, I have included a simple, portable replacement in C. Usage remains the same: bin2c ARRAYNAME < inputfile > outputfile. This change is also reflected in emul/Makefile.
2020-04-05 14:04:05 -04:00
$(BIN2C) KERNEL < forth/forth0.bin | tee $@ > /dev/null
emul: add forth target
2020-03-09 22:26:02 -04:00
forth: make bin staging process a bit less hackish The goal being to add a new native code dict staging phase.
2020-03-22 21:46:43 -04:00
forth/stage1: forth/stage.c $(OBJS) forth/forth0-bin.h
$(CC) forth/stage.c $(OBJS) -o $@
forth: add bin dict compilation stage! Big one. This allows us to write higher order words directly in Forth, which is much more convenient than writing post-immediate (see "NOT" structure in diff if you want to see what I mean) structures in ASM. These structures can then be written to ROM (rather than loaded in RAM for definitions loaded at run-time). That's quite a bit of tooling that was added, 2 compilations stages, but I think it's well worth it.
2020-03-12 00:14:44 -04:00
forth: make bin staging process a bit less hackish The goal being to add a new native code dict staging phase.
2020-03-22 21:46:43 -04:00
forth/stage1dbg: forth/stage.c $(OBJS) forth/forth0-bin.h
Add in-memory bootstrapping system This should help with the bootstrapping of non-emulated environment. For example, I have a problem with the RC2014: I can't send it bootstrap info until the ACIA is up. I need to find a way...
2020-04-03 08:31:30 -04:00
$(CC) -DDEBUG forth/stage.c $(OBJS) -o $@
forth: improve execution model My approach with RS was slightly wrong: RS' TOP was always containing current IP. It worked, but it was problematic when came the time to introduce RS-modifying words: it's impossible to modify RS in a word without immediately messing your flow. Therefore, what used to be RS' TOS has to be a variable that isn't changed midway by RS-modifying words. I guess that's why RS is called *return* stack...
2020-03-13 16:01:09 -04:00
Add stripfc tool
2020-04-04 10:27:21 -04:00
# We don't really need to use stripfc, but we do it anyway to test that we
# don't mistakenly break our code with that tool. It's easier to debug here.
forth: improve bootstrap process
2020-03-24 21:13:02 -04:00
forth/core.bin: $(FORTHSRC_PATHS) forth/stage1
boot: make HERE point to RAMEND instead of CURRENT The former was only used in the peculiar context of "/emul". The regular case is actually HERE pointing to RAMEND on boot.
2020-04-13 11:35:47 -04:00
cat $(FORTHSRC_PATHS) ./forth/stop.fs | $(STRIPFC) | ./forth/stage1 > $@
forth: improve bootstrap process
2020-03-24 21:13:02 -04:00
Add in-memory bootstrapping system This should help with the bootstrapping of non-emulated environment. For example, I have a problem with the RC2014: I can't send it bootstrap info until the ACIA is up. I need to find a way...
2020-04-03 08:31:30 -04:00
forth/forth1.bin: forth/core.bin $(SLATEST)
emul: build boot binary in one pass ... instead of building boot.fs, and then z80c.fs/icore.fs in separate passes. This strengten xcomp by making it support 2 completely separate dicts (that is, the X dict is *not* connected to the system dict. The chain now stops at EXIT def in boot.fs).
2020-04-10 09:55:58 -04:00
cat forth/z80c.bin forth/core.bin > $@
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
$(SLATEST) $@
forth: add bin dict compilation stage! Big one. This allows us to write higher order words directly in Forth, which is much more convenient than writing post-immediate (see "NOT" structure in diff if you want to see what I mean) structures in ASM. These structures can then be written to ROM (rather than loaded in RAM for definitions loaded at run-time). That's quite a bit of tooling that was added, 2 compilations stages, but I think it's well worth it.
2020-03-12 00:14:44 -04:00
Merge remote-tracking branch 'origin/master' into forth
2020-04-07 19:32:30 -04:00
forth/forth1-bin.h: forth/forth1.bin $(BIN2C)
boot: make HERE point to RAMEND instead of CURRENT The former was only used in the peculiar context of "/emul". The regular case is actually HERE pointing to RAMEND on boot.
2020-04-13 11:35:47 -04:00
$(BIN2C) KERNEL < forth/forth1.bin > $@
forth: add bin dict compilation stage! Big one. This allows us to write higher order words directly in Forth, which is much more convenient than writing post-immediate (see "NOT" structure in diff if you want to see what I mean) structures in ASM. These structures can then be written to ROM (rather than loaded in RAM for definitions loaded at run-time). That's quite a bit of tooling that was added, 2 compilations stages, but I think it's well worth it.
2020-03-12 00:14:44 -04:00
forth: Forth-ify ROT, a native word! This requires us to significantly adjust our build process, which now has 3 stages.
2020-03-24 13:46:05 -04:00
forth/stage2: forth/stage.c $(OBJS) forth/forth1-bin.h
$(CC) -DSTAGE2 forth/stage.c $(OBJS) -o $@
forth: improve bootstrap process
2020-03-24 21:13:02 -04:00
forth/forth: forth/forth.c $(OBJS) forth/forth1-bin.h
emul: add forth target
2020-03-09 22:26:02 -04:00
$(CC) forth/forth.c $(OBJS) -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
tools/emul: deduplicate a little bit of C code
2019-12-02 16:35:49 -05:00
emul.o: emul.c
$(CC) -c -o emul.o emul.c
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
zasm now bootstraps itself without scas!
2019-05-19 15:03:34 -04:00
.PHONY: updatebootstrap
emul: extract capture mark from icore into xstop.fs
2020-04-10 14:16:45 -04:00
updatebootstrap: forth/stage2
cat $(BOOTSRCS) | ./forth/stage2 > ./forth/z80c.bin
forth: Forth-ify ROT, a native word! This requires us to significantly adjust our build process, which now has 3 stages.
2020-03-24 13:46:05 -04:00
Add tools/emul
2019-05-09 12:58:41 -04:00
.PHONY: clean
clean:
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-02 23:15:43 -04:00
rm -f $(TARGETS) emul.o forth/*-bin.h forth/forth?.bin
Moved tools/bin2c to single-level with other tools.
2020-04-07 17:56:55 -04:00
$(MAKE) -C ../tools clean
Reference in New Issue Copy Permalink