lassik
/
upscheme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize boot image inclusion on C 

Cuts the build time in half that flisp.c is no longer re-compiled
unnecessarily.
This commit is contained in:
Lassi Kortela 2019-08-27 10:31:31 +03:00
parent 297e6fa13d
commit 847eb585ae
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
c/boot_image.c Normal file
View File

@ -0,0 +1,5 @@
#include <stddef.h>
#include "../scheme-boot/boot_image.h"
const size_t boot_image_size = sizeof(boot_image);

4
c/flisp.c
View File

@ -49,8 +49,6 @@
#include "opcodes.h" #include "opcodes.h"
#include "../scheme-boot/boot_image.h"
static char *builtin_names[] = { static char *builtin_names[] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
// predicates // predicates
@ -2654,7 +2652,7 @@ int fl_load_boot_image(void)
f = cvalue(iostreamtype, sizeof(struct ios)); f = cvalue(iostreamtype, sizeof(struct ios));
s = value2c(struct ios *, f); s = value2c(struct ios *, f);
ios_static_buffer(s, boot_image, sizeof(boot_image)); ios_static_buffer(s, boot_image, boot_image_size);
PUSH(f); PUSH(f);
saveSP = SP; saveSP = SP;
{ {

5
c/scheme.h
View File

@ -997,4 +997,9 @@ value_t fl_stringp(value_t *args, uint32_t nargs);
value_t fl_string_reverse(value_t *args, uint32_t nargs); value_t fl_string_reverse(value_t *args, uint32_t nargs);
value_t fl_string_sub(value_t *args, uint32_t nargs); value_t fl_string_sub(value_t *args, uint32_t nargs);
// boot_image.c
extern char boot_image[];
extern const size_t boot_image_size;
#include "htableh_inc.h" #include "htableh_inc.h"

8
scripts/build.sh
View File

@ -6,6 +6,7 @@ o_files="$o_files algo_color.o"
o_files="$o_files argcount.o" o_files="$o_files argcount.o"
o_files="$o_files bitvector-ops.o" o_files="$o_files bitvector-ops.o"
o_files="$o_files bitvector.o" o_files="$o_files bitvector.o"
o_files="$o_files boot_image.o"
o_files="$o_files buf.o" o_files="$o_files buf.o"
o_files="$o_files builtins.o" o_files="$o_files builtins.o"
o_files="$o_files dump.o" o_files="$o_files dump.o"
@ -94,6 +95,7 @@ $CC $CFLAGS -c ../c/builtins.c
$CC $CFLAGS -c ../c/dump.c $CC $CFLAGS -c ../c/dump.c
$CC $CFLAGS -c ../c/env_unix.c $CC $CFLAGS -c ../c/env_unix.c
$CC $CFLAGS -c ../c/equalhash.c $CC $CFLAGS -c ../c/equalhash.c
$CC $CFLAGS -c ../c/flisp.c
$CC $CFLAGS -c ../c/flmain.c $CC $CFLAGS -c ../c/flmain.c
$CC $CFLAGS -c ../c/hashing.c $CC $CFLAGS -c ../c/hashing.c
$CC $CFLAGS -c ../c/htable.c $CC $CFLAGS -c ../c/htable.c
@ -114,7 +116,7 @@ $CC $CFLAGS -c ../c/text_ini.c
$CC $CFLAGS -c ../c/time_unix.c $CC $CFLAGS -c ../c/time_unix.c
$CC $CFLAGS -c ../c/utf8.c $CC $CFLAGS -c ../c/utf8.c
$CC $CFLAGS -c ../c/flisp.c $CC $CFLAGS -c ../c/boot_image.c
$CC $LFLAGS -o upscheme $o_files $CC $LFLAGS -o upscheme $o_files
{ set +x; } 2>/dev/null { set +x; } 2>/dev/null
@ -131,7 +133,7 @@ cd ../"$builddir"
echo "Entering directory '$PWD'" echo "Entering directory '$PWD'"
set -x set -x
$CC $CFLAGS -c ../c/flisp.c $CC $CFLAGS -c ../c/boot_image.c
$CC $LFLAGS -o upscheme $o_files $CC $LFLAGS -o upscheme $o_files
{ set +x; } 2>/dev/null { set +x; } 2>/dev/null
@ -148,7 +150,7 @@ cd ../"$builddir"
echo "Entering directory '$PWD'" echo "Entering directory '$PWD'"
set -x set -x
$CC $CFLAGS -c ../c/flisp.c $CC $CFLAGS -c ../c/boot_image.c
$CC $LFLAGS -o upscheme $o_files $CC $LFLAGS -o upscheme $o_files
{ set +x; } 2>/dev/null { set +x; } 2>/dev/null