izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-10 02:38:05 +11:00
Code Issues Releases Wiki Activity
5504c796ee
collapseos/emul/Makefile

69 lines
1.4 KiB
Makefile
Raw Normal View History

Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
TARGETS = forth stage2
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-10 01:36:38 +11:00
OBJS = emul.o libz80/libz80.o
blk: first steps
2020-04-14 23:05:43 +10:00
BIN2C = ../tools/bin2c
BLKPACK = ../tools/blkpack
blk: add dirty flag and auto write blocks on fetch Also, fix some PSP leaks related to LOAD.
2020-04-17 10:59:20 +10:00
BLKUNPACK = ../tools/blkunpack
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
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-03 14:15:43 +11:00
all: $(TARGETS)
Add tools/emul
2019-05-10 02:58:41 +10:00
blk: first steps
2020-04-14 23:05:43 +10:00
$(BLKPACK):
Add /tools/slatest To update LATEST offset more easily. Will be useful for recipes.
2020-04-03 14:15:43 +11:00
$(MAKE) -C ../tools
emul: fix Makefile
2020-04-15 23:01:09 +10:00
emul: bootstrap to stage2 from within Collapse OS! Big bootstrapping change which greatly reduces the role of the modern operating system in the bootstrapping process.
2020-04-27 00:15:35 +10:00
.PHONY: $(BIN2C) $(BLKUNPACK)
Move notes.txt in blk
2020-04-15 04:25:14 +10:00
$(BIN2C): $(BLKPACK)
blk: add dirty flag and auto write blocks on fetch Also, fix some PSP leaks related to LOAD.
2020-04-17 10:59:20 +10:00
$(BLKUNPACK): $(BLKPACK)
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-16 07:37:49 +11:00
Keep stage1 bootstrap bin instead of stage 0 XPACKed source needing to be kept in bootstrap bin didn't make much sense. With the removal of stripfc, it makes more sense to keep the compiled form of stage 1 in repository as a bootstrap binary. Also, rename it to forth.bin.
2020-04-30 09:38:43 +10:00
stage0.bin: stage2 xcomp.fs
cat xcomp.fs | ./stage2 > stage0.bin
stage0-bin.h: stage0.bin $(BIN2C)
emul: bootstrap to stage2 from within Collapse OS! Big bootstrapping change which greatly reduces the role of the modern operating system in the bootstrapping process.
2020-04-27 00:15:35 +10:00
$(BIN2C) KERNEL < stage0.bin > $@
emul: add forth target
2020-03-10 13:26:02 +11:00
emul: bootstrap to stage2 from within Collapse OS! Big bootstrapping change which greatly reduces the role of the modern operating system in the bootstrapping process.
2020-04-27 00:15:35 +10:00
stage1: stage.c $(OBJS) stage0-bin.h
Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
$(CC) 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 15:14:44 +11:00
emul: bootstrap to stage2 from within Collapse OS! Big bootstrapping change which greatly reduces the role of the modern operating system in the bootstrapping process.
2020-04-27 00:15:35 +10:00
stage1dbg: stage.c $(OBJS) stage0-bin.h
Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
$(CC) -DDEBUG 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-14 07:01:09 +11:00
Keep stage1 bootstrap bin instead of stage 0 XPACKed source needing to be kept in bootstrap bin didn't make much sense. With the removal of stripfc, it makes more sense to keep the compiled form of stage 1 in repository as a bootstrap binary. Also, rename it to forth.bin.
2020-04-30 09:38:43 +10:00
# not dependent on forth.bin to avoid circular deps.
forth-bin.h: $(BIN2C)
$(BIN2C) KERNEL < forth.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 15:14:44 +11:00
Keep stage1 bootstrap bin instead of stage 0 XPACKed source needing to be kept in bootstrap bin didn't make much sense. With the removal of stripfc, it makes more sense to keep the compiled form of stage 1 in repository as a bootstrap binary. Also, rename it to forth.bin.
2020-04-30 09:38:43 +10:00
stage2: stage.c $(OBJS) forth-bin.h blkfs-bin.h
Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
$(CC) -DSTAGE2 stage.c $(OBJS) -o $@
forth: Forth-ify ROT, a native word! This requires us to significantly adjust our build process, which now has 3 stages.
2020-03-25 04:46:05 +11:00
blk: first steps
2020-04-14 23:05:43 +10:00
blkfs: $(BLKPACK)
$(BLKPACK) ../blk > $@
Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
blkfs-bin.h: blkfs $(BIN2C)
emul: make stage2 load z80a from blkfs This allows us to remove forth/z80a.fs. Another big step towards self-hosting!
2020-04-20 11:31:41 +10:00
$(BIN2C) BLKFS < blkfs > $@
Keep stage1 bootstrap bin instead of stage 0 XPACKed source needing to be kept in bootstrap bin didn't make much sense. With the removal of stripfc, it makes more sense to keep the compiled form of stage 1 in repository as a bootstrap binary. Also, rename it to forth.bin.
2020-04-30 09:38:43 +10:00
forth: forth.c $(OBJS) forth-bin.h blkfs-bin.h
Move /emul/forth/* to /emul Less noisy this way
2020-04-25 07:53:58 +10:00
$(CC) forth.c $(OBJS) -o $@
emul: add forth target
2020-03-10 13:26:02 +11:00
Add tools/emul
2019-05-10 02:58:41 +10:00
libz80/libz80.o: libz80/z80.c
Make tools/emul *BSD-friendly
2019-07-12 11:21:54 +10:00
$(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
tools/emul: deduplicate a little bit of C code
2019-12-03 08:35:49 +11: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 23:25:47 +10:00
zasm now bootstraps itself without scas!
2019-05-20 05:03:34 +10:00
.PHONY: updatebootstrap
Keep stage1 bootstrap bin instead of stage 0 XPACKed source needing to be kept in bootstrap bin didn't make much sense. With the removal of stripfc, it makes more sense to keep the compiled form of stage 1 in repository as a bootstrap binary. Also, rename it to forth.bin.
2020-04-30 09:38:43 +10:00
updatebootstrap: stage1 stage1.fs
./stage1 < stage1.fs > forth.bin
forth: Forth-ify ROT, a native word! This requires us to significantly adjust our build process, which now has 3 stages.
2020-03-25 04:46:05 +11:00
blk: add dirty flag and auto write blocks on fetch Also, fix some PSP leaks related to LOAD.
2020-04-17 10:59:20 +10:00
.PHONY: pack
pack:
rm blkfs && $(MAKE) blkfs
.PHONY: unpack
unpack:
$(BLKUNPACK) ../blk < blkfs
Add tools/emul
2019-05-10 02:58:41 +10:00
.PHONY: clean
clean:
emul: bootstrap to stage2 from within Collapse OS! Big bootstrapping change which greatly reduces the role of the modern operating system in the bootstrapping process.
2020-04-27 00:15:35 +10:00
rm -f $(TARGETS) emul.o *-bin.h stage{1,2}.bin blkfs
Moved tools/bin2c to single-level with other tools.
2020-04-08 07:56:55 +10:00
$(MAKE) -C ../tools clean
Reference in New Issue Copy Permalink