build: Cleanup trace output.

* build-aux/build-cc.sh: Cleanup trace output.
* build-aux/build-cc32.sh: Likewise.
* build-aux/build-guile.sh: Likewise.
* build-aux/build-mes.sh: Likewise.
* build-aux/build-x86_64-mes.sh: Likewise.
* build-aux/cc-mes.sh: Likewise.
* build-aux/cc.sh: Likewise.
* build-aux/cc32-mes.sh: Likewise.
* build-aux/cc64-mes.sh: Likewise.
* build-aux/check-boot.sh: Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2018-08-15 12:28:08 +02:00
parent 25c4acef82
commit 6633331876
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
10 changed files with 75 additions and 75 deletions

View file

@ -27,22 +27,22 @@ set -e
LIBC=${LIBC-c}
# native
trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c
trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c
trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c
trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c
trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c
trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c
trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c
trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c
trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c
trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c
trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c
trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c
trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c
trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c
# cc64-mes
trace "MSNARF gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "MSNARF lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "MSNARF math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "MSNARF mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "MSNARF posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "MSNARF reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "MSNARF vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
trace "SNARF.mes gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "SNARF.mes lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "SNARF.mes math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "SNARF.mes mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "SNARF.mes posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "SNARF.mes reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "SNARF.mes vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc.sh lib/libmes
sh ${srcdest}build-aux/cc.sh src/mes

View file

@ -28,22 +28,22 @@ LIBC=${LIBC-c}
##moduledir=${moduledir-${datadir}${datadir:+/}module}
# native
# trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c
# trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c
# trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c
# trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c
# trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c
# trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c
# trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c
# trace "SNARF gc.c" ${srcdest}build-aux/mes-snarf.scm src/gc.c
# trace "SNARF lib.c" ${srcdest}build-aux/mes-snarf.scm src/lib.c
# trace "SNARF math.c" ${srcdest}build-aux/mes-snarf.scm src/math.c
# trace "SNARF mes.c" ${srcdest}build-aux/mes-snarf.scm src/mes.c
# trace "SNARF posix.c" ${srcdest}build-aux/mes-snarf.scm src/posix.c
# trace "SNARF reader.c" ${srcdest}build-aux/mes-snarf.scm src/reader.c
# trace "SNARF vector.c" ${srcdest}build-aux/mes-snarf.scm src/vector.c
# cc32-mes
trace "MSNARF gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "MSNARF lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "MSNARF math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "MSNARF mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "MSNARF posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "MSNARF reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "MSNARF vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
trace "SNARF.mes gc.c" ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "SNARF.mes lib.c" ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "SNARF.mes math.c" ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "SNARF.mes mes.c" ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "SNARF.mes posix.c" ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "SNARF.mes reader.c" ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "SNARF.mes vector.c" ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc32-mes.sh lib/linux/x86-mes-gcc/crt0
ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc32-mes.sh lib/linux/x86-mes-gcc/crt1

View file

@ -61,6 +61,6 @@ for i in $SCM_FILES $SCRIPTS; do
b=$(basename $i)
go=${i%%.scm}.go
if [ $i -nt $go ]; then
trace "GUILEC $b" $GUILE_TOOLS compile -L ${srcdest}module -L ${srcdest}build-aux -L ${srcdest}scripts -o $go $i
trace "GUILEC $b" $GUILE_TOOLS compile -L ${srcdest}module -L ${srcdest}build-aux -L ${srcdest}scripts -o $go $i
fi
done

View file

