izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-27 13:18:06 +11:00
Code Issues Releases Wiki Activity

Keep stage1 bootstrap bin instead of stage 0

Browse Source 
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.
This commit is contained in:
Virgil Dupras 2020-04-29 19:38:43 -04:00
parent b046aba7f9
commit 581f04a4bc
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emul/.gitignore vendored
View File

@ -3,5 +3,5 @@
/stage2 /stage2
/forth /forth
/*-bin.h /*-bin.h
/stage1.bin /stage0.bin
/blkfs /blkfs

21
emul/Makefile
View File

@ -14,7 +14,10 @@ $(BLKPACK):
$(BIN2C): $(BLKPACK) $(BIN2C): $(BLKPACK)
$(BLKUNPACK): $(BLKPACK) $(BLKUNPACK): $(BLKPACK)
stage0-bin.h: $(BIN2C) stage0.bin: stage2 xcomp.fs
cat xcomp.fs | ./stage2 > stage0.bin
stage0-bin.h: stage0.bin $(BIN2C)
$(BIN2C) KERNEL < stage0.bin > $@ $(BIN2C) KERNEL < stage0.bin > $@
stage1: stage.c $(OBJS) stage0-bin.h stage1: stage.c $(OBJS) stage0-bin.h
@ -23,13 +26,11 @@ stage1: stage.c $(OBJS) stage0-bin.h
stage1dbg: stage.c $(OBJS) stage0-bin.h stage1dbg: stage.c $(OBJS) stage0-bin.h
$(CC) -DDEBUG stage.c $(OBJS) -o $@ $(CC) -DDEBUG stage.c $(OBJS) -o $@
stage1.bin: stage1.fs stage1 # not dependent on forth.bin to avoid circular deps.
./stage1 < stage1.fs > $@ forth-bin.h: $(BIN2C)
$(BIN2C) KERNEL < forth.bin > $@
stage1-bin.h: stage1.bin $(BIN2C) stage2: stage.c $(OBJS) forth-bin.h blkfs-bin.h
$(BIN2C) KERNEL < stage1.bin > $@
stage2: stage.c $(OBJS) stage1-bin.h blkfs-bin.h
$(CC) -DSTAGE2 stage.c $(OBJS) -o $@ $(CC) -DSTAGE2 stage.c $(OBJS) -o $@
blkfs: $(BLKPACK) blkfs: $(BLKPACK)
@ -38,7 +39,7 @@ blkfs: $(BLKPACK)
blkfs-bin.h: blkfs $(BIN2C) blkfs-bin.h: blkfs $(BIN2C)
$(BIN2C) BLKFS < blkfs > $@ $(BIN2C) BLKFS < blkfs > $@
forth: forth.c $(OBJS) stage1-bin.h blkfs-bin.h forth: forth.c $(OBJS) forth-bin.h blkfs-bin.h
$(CC) forth.c $(OBJS) -o $@ $(CC) forth.c $(OBJS) -o $@
libz80/libz80.o: libz80/z80.c libz80/libz80.o: libz80/z80.c
@ -50,8 +51,8 @@ emul.o: emul.c
.PHONY: updatebootstrap .PHONY: updatebootstrap
updatebootstrap: stage2 updatebootstrap: stage1 stage1.fs
cat xcomp.fs | ./stage2 > stage0.bin ./stage1 < stage1.fs > forth.bin
.PHONY: pack .PHONY: pack
pack: pack:

BIN
emul/forth.bin Normal file
View File

Binary file not shown.

2
emul/forth.c
View File

@ -3,7 +3,7 @@
#include <unistd.h> #include <unistd.h>
#include <termios.h> #include <termios.h>
#include "emul.h" #include "emul.h"
#include "stage1-bin.h" #include "forth-bin.h"
#include "blkfs-bin.h" #include "blkfs-bin.h"
// in sync with glue.asm // in sync with glue.asm

2
emul/stage.c
View File

@ -3,7 +3,7 @@
#include <unistd.h> #include <unistd.h>
#include "emul.h" #include "emul.h"
#ifdef STAGE2 #ifdef STAGE2
#include "stage1-bin.h" #include "forth-bin.h"
#include "blkfs-bin.h" #include "blkfs-bin.h"
#else #else
#include "stage0-bin.h" #include "stage0-bin.h"

BIN
emul/stage0.bin
View File

Binary file not shown.