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

Moved tools/bin2c to single-level with other tools.

Browse Source
This commit is contained in:
Byron A. Grobe 2020-04-07 16:56:55 -05:00
parent f65c189e9b
commit 217df20d77
No known key found for this signature in database
GPG Key ID: A031592157C3D920
5 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
emul/Makefile
View File

@ -6,7 +6,7 @@ ZASMBIN = zasm/zasm
AVRABIN = zasm/avra
SHELLAPPS = zasm ed
SHELLTGTS = ${SHELLAPPS:%=cfsin/%}
BIN2C = ../tools/bin2c/bin2c
BIN2C = ../tools/bin2c
# Those Forth source files are in a particular order
FORTHSRCS = core.fs str.fs parse.fs readln.fs fmt.fs z80a.fs
FORTHSRC_PATHS = ${FORTHSRCS:%=../forth/%}
@ -15,17 +15,17 @@ OBJS = emul.o libz80/libz80.o
SHELLOBJS = $(OBJS) $(CFSPACK_OBJ)
ZASMOBJS = $(SHELLOBJS)
.PHONY: all
.PHONY: all tools
all: $(TARGETS) $(AVRABIN) $(CFSIN_CONTENTS)
$(BIN2C): ../tools/bin2c/bin2c.c
$(MAKE) -C ../tools/bin2c
tools:
$(MAKE) -C ../tools
# -o in sync with SHELL_CODE in shell/glue.asm
shell/shell.bin: shell/glue.asm $(ZASMBIN) $(BIN2C)
shell/shell.bin: shell/glue.asm $(ZASMBIN) tools
$(ZASMBIN) $(KERNEL) shell/user.h $(APPS) < shell/glue.asm | tee $@ > /dev/null
shell/shell-bin.h: shell/shell.bin $(BIN2C)
shell/shell-bin.h: shell/shell.bin tools
$(BIN2C) KERNEL < shell/shell.bin | tee $@ > /dev/null
shell/shell: shell/shell.c $(SHELLOBJS) shell/shell-bin.h
@ -36,7 +36,7 @@ shell/shell: shell/shell.c $(SHELLOBJS) shell/shell-bin.h
forth/forth0.bin:
cat forth/boot.bin forth/z80c.bin > $@
forth/forth0-bin.h: forth/forth0.bin $(BIN2C)
forth/forth0-bin.h: forth/forth0.bin tools
$(BIN2C) KERNEL < forth/forth0.bin | tee $@ > /dev/null
forth/stage1: forth/stage.c $(OBJS) forth/forth0-bin.h
@ -51,7 +51,7 @@ forth/core.bin: $(FORTHSRC_PATHS) forth/stage1
forth/forth1.bin: forth/forth0.bin forth/core.bin
cat forth/forth0.bin forth/core.bin > $@
forth/forth1-bin.h: forth/forth1.bin $(BIN2C)
forth/forth1-bin.h: forth/forth1.bin tools
$(BIN2C) KERNEL < forth/forth1.bin | tee $@ > /dev/null
forth/stage2: forth/stage.c $(OBJS) forth/forth1-bin.h
@ -60,10 +60,10 @@ forth/stage2: forth/stage.c $(OBJS) forth/forth1-bin.h
forth/forth: forth/forth.c $(OBJS) forth/forth1-bin.h
$(CC) forth/forth.c $(OBJS) -o $@
zasm/kernel-bin.h: zasm/kernel.bin $(BIN2C)
zasm/kernel-bin.h: zasm/kernel.bin tools
$(BIN2C) KERNEL < zasm/kernel.bin | tee $@ > /dev/null
zasm/zasm-bin.h: zasm/zasm.bin $(BIN2C)
zasm/zasm-bin.h: zasm/zasm.bin tools
$(BIN2C) USERSPACE < zasm/zasm.bin | tee $@ > /dev/null
$(ZASMBIN): zasm/zasm.c $(ZASMOBJS) zasm/kernel-bin.h zasm/zasm-bin.h
@ -72,7 +72,7 @@ $(ZASMBIN): zasm/zasm.c $(ZASMOBJS) zasm/kernel-bin.h zasm/zasm-bin.h
zasm/avra.bin: $(ZASMBIN)
$(ZASMBIN) $(KERNEL) $(APPS) zasm/user.h < $(APPS)/zasm/gluea.asm > $@
zasm/avra-bin.h: zasm/avra.bin $(BIN2C)
zasm/avra-bin.h: zasm/avra.bin tools
$(BIN2C) USERSPACE < zasm/avra.bin | tee $@ > /dev/null
$(AVRABIN): zasm/zasm.c $(ZASMOBJS) zasm/kernel-bin.h zasm/avra-bin.h
@ -113,4 +113,4 @@ fbootstrap: forth/stage2
.PHONY: clean
clean:
rm -f $(TARGETS) $(SHELLTGTS) emul.o zasm/*-bin.h shell/*-bin.h
$(MAKE) -C ../tools/bin2c clean
$(MAKE) -C ../tools clean

4
tools/Makefile
View File

@ -4,8 +4,9 @@ UPLOAD_TGT = upload
FONTCOMPILE_TGT = fontcompile
TTYSAFE_TGT = ttysafe
PINGPONG_TGT = pingpong
BIN2C_TGT = bin2c
TARGETS = $(MEMDUMP_TGT) $(BLKDUMP_TGT) $(UPLOAD_TGT) $(FONTCOMPILE_TGT) \
$(TTYSAFE_TGT) $(PINGPONG_TGT)
$(TTYSAFE_TGT) $(PINGPONG_TGT) $(BIN2C_TGT)
OBJS = common.o
all: $(TARGETS)
@ -20,6 +21,7 @@ $(UPLOAD_TGT): $(UPLOAD_TGT).c
$(FONTCOMPILE_TGT): $(FONTCOMPILE_TGT).c
$(TTYSAFE_TGT): $(TTYSAFE_TGT).c
$(PINGPONG_TGT): $(PINGPONG_TGT).c
$(BIN2C_TGT): $(BIN2C_TGT).c
$(TARGETS): $(OBJS)
$(CC) $(CFLAGS) $@.c $(OBJS) -o $@

49
tools/bin2c.c Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 2020 Byron Grobe
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdio.h>
#include <stdlib.h>
#define BUFSZ 32
static const char intro[] = "static const unsigned char %s[] = {\n ";
int main(int argc, char **argv) {
int n;
int col = 0;
uint8_t buf[BUFSZ];
if (argc < 2) {
fprintf(stderr, "Specify a name for the data structure...\n");
return 1;
}
printf(intro, argv[1]);
while(!feof(stdin)) {
n = fread(buf, 1, BUFSZ, stdin);
for(int i = 0; i < n; ++i) {
if (col+4 >= 76) {
printf("\n ");
col = 0;
}
printf("0x%.2x, ", buf[i]);
col += 6;
}
}
printf("};\n");
}

12
tools/bin2c/Makefile
View File

@ -1,12 +0,0 @@
.PHONY: all clean
all: bin2c
bin2c: bin2c.o
$(CC) -o $@ $<
%.o: %.c
$(CC) -c -o $@ $<
clean:
rm -rf bin2c bin2c.o

33
tools/bin2c/bin2c.c
View File

@ -1,33 +0,0 @@
#include <stdio.h>
#include <stdlib.h>
#define BUFSZ 32
static const char intro[] = "static const unsigned char %s[] = {\n ";
int main(int argc, char **argv) {
int n;
int col = 0;
uint8_t buf[BUFSZ];
if (argc < 2) {
fprintf(stderr, "Specify a name for the data structure...\n");
return 1;
}
printf(intro, argv[1]);
while(!feof(stdin)) {
n = fread(buf, 1, BUFSZ, stdin);
for(int i = 0; i < n; ++i) {
if (col+4 >= 76) {
printf("\n ");
col = 0;
}
printf("0x%.2x, ", buf[i]);
col += 6;
}
}
printf("};\n");
}