@ -32,7 +32,7 @@ MES=${MES-$(command -v mes)}
set -e
trace "HEX2 0exit-42" $HEX2\
trace "HEX2 0exit-42" $HEX2\
--LittleEndian\
--Architecture 1\
--BaseAddress 0x1000000\
@ -42,11 +42,11 @@ trace "HEX2 0exit-42" $HEX2\
--exec_enable\
-o lib/x86-mes/0exit-42.x86-out
trace "TEST 0exit-42"
trace "TEST lib/x86-mes/0exit-42.x86-out" echo lib/x86-mes/0exit-42.x86-out
{ set +e; lib/x86-mes/0exit-42.x86-out; r=$?; set -e; }
[ $r != 42 ] && echo " => $r" && exit 1
trace "HEX2 0exit-42" $HEX2\
trace "HEX2 0exit-42" $HEX2\
--LittleEndian\
--Architecture 1\
--BaseAddress 0x1000000\
@ -56,39 +56,39 @@ trace "HEX2 0exit-42" $HEX2\
--exec_enable\
-o lib/x86-mes/exit-42.x86-out
trace "TEST exit-42"
trace "TEST lib/x86-mes/exit-42.x86-out" echo lib/x86-mes/exit-42.x86-out
{ set +e; lib/x86-mes/exit-42.x86-out; r=$?; set -e; }
[ $r != 42 ] && echo " => $r" && exit 1
if [ -d "$MES_SEED" ]; then
mkdir -p lib/x86-mes
trace "M1 crt1.S" $M1\
trace "M1 crt1.S" $M1\
$M1FLAGS\
-f ${srcdest}lib/x86-mes/x86.M1\
-f $MES_SEED/x86-mes/crt1.S\
-o lib/x86-mes/crt1.o
trace "M1 libc.S" $M1\
trace "M1 libc.S" $M1\
$M1FLAGS\
-f ${srcdest}lib/x86-mes/x86.M1\
-f $MES_SEED/x86-mes/libc.S\
-o lib/x86-mes/libc.o
trace "M1 mes.S" $M1\
trace "M1 mes.S" $M1\
--LittleEndian\
--Architecture 1\
-f ${srcdest}lib/x86-mes/x86.M1\
-f $MES_SEED/x86-mes/mes.S\
-o src/mes.o
trace "BLOOD_ELF mes.S" $BLOOD_ELF\
trace "BLOOD_ELF mes.S" $BLOOD_ELF\
-f ${srcdest}lib/x86-mes/x86.M1\
-f $MES_SEED/x86-mes/mes.S\
-f $MES_SEED/x86-mes/libc.S\
-o src/mes.S.blood-elf
trace "M1 mes.blood-elf" $M1\
trace "M1 mes.blood-elf" $M1\
--LittleEndian\
--Architecture 1\
-f src/mes.S.blood-elf\
-o src/mes.o.blood-elf
trace "HEX2 mes.o" $HEX2\
trace "HEX2 mes.o" $HEX2\
$HEX2FLAGS\
-f ${srcdest}lib/x86-mes/elf32-header.hex2\
-f lib/x86-mes/crt1.o\
@ -98,7 +98,7 @@ if [ -d "$MES_SEED" ]; then
--exec_enable\
-o src/mes.seed-out
cp src/mes.seed-out src/mes
trace "M1 libc+tcc.S" $M1\
trace "M1 libc+tcc.S" $M1\
$M1FLAGS\
-f ${srcdest}lib/x86-mes/x86.M1\
-f $MES_SEED/x86-mes/libc+tcc.S\
@ -119,7 +119,7 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc-mini
PREPROCESS= bash ${srcdest}build-aux/cc-mes.sh lib/x86-mes/exit-42
trace "TEST exit-42.out"
trace "TEST lib/x86-mes/exit-42.mes-out" echo lib/x86-mes/exit-42.mes-out
{ set +e; lib/x86-mes/exit-42.mes-out; r=$?; set -e; }
[ $r != 42 ] && echo " => $r" && exit 1
@ -136,13 +136,13 @@ ARCHDIR=1 NOLINK=1 bash ${srcdest}build-aux/cc-mes.sh lib/libc+gnu
[ -n "$SEED" ] && exit 0
MES_ARENA=${MES_ARENA-100000000}
trace "MSNARF gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "MSNARF lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "MSNARF math.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "MSNARF mes.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "MSNARF posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "MSNARF reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "MSNARF vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
trace "SNARF.mes gc.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/gc.c
trace "SNARF.mes lib.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/lib.c
trace "SNARF.mes math.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/math.c
trace "SNARF.mes mes.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/mes.c
trace "SNARF.mes posix.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/posix.c
trace "SNARF.mes reader.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/reader.c
trace "SNARF.mes vector.c" ./pre-inst-env bash ${srcdest}build-aux/mes-snarf.scm --mes src/vector.c
echo MES_ARENA=$MES_ARENA
bash ${srcdest}build-aux/cc-mes.sh scaffold/main

View file

@ -32,7 +32,7 @@ MES=${MES-$(command -v mes)}
set -e
trace "HEX2 0exit-42" $HEX2\
trace "HEX2 0exit-42" $HEX2\
--LittleEndian\
--Architecture 2\
--BaseAddress 0x1000000\
@ -42,11 +42,11 @@ trace "HEX2 0exit-42" $HEX2\
--exec_enable\
-o lib/x86_64-mes/0exit-42.x86_64-out
trace "TEST 0exit-42"
trace "TEST lib/x86_64-mes/0exit-42.x86_64-out" echo lib/x86_64-mes/0exit-42.x86_64-out
{ set +e; lib/x86_64-mes/0exit-42.x86_64-out; r=$?; set -e; }
[ $r != 42 ] && echo " => $r" && exit 1
trace "HEX2 0exit-42" $HEX2\
trace "HEX2 0exit-42" $HEX2\
--LittleEndian\
--Architecture 2\
--BaseAddress 0x1000000\
@ -56,39 +56,39 @@ trace "HEX2 0exit-42" $HEX2\
--exec_enable\
-o lib/x86_64-mes/exit-42.x86_64-out
trace "TEST exit-42"
trace "TEST lib/x86_64-mes/exit-42.x86_64-out" echo lib/x86_64-mes/exit-42.x86_64-out
{ set +e; lib/x86_64-mes/exit-42.x86_64-out; r=$?; set -e; }
[ $r != 42 ] && echo " => $r" && exit 1
# if [ -d "$MES_SEED" ]; then
# mkdir -p lib/x86_64-mes
# trace "M1 crt1.S" $M1\
# trace "M1 crt1.S" $M1\
# $M1FLAGS\
# -f ${srcdest}lib/x86_64-mes/x86_64.M1\
# -f $MES_SEED/x86_64-mes/crt1.S\
# -o lib/x86_64-mes/crt1.o
# trace "M1 libc.S" $M1\
# trace "M1 libc.S" $M1\
# $M1FLAGS\
# -f ${srcdest}lib/x86_64-mes/x86_64.M1\
# -f $MES_SEED/x86_64-mes/libc.S\
# -o lib/x86_64-mes/libc.o
# trace "M1 mes.S" $M1\
# trace "M1 mes.S" $M1\
# --LittleEndian\
# --Architecture 2\
# -f ${srcdest}lib/x86_64-mes/x86_64.M1\
# -f $MES_SEED/x86_64-mes/mes.S\
# -o src/mes.o
# trace "BLOOD_ELF mes.S" $BLOOD_ELF\
# trace "BLOOD_ELF mes.S" $BLOOD_ELF\
# -f ${srcdest}lib/x86_64-mes/x86_64.M1\
# -f $MES_SEED/x86_64-mes/mes.S\
# -f $MES_SEED/x86_64-mes/libc.S\
# -o src/mes.S.blood-elf
# trace "M1 mes.blood-elf" $M1\
# trace "M1 mes.blood-elf" $M1\
# --LittleEndian\
# --Architecture 2\
# -f src/mes.S.blood-elf\
# -o src/mes.o.blood-elf
# trace "HEX2 mes.o" $HEX2\
# trace "HEX2 mes.o" $HEX2\
# $HEX2FLAGS\
# -f ${srcdest}lib/x86_64-mes/elf64-header.hex2\
# -f lib/x86_64-mes/crt1.o\
@ -98,7 +98,7 @@ trace "TEST exit-42"
# --exec_enable\
# -o src/mes.seed-out
# cp src/mes.seed-out src/mes
# trace "M1 libc+tcc.S" $M1\
# trace "M1 libc+tcc.S" $M1\
# $M1FLAGS\
# -f ${srcdest}lib/x86_64-mes/x86_64.M1\
# -f $MES_SEED/x86_64-mes/libc+tcc.S\

View file

@ -48,20 +48,20 @@ fi
mkdir -p $d
if [ -n "$PREPROCESS" ]; then
trace "MESCPP $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -E -o "$o.E" "${srcdest}$c".c
trace "MESCC $c.E" ./pre-inst-env bash $MESCC $MES_CFLAGS -S "$o".E
trace "MESAS $c.S" ./pre-inst-env bash $MESCC $MES_CFLAGS -c -o "$o".${p}o "$o".S
trace "CPP.mes $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -E -o "$o.E" "${srcdest}$c".c
trace "CC.mes $c.E" ./pre-inst-env bash $MESCC $MES_CFLAGS -S "$o".E
trace "AS.mes $c.S" ./pre-inst-env bash $MESCC $MES_CFLAGS -c -o "$o".${p}o "$o".S
if [ -z "$NOLINK" ]; then
trace "MESLD $c.o" ./pre-inst-env bash $MESCC $MES_CFLAGS -o "$o".${p}out "$o".${p}o $MES_LIBS
trace "LD.mes $c.o" ./pre-inst-env bash $MESCC $MES_CFLAGS -o "$o".${p}out "$o".${p}o $MES_LIBS
fi
elif [ -n "$COMPILE" ]; then
trace "MESCC $c.c" trace "MESCC $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -S -o "$o.S" "${srcdest}$c".c
trace "MESAS $c.S" ./pre-inst-env bash $MESCC $MES_CFLAGS -c -o "$o".${p}o "$o".S
trace "CC.mes $c.c" trace "MESCC $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -S -o "$o.S" "${srcdest}$c".c
trace "AS.mes $c.S" ./pre-inst-env bash $MESCC $MES_CFLAGS -c -o "$o".${p}o "$o".S
if [ -z "$NOLINK" ]; then
trace "MESLD $c.o" ./pre-inst-env bash $MESCC $MES_CFLAGS -o "$o".${p}out "$o".${p}o $MES_LIBS
trace "LD.mes $c.o" ./pre-inst-env bash $MESCC $MES_CFLAGS -o "$o".${p}out "$o".${p}o $MES_LIBS
fi
elif [ -z "$NOLINK" ]; then
trace "MESCC $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -o "$o".${p}out "${srcdest}$c".c $MES_LIBS
trace "CC.mes $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -o "$o".${p}out "${srcdest}$c".c $MES_LIBS
else
trace "MESCC $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -c -o "$o".${p}o "${srcdest}$c".c
trace "CC.mes $c.c" ./pre-inst-env bash $MESCC $MES_CPPFLAGS $MES_CFLAGS -c -o "$o".${p}o "${srcdest}$c".c
fi

View file

@ -36,7 +36,7 @@ else
fi
mkdir -p $d
trace "CC $c.c" $CC\
trace "CC $c.c" $CC\
-c\
$CC_CPPFLAGS\
$CPPFLAGS\
@ -48,7 +48,7 @@ trace "CC $c.c" $CC\
"${srcdest}$c".c
if [ -z "$NOLINK" ]; then
trace "CCLD "$o".${p}out" $CC\
trace "CCLD "$o".${p}out" $CC\
$CC_CPPFLAGS\
$CPPFLAGS\
$CC_CFLAGS\

View file

@ -47,7 +47,7 @@ else
fi
mkdir -p $d
trace "CC32 $c.c" $CC32\
trace "CC.32 $c.c" $CC32\
-c\
$CC32_CPPFLAGS\
$CC32_CFLAGS\
@ -55,7 +55,7 @@ trace "CC32 $c.c" $CC32\
"${srcdest}$c".c
if [ -z "$NOLINK" ]; then
trace "CCLD32 $c.c" $CC32\
trace "CCLD.32 $c.c" $CC32\
$CC32_CPPFLAGS\
$CC32_CFLAGS\
-o "$o".${p}out\

View file

@ -46,7 +46,7 @@ else
fi
mkdir -p $d
trace "CC64 $c.c" $CC64\
trace "CC.64 $c.c" $CC64\
-c\
$CC64_CPPFLAGS\
$CC64_CFLAGS\
@ -54,7 +54,7 @@ trace "CC64 $c.c" $CC64\
"${srcdest}$c".c
if [ -z "$NOLINK" ]; then
trace "CCLD64 $c.c" $CC64\
trace "CCLD.64 $c.c" $CC64\
$CC64_CPPFLAGS\
$CC64_CFLAGS\
-o "$o".${p}out\

View file

@ -119,7 +119,7 @@ for i in $tests; do
echo ' [SKIP]'
continue;
fi
trace "TEST $i.guile" $GUILE -L ${srcdest}module -C module -L . <(echo '(use-modules (mes guile))'; cat scaffold/boot/$i)
trace "TEST $i.guile" $GUILE -L ${srcdest}module -C module -L . <(echo '(use-modules (mes guile))'; cat scaffold/boot/$i)
x=$(
if [ "$MES" = guile ]; then
true