Revert "core: Pointer Cells: copy back. WIPPERDEWIP"

This reverts commit def3f1a4b5.
POINTER/haas define
2019-11-02 08:54:56 +01:00 · 2019-11-02 08:45:49 +01:00 · 2019-11-02 08:45:43 +01:00 · 2019-11-02 08:45:29 +01:00 · 2019-11-02 08:45:29 +01:00 · 2019-11-02 08:44:46 +01:00
173 changed files with 7363 additions and 3636 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,32 +33,15 @@
 *.mini-hex2
 *.a
 *.o
+*.h.m2
+*.c.m2
 *.seed-out
 *.stderr
 *.stdout

 *.x86-out

-*.x86-mes-E
-*.x86-mes-S
-*.x86-mes-gcc-a
-*.x86-mes-gcc-o
-*.x86-mes-gcc-out
-*.x86-mes-gcc-stdout
-*.x86-mes-o
-*.x86-mes-out
-*.x86-mes-stdout
-
-*.x86_64-mes-E
-*.x86_64-mes-S
-*.x86_64-mes-gcc-a
-*.x86_64-mes-gcc-o
-*.x86_64-mes-gcc-out
-*.x86_64-mes-gcc-stdout
-*.x86_64-mes-o
-*.x86_64-mes-out
-*.x86_64-mes-stdout
-*.x86_64-out
+/TAGS

 /lib/x86-mes/0exit-42
 /lib/x86-mes/exit-42
@ -69,58 +52,30 @@
 !/lib/tests/*/*.exit
 !/lib/tests/*/*.stdout

+/scaffold/*.M1
+/scaffold/*.m2
+/scaffold/*.hex2
 /scaffold/argv
 /scaffold/hello
 /scaffold/main
 /scaffold/micro-mes
+/scaffold/read
 /scaffold/tiny-mes

-/scaffold/x86-mes-*
-/scaffold/x86_64-mes-*
-
-/scaffold/tests/x86-mes-*
-/scaffold/tests/[0-9a][0-9a-z]-*
-/scaffold/tests/t.*
-!/scaffold/tests/*.c
-!/scaffold/tests/*.exit
-!/scaffold/tests/*.stdout
-
-/src/mes.mes.symbols.h
-/src/gc.mes.h
-/src/hash.mes.h
-/src/lib.mes.h
-/src/math.mes.h
-/src/mes.mes.h
-/src/module.mes.h
-/src/posix.mes.h
-/src/reader.mes.h
-/src/strings.mes.h
-/src/struct.mes.h
-/src/vector.mes.h
-/src/gc.mes.i
-/src/hash.mes.i
-/src/lib.mes.i
-/src/math.mes.i
-/src/mes.mes.i
-/src/module.mes.i
-/src/posix.mes.i
-/src/reader.mes.i
-/src/strings.mes.i
-/src/struct.mes.i
-/src/vector.mes.i
+/scaffold/argv-m2
+/scaffold/hello-m2
+/scaffold/main-m2
+/scaffold/micro-mes-m2
+/scaffold/read-m2
+/scaffold/tiny-mes-m2

 /src/mes
-/src/x86-mes-mes
-/src/x86_64-mes-mes

+/.config
 /.config.make
 /.store
 /.tarball-version

-#keep this: bootstrap
-#/mes.mes
-
-/out
 ?
 ?.mes
 \#*#
@ -147,6 +102,7 @@
 /install.sh
 /uninstall.sh
 /mes/module/mes/boot-0.scm
+/scripts/m2-merge.scm
 /scripts/mesar
 /scripts/mescc.scm
 /scripts/mescc
--- a/build-aux/bootstrap.sh.in
+++ b/build-aux/bootstrap.sh.in
@ -20,8 +20,11 @@

 LANG=
 MES_ARENA=${MES_ARENA-100000000}
-MES_MAX_ARENA=${MES_MAX_ARENA-100000000}
-MES_STACK=${MES_STACK-500000}
+export MES_ARENA
+MES_MAX_ARENA=${MES_MAX_ARENA-${MES_ARENA}}
+export MES_MAX_ARENA
+MES_STACK=${MES_STACK-10000000}
+export MES_STACK

 . build-aux/configure-lib.sh

@ -81,3 +84,15 @@ for c in $mes_SOURCES; do
 done
 echo "CCLD       src/mes"
 $CC -nostdlib -o src/mes -L mescc-lib mescc-lib/crt1.o $objects -lc
+
+(
+    mkdir -p gcc-lib
+    cp config.sh gcc-lib
+    cd gcc-lib
+    compiler=gcc
+    if test -z "$srcdest"; then
+        srcdest=../
+        srcdir=../
+    fi
+    @SHELL@ ${srcdest}build-aux/build-source-lib.sh
+)
--- a/build-aux/build-lib.sh
+++ b/build-aux/build-lib.sh
@ -79,26 +79,3 @@ cp libgetopt.a $mes_cpu-mes
 if test -e libgetopt.s; then
    cp libgetopt.s $mes_cpu-mes
 fi
-
-cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt*.c $mes_cpu-mes
-
-rm -f libc+gnu.c
-cat > libc+gnu.c <<EOF
-// Generated from Mes -- do not edit
-// compiler: $compiler
-// cpu:      $mes_cpu
-// bits:     $mes_bits
-// libc:     $mes_libc
-// kernel:   $mes_kernel
-// system:   $mes_system
-
-EOF
-for c in $libc_gnu_SOURCES; do
-    echo "// $c" >> libc+gnu.c
-    cat ${srcdest}$c >> libc+gnu.c
-    echo >> libc+gnu.c
-done
-cp libc+gnu.c $mes_cpu-mes
-
-cp ${srcdest}lib/libtcc1.c $mes_cpu-mes
-cp ${srcdest}lib/posix/getopt.c $mes_cpu-mes/libgetopt.c
--- a/build-aux/build-mes.sh
+++ b/build-aux/build-mes.sh
@ -35,6 +35,11 @@ trap 'test -f .log && cat .log' EXIT

 srcdest=${srcdest-}
 mes_sources="
+src/builtins.c
+src/cc.c
+src/core.c
+src/display.c
+src/eval-apply.c
 src/gc.c
 src/hash.c
 src/lib.c
@ -43,8 +48,10 @@ src/mes.c
 src/module.c
 src/posix.c
 src/reader.c
+src/stack.c
 src/string.c
 src/struct.c
+src/symbol.c
 src/vector.c
 "

--- a/build-aux/build-source-lib.sh
+++ b/build-aux/build-source-lib.sh
@ -0,0 +1,53 @@
+#! /bin/sh
+
+# GNU Mes --- Maxwell Equations of Software
+# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+#
+# This file is part of GNU Mes.
+#
+# GNU Mes is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Mes is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+if test "$V" = 2; then
+    set -x
+fi
+
+set -u
+srcdest=${srcdest-}
+. ${srcdest}build-aux/configure-lib.sh
+
+mkdir -p $mes_cpu-mes
+cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt*.c $mes_cpu-mes
+
+rm -f libc+gnu.c
+cat > libc+gnu.c <<EOF
+// Generated from Mes -- do not edit
+// compiler: $compiler
+// cpu:      $mes_cpu
+// bits:     $mes_bits
+// libc:     $mes_libc
+// kernel:   $mes_kernel
+// system:   $mes_system
+
+EOF
+for c in $libc_gnu_SOURCES; do
+    echo "// $c" >> libc+gnu.c
+    cat ${srcdest}$c >> libc+gnu.c
+    echo >> libc+gnu.c
+done
+cp libc+gnu.c $mes_cpu-mes
+
+cp ${srcdest}lib/libtcc1.c $mes_cpu-mes
+cp ${srcdest}lib/posix/getopt.c $mes_cpu-mes/libgetopt.c
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@ -87,15 +87,15 @@ export CPPFLAGS
 export LDFLAGS
 export LIBS

-if test $compiler = gcc; then
-    (
-        mkdir -p gcc-lib
-        cp config.sh gcc-lib
-        cd gcc-lib
-        if test -z "$srcdest"; then
-            srcdest=../
-            srcdir=../
-        fi
+(
+    mkdir -p gcc-lib
+    cp config.sh gcc-lib
+    cd gcc-lib
+    if test -z "$srcdest"; then
+        srcdest=../
+        srcdir=../
+    fi
+    if test $compiler = gcc; then
        CPPFLAGS="
 -D HAVE_CONFIG_H=1
 -I include
@ -104,8 +104,9 @@ if test $compiler = gcc; then
 "
        ${SHELL} ${srcdest}build-aux/build-lib.sh
        cp crt1.o ..
-    )
-fi
+    fi
+    compiler=gcc ${SHELL} ${srcdest}build-aux/build-source-lib.sh
+)

 (
    if test $compiler = gcc; then
@ -145,4 +146,5 @@ fi
    AR="${srcdest}pre-inst-env mesar"
    CC="${srcdest}pre-inst-env mescc -m $mes_bits"
    ${SHELL} ${srcdest}build-aux/build-lib.sh
+    ${SHELL} ${srcdest}build-aux/build-source-lib.sh
 )
--- a/build-aux/check-boot.sh
+++ b/build-aux/check-boot.sh
@ -77,7 +77,6 @@ scaffold/boot/2g-vector.scm
 scaffold/boot/30-capture.scm
 scaffold/boot/31-capture-define.scm
 scaffold/boot/32-capture-modify-close.scm
-scaffold/boot/32-capture-modify-close.scm
 scaffold/boot/33-procedure-override-close.scm
 scaffold/boot/34-cdr-override-close.scm
 scaffold/boot/35-closure-modify.scm
@ -111,6 +110,7 @@ scaffold/boot/50-primitive-load.scm
 scaffold/boot/53-closure-display.scm
 scaffold/boot/60-let-syntax.scm
 scaffold/boot/call-cc.scm
+scaffold/boot/gc.scm
 scaffold/boot/memory.scm
 scaffold/boot/numbers.scm
 "
--- a/build-aux/check-mes.sh
+++ b/build-aux/check-mes.sh
@ -27,6 +27,7 @@ tests/boot.test
 tests/read.test
 tests/srfi-0.test
 tests/macro.test
+tests/gc.test
 tests/perform.test
 tests/base.test
 tests/quasiquote.test
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@ -200,12 +200,16 @@ if test -z "$bootstrap"; then
    TESTS="$TESTS
 lib/tests/dirent/90-readdir.c
 lib/tests/io/90-stat.c
+lib/tests/mes/90-abtod.c
+lib/tests/mes/90-dtoab.c
+lib/tests/posix/90-execlp.c
 lib/tests/posix/90-unsetenv.c
 lib/tests/signal/90-signal.c
 lib/tests/stdio/90-fopen.c
 lib/tests/stdio/90-fopen-append.c
 lib/tests/stdio/90-fread-fwrite.c
 lib/tests/stdio/90-fseek.c
+lib/tests/stdio/90-sprintf.c
 lib/tests/stdlib/90-strtol.c
 lib/tests/string/90-snprintf.c
 lib/tests/string/90-strpbrk.c
@ -222,7 +226,7 @@ lib/tests/scaffold/a1-global-no-clobber.c
 fi

 XFAIL_TESTS="
-lib/tests/stdio/90-sprintf.c
+lib/tests/mes/90-abtod.c
 lib/tests/stdio/90-sprintf.c
 "

@ -232,6 +236,7 @@ lib/tests/scaffold/17-compare-unsigned-char-le.c
 lib/tests/scaffold/17-compare-unsigned-short-le.c
 lib/tests/scaffold/66-local-char-array.c
 lib/tests/scaffold/72-typedef-struct-def-local.c
+lib/tests/mes/90-dtoab.c
 lib/tests/scaffold/90-goto-var.c
 lib/tests/scaffold/91-goto-array.c
 "
@ -248,11 +253,6 @@ lib/tests/scaffold/a0-call-trunc-int.c
    fi
 fi

-if test $mes_cpu = x86; then
-    XFAIL_TESTS="$XFAIL_TESTS
-"
-fi
-
 if test $mes_cpu = x86_64; then
    XFAIL_TESTS="$XFAIL_TESTS
 lib/tests/stdio/70-printf-stdarg.c
@ -261,10 +261,12 @@ fi

 if test $compiler = gcc; then
    XFAIL_TESTS="$XFAIL_TESTS
+lib/tests/mes/90-abtod.c
 "

    if test $mes_cpu = x86; then
        XFAIL_TESTS="$XFAIL_TESTS
+lib/tests/mes/90-dtoab.c
 "
    fi

--- a/build-aux/configure-lib.sh
+++ b/build-aux/configure-lib.sh
@ -76,6 +76,7 @@ if test $mes_libc = mes; then
 lib/ctype/isdigit.c
 lib/ctype/isspace.c
 lib/ctype/isxdigit.c
+lib/mes/assert_msg.c
 lib/posix/write.c
 lib/stdlib/atoi.c
 "
@ -86,6 +87,8 @@ lib/linux/lseek.c
    fi
 else
    libmes_SOURCES="$libmes_SOURCES
+lib/mes/abtod.c
+lib/mes/dtoab.c
 "
 fi

@ -156,6 +159,8 @@ lib/ctype/islower.c
 lib/ctype/isupper.c
 lib/ctype/tolower.c
 lib/ctype/toupper.c
+lib/mes/abtod.c
+lib/mes/dtoab.c
 lib/mes/search-path.c
 lib/posix/execvp.c
 lib/stdio/fclose.c
@ -180,6 +185,7 @@ lib/stdio/vsprintf.c
 lib/stdio/vsscanf.c
 lib/stdlib/calloc.c
 lib/stdlib/qsort.c
+lib/stdlib/strtod.c
 lib/stdlib/strtof.c
 lib/stdlib/strtol.c
 lib/stdlib/strtold.c
@ -199,7 +205,6 @@ lib/stub/ldexp.c
 lib/stub/mprotect.c
 lib/stub/localtime.c
 lib/stub/sigemptyset.c
-lib/stub/strtod.c
 lib/$mes_cpu-mes-$compiler/setjmp.c
 "

@ -217,6 +222,7 @@ lib/ctype/isalnum.c
 lib/ctype/isalpha.c
 lib/ctype/isascii.c
 lib/ctype/iscntrl.c
+lib/ctype/isgraph.c
 lib/ctype/isprint.c
 lib/ctype/ispunct.c
 lib/dirent/__getdirentries.c
@ -227,6 +233,7 @@ lib/math/fabs.c
 lib/mes/fdgets.c
 lib/posix/alarm.c
 lib/posix/execl.c
+lib/posix/execlp.c
 lib/posix/mktemp.c
 lib/posix/raise.c
 lib/posix/sbrk.c
@ -243,6 +250,7 @@ lib/stdlib/abort.c
 lib/stdlib/abs.c
 lib/stdlib/alloca.c
 lib/stdlib/atexit.c
+lib/stdlib/atof.c
 lib/stdlib/atol.c
 lib/stdlib/mbstowcs.c
 lib/string/bcmp.c
@ -263,14 +271,20 @@ lib/stub/ctime.c
 lib/stub/fpurge.c
 lib/stub/freadahead.c
 lib/stub/frexp.c
+lib/stub/getgrgid.c
+lib/stub/getgrnam.c
 lib/stub/getlogin.c
+lib/stub/getpgid.c
+lib/stub/getpgrp.c
 lib/stub/getpwnam.c
 lib/stub/getpwuid.c
 lib/stub/gmtime.c
+lib/stub/mktime.c
 lib/stub/pclose.c
 lib/stub/popen.c
 lib/stub/rand.c
 lib/stub/setbuf.c
+lib/stub/setgrent.c
 lib/stub/setlocale.c
 lib/stub/setvbuf.c
 lib/stub/sigaddset.c
@ -303,14 +317,17 @@ lib/linux/kill.c
 lib/linux/link.c
 lib/linux/lstat.c
 lib/linux/mkdir.c
+lib/linux/mknod.c
 lib/linux/nanosleep.c
 lib/linux/pipe.c
+lib/linux/readlink.c
 lib/linux/rename.c
 lib/linux/setgid.c
 lib/linux/settimer.c
 lib/linux/setuid.c
 lib/linux/signal.c
 lib/linux/sigprogmask.c
+lib/linux/symlink.c
 "
 fi

--- a/build-aux/indent.sh
+++ b/build-aux/indent.sh
@ -19,3 +19,4 @@
 # along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.

 for i in $(find . -name '*.c' -o -name '*.h' -o -name '*.i'); do indent $i --no-tabs --line-length 110 --honour-newlines; done
+rm -f $(find . -name '*~')
--- a/build-aux/install.sh.in
+++ b/build-aux/install.sh.in
@ -77,13 +77,15 @@ else
    cp $_v ChangeLog ${DESTDIR}${docdir}
 fi

+if test -f module/mescc.go; then
+    __exclude_go=--exclude='*.go'
+    __exclude_scm=--exclude='*.scm'
+fi
 mkdir -p $DESTDIR$libdir
 mkdir -p $DESTDIR$pkgdatadir
-# rm -f $(find lib -type f -a -executable)
-# rm -f $(find scaffold -type f -a -executable)
 tar -cf- -C ${srcdir} include lib/$mes_cpu-mes | tar -${v}xf- -C $DESTDIR$prefix
 if test -z "$srcdest"; then
-    tar -cf- --exclude='*.go' module | tar -${v}xf- -C $DESTDIR$pkgdatadir
+    tar -cf- $__exclude_go module | tar -${v}xf- -C $DESTDIR$pkgdatadir
 else
    tar -cf- -C ${srcdest} module | tar -${v}xf- -C $DESTDIR$pkgdatadir
 fi
@ -97,8 +99,8 @@ fi

 mkdir -p ${DESTDIR}${guile_site_dir}
 mkdir -p ${DESTDIR}${guile_site_ccache_dir}
-tar -cf- -C ${srcdest}module --exclude='*.go' . | tar -${v}xf- -C ${DESTDIR}${guile_site_dir}
-tar -cf- -C module --exclude='*.scm' . | tar -${v}xf- -C ${DESTDIR}${guile_site_ccache_dir}
+tar -cf- -C ${srcdest}module $__exclude_go . | tar -${v}xf- -C ${DESTDIR}${guile_site_dir}
+tar -cf- -C module $__exclude_scm . | tar -${v}xf- -C ${DESTDIR}${guile_site_ccache_dir}

 if test -f doc/mes.info; then
    mkdir -p ${DESTDIR}${infodir}
--- a/build-aux/mes-snarf.scm
+++ b/build-aux/mes-snarf.scm
@ -4,7 +4,7 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
 !#

 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; mes-snarf.scm: This file is part of GNU Mes.
 ;;;
@ -85,8 +85,7 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
                    (cut string-replace-string <> "_to_" "->")
                    (cut string-replace-suffix <> "_x" "!")
                    (cut string-replace-suffix <> "_x_" "!-")
-                    (cut string-replace-suffix <> "_p" "?")
-                    )
+                    (cut string-replace-suffix <> "_p" "?"))
                   (function.name f))))
        (if (not (string-suffix? "-" name)) name
            (string-append "core:" (string-drop-right name 1))))))
@ -117,7 +116,7 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
                    (if (string-null? (function.formals f)) 0
                        (length (string-split (function.formals f) #\,)))))
         (n (if (eq? arity 'n) -1 arity)))
-    (format #f "  a = init_builtin (builtin_type, ~s, ~a, &~a, a);\n" (function.name f) n (function.name f))))
+    (format #f "  a = init_builtin (builtin_type, ~s, ~a, &~a, a);\n" (function-scm-name f) n (function.name f))))

 (define (disjoin . predicates)
  (lambda (. arguments)
@ -150,9 +149,16 @@ exec ${GUILE-guile} --no-auto-compile -L $(dirname $0) -C $(dirname $0) -e '(mes
              (not (string-prefix? "/" function))
              rest
              (receive (parameter-list annotation)
-                  (apply values (string-split-string rest " ///"))
-                (let* ((parameters (string-drop parameter-list 1))
+                  (apply values (string-split-string rest " /*:"))
+                (let* ((parameters (string-trim-both parameter-list))
+                       (parameters (string-drop parameters 1))
                       (parameters (string-drop-right parameters 1))
+                       (annotation (if (string? annotation) (string-trim-both annotation)
+                                       annotation))
+                       (annotation (if (and (string? annotation)
+                                            (string-suffix? "*/" annotation))
+                                       (string-drop-right annotation 2)
+                                       annotation))
                       (formals (if (string-null? parameters) '()
                                    (string-split parameters #\,)))
                       (formals (map string-trim formals)))
--- a/build-aux/pointer.sh
+++ b/build-aux/pointer.sh
@ -0,0 +1,71 @@
+#! /bin/sh
+
+set -x
+
+ptr_once='s,([^N])(MACRO|NAME|VALUE) \(([^()]*)\),\1\3->\L\2,'
+ptr_once='s,([^N])(BYTES|CAR|CDR|CLOSURE|CONTINUATION|LENGTH|MACRO|NAME|PORT|REF|STRING|STRUCT|TYPE|VALUE|VARIABLE|VECTOR) \(([^()]*)\),\1\3->\L\2,'
+n_once='s,N(TYPE|CAR|CDR|LENGTH|VALUE|VECTOR) \(([^()]*)\),\2->\L\1,'
+ncbytes='s,NC(BYTES) \(([^()]*)\),news_\L\1 (\2),'
+cbytes='s,([^N])C(BYTES) \(([^()]*)\),\1cell_\L\2 (\3),'
+cstring='s,C(STRING) \(([^()]*)\),cell_bytes (STRING (\2)),'
+struct='s,SCM,struct scm*,g'
+
+sed -ri                                                         \
+    -e 's,POINTER_CELLS=0,POINTER_CELLS=1',                     \
+    -e 's,#define POINTER_CELLS 0,#define POINTER_CELLS 1',     \
+    -e "$ncbytes"                                               \
+    -e "$cbytes"                                                \
+    -e "$cstring"                                               \
+                                                                \
+    -e "$ncbytes"                                               \
+    -e "$cbytes"                                                \
+    -e "$cstring"                                               \
+                                                                \
+    -e "$ptr_once"                                              \
+    -e "$ptr_once"                                              \
+    -e "$ptr_once"                                              \
+    -e 's,->\<struct\>,->structure,g'                           \
+    -e "$struct"                                                \
+                                                                \
+    -e "$n_once"                                                \
+    -e "$n_once"                                                \
+                                                                \
+    -e 's,CAR \(([^()]*)\),\1->cdr,'                            \
+    -e 's,CAAR \(([^()]*)\),\1->car->car,'                      \
+    -e 's,CADR \(([^()]*)\),\1->cdr->car,'                      \
+    -e 's,CDAR \(([^()]*)\),\1->car->cdr,'                      \
+    -e 's,CDDR \(([^()]*)\),\1->cdr->cdr,'                      \
+    -e 's,CADAR \(([^()]*)\),\1->car->cdr->car,'                \
+    -e 's,CADDR \(([^()]*)\),\1->cdr->cdr->car,'                \
+    -e 's,CDADR \(([^()]*)\),\1->cdr->car->cdr,'                \
+    -e 's,CDDDR \(([^()]*)\),\1->cdr->cdr->cdr,'                \
+    -e 's,CDDAR \(([^()]*)\),\1->car->cdr->cdr,'                \
+    -e 's,CDADAR \(([^()]*)\),\1->cdr->car->cdr->car,'          \
+                                                                \
+    include/mes/builtins.h                                      \
+    include/mes/mes.h                                           \
+    include/mes/symbols.h                                       \
+    include/mes/builtins.h                                      \
+    include/m2/lib.h                                            \
+    include/mes/m2.h                                            \
+    src/builtins.c                                              \
+    src/cc.c                                                    \
+    src/core.c                                                  \
+    src/display.c                                               \
+    src/eval-apply.c                                            \
+    src/gc.c                                                    \
+    src/hash.c                                                  \
+    src/lib.c                                                   \
+    src/m2.c                                                    \
+    src/math.c                                                  \
+    src/mes.c                                                   \
+    src/module.c                                                \
+    src/posix.c                                                 \
+    src/reader.c                                                \
+    src/stack.c                                                 \
+    src/string.c                                                \
+    src/struct.c                                                \
+    src/symbol.c                                                \
+    src/vector.c                                                \
+    src/test/gc.c                                               \
+    simple.make                                                 \
--- a/build-aux/snarf.sh
+++ b/build-aux/snarf.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -20,17 +20,43 @@

 set -e

-. ${srcdest}build-aux/config.sh
+srcdest=${srcdest-./}
+. ${srcdest}config.sh
 . ${srcdest}build-aux/trace.sh

-trace "SNARF$snarf  gc.c"      ${srcdest}build-aux/mes-snarf.scm src/gc.c
-trace "SNARF$snarf  hash.c"    ${srcdest}build-aux/mes-snarf.scm src/hash.c
-trace "SNARF$snarf  lib.c"     ${srcdest}build-aux/mes-snarf.scm src/lib.c
-trace "SNARF$snarf  math.c"    ${srcdest}build-aux/mes-snarf.scm src/math.c
-trace "SNARF$snarf  mes.c"     ${srcdest}build-aux/mes-snarf.scm src/mes.c
-trace "SNARF$snarf  module.c"  ${srcdest}build-aux/mes-snarf.scm src/module.c
-trace "SNARF$snarf  posix.c"   ${srcdest}build-aux/mes-snarf.scm src/posix.c
-trace "SNARF$snarf  reader.c"  ${srcdest}build-aux/mes-snarf.scm src/reader.c
-trace "SNARF$snarf  strings.c" ${srcdest}build-aux/mes-snarf.scm src/string.c
-trace "SNARF$snarf  struct.c"  ${srcdest}build-aux/mes-snarf.scm src/struct.c
-trace "SNARF$snarf  vector.c"  ${srcdest}build-aux/mes-snarf.scm src/vector.c
+trace "SNARF$snarf  builtins.c"   ${srcdest}build-aux/mes-snarf.scm src/builtins.c
+trace "SNARF$snarf  core.c"       ${srcdest}build-aux/mes-snarf.scm src/core.c
+trace "SNARF$snarf  display.c"    ${srcdest}build-aux/mes-snarf.scm src/display.c
+trace "SNARF$snarf  eval-apply.c" ${srcdest}build-aux/mes-snarf.scm src/eval-apply.c
+trace "SNARF$snarf  gc.c"         ${srcdest}build-aux/mes-snarf.scm src/gc.c
+trace "SNARF$snarf  hash.c"       ${srcdest}build-aux/mes-snarf.scm src/hash.c
+trace "SNARF$snarf  lib.c"        ${srcdest}build-aux/mes-snarf.scm src/lib.c
+trace "SNARF$snarf  math.c"       ${srcdest}build-aux/mes-snarf.scm src/math.c
+trace "SNARF$snarf  mes.c"        ${srcdest}build-aux/mes-snarf.scm src/mes.c
+trace "SNARF$snarf  module.c"     ${srcdest}build-aux/mes-snarf.scm src/module.c
+trace "SNARF$snarf  posix.c"      ${srcdest}build-aux/mes-snarf.scm src/posix.c
+trace "SNARF$snarf  reader.c"     ${srcdest}build-aux/mes-snarf.scm src/reader.c
+trace "SNARF$snarf  stack.c"      ${srcdest}build-aux/mes-snarf.scm src/string.c
+trace "SNARF$snarf  strings.c"    ${srcdest}build-aux/mes-snarf.scm src/string.c
+trace "SNARF$snarf  struct.c"     ${srcdest}build-aux/mes-snarf.scm src/struct.c
+trace "SNARF$snarf  symbol.c"     ${srcdest}build-aux/mes-snarf.scm src/symbol.c
+trace "SNARF$snarf  vector.c"     ${srcdest}build-aux/mes-snarf.scm src/vector.c
+
+for i in src/*.symbols.h; do
+    n=$(basename $i .symbols.h)
+    echo "/* src/$n.c */"
+    cat $i
+    mv $i $(basename $i .symbols.h).s
+done > s
+
+for i in src/*.h; do
+    n=$(basename $i .h)
+    echo "/* src/$n.c */"
+    cat $i
+done > h
+
+for i in src/*.i; do
+    n=$(basename $i .i)
+    echo "  /* src/$n.c */"
+    cat $i
+done > c
--- a/2
+++ b/2
@ -632,11 +632,13 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                    "build-aux/install.sh.in"
                    "build-aux/pre-inst-env.in"
                    "build-aux/uninstall.sh.in"
+                    "scripts/m2-merge.scm.in"
                    "scripts/mesar.in"
                    "scripts/mescc.scm.in"
                    "scripts/mescc.in"
                    ))
        (chmod "pre-inst-env" #o755)
+        (chmod "scripts/m2-merge.scm" #o755)
        (chmod "scripts/mesar" #o755)
        (chmod "scripts/mescc" #o755)
        (chmod "scripts/mescc.scm" #o755)
--- a/configure.sh
+++ b/configure.sh
@ -24,65 +24,35 @@ VERSION=0.20
 srcdir=${srcdir-$(dirname $0)}
 . ${srcdest}build-aux/trace.sh

-# parse --with-system-libc
-cmdline=$(echo " $@")
-p=${cmdline/ --with-system-libc/}
-if test "$p" != "$cmdline"; then
-    mes_libc=${mes_libc-system}
-else
-    mes_libc=mes
-fi
+# parse arguments
+while [ $# -gt 0 ]; do
+    case $1 in
+        (--with-courage)
+            courageous=true
+            ;;
+        (--with-system-libc)
+            mes_libc=system
+            ;;
+        (--build=*)
+            build=${1#--build=}
+            ;;
+        (--host=*)
+            host=${1#--host=}
+            ;;
+        (--prefix=*)
+            prefix=${1#--prefix=}
+            ;;
+        (--program-prefix=*)
+            program_prefix=${1#--program-prefix=}
+            ;;
+    esac
+    shift
+done

-# parse --with-courage
-cmdline=$(echo " $@")
-p=${cmdline/ --with-courage/}
-if test "$p" != "$cmdline"; then
-    courageous=true
-else
-    courageous=false
-fi
-
-# parse --prefix=PREFIX
-p=${cmdline/ --prefix=/ -prefix=}
-if test "$p" != "$cmdline"; then
-    p=${p##* -prefix=}
-    p=${p% *}
-    p=${p% -*}
-    prefix=${p-/usr/local}
-else
-    prefix=${prefix-/usr/local}
-fi
-
-# parse --build=BUILD
-p=${cmdline/ --build=/ -build=}
-if [ "$p" != "$cmdline" ]; then
-    p=${p##* -build=}
-    p=${p% *}
-    p=${p% -*}
-    build=${p-$build}
-else
-    build=$build
-fi
-
-# parse --host=HOST
-p=${cmdline/ --host=/ -host=}
-if [ "$p" != "$cmdline" ]; then
-    p=${p##* -host=}
-    p=${p% *}
-    p=${p% -*}
-    host=${p-$build}
-elif test -n "$build"; then
-    host=${host-$build}
-fi
-
-# parse --program-prefix=
-p=${cmdline/ --program-prefix=/ -program-prefix=}
-if test "$p" != "$cmdline"; then
-    p=${p##* -program-prefix=}
-    p=${p% *}
-    p=${p% -*}
-    program_prefix=$p
-fi
+prefix=${prefix-/usr/local}
+mes_libc=${mes_libc-mes}
+courageous=${courageous-false}
+host=${host-$build}

 AR=${AR-$(command -v ar)} || true
 BASH=${BASH-$(command -v bash)}
--- a/doc/announce/ANNOUNCE-0.20
+++ b/doc/announce/ANNOUNCE-0.20
@ -7,7 +7,9 @@ We are pleased to announce the release of GNU Mes 0.20, representing
 147 commits over 38 weeks.

 Mes has now brought the Reduced Binary Seed bootstrap to Guix (bootstrap
-a GNU/Linux system without binary GNU toolchain or equivalent).
+a GNU/Linux system without binary GNU toolchain or equivalent).  It
+should land in Guix master any day now: a big thank you to everyone who
+helped, notably Ludovic and Mark.

 This release is a step towards the upcoming Scheme-only bootstrap and
 bringing Mes into NixOS and Debian.  This effort is now sponsored by
@ -67,8 +69,8 @@ Packages are available in Guix master.

  Here are the MD5 and SHA1 checksums:

-  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  mes-0.20.tar.gz
-  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  mes-0.20.tar.gz
+  df839a83e4a2ad6c2a4accc5bf17b1a7  mes-0.20.tar.gz
+  38d4cb3fa28fa1f5fc57fea9e046d4d8052bbb8c  mes-0.20.tar.gz

  [*] Use a .sig file to verify that the corresponding file (without the
  .sig suffix) is intact.  First, be sure to download both the .sig file
@ -83,6 +85,11 @@ Packages are available in Guix master.

  and rerun the 'gpg --verify' command.

+* Get informed, get involved
+
+  See https://bootstrappable.org
+  Join #bootstrappable on irc.freenode.net.
+
 * Changes in 0.20 since 0.19
 ** Core
 *** The build system has been simplified, again.
@ -108,6 +115,9 @@ Packages are available in Guix master.
 *** string->number now support #x hex-prefix.
 *** ungetc now has a buffer per file handle.

+Greetings,
+janneke and Danny.
+
 [0] https://www.gnu.org/software/mes
 [1] http://joyofsource.com/reduced-binary-seed-bootstrap.html
 [2] https://www.gnu.org/software/guix
@ -119,5 +129,5 @@ Packages are available in Guix master.
 [8] https://www.nongnu.org/nyacc
 [9] https://gitlab.com/janneke/tinycc
 [10] http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf
-[11] https://github.com/oriansj/stage0
+[11] https://savannah.nongnu.org/projects/stage0
 [12] https://nlnet.nl/project/GNUMes
--- a/guix/git/mes.scm
+++ b/guix/git/mes.scm
@ -131,7 +131,7 @@ extensive examples, including parsers for the Javascript and C99 languages.")
                (uri (string-append
                      "https://ftp.gnu.org/pub/gnu/mes/mes-" version ".tar.gz"))
                (sha256
-                 (base32 #!mes!# "06qkwkahcpzk5v4qydpvcvzm7lx8g8pflc48f9l7bpjz6hl5lk4s"))))
+                 (base32 #!mes!# "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
      (build-system gnu-build-system)
      (supported-systems '("i686-linux" "x86_64-linux"))
      (propagated-inputs
--- a/include/ctype.h
+++ b/include/ctype.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -35,6 +35,7 @@ int isalpha (int c);
 int isascii (int c);
 int iscntrl (int c);
 int isdigit (int c);
+int isgraph (int c);
 int islower (int c);
 int isnumber (int c, int base);
 int isprint (int c);
--- a/include/errno.h
+++ b/include/errno.h
@ -38,14 +38,16 @@ int errno;
 #define ENOENT   2
 #define EINTR    4
 #define EIO      5
+#define ENXIO    6
 #define E2BIG    7
-#define	ENOEXEC  8
+#define ENOEXEC  8
 #define EBADF    9
 #define	ECHILD  10
 #define EAGAIN  11
 #define ENOMEM  12
 #define EACCES  13
 #define EEXIST  17
+#define EXDEV   18
 #define ENOTDIR 20
 #define EISDIR  21
 #define EINVAL  22
--- a/include/fcntl.h
+++ b/include/fcntl.h
@ -48,6 +48,7 @@
 #define F_GETFL 3
 #define F_SETFL 4

+#define creat(file_name, mode) open (file_name, O_WRONLY | O_CREAT | O_TRUNC, mode)
 int dup (int old);
 int dup2 (int old, int new);
 int fcntl (int filedes, int command, ...);
--- a/include/linux/x86/syscall.h
+++ b/include/linux/x86/syscall.h
@ -20,34 +20,61 @@
 #ifndef __MES_LINUX_X86_SYSCALL_H
 #define __MES_LINUX_X86_SYSCALL_H 1

-// libc-mini
-// #define SYS_exit    0x01
-// #define SYS_write   0x04
+/* libc-mini */
+#ifndef SYS_exit
+// CONSTANT SYS_exit 0x01
+#define SYS_exit    0x01
+#endif
+#ifndef SYS_write
+// CONSTANT SYS_write 0x04
+#define SYS_write   0x04
+#endif

-// libc
+/* libc */
+// CONSTANT SYS_fork 0x02
 #define SYS_fork    0x02
+// CONSTANT SYS_read 0x03
 #define SYS_read    0x03
+// CONSTANT SYS_open 0x05
 #define SYS_open    0x05
+// CONSTANT SYS_waitpid 0x07
 #define SYS_waitpid 0x07
+// CONSTANT SYS_wait4 0x72
 #define SYS_wait4   0x72
+// CONSTANT SYS_execve 0x0b
 #define SYS_execve  0x0b
+// CONSTANT SYS_chmod 0x0f
 #define SYS_chmod   0x0f
+// CONSTANT SYS_access 0x21
 #define SYS_access  0x21
+// CONSTANT SYS_brk 0x2d
 #define SYS_brk     0x2d
+// CONSTANT SYS_ioctl 0x36
 #define SYS_ioctl   0x36
+// CONSTANT SYS_fsync 0x76
 #define SYS_fsync   0x76
-
-// libc+tcc
-#define SYS_close  0x06
-#define SYS_time   0x0d
-#define SYS_lseek  0x13
-#define SYS_unlink 0x0a
-#define SYS_rmdir  0x28
-#define SYS_gettimeofday 0x4e
-#define SYS_stat   0x6a
+// CONSTANT SYS_getcwd 0xb7
 #define SYS_getcwd 0xb7
+// CONSTANT SYS_dup 0x29
+#define SYS_dup       0x29
+// CONSTANT SYS_dup2 0x3f
+#define SYS_dup2      0x3f
+// CONSTANT SYS_unlink 0x0a
+#define SYS_unlink 0x0a
+// CONSTANT SYS_gettimeofday 0x4e
+#define SYS_gettimeofday 0x4e
+// CONSTANT SYS_clock_gettime 0x109
+#define SYS_clock_gettime 0x109
+// CONSTANT SYS_time 0x0d
+#define SYS_time   0x0d

-// libc+gnu
+/* libc+tcc */
+#define SYS_close  0x06
+#define SYS_lseek  0x13
+#define SYS_rmdir  0x28
+#define SYS_stat   0x6a
+
+/* libc+gnu */

 #define SYS_chdir     0x0c
 #define SYS_link      0x09
@ -56,7 +83,6 @@
 #define SYS_kill      0x25
 #define SYS_rename    0x26
 #define SYS_mkdir     0x27
-#define SYS_dup       0x29
 #define SYS_pipe      0x2a
 #define SYS_getgid    0x2f
 #define SYS_signal    0x30
@ -64,23 +90,26 @@
 #define SYS_rt_sigaction 0xae
 #define SYS_signal    0x30
 #define SYS_fcntl     0x37
-#define SYS_dup2      0x3f
 #define SYS_getrusage 0x4d
 #define SYS_lstat     0x6b
 #define SYS_setitimer 0x68
 #define SYS_fstat     0x6c
 #define SYS_nanosleep 0xa2
 #define SYS_getdents  0x8d
-#define SYS_clock_gettime 0x109

-// bash
+/* bash */
 #define SYS_setuid    0x17
 #define SYS_geteuid   0x31
 #define SYS_getegid   0x32
 #define SYS_setgid    0x3e
 #define SYS_getppid   0x40

-// make+POSIX
+/* make+POSIX */
 #define SYS_sigprocmask 0x7e

-#endif // __MES_LINUX_X86_SYSCALL_H
+/* tar */
+#define SYS_symlink   0x53
+#define SYS_readlink  0x55
+#define SYS_mknod     0x0e
+
+#endif /* __MES_LINUX_X86_SYSCALL_H */
--- a/include/linux/x86_64/syscall.h
+++ b/include/linux/x86_64/syscall.h
@ -80,4 +80,9 @@
 // make+SYSTEM_LIBC
 #define SYS_rt_sigprocmask 0x0e

+// tar
+#define SYS_symlink   0x58
+#define SYS_readlink  0x59
+#define SYS_mknod     0x85
+
 #endif // __MES_LINUX_X86_64_SYSCALL_H
--- a/include/m2/lib.h
+++ b/include/m2/lib.h
@ -0,0 +1,62 @@
+/*
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __M2_LIB_H
+#define __M2_LIB_H
+
+char **environ;
+int __stdin;
+int __stdout;
+int __stderr;
+int errno;
+
+// CONSTANT EOF 0xffffffff
+// CONSTANT __FILEDES_MAX 512
+
+int __ungetc_p (int filedes);
+int eputs (char *s);
+int oputs (char *s);
+int puts (char *s);
+size_t strlen (char *s);
+ssize_t _write ();
+ssize_t write (int filedes, void *buffer, size_t size);
+void __ungetc_clear (int filedes);
+void __ungetc_init ();
+void __ungetc_set (int filedes, int c);
+
+struct timezone
+{
+  int tz_minuteswest;
+  int tz_dsttime;
+};
+
+struct timespec
+{
+  long tv_sec;
+  long tv_nsec;
+};
+
+struct timeval
+{
+  long tv_sec;
+  long tv_usec;
+};
+
+#endif /* __M2_LIB_H */
--- a/include/mes/builtins.h
+++ b/include/mes/builtins.h
@ -21,10 +21,31 @@
 #ifndef __MES_BUILTINS_H
 #define __MES_BUILTINS_H

-// src/gc.mes
+/* src/builtins.c */
+SCM make_builtin (SCM builtin_type, SCM name, SCM arity, SCM function);
+SCM builtin_name (SCM builtin);
+SCM builtin_arity (SCM builtin);
+SCM builtin_p (SCM x);
+SCM builtin_printer (SCM builtin);
+/* src/display.c */
+SCM display_ (SCM x);
+SCM display_error_ (SCM x);
+SCM display_port_ (SCM x, SCM p);
+SCM write_ (SCM x);
+SCM write_error_ (SCM x);
+SCM write_port_ (SCM x, SCM p);
+/* src/eval-apply.c */
+SCM pairlis (SCM x, SCM y, SCM a);
+SCM set_car_x (SCM x, SCM e);
+SCM set_cdr_x (SCM x, SCM e);
+SCM set_env_x (SCM x, SCM e, SCM a);
+SCM macro_get_handle (SCM name);
+SCM add_formals (SCM formals, SCM x);
+SCM eval_apply ();
+/* src/gc.c */
 SCM gc_check ();
 SCM gc ();
-// src/hash.mes
+/* src/hash.c */
 SCM hashq (SCM x, SCM size);
 SCM hash (SCM x, SCM size);
 SCM hashq_get_handle (SCM table, SCM key, SCM dflt);
@ -34,14 +55,7 @@ SCM hashq_set_x (SCM table, SCM key, SCM value);
 SCM hash_set_x (SCM table, SCM key, SCM value);
 SCM hash_table_printer (SCM table);
 SCM make_hash_table (SCM x);
-// src/lib.mes
-SCM procedure_name_ (SCM x);
-SCM display_ (SCM x);
-SCM display_error_ (SCM x);
-SCM display_port_ (SCM x, SCM p);
-SCM write_ (SCM x);
-SCM write_error_ (SCM x);
-SCM write_port_ (SCM x, SCM p);
+/* src/lib.c */
 SCM exit_ (SCM x);
 SCM frame_printer (SCM frame);
 SCM make_stack (SCM stack);
@ -52,7 +66,9 @@ SCM memq (SCM x, SCM a);
 SCM equal2_p (SCM a, SCM b);
 SCM last_pair (SCM x);
 SCM pair_p (SCM x);
-// src/math.mes
+SCM char_to_integer (SCM x);
+SCM integer_to_char (SCM x);
+/* src/math.mes */
 SCM greater_p (SCM x);
 SCM less_p (SCM x);
 SCM is_p (SCM x);
@ -66,12 +82,11 @@ SCM logior (SCM x);
 SCM lognot (SCM x);
 SCM logxor (SCM x);
 SCM ash (SCM n, SCM count);
-// src/mes.mes
+/* src/mes.c */
 SCM make_cell_ (SCM type, SCM car, SCM cdr);
 SCM type_ (SCM x);
 SCM car_ (SCM x);
 SCM cdr_ (SCM x);
-SCM arity_ (SCM x);
 SCM cons (SCM x, SCM y);
 SCM car (SCM x);
 SCM cdr (SCM x);
@ -85,264 +100,20 @@ SCM error (SCM key, SCM x);
 SCM append2 (SCM x, SCM y);
 SCM append_reverse (SCM x, SCM y);
 SCM reverse_x_ (SCM x, SCM t);
-SCM pairlis (SCM x, SCM y, SCM a);
-SCM call (SCM fn, SCM x);
 SCM assq (SCM x, SCM a);
 SCM assoc (SCM x, SCM a);
 SCM set_car_x (SCM x, SCM e);
 SCM set_cdr_x (SCM x, SCM e);
 SCM set_env_x (SCM x, SCM e, SCM a);
-SCM macro_get_handle (SCM name);
 SCM add_formals (SCM formals, SCM x);
 SCM eval_apply ();
-SCM make_builtin_type ();
-SCM make_builtin (SCM builtin_type, SCM name, SCM arity, SCM function);
-SCM builtin_arity (SCM builtin);
-SCM builtin_p (SCM x);
-SCM builtin_printer (SCM builtin);
-// CONSTANT cell_nil 1
-#define cell_nil 1
-// CONSTANT cell_f 2
-#define cell_f 2
-// CONSTANT cell_t 3
-#define cell_t 3
-// CONSTANT cell_dot 4
-#define cell_dot 4
-// CONSTANT cell_arrow 5
-#define cell_arrow 5
-// CONSTANT cell_undefined 6
-#define cell_undefined 6
-// CONSTANT cell_unspecified 7
-#define cell_unspecified 7
-// CONSTANT cell_closure 8
-#define cell_closure 8
-// CONSTANT cell_circular 9
-#define cell_circular 9
-// CONSTANT cell_begin 10
-#define cell_begin 10
-// CONSTANT cell_call_with_current_continuation 11
-#define cell_call_with_current_continuation 11
-// CONSTANT cell_vm_apply 12
-#define cell_vm_apply 12
-// CONSTANT cell_vm_apply2 13
-#define cell_vm_apply2 13
-// CONSTANT cell_vm_begin 14
-#define cell_vm_begin 14
-// CONSTANT cell_vm_begin_eval 15
-#define cell_vm_begin_eval 15
-// CONSTANT cell_vm_begin_expand 16
-#define cell_vm_begin_expand 16
-// CONSTANT cell_vm_begin_expand_eval 17
-#define cell_vm_begin_expand_eval 17
-// CONSTANT cell_vm_begin_expand_macro 18
-#define cell_vm_begin_expand_macro 18
-// CONSTANT cell_vm_begin_expand_primitive_load 19
-#define cell_vm_begin_expand_primitive_load 19
-// CONSTANT cell_vm_begin_primitive_load 20
-#define cell_vm_begin_primitive_load 20
-// CONSTANT cell_vm_begin_read_input_file 21
-#define cell_vm_begin_read_input_file 21
-// CONSTANT cell_vm_call_with_current_continuation2 22
-#define cell_vm_call_with_current_continuation2 22
-// CONSTANT cell_vm_call_with_values2 23
-#define cell_vm_call_with_values2 23
-// CONSTANT cell_vm_eval 24
-#define cell_vm_eval 24
-// CONSTANT cell_vm_eval2 25
-#define cell_vm_eval2 25
-// CONSTANT cell_vm_eval_check_func 26
-#define cell_vm_eval_check_func 26
-// CONSTANT cell_vm_eval_define 27
-#define cell_vm_eval_define 27
-// CONSTANT cell_vm_eval_macro_expand_eval 28
-#define cell_vm_eval_macro_expand_eval 28
-// CONSTANT cell_vm_eval_macro_expand_expand 29
-#define cell_vm_eval_macro_expand_expand 29
-// CONSTANT cell_vm_eval_pmatch_car 30
-#define cell_vm_eval_pmatch_car 30
-// CONSTANT cell_vm_eval_pmatch_cdr 31
-#define cell_vm_eval_pmatch_cdr 31
-// CONSTANT cell_vm_eval_set_x 32
-#define cell_vm_eval_set_x 32
-// CONSTANT cell_vm_evlis 33
-#define cell_vm_evlis 33
-// CONSTANT cell_vm_evlis2 34
-#define cell_vm_evlis2 34
-// CONSTANT cell_vm_evlis3 35
-#define cell_vm_evlis3 35
-// CONSTANT cell_vm_if 36
-#define cell_vm_if 36
-// CONSTANT cell_vm_if_expr 37
-#define cell_vm_if_expr 37
-// CONSTANT cell_vm_macro_expand 38
-#define cell_vm_macro_expand 38
-// CONSTANT cell_vm_macro_expand_car 39
-#define cell_vm_macro_expand_car 39
-// CONSTANT cell_vm_macro_expand_cdr 40
-#define cell_vm_macro_expand_cdr 40
-// CONSTANT cell_vm_macro_expand_define 41
-#define cell_vm_macro_expand_define 41
-// CONSTANT cell_vm_macro_expand_define_macro 42
-#define cell_vm_macro_expand_define_macro 42
-// CONSTANT cell_vm_macro_expand_lambda 43
-#define cell_vm_macro_expand_lambda 43
-// CONSTANT cell_vm_macro_expand_set_x 44
-#define cell_vm_macro_expand_set_x 44
-// CONSTANT cell_vm_return 45
-#define cell_vm_return 45
-// CONSTANT cell_symbol_dot 46
-#define cell_symbol_dot 46
-// CONSTANT cell_symbol_lambda 47
-#define cell_symbol_lambda 47
-// CONSTANT cell_symbol_begin 48
-#define cell_symbol_begin 48
-// CONSTANT cell_symbol_if 49
-#define cell_symbol_if 49
-// CONSTANT cell_symbol_quote 50
-#define cell_symbol_quote 50
-// CONSTANT cell_symbol_define 51
-#define cell_symbol_define 51
-// CONSTANT cell_symbol_define_macro 52
-#define cell_symbol_define_macro 52
-// CONSTANT cell_symbol_quasiquote 53
-#define cell_symbol_quasiquote 53
-// CONSTANT cell_symbol_unquote 54
-#define cell_symbol_unquote 54
-// CONSTANT cell_symbol_unquote_splicing 55
-#define cell_symbol_unquote_splicing 55
-// CONSTANT cell_symbol_syntax 56
-#define cell_symbol_syntax 56
-// CONSTANT cell_symbol_quasisyntax 57
-#define cell_symbol_quasisyntax 57
-// CONSTANT cell_symbol_unsyntax 58
-#define cell_symbol_unsyntax 58
-// CONSTANT cell_symbol_unsyntax_splicing 59
-#define cell_symbol_unsyntax_splicing 59
-// CONSTANT cell_symbol_set_x 60
-#define cell_symbol_set_x 60
-// CONSTANT cell_symbol_sc_expand 61
-#define cell_symbol_sc_expand 61
-// CONSTANT cell_symbol_macro_expand 62
-#define cell_symbol_macro_expand 62
-// CONSTANT cell_symbol_portable_macro_expand 63
-#define cell_symbol_portable_macro_expand 63
-// CONSTANT cell_symbol_sc_expander_alist 64
-#define cell_symbol_sc_expander_alist 64
-// CONSTANT cell_symbol_call_with_values 65
-#define cell_symbol_call_with_values 65
-// CONSTANT cell_symbol_call_with_current_continuation 66
-#define cell_symbol_call_with_current_continuation 66
-// CONSTANT cell_symbol_boot_module 67
-#define cell_symbol_boot_module 67
-// CONSTANT cell_symbol_current_module 68
-#define cell_symbol_current_module 68
-// CONSTANT cell_symbol_primitive_load 69
-#define cell_symbol_primitive_load 69
-// CONSTANT cell_symbol_read_input_file 70
-#define cell_symbol_read_input_file 70
-// CONSTANT cell_symbol_write 71
-#define cell_symbol_write 71
-// CONSTANT cell_symbol_display 72
-#define cell_symbol_display 72
-// CONSTANT cell_symbol_car 73
-#define cell_symbol_car 73
-// CONSTANT cell_symbol_cdr 74
-#define cell_symbol_cdr 74
-// CONSTANT cell_symbol_not_a_number 75
-#define cell_symbol_not_a_number 75
-// CONSTANT cell_symbol_not_a_pair 76
-#define cell_symbol_not_a_pair 76
-// CONSTANT cell_symbol_system_error 77
-#define cell_symbol_system_error 77
-// CONSTANT cell_symbol_throw 78
-#define cell_symbol_throw 78
-// CONSTANT cell_symbol_unbound_variable 79
-#define cell_symbol_unbound_variable 79
-// CONSTANT cell_symbol_wrong_number_of_args 80
-#define cell_symbol_wrong_number_of_args 80
-// CONSTANT cell_symbol_wrong_type_arg 81
-#define cell_symbol_wrong_type_arg 81
-// CONSTANT cell_symbol_buckets 82
-#define cell_symbol_buckets 82
-// CONSTANT cell_symbol_builtin 83
-#define cell_symbol_builtin 83
-// CONSTANT cell_symbol_frame 84
-#define cell_symbol_frame 84
-// CONSTANT cell_symbol_hashq_table 85
-#define cell_symbol_hashq_table 85
-// CONSTANT cell_symbol_module 86
-#define cell_symbol_module 86
-// CONSTANT cell_symbol_procedure 87
-#define cell_symbol_procedure 87
-// CONSTANT cell_symbol_record_type 88
-#define cell_symbol_record_type 88
-// CONSTANT cell_symbol_size 89
-#define cell_symbol_size 89
-// CONSTANT cell_symbol_stack 90
-#define cell_symbol_stack 90
-// CONSTANT cell_symbol_argv 91
-#define cell_symbol_argv 91
-// CONSTANT cell_symbol_mes_prefix 92
-#define cell_symbol_mes_prefix 92
-// CONSTANT cell_symbol_mes_version 93
-#define cell_symbol_mes_version 93
-// CONSTANT cell_symbol_internal_time_units_per_second 94
-#define cell_symbol_internal_time_units_per_second 94
-// CONSTANT cell_symbol_compiler 95
-#define cell_symbol_compiler 95
-// CONSTANT cell_symbol_arch 96
-#define cell_symbol_arch 96
-// CONSTANT cell_symbol_pmatch_car 97
-#define cell_symbol_pmatch_car 97
-// CONSTANT cell_symbol_pmatch_cdr 98
-#define cell_symbol_pmatch_cdr 98
-// CONSTANT cell_type_bytes 99
-#define cell_type_bytes 99
-// CONSTANT cell_type_char 100
-#define cell_type_char 100
-// CONSTANT cell_type_closure 101
-#define cell_type_closure 101
-// CONSTANT cell_type_continuation 102
-#define cell_type_continuation 102
-// CONSTANT cell_type_function 103
-#define cell_type_function 103
-// CONSTANT cell_type_keyword 104
-#define cell_type_keyword 104
-// CONSTANT cell_type_macro 105
-#define cell_type_macro 105
-// CONSTANT cell_type_number 106
-#define cell_type_number 106
-// CONSTANT cell_type_pair 107
-#define cell_type_pair 107
-// CONSTANT cell_type_port 108
-#define cell_type_port 108
-// CONSTANT cell_type_ref 109
-#define cell_type_ref 109
-// CONSTANT cell_type_special 110
-#define cell_type_special 110
-// CONSTANT cell_type_string 111
-#define cell_type_string 111
-// CONSTANT cell_type_struct 112
-#define cell_type_struct 112
-// CONSTANT cell_type_symbol 113
-#define cell_type_symbol 113
-// CONSTANT cell_type_values 114
-#define cell_type_values 114
-// CONSTANT cell_type_variable 115
-#define cell_type_variable 115
-// CONSTANT cell_type_vector 116
-#define cell_type_vector 116
-// CONSTANT cell_type_broken_heart 117
-#define cell_type_broken_heart 117
-// CONSTANT cell_symbol_test 118
-#define cell_symbol_test 118
-// src/module.mes
+/* src/module.c */
 SCM make_module_type ();
 SCM module_printer (SCM module);
 SCM module_variable (SCM module, SCM name);
 SCM module_ref (SCM module, SCM name);
 SCM module_define_x (SCM module, SCM name, SCM value);
-// src/posix.mes
+/* src/posix.c */
 SCM peek_byte ();
 SCM read_byte ();
 SCM unread_byte (SCM i);
@ -363,7 +134,6 @@ SCM current_error_port ();
 SCM open_output_file (SCM x);
 SCM set_current_output_port (SCM port);
 SCM set_current_error_port (SCM port);
-SCM force_output (SCM p);
 SCM chmod_ (SCM file_name, SCM mode);
 SCM isatty_p (SCM port);
 SCM primitive_fork ();
@ -376,7 +146,7 @@ SCM getcwd_ ();
 SCM dup_ (SCM port);
 SCM dup2_ (SCM old, SCM new);
 SCM delete_file (SCM file_name);
-// src/reader.mes
+/* src/reader.c */
 SCM read_input_file_env_ (SCM e, SCM a);
 SCM read_input_file_env (SCM a);
 SCM read_env (SCM a);
@ -386,7 +156,7 @@ SCM reader_read_binary ();
 SCM reader_read_octal ();
 SCM reader_read_hex ();
 SCM reader_read_string ();
-// src/strings.mes
+/* src/string.c */
 SCM string_equal_p (SCM a, SCM b);
 SCM symbol_to_string (SCM symbol);
 SCM symbol_to_keyword (SCM symbol);
@ -399,13 +169,13 @@ SCM read_string (SCM port);
 SCM string_append (SCM x);
 SCM string_length (SCM string);
 SCM string_ref (SCM str, SCM k);
-// src/struct.mes
+/* src/struct.c */
 SCM make_struct (SCM type, SCM fields, SCM printer);
 SCM struct_length (SCM x);
 SCM struct_ref (SCM x, SCM i);
 SCM struct_set_x (SCM x, SCM i, SCM e);
-// src/vector.mes
-SCM make_vector_ (SCM n);
+/* src/vector.c */
+SCM make_vector (SCM x);
 SCM vector_length (SCM x);
 SCM vector_ref (SCM x, SCM i);
 SCM vector_entry (SCM x);
@ -413,4 +183,4 @@ SCM vector_set_x (SCM x, SCM i, SCM e);
 SCM list_to_vector (SCM x);
 SCM vector_to_list (SCM v);

-#endif //__MES_BUILTINS_H
+#endif /* __MES_BUILTINS_H */
--- a/include/mes/cc.h
+++ b/include/mes/cc.h
@ -0,0 +1,46 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MES_CC_H
+#define __MES_CC_H
+
+#if POINTER_CELLS
+typedef struct scm* SCM;
+#else
+typedef long SCM;
+#endif
+
+#if __MESC__
+typedef long FUNCTION;
+typedef long function0_t;
+typedef long function1_t;
+typedef long function2_t;
+typedef long function3_t;
+typedef long functionn_t;
+#else // !__MESC__
+typedef SCM (*FUNCTION) (void);
+typedef SCM (*function0_t) (void);
+typedef SCM (*function1_t) (SCM);
+typedef SCM (*function2_t) (SCM, SCM);
+typedef SCM (*function3_t) (SCM, SCM, SCM);
+typedef SCM (*functionn_t) (SCM);
+#endif // !__MESC__
+
+#endif //__MES_CC_H
--- a/include/mes/constants.h
+++ b/include/mes/constants.h
@ -21,263 +21,13 @@
 #ifndef __MES_CONSTANTS_H
 #define __MES_CONSTANTS_H

-/* Symbols */
-
-// CONSTANT cell_nil 1
-#define cell_nil 1
-// CONSTANT cell_f 2
-#define cell_f 2
-// CONSTANT cell_t 3
-#define cell_t 3
-// CONSTANT cell_dot 4
-#define cell_dot 4
-// CONSTANT cell_arrow 5
-#define cell_arrow 5
-// CONSTANT cell_undefined 6
-#define cell_undefined 6
-// CONSTANT cell_unspecified 7
-#define cell_unspecified 7
-// CONSTANT cell_closure 8
-#define cell_closure 8
-// CONSTANT cell_circular 9
-#define cell_circular 9
-// CONSTANT cell_begin 10
-#define cell_begin 10
-// CONSTANT cell_call_with_current_continuation 11
-#define cell_call_with_current_continuation 11
-
-// CONSTANT cell_vm_apply 12
-#define cell_vm_apply 12
-// CONSTANT cell_vm_apply2 13
-#define cell_vm_apply2 13
-// CONSTANT cell_vm_begin 14
-#define cell_vm_begin 14
-// CONSTANT cell_vm_begin_eval 15
-#define cell_vm_begin_eval 15
-// CONSTANT cell_vm_begin_expand 16
-#define cell_vm_begin_expand 16
-// CONSTANT cell_vm_begin_expand_eval 17
-#define cell_vm_begin_expand_eval 17
-// CONSTANT cell_vm_begin_expand_macro 18
-#define cell_vm_begin_expand_macro 18
-// CONSTANT cell_vm_begin_expand_primitive_load 19
-#define cell_vm_begin_expand_primitive_load 19
-// CONSTANT cell_vm_begin_primitive_load 20
-#define cell_vm_begin_primitive_load 20
-// CONSTANT cell_vm_begin_read_input_file 21
-#define cell_vm_begin_read_input_file 21
-// CONSTANT cell_vm_call_with_current_continuation2 22
-#define cell_vm_call_with_current_continuation2 22
-// CONSTANT cell_vm_call_with_values2 23
-#define cell_vm_call_with_values2 23
-// CONSTANT cell_vm_eval 24
-#define cell_vm_eval 24
-// CONSTANT cell_vm_eval2 25
-#define cell_vm_eval2 25
-// CONSTANT cell_vm_eval_check_func 26
-#define cell_vm_eval_check_func 26
-// CONSTANT cell_vm_eval_define 27
-#define cell_vm_eval_define 27
-// CONSTANT cell_vm_eval_macro_expand_eval 28
-#define cell_vm_eval_macro_expand_eval 28
-// CONSTANT cell_vm_eval_macro_expand_expand 29
-#define cell_vm_eval_macro_expand_expand 29
-// CONSTANT cell_vm_eval_pmatch_car 30
-#define cell_vm_eval_pmatch_car 30
-// CONSTANT cell_vm_eval_pmatch_cdr 31
-#define cell_vm_eval_pmatch_cdr 31
-// CONSTANT cell_vm_eval_set_x 32
-#define cell_vm_eval_set_x 32
-// CONSTANT cell_vm_evlis 33
-#define cell_vm_evlis 33
-// CONSTANT cell_vm_evlis2 34
-#define cell_vm_evlis2 34
-// CONSTANT cell_vm_evlis3 35
-#define cell_vm_evlis3 35
-// CONSTANT cell_vm_if 36
-#define cell_vm_if 36
-// CONSTANT cell_vm_if_expr 37
-#define cell_vm_if_expr 37
-// CONSTANT cell_vm_macro_expand 38
-#define cell_vm_macro_expand 38
-// CONSTANT cell_vm_macro_expand_car 39
-#define cell_vm_macro_expand_car 39
-// CONSTANT cell_vm_macro_expand_cdr 40
-#define cell_vm_macro_expand_cdr 40
-// CONSTANT cell_vm_macro_expand_define 41
-#define cell_vm_macro_expand_define 41
-// CONSTANT cell_vm_macro_expand_define_macro 42
-#define cell_vm_macro_expand_define_macro 42
-// CONSTANT cell_vm_macro_expand_lambda 43
-#define cell_vm_macro_expand_lambda 43
-// CONSTANT cell_vm_macro_expand_set_x 44
-#define cell_vm_macro_expand_set_x 44
-// CONSTANT cell_vm_return 45
-#define cell_vm_return 45
-
-// CONSTANT cell_symbol_dot 46
-#define cell_symbol_dot 46
-// CONSTANT cell_symbol_lambda 47
-#define cell_symbol_lambda 47
-// CONSTANT cell_symbol_begin 48
-#define cell_symbol_begin 48
-// CONSTANT cell_symbol_if 49
-#define cell_symbol_if 49
-// CONSTANT cell_symbol_quote 50
-#define cell_symbol_quote 50
-// CONSTANT cell_symbol_define 51
-#define cell_symbol_define 51
-// CONSTANT cell_symbol_define_macro 52
-#define cell_symbol_define_macro 52
-
-// CONSTANT cell_symbol_quasiquote 53
-#define cell_symbol_quasiquote 53
-// CONSTANT cell_symbol_unquote 54
-#define cell_symbol_unquote 54
-// CONSTANT cell_symbol_unquote_splicing 55
-#define cell_symbol_unquote_splicing 55
-// CONSTANT cell_symbol_syntax 56
-#define cell_symbol_syntax 56
-// CONSTANT cell_symbol_quasisyntax 57
-#define cell_symbol_quasisyntax 57
-// CONSTANT cell_symbol_unsyntax 58
-#define cell_symbol_unsyntax 58
-// CONSTANT cell_symbol_unsyntax_splicing 59
-#define cell_symbol_unsyntax_splicing 59
-
-// CONSTANT cell_symbol_set_x 60
-#define cell_symbol_set_x 60
-
-// CONSTANT cell_symbol_sc_expand 61
-#define cell_symbol_sc_expand 61
-// CONSTANT cell_symbol_macro_expand 62
-#define cell_symbol_macro_expand 62
-// CONSTANT cell_symbol_portable_macro_expand 63
-#define cell_symbol_portable_macro_expand 63
-// CONSTANT cell_symbol_sc_expander_alist 64
-#define cell_symbol_sc_expander_alist 64
-
-// CONSTANT cell_symbol_call_with_values 65
-#define cell_symbol_call_with_values 65
-// CONSTANT cell_symbol_call_with_current_continuation 66
-#define cell_symbol_call_with_current_continuation 66
-// CONSTANT cell_symbol_boot_module 67
-#define cell_symbol_boot_module 67
-// CONSTANT cell_symbol_current_module 68
-#define cell_symbol_current_module 68
-// CONSTANT cell_symbol_primitive_load 69
-#define cell_symbol_primitive_load 69
-// CONSTANT cell_symbol_read_input_file 70
-#define cell_symbol_read_input_file 70
-// CONSTANT cell_symbol_write 71
-#define cell_symbol_write 71
-// CONSTANT cell_symbol_display 72
-#define cell_symbol_display 72
-
-// CONSTANT cell_symbol_car 73
-#define cell_symbol_car 73
-// CONSTANT cell_symbol_cdr 74
-#define cell_symbol_cdr 74
-// CONSTANT cell_symbol_not_a_number 75
-#define cell_symbol_not_a_number 75
-// CONSTANT cell_symbol_not_a_pair 76
-#define cell_symbol_not_a_pair 76
-// CONSTANT cell_symbol_system_error 77
-#define cell_symbol_system_error 77
-// CONSTANT cell_symbol_throw 78
-#define cell_symbol_throw 78
-// CONSTANT cell_symbol_unbound_variable 79
-#define cell_symbol_unbound_variable 79
-// CONSTANT cell_symbol_wrong_number_of_args 80
-#define cell_symbol_wrong_number_of_args 80
-// CONSTANT cell_symbol_wrong_type_arg 81
-#define cell_symbol_wrong_type_arg 81
-
-// CONSTANT cell_symbol_buckets 82
-#define cell_symbol_buckets 82
-// CONSTANT cell_symbol_builtin 83
-#define cell_symbol_builtin 83
-// CONSTANT cell_symbol_frame 84
-#define cell_symbol_frame 84
-// CONSTANT cell_symbol_hashq_table 85
-#define cell_symbol_hashq_table 85
-// CONSTANT cell_symbol_module 86
-#define cell_symbol_module 86
-// CONSTANT cell_symbol_procedure 87
-#define cell_symbol_procedure 87
-// CONSTANT cell_symbol_record_type 88
-#define cell_symbol_record_type 88
-// CONSTANT cell_symbol_size 89
-#define cell_symbol_size 89
-// CONSTANT cell_symbol_stack 90
-#define cell_symbol_stack 90
-
-// CONSTANT cell_symbol_argv 91
-#define cell_symbol_argv 91
-// CONSTANT cell_symbol_mes_datadir 92
-#define cell_symbol_mes_datadir 92
-// CONSTANT cell_symbol_mes_version 93
-#define cell_symbol_mes_version 93
-
-// CONSTANT cell_symbol_internal_time_units_per_second 94
-#define cell_symbol_internal_time_units_per_second 94
-// CONSTANT cell_symbol_compiler 95
-#define cell_symbol_compiler 95
-// CONSTANT cell_symbol_arch 96
-#define cell_symbol_arch 96
-// CONSTANT cell_symbol_pmatch_car 97
-#define cell_symbol_pmatch_car 97
-// CONSTANT cell_symbol_pmatch_cdr 98
-#define cell_symbol_pmatch_cdr 98
-
-// CONSTANT cell_type_bytes 99
-#define cell_type_bytes 99
-// CONSTANT cell_type_char 100
-#define cell_type_char 100
-// CONSTANT cell_type_closure 101
-#define cell_type_closure 101
-// CONSTANT cell_type_continuation 102
-#define cell_type_continuation 102
-// CONSTANT cell_type_function 103
-#define cell_type_function 103
-// CONSTANT cell_type_keyword 104
-#define cell_type_keyword 104
-// CONSTANT cell_type_macro 105
-#define cell_type_macro 105
-// CONSTANT cell_type_number 106
-#define cell_type_number 106
-// CONSTANT cell_type_pair 107
-#define cell_type_pair 107
-// CONSTANT cell_type_port 108
-#define cell_type_port 108
-// CONSTANT cell_type_ref 109
-#define cell_type_ref 109
-// CONSTANT cell_type_special 110
-#define cell_type_special 110
-// CONSTANT cell_type_string 111
-#define cell_type_string 111
-// CONSTANT cell_type_struct 112
-#define cell_type_struct 112
-// CONSTANT cell_type_symbol 113
-#define cell_type_symbol 113
-// CONSTANT cell_type_values 114
-#define cell_type_values 114
-// CONSTANT cell_type_variable 115
-#define cell_type_variable 115
-// CONSTANT cell_type_vector 116
-#define cell_type_vector 116
-// CONSTANT cell_type_broken_heart 117
-#define cell_type_broken_heart 117
-
-// CONSTANT cell_test 118
-#define cell_test 118
-
 /* Cell types */

-// CONSTANT TBYTES         0
-#define TBYTES             0
-// CONSTANT TCHAR          1
-#define TCHAR              1
+// CONSTANT TCHAR          0
+#define TCHAR              0
+
+// CONSTANT TBYTES         1
+#define TBYTES             1
 // CONSTANT TCLOSURE       2
 #define TCLOSURE           2
 // CONSTANT TCONTINUATION  3
@ -318,7 +68,31 @@
 // CONSTANT STRUCT_PRINTER 1
 #define STRUCT_PRINTER 1

+// CONSTANT FRAME_SIZE 5
 #define FRAME_SIZE 5
+// CONSTANT FRAME_PROCEDURE 4
 #define FRAME_PROCEDURE 4

-#endif //__MES_CONSTANTS_H
+// CONSTANT STDIN 0
+// CONSTANT STDOUT 1
+// CONSTANT STDERR 2
+
+/* Unknown type 1
+// CONSTANT EOF -1
+*/
+
+// CONSTANT O_RDONLY 0
+// CONSTANT O_WRONLY 1
+// CONSTANT O_CREAT 0x40
+// CONSTANT O_TRUNC 0x200
+
+// CONSTANT PATH_MAX 1024
+// CONSTANT __FILEDES_MAX 512
+
+// CONSTANT S_IRUSR 00400
+// CONSTANT S_IWUSR 00200
+
+// CONSTANT CLOCK_PROCESS_CPUTIME_ID 2
+
+
+#endif /* __MES_CONSTANTS_H */
--- a/include/mes/lib.h
+++ b/include/mes/lib.h
@ -28,7 +28,9 @@ void __ungetc_init ();
 void __ungetc_clear (int filedes);
 void __ungetc_set (int filedes, int c);
 int __ungetc_p (int filedes);
+double abtod (char const **p, int base);
 long abtol (char const **p, int base);
+char *dtoab (double number, int base, int signed_p);
 char *itoa (int number);
 char *ltoa (long number);
 char *ltoab (long x, int base);
@ -50,6 +52,7 @@ int oputc (int c);
 int oputs (char const *s);
 char *search_path (char const *file_name);
 ssize_t _read (int fd, void *buffer, size_t size);
+void assert_msg (int check, char *msg);

 extern char *__brk;
 extern void (*__call_at_exit) (void);
--- a/include/mes/m2.h
+++ b/include/mes/m2.h
@ -0,0 +1,24 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MES_M2_H
+#define __MES_M2_H
+
+#endif /* __MES_M2_H */
--- a/include/mes/macros.h
+++ b/include/mes/macros.h
@ -21,6 +21,43 @@
 #ifndef __MES_MACROS_H
 #define __MES_MACROS_H

+#if POINTER_CELLS
+
+#define TYPE(x) g_cells[x - g_cells].type
+#define CAR(x) g_cells[x - g_cells].car
+#define CDR(x) g_cells[x - g_cells].cdr
+
+#define NTYPE(x) g_news[x - g_news].type
+#define NCAR(x) g_news[x - g_news].car
+#define NCDR(x) g_news[x - g_news].cdr
+
+#define STYPE(x) TYPE (g_stack_array[x])
+#define SCAR(x) CAR (g_stack_array[x])
+#define SCDR(x) CDR (g_stack_arraynews[x])
+
+#define BYTES(x) g_cells[x - g_cells].bytes
+#define LENGTH(x) g_cells[x - g_cells].length
+#define MACRO(x) g_cells[x - g_cells].macro
+#define PORT(x) g_cells[x - g_cells].port
+#define REF(x) g_cells[x - g_cells].ref
+#define VARIABLE(x) g_cells[x - g_cells].variable
+
+#define CLOSURE(x) g_cells[x - g_cells].closure
+#define CONTINUATION(x) g_cells[x - g_cells].continuation
+
+#define NAME(x) g_cells[x - g_cells].name
+#define STRING(x) g_cells[x - g_cells].string
+#define STRUCT(x) g_cells[x - g_cells].structure
+#define VALUE(x) g_cells[x - g_cells].value
+#define VECTOR(x) g_cells[x - g_cells].vector
+
+#define NLENGTH(x) g_news[x - g_news].length
+#define NVALUE(x) g_news[x - g_news].value
+#define NSTRING(x) g_news[x - g_news].string
+#define NVECTOR(x) g_news[x - g_news].vector
+
+#else
+
 #define TYPE(x) g_cells[x].type
 #define CAR(x) g_cells[x].car
 #define CDR(x) g_cells[x].cdr
@ -29,19 +66,18 @@
 #define NCAR(x) g_news[x].car
 #define NCDR(x) g_news[x].cdr

+#define STYPE(x) TYPE (g_stack_array[x])
+#define SCAR(x) CAR (g_stack_array[x])
+#define SCDR(x) CDR (g_stack_array[x])
+
 #define BYTES(x) g_cells[x].car
 #define LENGTH(x) g_cells[x].car
 #define REF(x) g_cells[x].car
-#define START(x) (g_cells[x].car >> 16)
-#define LEN(x) (g_cells[x].car & 0xffff)
 #define VARIABLE(x) g_cells[x].car

 #define CLOSURE(x) g_cells[x].cdr
 #define CONTINUATION(x) g_cells[x].cdr

-#define CBYTES(x) (char*)&g_cells[x].cdr
-#define CSTRING_STRUCT(x) (char*)&g_cells[x.cdr].cdr
-
 #define MACRO(x) g_cells[x].car
 #define NAME(x) g_cells[x].cdr
 #define PORT(x) g_cells[x].car
@ -51,23 +87,11 @@
 #define VECTOR(x) g_cells[x].cdr

 #define NLENGTH(x) g_news[x].car
-#define NCBYTES(x) (char*)&g_news[x].cdr
 #define NVALUE(x) g_news[x].cdr
 #define NSTRING(x) g_news[x].cdr
 #define NVECTOR(x) g_news[x].cdr

-#define CSTRING(x) CBYTES (STRING (x))
-
-#define MAKE_BYTES0(x) make_bytes (x, strlen (x))
-#define NAME_SYMBOL(symbol,name) {size_t s = strlen (name); CAR (symbol) = s; CDR (symbol) = make_bytes (name, s);}
-
-#define MAKE_CHAR(n) make_cell__ (TCHAR, 0, n)
-#define MAKE_CONTINUATION(n) make_cell__ (TCONTINUATION, n, g_stack)
-#define MAKE_NUMBER(n) make_cell__ (TNUMBER, 0, (long)n)
-#define MAKE_REF(n) make_cell__ (TREF, n, 0)
-#define MAKE_STRING0(x) make_string (x, strlen (x))
-#define MAKE_STRING_PORT(x) make_cell__ (TPORT, -length__ (g_ports) - 2, x)
-#define MAKE_MACRO(name, x) make_cell__ (TMACRO, x, STRING (name))
+#endif

 #define CAAR(x) CAR (CAR (x))
 #define CADR(x) CAR (CDR (x))
@ -75,6 +99,7 @@
 #define CDDR(x) CDR (CDR (x))
 #define CADAR(x) CAR (CDR (CAR (x)))
 #define CADDR(x) CAR (CDR (CDR (x)))
-#define CDADAR(x) CAR (CDR (CAR (CDR (x))))
+#define CDADR(x) CDR (CAR (CDR (x)))
+#define CDDAR(x) CDR (CDR (CAR (x)))

 #endif //__MES_MACROS_H
--- a/include/mes/mes.h
+++ b/include/mes/mes.h
@ -21,86 +21,153 @@
 #ifndef __MES_MES_H
 #define __MES_MES_H

-#include <sys/types.h>
+#define POINTER_CELLS 0

-typedef long SCM;
+#include <sys/types.h>
+#include "mes/cc.h"

 struct scm
 {
  long type;
-  SCM car;
-  SCM cdr;
+  union
+  {
+    SCM car;
+    char *bytes;
+    long length;
+    SCM ref;
+    SCM variable;
+    SCM macro;
+    long port;
+  };
+  union
+  {
+    SCM cdr;
+    SCM closure;
+    SCM continuation;
+    char *name;
+    SCM string;
+    SCM structure;
+    long value;
+    SCM vector;
+  };
 };

-// mes
-extern int g_debug;
-extern char *g_buf;
-extern SCM g_continuations;
-extern SCM g_symbols;
-extern SCM g_symbol_max;
+/* mes */
+char *g_datadir;
+int g_debug;
+char *g_buf;
+SCM g_continuations;
+SCM g_symbols;
+SCM g_symbol_max;
+int g_mini;

-// a/env
-extern SCM r0;
-// param 1
-extern SCM r1;
-// save 2
-extern SCM r2;
-// continuation
-extern SCM r3;
-// current-module
-extern SCM m0;
-// macro
-extern SCM g_macros;
-extern SCM g_ports;
+/* a/env */
+SCM R0;
+/* param 1 */
+SCM R1;
+/* save 2 */
+SCM R2;
+/* continuation */
+SCM R3;
+/* current-module */
+SCM M0;
+/* macro */
+SCM g_macros;
+SCM g_ports;

-// gc
-extern long ARENA_SIZE;
-extern long MAX_ARENA_SIZE;
-extern long STACK_SIZE;
-extern long JAM_SIZE;
-extern long GC_SAFETY;
-extern long MAX_STRING;
-extern char *g_arena;
-extern long g_free;
-extern SCM g_stack;
-extern SCM *g_stack_array;
-extern struct scm *g_cells;
-extern struct scm *g_news;
+/* gc */
+long ARENA_SIZE;
+long MAX_ARENA_SIZE;
+long STACK_SIZE;
+long JAM_SIZE;
+long GC_SAFETY;
+long MAX_STRING;
+char *g_arena;
+SCM cell_arena;
+SCM cell_zero;
+
+#if !POINTER_CELLS
+long g_free;
+long g_symbol;
+#else
+SCM g_free;
+SCM g_symbol;
+#endif
+
+SCM *g_stack_array;
+struct scm *g_cells;
+struct scm *g_news;
+long g_stack;
+
+char **__execl_c_argv;
+char *__getcwd_buf;
+char *__open_boot_buf;
+char *__open_boot_file_name;
+char *__setenv_buf;
+char *__reader_read_char_buf;
+struct timespec *g_start_time;
+struct timeval *__gettimeofday_time;
+struct timespec *__get_internal_run_time_ts;

 SCM alloc (long n);
 SCM apply (SCM f, SCM x, SCM a);
 SCM apply_builtin (SCM fn, SCM x);
+SCM apply_builtin0 (SCM fn);
+SCM apply_builtin1 (SCM fn, SCM x);
+SCM apply_builtin2 (SCM fn, SCM x, SCM y);
+SCM apply_builtin3 (SCM fn, SCM x, SCM y, SCM z);
+SCM builtin_name (SCM builtin);
 SCM cstring_to_list (char const *s);
 SCM cstring_to_symbol (char const *s);
-SCM display_ (SCM x);
+SCM cell_ref (SCM cell, long index);
 SCM fdisplay_ (SCM, int, int);
-SCM gc_init ();
-SCM gc_peek_frame ();
-SCM gc_pop_frame ();
-SCM gc_push_frame ();
+SCM init_symbols ();
 SCM init_time (SCM a);
+SCM make_builtin_type ();
 SCM make_bytes (char const *s, size_t length);
-SCM make_cell__ (long type, SCM car, SCM cdr);
+SCM make_cell (long type, SCM car, SCM cdr);
+SCM make_char (int n);
+SCM make_continuation (long n);
 SCM make_hash_table_ (long size);
 SCM make_hashq_type ();
 SCM make_initial_module (SCM a);
+SCM make_macro (SCM name, SCM x);
+SCM make_number (long n);
+SCM make_ref (SCM x);
 SCM make_string (char const *s, size_t length);
-SCM make_vector__ (long k);
-SCM read_input_file_env (SCM);
-SCM string_equal_p (SCM a, SCM b);
+SCM make_string0 (char const *s);
+SCM make_string_port (SCM x);
+SCM make_vector_ (long k, SCM e);
+SCM mes_builtins (SCM a);
+SCM push_cc (SCM p1, SCM p2, SCM a, SCM c);
 SCM struct_ref_ (SCM x, long i);
 SCM struct_set_x_ (SCM x, long i, SCM e);
 SCM vector_ref_ (SCM x, long i);
 SCM vector_set_x_ (SCM x, long i, SCM e);
+FUNCTION builtin_function (SCM builtin);
+char *cell_bytes (SCM x);
+char *news_bytes (SCM x);
 int peekchar ();
 int readchar ();
 int unreadchar ();
+long gc_free ();
 long length__ (SCM x);
 size_t bytes_cells (size_t length);
 void assert_max_string (size_t i, char const *msg, char *string);
+void assert_msg (int check, char *msg);
+void assert_number (char const *name, SCM x);
+void copy_cell (SCM to, SCM from);
+void gc_ ();
+void gc_init ();
+void gc_peek_frame ();
+void gc_pop_frame ();
+void gc_push_frame ();
+void gc_stats_ (char const* where);
+void init_symbols_ ();

 #include "mes/builtins.h"
 #include "mes/constants.h"
 #include "mes/macros.h"
+#include "mes/symbols.h"

-#endif //__MES_MES_H
+#endif /* __MES_MES_H */
--- a/include/mes/symbols.h
+++ b/include/mes/symbols.h
@ -0,0 +1,150 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MES_SYMBOLS_H
+#define __MES_SYMBOLS_H
+
+SCM cell_nil;
+SCM cell_f;
+SCM cell_t;
+SCM cell_dot;
+SCM cell_arrow;
+SCM cell_undefined;
+SCM cell_unspecified;
+SCM cell_closure;
+SCM cell_circular;
+
+SCM cell_vm_apply;
+SCM cell_vm_apply2;
+SCM cell_vm_begin;
+SCM cell_vm_begin_eval;
+SCM cell_vm_begin_expand;
+SCM cell_vm_begin_expand_eval;
+SCM cell_vm_begin_expand_macro;
+SCM cell_vm_begin_expand_primitive_load;
+SCM cell_vm_begin_primitive_load;
+SCM cell_vm_begin_read_input_file;
+SCM cell_vm_call_with_current_continuation2;
+SCM cell_vm_call_with_values2;
+SCM cell_vm_eval;
+SCM cell_vm_eval2;
+SCM cell_vm_eval_check_func;
+SCM cell_vm_eval_define;
+SCM cell_vm_eval_macro_expand_eval;
+SCM cell_vm_eval_macro_expand_expand;
+SCM cell_vm_eval_pmatch_car;
+SCM cell_vm_eval_pmatch_cdr;
+SCM cell_vm_eval_set_x;
+SCM cell_vm_evlis;
+SCM cell_vm_evlis2;
+SCM cell_vm_evlis3;
+SCM cell_vm_if;
+SCM cell_vm_if_expr;
+SCM cell_vm_macro_expand;
+SCM cell_vm_macro_expand_car;
+SCM cell_vm_macro_expand_cdr;
+SCM cell_vm_macro_expand_define;
+SCM cell_vm_macro_expand_define_macro;
+SCM cell_vm_macro_expand_lambda;
+SCM cell_vm_macro_expand_set_x;
+SCM cell_vm_return;
+
+SCM cell_symbol_lambda;
+SCM cell_symbol_begin;
+SCM cell_symbol_if;
+SCM cell_symbol_quote;
+SCM cell_symbol_define;
+SCM cell_symbol_define_macro;
+SCM cell_symbol_quasiquote;
+SCM cell_symbol_unquote;
+SCM cell_symbol_unquote_splicing;
+SCM cell_symbol_syntax;
+SCM cell_symbol_quasisyntax;
+SCM cell_symbol_unsyntax;
+SCM cell_symbol_unsyntax_splicing;
+SCM cell_symbol_set_x;
+SCM cell_symbol_sc_expand;
+SCM cell_symbol_macro_expand;
+SCM cell_symbol_portable_macro_expand;
+SCM cell_symbol_sc_expander_alist;
+SCM cell_symbol_call_with_values;
+SCM cell_symbol_call_with_current_continuation;
+SCM cell_symbol_boot_module;
+SCM cell_symbol_current_module;
+SCM cell_symbol_primitive_load;
+SCM cell_symbol_car;
+SCM cell_symbol_cdr;
+SCM cell_symbol_not_a_number;
+SCM cell_symbol_not_a_pair;
+SCM cell_symbol_system_error;
+SCM cell_symbol_throw;
+SCM cell_symbol_unbound_variable;
+SCM cell_symbol_wrong_number_of_args;
+SCM cell_symbol_wrong_type_arg;
+SCM cell_symbol_buckets;
+SCM cell_symbol_builtin;
+SCM cell_symbol_frame;
+SCM cell_symbol_hashq_table;
+SCM cell_symbol_module;
+SCM cell_symbol_procedure;
+SCM cell_symbol_record_type;
+SCM cell_symbol_size;
+SCM cell_symbol_stack;
+SCM cell_symbol_argv;
+SCM cell_symbol_mes_datadir;
+SCM cell_symbol_mes_version;
+SCM cell_symbol_internal_time_units_per_second;
+SCM cell_symbol_compiler;
+SCM cell_symbol_arch;
+SCM cell_symbol_pmatch_car;
+SCM cell_symbol_pmatch_cdr;
+SCM cell_type_bytes;
+SCM cell_type_char;
+SCM cell_type_closure;
+SCM cell_type_continuation;
+SCM cell_type_function;
+SCM cell_type_keyword;
+SCM cell_type_macro;
+SCM cell_type_number;
+SCM cell_type_pair;
+SCM cell_type_port;
+SCM cell_type_ref;
+SCM cell_type_special;
+SCM cell_type_string;
+SCM cell_type_struct;
+SCM cell_type_symbol;
+SCM cell_type_values;
+SCM cell_type_variable;
+SCM cell_type_vector;
+SCM cell_type_broken_heart;
+SCM cell_symbol_program;
+SCM cell_symbol_test;
+
+// CONSTANT SYMBOL_MAX 114
+#define SYMBOL_MAX 114
+
+// CONSTANT CELL_UNSPECIFIED 7
+#define CELL_UNSPECIFIED 7
+
+// CONSTANT CELL_SYMBOL_RECORD_TYPE 82
+#define CELL_SYMBOL_RECORD_TYPE 82
+
+
+#endif /* __MES_SYMBOLS_H */
--- a/include/stdarg.h
+++ b/include/stdarg.h
@ -34,6 +34,8 @@
 typedef char *va_list;
 #define va_start(ap, last) (void)((ap) = (char*)(&(last) + 1))
 #define va_arg(ap, type) (type)(((long*)((ap) = ((ap) + sizeof (void*))))[-1])
+#define va_align(ap, alignment) ((char*)((((unsigned long) (ap)) + (alignment) - 1) &~ ((alignment) - 1)))
+#define va_arg8(ap, type) (type)(((double*)((ap) = (va_align((ap), 8) + sizeof(double))))[-1])
 #define va_end(ap) (void)((ap) = 0)
 #define va_copy(dest, src) dest = src

--- a/include/stdlib.h
+++ b/include/stdlib.h
@ -36,6 +36,7 @@ typedef int (*comparison_fn_t) (void const *, void const *);
 #include <sys/types.h>
 #include <alloca.h>

+void abort (void);
 double atof (char const *s);
 int atoi (char const *s);
 int atexit (void (*function) (void));
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@ -85,10 +85,12 @@ struct stat
 int chmod (char const *file_name, mode_t mode);
 int fstat (int filedes, struct stat *buf);
 int mkdir (char const *file_name, mode_t mode);
+int mknod (char const *file_name, mode_t mode, dev_t dev);
 int chown (char const *file_name, uid_t owner, gid_t group);
 int rmdir (char const *file_name);
 int stat (char const *file_name, struct stat *buf);

+#define S_IFIFO 0010000
 #define S_IFCHR 0020000
 #define S_IFDIR 0040000
 #define S_IFBLK 0060000
@ -96,6 +98,7 @@ int stat (char const *file_name, struct stat *buf);
 #define S_IFLNK 0120000
 #define S_IFMT  0170000

+#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)

--- a/include/sys/types.h
+++ b/include/sys/types.h
@ -87,7 +87,7 @@ typedef unsigned long uintptr_t;
 #ifndef __MES_OFF_T
 #define __MES_OFF_T
 #undef off_t
-typedef unsigned long off_t;
+typedef long off_t;
 #endif

 #ifndef __MES_OFF64_T
@ -138,6 +138,15 @@ typedef long ssize_t;
 typedef unsigned uid_t;
 #endif

+#ifndef __WCHAR_T
+#define __WCHAR_T
+#ifndef __MES_WCHAR_T
+#define __MES_WCHAR_T
+#undef wchar_t
+typedef int wchar_t;
+#endif
+#endif
+
 #endif // ! SYSTEM_LIBC

 #endif // __MES_SYS_TYPES_H
--- a/include/termio.h
+++ b/include/termio.h
@ -49,6 +49,14 @@
 #define   CS8	0000060
 #define PARENB	0000400

+struct winsize
+{
+  unsigned short ws_row;
+  unsigned short ws_col;
+  unsigned short ws_xpixel;
+  unsigned short ws_ypixel;
+};
+
 struct termio
 {
  unsigned short c_iflag;
--- a/include/time.h
+++ b/include/time.h
@ -59,6 +59,7 @@ struct timespec
 int clock_gettime (clockid_t clk_id, struct timespec *tp);
 struct tm *localtime (time_t const *timep);
 struct tm *gmtime (time_t const *time);
+time_t mktime (struct tm *broken_time);
 int nanosleep (struct timespec const *requested_time, struct timespec const *remaining);
 time_t time (time_t * tloc);

--- a/include/unistd.h
+++ b/include/unistd.h
@ -62,6 +62,7 @@ unsigned int alarm (unsigned int seconds);
 int close (int fd);
 int execv (char const *file_name, char *const argv[]);
 int execl (char const *file_name, char const *arg, ...);
+int execlp (char const *file_name, char const *arg, ...);
 int execve (char const *file, char *const argv[], char *const env[]);
 int execvp (char const *file, char *const argv[]);
 int fork (void);
@ -73,21 +74,24 @@ int setgid (gid_t newgid);
 int setuid (uid_t newuid);
 uid_t geteuid (void);
 gid_t getegid (void);
+pid_t getpgrp (void);
 pid_t getpid (void);
 pid_t getppid (void);
+int getpgid (pid_t pid);
 int isatty (int fd);
-int link (char const *oldname, char const *newname);
+int link (char const *old_name, char const *new_name);
 off_t lseek (int fd, off_t offset, int whence);
 ssize_t read (int fd, void *buffer, size_t size);
+ssize_t readlink (char const *file_name, char *buffer, size_t size);
 #if __SBRK_CHAR_PTRDIFF
 /* xmalloc in binutils <= 2.10.1 uses this old prototype */
 char *sbrk (ptrdiff_t delta);
 #else
 void *sbrk (intptr_t delta);
 #endif
+int symlink (char const *old_name, char const *new_name);
 int unlink (char const *file_name);
 ssize_t write (int filedes, void const *buffer, size_t size);
-pid_t getpid (void);

 #endif // ! SYSTEM_LIBC

--- a/kaem.run
+++ b/kaem.run
@ -0,0 +1,139 @@
+#!/bin/bash
+# Copyright (C) 2019 Jeremiah Orians <jeremiah@pdp10.guru>
+# Copyright (C) 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# This file is part of Gnu Mes
+#
+# Gnu Mes is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Gnu Mes is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Gnu Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+# Usage:
+# kaem --verbose --strict
+
+./build-aux/pointer.sh
+./build-aux/pointer.sh
+./build-aux/pointer.sh
+./build-aux/pointer.sh
+./build-aux/pointer.sh
+
+M2-Planet                                       \
+    --debug                                     \
+    --architecture x86                          \
+    -f include/m2/lib.h                         \
+    -f lib/linux/x86-mes-m2/crt1.c              \
+    -f lib/linux/x86-mes-m2/mini.c              \
+    -f lib/m2/exit.c                            \
+    -f lib/mes/write.c                          \
+    -f lib/linux/x86-mes-m2/syscall.c           \
+    -f include/linux/x86/syscall.h              \
+    -f lib/linux/brk.c                          \
+    -f lib/stdlib/malloc.c                      \
+    -f lib/string/memset.c                      \
+    -f lib/m2/read.c                            \
+    -f lib/mes/fdgetc.c                         \
+    -f lib/stdio/getchar.c                      \
+    -f lib/stdio/putchar.c                      \
+    -f lib/m2/open.c                            \
+    -f lib/m2/mes_open.c                        \
+    -f lib/string/strlen.c                      \
+    -f lib/mes/eputs.c                          \
+    -f lib/mes/fdputc.c                         \
+    -f lib/mes/eputc.c                          \
+                                                \
+    -f include/mes/mes.h                        \
+    -f include/mes/m2.h                         \
+    -f include/mes/builtins.h                   \
+    -f include/mes/constants.h                  \
+    -f include/mes/symbols.h                    \
+                                                \
+    -f lib/mes/__assert_fail.c                  \
+    -f lib/mes/assert_msg.c                     \
+                                                \
+    -f lib/mes/fdputc.c                         \
+    -f lib/string/strncmp.c                     \
+    -f lib/posix/getenv.c                       \
+    -f lib/mes/fdputs.c                         \
+    -f lib/m2/ntoab.c                           \
+    -f lib/ctype/isdigit.c                      \
+    -f lib/ctype/isxdigit.c                     \
+    -f lib/ctype/isspace.c                      \
+    -f lib/ctype/isnumber.c                     \
+    -f lib/mes/abtol.c                          \
+    -f lib/stdlib/atoi.c                        \
+    -f lib/string/memcpy.c                      \
+    -f lib/stdlib/free.c                        \
+    -f lib/stdlib/realloc.c                     \
+    -f lib/string/strcpy.c                      \
+    -f lib/mes/itoa.c                           \
+    -f lib/mes/fdungetc.c                       \
+    -f lib/posix/setenv.c                       \
+    -f lib/linux/access.c                       \
+    -f lib/m2/chmod.c                           \
+    -f lib/m2/ioctl.c                           \
+    -f lib/m2/isatty.c                          \
+    -f lib/linux/fork.c                         \
+    -f lib/m2/execve.c                          \
+    -f lib/m2/execv.c                           \
+    -f lib/m2/waitpid.c                         \
+    -f lib/linux/gettimeofday.c                 \
+    -f lib/m2/clock_gettime.c                   \
+    -f lib/m2/time.c                            \
+    -f lib/linux/_getcwd.c                      \
+    -f lib/m2/getcwd.c                          \
+    -f lib/linux/dup.c                          \
+    -f lib/linux/dup2.c                         \
+    -f lib/string/strcmp.c                      \
+    -f lib/string/memcmp.c                      \
+    -f lib/linux/unlink.c                       \
+    -f src/builtins.c                           \
+    -f src/core.c                               \
+    -f src/display.c                            \
+    -f src/eval-apply.c                         \
+    -f src/gc.c                                 \
+    -f src/hash.c                               \
+    -f src/lib.c                                \
+    -f src/m2.c                                 \
+    -f src/math.c                               \
+    -f src/mes.c                                \
+    -f src/module.c                             \
+    -f src/posix.c                              \
+    -f src/reader.c                             \
+    -f src/stack.c                              \
+    -f src/string.c                             \
+    -f src/struct.c                             \
+    -f src/symbol.c                             \
+    -f src/vector.c                             \
+    -o bin/mes.M1
+
+blood-elf -f bin/mes.M1 -o bin/mes.blood-elf-M1
+
+M1                                              \
+    --LittleEndian                              \
+    --architecture x86                          \
+    -f lib/m2/x86/x86_defs.M1                   \
+    -f lib/x86-mes/x86.M1                       \
+    -f lib/linux/x86-mes-m2/crt1.M1             \
+    -f bin/mes.M1                               \
+    -f bin/mes.blood-elf-M1                     \
+    -o bin/mes.hex2
+
+hex2                                            \
+    --LittleEndian                              \
+    --architecture x86                          \
+    --BaseAddress 0x1000000                     \
+    --exec_enable                               \
+    -f lib/x86-mes/elf32-header.hex2            \
+    -f bin/mes.hex2                             \
+    -o bin/mes-m2
+
+echo Running mes-m2
+./bin/mes-m2 -c '(display "Hello Mes-M2\n")'
--- a/lib/ctype/isgraph.c
+++ b/lib/ctype/isgraph.c
@ -0,0 +1,27 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <ctype.h>
+
+int
+isgraph (int c)
+{
+  return c > 32 && c < 127;
+}
--- a/lib/linux/_getcwd.c
+++ b/lib/linux/_getcwd.c
@ -25,7 +25,7 @@
 char *
 _getcwd (char *buffer, size_t size)
 {
-  int r = _sys_call2 (SYS_getcwd, (long) buffer, (long) size);
+  int r = _sys_call2 (SYS_getcwd, buffer, size);
  if (r >= 0)
    return buffer;
  return 0;
--- a/lib/linux/access.c
+++ b/lib/linux/access.c
@ -24,5 +24,7 @@
 int
 access (char const *file_name, int how)
 {
-  return _sys_call2 (SYS_access, (long) file_name, (int) how);
+  long long_file_name = file_name;
+  long long_how = how;
+  return _sys_call2 (SYS_access, long_file_name, long_how);
 }
--- a/lib/linux/brk.c
+++ b/lib/linux/brk.c
@ -24,5 +24,5 @@
 long
 brk (void *addr)
 {
-  return _sys_call1 (SYS_brk, (long) addr);
+  return _sys_call1 (SYS_brk, addr);
 }
--- a/lib/linux/chmod.c
+++ b/lib/linux/chmod.c
@ -25,5 +25,7 @@
 int
 chmod (char const *file_name, mode_t mask)
 {
-  return _sys_call2 (SYS_chmod, (long) file_name, (long) mask);
+  long long_file_name = file_name;
+  long long_mask = mask;
+  return _sys_call2 (SYS_chmod, long_file_name, long_mask);
 }
--- a/lib/linux/clock_gettime.c
+++ b/lib/linux/clock_gettime.c
@ -25,5 +25,7 @@
 int
 clock_gettime (clockid_t clk_id, struct timespec *tp)
 {
-  return _sys_call2 (SYS_clock_gettime, (long) clk_id, (long) tp);
+  long long_clk_id = clk_id;
+  long long_tp = tp;
+  return _sys_call2 (SYS_clock_gettime, clk_id, tp);
 }
--- a/lib/linux/dup.c
+++ b/lib/linux/dup.c
@ -24,5 +24,6 @@
 int
 dup (int old)
 {
-  return _sys_call1 (SYS_dup, (int) old);
+  long long_old = old;
+  return _sys_call1 (SYS_dup, long_old);
 }
--- a/lib/linux/dup2.c
+++ b/lib/linux/dup2.c
@ -24,5 +24,7 @@
 int
 dup2 (int old, int new)
 {
-  return _sys_call2 (SYS_dup2, (int) old, (int) new);
+  long long_old = old;
+  long long_new = new;
+  return _sys_call2 (SYS_dup2, long_old, long_new);
 }
--- a/lib/linux/gettimeofday.c
+++ b/lib/linux/gettimeofday.c
@ -25,5 +25,7 @@
 int
 gettimeofday (struct timeval *tv, struct timezone *tz)
 {
-  return _sys_call2 (SYS_gettimeofday, (long) tv, (long) tz);
+  long long_tv = tv;
+  long long_tz = tz;
+  return _sys_call2 (SYS_gettimeofday, long_tv, long_tz);
 }
--- a/lib/linux/mknod.c
+++ b/lib/linux/mknod.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <sys/stat.h>
+
+int
+mknod (char const *file_name, mode_t mode, dev_t dev)
+{
+  return _sys_call3 (SYS_mknod, (long) file_name, (long) mode, (long) dev);
+}
--- a/lib/linux/read.c
+++ b/lib/linux/read.c
@ -26,21 +26,23 @@
 ssize_t
 read (int filedes, void *buffer, size_t size)
 {
-  ssize_t bytes = _sys_call3 (SYS_read, (int) filedes, (long) buffer, (long) size);
+  long long_filedes = filedes;
+  ssize_t bytes = _sys_call3 (SYS_read, long_filedes, buffer, size);
  if (__mes_debug () > 4)
    {
      if (bytes == 1)
        {
          eputs ("read fd=");
-          eputs (itoa ((int) filedes));
+          eputs (itoa (filedes));
          eputs (" c=");
-          eputc (*(char *) buffer);
+          char *s = buffer;
+          eputc (s[0]);
          eputs ("\n");
        }
      else
        {
          eputs ("read fd=");
-          eputs (itoa ((int) filedes));
+          eputs (itoa (filedes));
          eputs (" bytes=");
          eputs (itoa (bytes));
          eputs ("\n");
--- a/lib/linux/readlink.c
+++ b/lib/linux/readlink.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <sys/stat.h>
+
+ssize_t
+readlink (char const *file_name, char *buffer, size_t size)
+{
+  return _sys_call3 (SYS_readlink, (long) file_name, (long) buffer, (long) size);
+}
--- a/lib/linux/symlink.c
+++ b/lib/linux/symlink.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <unistd.h>
+
+int
+symlink (char const *old_name, char const *new_name)
+{
+  return _sys_call2 (SYS_symlink, (long) old_name, (long) new_name);
+}
--- a/lib/linux/unlink.c
+++ b/lib/linux/unlink.c
@ -24,5 +24,5 @@
 int
 unlink (char const *file_name)
 {
-  return _sys_call1 (SYS_unlink, (long) file_name);
+  return _sys_call1 (SYS_unlink, file_name);
 }
--- a/lib/linux/x86-mes-m2/crt1.M1
+++ b/lib/linux/x86-mes-m2/crt1.M1
@ -0,0 +1,43 @@
+DEFINE mov____%edi,%ebp 89fd
+DEFINE mov____%esp,%edi 89e7
+:_start
+	push___%ebp
+	mov____%esp,%ebp
+	sub____$i32,%esp %0x1054
+	mov____$i8,%eax !0
+	mov____%eax,0x32 &GLOBAL___stdin
+	mov____$i8,%eax !1
+	mov____%eax,0x32 &GLOBAL___stdout
+	mov____$i8,%eax !2
+	mov____%eax,0x32 &GLOBAL___stderr
+	mov____%ebp,%eax
+	add____$i8,%eax !4
+	movzbl_(%eax),%eax
+	add____$i8,%eax !3
+	shl____$i8,%eax !0x02
+	add____%ebp,%eax
+	mov____%eax,0x32 &GLOBAL_environ
+
+	mov____%esp,%edi  	; M2-Planet calling convention pushes forward
+	mov____%ebp,%eax 	; argc
+	add____$i8,%eax !4
+	movzbl_(%eax),%eax
+	push___%eax
+
+	mov____%ebp,%eax 	; argv
+	add____$i8,%eax !8
+	push___%eax
+
+	mov____0x32,%eax &GLOBAL_environ
+	push___%eax
+
+	mov____%edi,%ebp    	; M2-Planet calling convention
+	call32 %FUNCTION_main
+	add____$i8,%esp !0x0
+	test___%eax,%eax
+	mov____%eax,%ebx
+	mov____$i32,%eax %1
+	int____$0x80
+	hlt
+	leave
+	ret
--- a/lib/linux/x86-mes-m2/crt1.c
+++ b/lib/linux/x86-mes-m2/crt1.c
@ -0,0 +1,68 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mes/lib-mini.h"
+
+int __stdin;
+int __stdout;
+int __stderr;
+char **environ;
+int main (int argc, char **argv, char **envp);
+
+/* FIXME: this is going to be called `FUNCTION__start'
+int
+_start ()
+{
+  asm ("mov____$i8,%eax !0");
+  asm ("mov____%eax,0x32 &GLOBAL___stdin");
+
+  asm ("mov____$i8,%eax !1");
+  asm ("mov____%eax,0x32 &GLOBAL___stdout");
+
+  asm ("mov____$i8,%eax !2");
+  asm ("mov____%eax,0x32 &GLOBAL___stderr");
+
+  asm ("mov____%ebp,%eax");
+  asm ("add____$i8,%eax !4");
+
+  asm ("movzbl_(%eax),%eax");
+  asm ("add____$i8,%eax !3");
+
+  asm ("shl____$i8,%eax !0x02");
+  asm ("add____%ebp,%eax");
+  asm ("mov____%eax,0x32 &GLOBAL_environ");
+  asm ("push___%eax");
+
+  asm ("mov____%ebp,%eax");
+  asm ("add____$i8,%eax !8");
+  asm ("push___%eax");
+
+  asm ("mov____%ebp,%eax");
+  asm ("add____$i8,%eax !4");
+  asm ("movzbl_(%eax),%eax");
+  asm ("push___%eax");
+  main ();
+
+  asm ("mov____%eax,%ebx");
+  asm ("mov____$i32,%eax %1");
+  asm ("int____$0x80");
+  asm ("hlt");
+}
+*/
--- a/lib/linux/x86-mes-m2/mini.c
+++ b/lib/linux/x86-mes-m2/mini.c
@ -0,0 +1,37 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+void
+_exit ()
+{
+  asm ("mov____$i32,%eax SYS_exit");
+  asm ("mov____0x8(%ebp),%ebx !-4");
+  asm ("int____$0x80");
+}
+
+void
+_write (int filedes, void *buffer, int size)
+{
+  asm ("mov____$i32,%eax SYS_write");
+  asm ("mov____0x8(%ebp),%ebx !-4");
+  asm ("mov____0x8(%ebp),%ecx !-8");
+  asm ("mov____0x8(%ebp),%edx !-12");
+  asm ("int____$0x80");
+}
--- a/lib/linux/x86-mes-m2/syscall.c
+++ b/lib/linux/x86-mes-m2/syscall.c
@ -0,0 +1,139 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <errno.h>
+#include <linux/x86/syscall.h>
+
+int errno;
+
+int
+__sys_call (int sys_call)
+{
+  asm ("mov____0x8(%ebp),%eax !-4");
+  asm ("int____$0x80");
+}
+
+int
+__sys_call1 (int sys_call, int one)
+{
+  asm ("mov____0x8(%ebp),%eax !-4");
+  asm ("mov____0x8(%ebp),%ebx !-8");
+  asm ("int____$0x80");
+}
+
+int
+__sys_call2 (int sys_call, int one, int two)
+{
+  asm ("mov____0x8(%ebp),%eax !-4");
+  asm ("mov____0x8(%ebp),%ebx !-8");
+  asm ("mov____0x8(%ebp),%ecx !-12");
+  asm ("int____$0x80");
+}
+
+int
+__sys_call3 (int sys_call, int one, int two, int three)
+{
+  asm ("mov____0x8(%ebp),%eax !-4");
+  asm ("mov____0x8(%ebp),%ebx !-8");
+  asm ("mov____0x8(%ebp),%ecx !-12");
+  asm ("mov____0x8(%ebp),%edx !-16");
+  asm ("int____$0x80");
+}
+
+int
+__sys_call4 (int sys_call, int one, int two, int three, int four)
+{
+  asm ("mov____0x8(%ebp),%eax !-4");
+  asm ("mov____0x8(%ebp),%ebx !-8");
+  asm ("mov____0x8(%ebp),%ecx !-12");
+  asm ("mov____0x8(%ebp),%edx !-16");
+  asm ("mov____0x8(%ebp),%esi !-24");
+  asm ("int____$0x80");
+}
+
+int
+_sys_call (int sys_call)
+{
+  int r = __sys_call (sys_call);
+  if (r < 0)
+    {
+      errno = -r;
+      r = -1;
+    }
+  else
+    errno = 0;
+  return r;
+}
+
+int
+_sys_call1 (int sys_call, int one)
+{
+  int r = __sys_call1 (sys_call, one);
+  if (r < 0)
+    {
+      errno = -r;
+      r = -1;
+    }
+  else
+    errno = 0;
+  return r;
+}
+
+int
+_sys_call2 (int sys_call, int one, int two)
+{
+  int r = __sys_call2 (sys_call, one, two);
+  if (r < 0)
+    {
+      errno = -r;
+      r = -1;
+    }
+  else
+    errno = 0;
+  return r;
+}
+
+int
+_sys_call3 (int sys_call, int one, int two, int three)
+{
+  int r = __sys_call3 (sys_call, one, two, three);
+  if (r < 0)
+    {
+      errno = -r;
+      r = -1;
+    }
+  else
+    errno = 0;
+  return r;
+}
+
+int
+_sys_call4 (int sys_call, int one, int two, int three, int four)
+{
+  int r = __sys_call4 (sys_call, one, two, three, four);
+  if (r < 0)
+    {
+      errno = -r;
+      r = -1;
+    }
+  else
+    errno = 0;
+  return r;
+}
--- a/lib/m2/abtol.c
+++ b/lib/m2/abtol.c
@ -0,0 +1,55 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <ctype.h>
+
+long
+abtol (char **p, int base)
+{
+  char *s = p[0];
+  int i = 0;
+  int sign_p = 0;
+  if (base == 0)
+    base = 10;
+  while (isspace (s[0]) != 0)
+    s = s + 1;
+  if (s[0] != 0 && s[0] == '+')
+    s = s + 1;
+  if (s[0] != 0 && s[0] == '-')
+    {
+      sign_p = 1;
+      s = s + 1;
+    }
+  while (isnumber (s[0], base) != 0)
+    {
+      i = i * base;
+      int m = '0';
+      if (s[0] > '9')
+        m = 'a' - 10;
+      i = i + s[0] - m;
+      s = s + 1;
+    }
+  p[0] = s;
+  if (sign_p != 0)
+    return -i;
+
+  return i;
+}
--- a/lib/m2/chmod.c
+++ b/lib/m2/chmod.c
@ -0,0 +1,31 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <sys/stat.h>
+
+int
+chmod (char const *file_name, int mask)
+{
+  long long_file_name = file_name;
+  long long_mask = mask;
+  return _sys_call2 (SYS_chmod, long_file_name, long_mask);
+}
--- a/lib/m2/clock_gettime.c
+++ b/lib/m2/clock_gettime.c
@ -0,0 +1,30 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <time.h>
+
+int
+clock_gettime (long clk_id, struct timespec *tp)
+{
+  long long_tp = tp;
+  return _sys_call2 (SYS_clock_gettime, clk_id, tp);
+}
--- a/lib/m2/execv.c
+++ b/lib/m2/execv.c
@ -0,0 +1,25 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int
+execv (char *file_name, char **argv)
+{
+  return execve (file_name, argv, environ);
+}
--- a/lib/m2/execve.c
+++ b/lib/m2/execve.c
@ -0,0 +1,31 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+
+int
+execve (char const *file_name, char **argv, char **env)
+{
+  long long_file_name = file_name;
+  long long_argv = argv;
+  long long_env = env;
+  return _sys_call3 (SYS_execve, file_name, argv, env);
+}
--- a/lib/m2/exit.c
+++ b/lib/m2/exit.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+
+void _exit (int code);
+
+void
+exit (int code)
+{
+  _exit (code);
+}
--- a/lib/m2/getcwd.c
+++ b/lib/m2/getcwd.c
@ -0,0 +1,37 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <mes/lib.h>
+
+// CONSTANT PATH_MAX 1024
+
+char *
+getcwd (char *buffer, int size)
+{
+  if (__getcwd_buf == 0)
+    __getcwd_buf = malloc (PATH_MAX);
+  char *buf = __itoa_buf;
+  if (buffer != 0)
+    return _getcwd (buffer, size);
+  return _getcwd (buf, PATH_MAX);
+}
--- a/lib/m2/ioctl.c
+++ b/lib/m2/ioctl.c
@ -0,0 +1,34 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <stdarg.h>
+#include <sys/ioctl.h>
+
+int
+ioctl (int filedes, long command, int data)
+{
+  long long_filedes = filedes;
+  long long_command = command;
+  long long_data = data;
+  int r = _sys_call3 (SYS_ioctl, long_filedes, long_command, long_data);
+  return r;
+}
--- a/lib/m2/isatty.c
+++ b/lib/m2/isatty.c
@ -0,0 +1,54 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <sys/ioctl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termio.h>
+
+// CONSTANT TCGETS 0x5401
+#define TCGETS 0x5401
+
+// CONSTANT NCCS 19
+#define NCCS 19
+
+struct ktermios
+{
+  unsigned c_iflag;
+  unsigned c_oflag;
+  unsigned c_cflag;
+  unsigned c_lflag;
+  char c_line;
+  char c_cc[NCCS];
+  unsigned c_ispeed;
+  unsigned c_ospeed;
+};
+
+struct ktermios *__isatty_kernel_termios;
+
+int
+isatty (int filedes)
+{
+  if (__isatty_kernel_termios == 0)
+    __isatty_kernel_termios = malloc (sizeof (struct ktermios));
+  int r = ioctl (filedes, TCGETS, __isatty_kernel_termios);
+  return r == 0;
+}
--- a/lib/m2/mes_open.c
+++ b/lib/m2/mes_open.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int
+mes_open (char *file_name, int flags, int mask)
+{
+  __ungetc_init ();
+  int filedes = open (file_name, flags, mask);
+  if (filedes > 2)
+    __ungetc_clear (filedes);
+  return filedes;
+}
--- a/lib/m2/ntoab.c
+++ b/lib/m2/ntoab.c
@ -0,0 +1,69 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <assert.h>
+#include <string.h>
+
+char *__itoa_buf;
+
+char *
+ntoab (long x, int base, int signed_p)
+{
+  if (__itoa_buf == 0)
+    __itoa_buf = malloc (20);
+
+  char *buf = __itoa_buf;
+  char *p = buf + 11;
+  p[0] = 0;
+  p = p - 1;
+  assert_msg (base > 0, "base  > 0");
+
+  int sign_p = 0;
+  unsigned u;
+  if (signed_p != 0 && x < 0)
+    {
+      sign_p = 1;
+      u = -x;
+    }
+  else
+    u = x;
+
+  do
+    {
+      unsigned i;
+      i = u % base;
+      u = u / base;
+      if (i > 9)
+        p[0] = 'a' + i - 10;
+      else
+        p[0] = '0' + i;
+      p = p - 1;
+    }
+  while (u != 0);
+
+  if (sign_p && p[1] != '0')
+    {
+      p[0] = '-';
+      p = p - 1;
+    }
+
+  return p + 1;
+}
--- a/lib/m2/open.c
+++ b/lib/m2/open.c
@ -0,0 +1,33 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+int
+open (char *file_name, int flags, int mask)
+{
+  int r = _sys_call3 (SYS_open, file_name, flags, mask);
+  __ungetc_init ();
+  if (r > 2)
+    __ungetc_clear (r);
+  return r;
+}
--- a/lib/m2/read.c
+++ b/lib/m2/read.c
@ -0,0 +1,31 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * aSCM with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <mes/lib.h>
+#include <fcntl.h>
+
+SCM
+read (int filedes, void *buffer, SCM size)
+{
+  SCM bytes = _sys_call3 (SYS_read, filedes, buffer, size);
+  return bytes;
+}
--- a/lib/m2/strncmp.c
+++ b/lib/m2/strncmp.c
@ -0,0 +1,35 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int
+strncmp (char const *a, char const *b, size_t size)
+{
+  if (size == 0)
+    return 0;
+
+  while (a[0] != 0 && b[0] != 0 && a[0] == b[0] && size > 1)
+    {
+      size = size - 1;
+      a = a + 1;
+      b = b + 1;
+    }
+
+  return a[0] - b[0];
+}
--- a/lib/m2/time.c
+++ b/lib/m2/time.c
@ -0,0 +1,29 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <time.h>
+
+long
+time (long *result)
+{
+  return _sys_call1 (SYS_time, result);
+}
--- a/lib/m2/waitpid.c
+++ b/lib/m2/waitpid.c
@ -0,0 +1,38 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/syscall.h>
+#include <syscall.h>
+#include <sys/types.h>
+
+int
+waitpid (int pid, int *status_ptr, int options)
+{
+  long long_pid = pid;
+  long long_status_ptr = status_ptr;
+  long long_options = options;
+#if __i386__
+  return _sys_call3 (SYS_waitpid, long_pid, long_status_ptr, long_options);
+#elif __x86_64__
+  return _sys_call4 (SYS_wait4, long_pid, long_status_ptr, long_options, 0);
+#else
+#error arch not supported
+#endif
+}
--- a/lib/m2/x86/x86_defs.M1
+++ b/lib/m2/x86/x86_defs.M1
@ -0,0 +1,90 @@
+## Copyright (C) 2017 Jeremiah Orians
+## This file is part of M2-Planet.
+##
+## M2-Planet is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## M2-Planet is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with M2-Planet.  If not, see <http://www.gnu.org/licenses/>.
+
+
+DEFINE ADD_IMMEDIATE_to_eax 81C0
+DEFINE ADD_IMMEDIATE_to_ebp 81C5
+DEFINE ADD_eax_to_ebx 01C3
+DEFINE ADD_ebp_to_eax 01E8
+DEFINE ADD_ebx_to_eax 01D8
+DEFINE AND_eax_ebx 21D8
+DEFINE CALL_IMMEDIATE E8
+DEFINE CALL_eax FFD0
+DEFINE CMP 39C3
+DEFINE COPY_eax_to_ebx 89C3
+DEFINE COPY_eax_to_ecx 89C1
+DEFINE COPY_ebp_to_eax 89E8
+DEFINE COPY_ebx_to_eax 89D8
+DEFINE COPY_ebx_to_edx 89DA
+DEFINE COPY_ecx_to_ebp 89CD
+DEFINE COPY_edi_to_ebp 89fd
+DEFINE COPY_esp_to_ebp 89E5
+DEFINE COPY_esp_to_ecx 89E1
+DEFINE COPY_esp_to_edi 89E7
+DEFINE DIVIDE_eax_by_ebx_into_eax F7FB
+DEFINE INT_80 CD80
+DEFINE JUMP E9
+DEFINE JUMP_EQ 0F84
+DEFINE JUMP_NE 0F85
+DEFINE JUMP_EQ8 74
+DEFINE JUMP_NE8 75
+DEFINE LOAD_BASE_ADDRESS_eax 8D85
+DEFINE LOAD_BYTE 0FBE00
+DEFINE LOAD_EFFECTIVE_ADDRESS 8D8424
+DEFINE LOAD_EFFECTIVE_ADDRESS_ebx 8D9C24
+DEFINE LOAD_EFFECTIVE_ADDRESS_ecx 8D8C24
+DEFINE LOAD_EFFECTIVE_ADDRESS_edx 8D9424
+DEFINE LOAD_ESP_IMMEDIATE_into_eax 8B8424
+DEFINE LOAD_IMMEDIATE_eax B8
+DEFINE LOAD_IMMEDIATE_ebx BB
+DEFINE LOAD_IMMEDIATE_edx BA
+DEFINE LOAD_INTEGER 8B00
+DEFINE LOAD_INTEGER_ebx 8B1B
+DEFINE LOAD_INTEGER_ecx 8B09
+DEFINE LOAD_INTEGER_edx 8B12
+DEFINE MODULUS_eax_from_ebx_into_ebx F7FB
+DEFINE MOVEZBL 0FB6C0
+DEFINE MOVE_ebx_to_eax 89D8
+DEFINE MOVE_ecx_to_eax 89C8
+DEFINE MOVE_edx_to_eax 89D0
+DEFINE MULTIPLY_eax_by_ebx_into_eax F7E3
+DEFINE NOP 00000000
+DEFINE NOT_eax F7D0
+DEFINE OR_eax_ebx 09D8
+DEFINE POP_eax 58
+DEFINE POP_ebx 5B
+DEFINE POP_ebp 5D
+DEFINE POP_edi 5F
+DEFINE PUSH_eax 50
+DEFINE PUSH_ebx 53
+DEFINE PUSH_ebp 55
+DEFINE PUSH_edi 57
+DEFINE RETURN C3
+DEFINE SAL_eax_Immediate8 C1E0
+DEFINE SAL_eax_cl D3E0
+DEFINE SAR_eax_cl D3F8
+DEFINE SETE 0F94C0
+DEFINE SETLE 0F9EC0
+DEFINE SETL 0F9CC0
+DEFINE SETGE 0F9DC0
+DEFINE SETG 0F9FC0
+DEFINE SETNE 0F95C0
+DEFINE STORE_CHAR 8803
+DEFINE STORE_INTEGER 8903
+DEFINE SUBTRACT_eax_from_ebx_into_ebx 29C3
+DEFINE TEST 85C0
+DEFINE XCHG_eax_ebx 93
+DEFINE XOR_ebx_eax_into_eax 31D8
--- a/lib/mes/__assert_fail.c
+++ b/lib/mes/__assert_fail.c
@ -28,5 +28,5 @@ __assert_fail (char *s)
  eputs ("\n");
  char *fail = s;
  fail = 0;
-  *fail = 0;
+  fail[0] = 0;
 }
--- a/lib/mes/abtod.c
+++ b/lib/mes/abtod.c
@ -0,0 +1,53 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+
+double
+abtod (char const **p, int base)
+{
+  char const *s = *p;
+  double d = 0;
+  int sign_p = 0;
+  if (!base)
+    base = 10;
+  double dbase = base;
+  long i = abtol (&s, base);
+  long f = 0;
+  long e = 0;
+  if (*s == '.')
+    {
+      s++;
+      f = abtol (&s, base);
+    }
+  if (*s == 'e')
+    {
+      s++;
+      e = abtol (&s, base);
+    }
+  d = i + f / dbase;
+  if (e < 0)
+    while (e++)
+      d = d / dbase;
+  while (e--)
+    d = d * dbase;
+  *p = s;
+  return sign_p ? -d : d;
+}
--- a/lib/mes/abtol.c
+++ b/lib/mes/abtol.c
@ -24,23 +24,32 @@
 long
 abtol (char const **p, int base)
 {
-  char const *s = *p;
+  char const *s = p[0];
  int i = 0;
-  int sign = 1;
-  if (!base)
+  int sign_p = 0;
+  if (base == 0)
    base = 10;
-  if (*s && *s == '-')
+  while (isspace (s[0]) != 0)
+    s = s + 1;
+  if (s[0] != 0 && s[0] == '+')
+    s = s + 1;
+  if (s[0] != 0 && s[0] == '-')
    {
-      sign = -1;
-      s++;
+      sign_p = 1;
+      s = s + 1;
    }
-  while (isnumber (*s, base))
+  while (isnumber (s[0], base) != 0)
    {
-      i *= base;
-      int m = *s > '9' ? 'a' - 10 : '0';
-      i += *s - m;
-      s++;
+      i = i * base;
+      int m = '0';
+      if (s[0] > '9')
+        m = 'a' - 10;
+      i = i + s[0] - m;
+      s = s + 1;
    }
-  *p = s;
-  return i * sign;
+  p[0] = s;
+  if (sign_p != 0)
+    return -i;
+
+  return i;
 }
--- a/lib/mes/assert_msg.c
+++ b/lib/mes/assert_msg.c
@ -0,0 +1,30 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2019 Jeremiah Orians <jeremiah@pdp10.guru>
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <stdlib.h>
+
+void
+assert_msg (int bool, char *msg)
+{
+  if (bool == 0)
+    __assert_fail (msg);
+}
--- a/lib/mes/dtoab.c
+++ b/lib/mes/dtoab.c
@ -0,0 +1,46 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <limits.h>
+#include <string.h>
+
+char *
+dtoab (double d, int base, int signed_p)
+{
+  static char dtoa_buf[40];
+  long i = (long) d;
+  char *p = ntoab (i, base, signed_p);
+  strcpy (dtoa_buf, p);
+  long f = (d - (double) i) * (double) 100000000;
+  if (f)
+    {
+      if (f < 0)
+        f = -f;
+      strcat (dtoa_buf, ".");
+      p = ntoab (f, base, 1);
+      strcat (dtoa_buf, p);
+      p = strchr (dtoa_buf, 0);
+      p--;
+      while (*p && *p == '0')
+        *p-- = 0;
+    }
+  return dtoa_buf;
+}
--- a/lib/mes/fdgetc.c
+++ b/lib/mes/fdgetc.c
@ -19,12 +19,15 @@
 */

 #include <mes/lib.h>
+#include <errno.h>
 #include <limits.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/resource.h>
 #include <unistd.h>

-int __ungetc_buf[__FILEDES_MAX + 1] = { 0 };
+int errno;
+int *__ungetc_buf;

 int
 __ungetc_p (int filedes)
@ -35,8 +38,13 @@ __ungetc_p (int filedes)
 void
 __ungetc_init ()
 {
-  if (__ungetc_buf[__FILEDES_MAX] == 0)
-    memset (__ungetc_buf, -1, (__FILEDES_MAX + 1) * sizeof (int));
+  if (__ungetc_buf == 0)
+    {
+      int save_errno = errno;
+      __ungetc_buf = malloc ((__FILEDES_MAX + 1) * sizeof (int));
+      errno = save_errno;
+      memset (__ungetc_buf, -1, (__FILEDES_MAX + 1) * sizeof (int));
+    }
 }

 void
@ -65,10 +73,10 @@ fdgetc (int fd)
      int r = read (fd, &c, 1);
      if (r < 1)
        return -1;
-      i = (int) c;
+      i = c;
    }
  if (i < 0)
-    i += 256;
+    i = i + 256;

  return i;
 }
--- a/lib/mes/fdputc.c
+++ b/lib/mes/fdputc.c
@ -23,6 +23,7 @@
 int
 fdputc (int c, int fd)
 {
-  write (fd, (char *) &c, 1);
+  char *p = &c;
+  write (fd, p, 1);
  return 0;
 }
--- a/lib/mes/fdungetc.c
+++ b/lib/mes/fdungetc.c
@ -19,7 +19,6 @@
 */

 #include <mes/lib.h>
-#include <assert.h>

 int
 fdungetc (int c, int fd)
@ -32,7 +31,7 @@ fdungetc (int c, int fd)
      eputs (" ***MES C LIB*** fdungetc ungetc buffer overflow fd=");
      eputs (itoa (fd));
      eputs ("\n");
-      assert (0);
+      assert_msg (0, "0");
    }
  __ungetc_set (fd, c);
  return c;
--- a/lib/mes/ntoab.c
+++ b/lib/mes/ntoab.c
@ -18,20 +18,32 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <assert.h>
 #include <mes/lib.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+char *__itoa_buf;

 char *
 ntoab (long x, int base, int signed_p)
 {
-  static char itoa_buf[20];
-  char *p = itoa_buf + 11;
-  *p-- = 0;
-  assert(base > 0);
+#if 0
+  if (! __itoa_buf)
+    __itoa_buf = malloc (20);
+  p = __itoa_buf + 11;
+#else
+  static char buf[20];
+  char *p = buf + 19;
+#endif
+
+  p[0] = 0;
+  p = p - 1;
+  assert_msg (base > 0, "base > 0");

  int sign_p = 0;
  unsigned long u;
-  if (signed_p && x < 0)
+  if (signed_p != 0 && x < 0)
    {
      sign_p = 1;
      u = -x;
@ -48,12 +60,19 @@ ntoab (long x, int base, int signed_p)
      i = u % base;
      u = u / base;
 #endif
-      *p-- = i > 9 ? 'a' + i - 10 : '0' + i;
+      if (i > 9)
+        p[0] = 'a' + i - 10;
+      else
+        p[0] = '0' + i;
+      p = p - 1;
    }
-  while (u);
+  while (u != 0);

-  if (sign_p && *(p + 1) != '0')
-    *p-- = '-';
+  if (sign_p && p[1] != '0')
+    {
+      p[0] = '-';
+      p = p - 1;
+    }

  return p + 1;
 }
--- a/lib/posix/execl.c
+++ b/lib/posix/execl.c
@ -23,22 +23,13 @@
 #include <unistd.h>

 int
-execl (char const *file_name, char const *arg, ...)
+vexec (char const *file_name, va_list ap)
 {
-  if (__mes_debug () > 2)
-    {
-      eputs ("execl ");
-      eputs (file_name);
-      eputs ("\n");
-    }
+  char *arg = va_arg (ap, char *);
  char *argv[1000];             // POSIX minimum 4096
  int i = 0;

-  va_list ap;
-  va_start (ap, arg);
-
-  argv[i++] = (char *)file_name;
-  arg = va_arg (ap, char const *);
+  argv[i++] = (char *) file_name;
  while (arg)
    {
      argv[i++] = arg;
@ -57,3 +48,20 @@ execl (char const *file_name, char const *arg, ...)
  va_end (ap);
  return r;
 }
+
+int
+execl (char const *file_name, char const *arg, ...)
+{
+  va_list ap;
+  int r;
+  va_start (ap, arg);
+  if (__mes_debug () > 2)
+    {
+      eputs ("execl ");
+      eputs (file_name);
+      eputs ("\n");
+    }
+  r = vexec (file_name, ap);
+  va_end (ap);
+  return r;
+}
--- a/lib/posix/execlp.c
+++ b/lib/posix/execlp.c
@ -0,0 +1,47 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <errno.h>
+#include <stdarg.h>
+
+int
+execlp (char const *file_name, char const *arg, ...)
+{
+  va_list ap;
+  int r;
+  va_start (ap, arg);
+  if (file_name[0] != '/')
+    file_name = search_path (file_name);
+  if (__mes_debug () > 2)
+    {
+      eputs ("execlp ");
+      eputs (file_name ? file_name : "0");
+      eputs ("\n");
+    }
+  if (!file_name)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+  r = vexec (file_name, ap);
+  va_end (ap);
+  return r;
+}
--- a/lib/posix/getenv.c
+++ b/lib/posix/getenv.c
@ -1,4 +1,4 @@
-/* -*-comment-start: "//";comment-end:""-*-
+/*
 * GNU Mes --- Maxwell Equations of Software
 * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
@ -22,16 +22,30 @@
 #include <string.h>
 #include <stdlib.h>

+// CONSTANT M2_PTR_SIZE 4
+#define M2_PTR_SIZE 1
+
 char *
 getenv (char const *s)
 {
+  /* eputs ("\ngetenv s="); eputs (s); eputs ("\n"); */
  char **p = environ;
  int length = strlen (s);
-  while (*p)
+
+  while (p[0] != 0)
    {
-      if (!strncmp (s, *p, length) && *(*p + length) == '=')
-        return (*p + length + 1);
-      p++;
+      /* eputs ("getenv p[0]="); eputs (p[0]); eputs ("\n"); */
+      if (strncmp (s, p[0], length) == 0)
+        {
+          /* eputs ("found!\n"); */
+          char *q = p[0] + length;
+          if (q[0] == '=')
+            return q + 1;
+        }
+      /* else */
+      /*   eputs ("not found!\n"); */
+      p = p + M2_PTR_SIZE;
    }
+
  return 0;
 }
--- a/lib/posix/setenv.c
+++ b/lib/posix/setenv.c
@ -22,25 +22,34 @@
 #include <string.h>
 #include <stdlib.h>

+// CONSTANT M2_PTR_SIZE 4
+#define M2_PTR_SIZE 1
+
 int
 setenv (char const *s, char const *v, int overwrite_p)
 {
  char **p = environ;
  int length = strlen (s);
-  while (*p)
+
+  while (p[0] != 0)
    {
-      if (!strncmp (s, *p, length) && *(*p + length) == '=')
-        break;
-      p++;
+      if (strncmp (s, p[0], length) == 0)
+        {
+          char *q = p[0] + length;
+          if (q[0] == '=')
+            break;
+        }
+      p = p + M2_PTR_SIZE;
    }
  char *entry = malloc (length + strlen (v) + 2);
-  int end_p = *p == 0;
-  *p = entry;
+  int end_p = p[0] == 0;
+  p[0] = entry;
  strcpy (entry, s);
  strcpy (entry + length, "=");
  strcpy (entry + length + 1, v);
-  *(entry + length + strlen (v) + 2) = 0;
-  if (end_p)
-    *++p = 0;
+  entry[length + strlen (v) + 2] = 0;
+  if (end_p != 0)
+    p[1] = 0;
+
  return 0;
 }
--- a/lib/stdio/fflush.c
+++ b/lib/stdio/fflush.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -25,5 +25,8 @@
 int
 fflush (FILE * stream)
 {
-  fsync ((long) stream);
+  int filedes = (long) stream;
+  if (filedes < 3)
+    return 0;
+  return fsync (filedes);
 }
--- a/lib/stdio/putchar.c
+++ b/lib/stdio/putchar.c
@ -23,6 +23,7 @@
 int
 putchar (int c)
 {
-  write (STDOUT, (char *) &c, 1);
+  char *p = &c;
+  write (__stdout, p, 1);
  return 0;
 }
--- a/lib/stdio/vfprintf.c
+++ b/lib/stdio/vfprintf.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -33,7 +33,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
    if (*p != '%')
      {
        count++;
-        fputc (*p++, fd);
+        fputc (*p++, f);
      }
    else
      {
@ -88,7 +88,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
          {
          case '%':
            {
-              fputc (*p, fd);
+              fputc (*p, f);
              count++;
              break;
            }
@ -96,7 +96,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
            {
              char _c;
              _c = va_arg (ap, long);
-              fputc (_c, fd);
+              fputc (_c, f);
              break;
            }
          case 'd':
@ -108,7 +108,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
            {
              long d = va_arg (ap, long);
              int base = c == 'o' ? 8 : c == 'x' || c == 'X' ? 16 : 10;
-              char const *s = ntoab (d, base, c != 'u' && c != 'x' && c != 'X');
+              char *s = ntoab (d, base, c != 'u' && c != 'x' && c != 'X');
              if (c == 'X')
                strupr (s);
              int length = strlen (s);
@ -182,6 +182,50 @@ vfprintf (FILE * f, char const *format, va_list ap)
                }
              break;
            }
+          case 'f':
+          case 'e':
+          case 'E':
+          case 'g':
+          case 'G':
+            {
+              double d = va_arg8 (ap, double);
+              char *s = dtoab (d, 10, 1);
+              if (c == 'E' || c == 'G')
+                strupr (s);
+              int length = strlen (s);
+              if (precision == -1)
+                precision = length;
+              if (!left_p)
+                {
+                  while (width-- > precision)
+                    {
+                      fputc (pad, f);
+                      count++;
+                    }
+                  while (precision > length)
+                    {
+                      fputc (' ', f);
+                      precision--;
+                      width--;
+                      count++;
+                    }
+                }
+              while (*s)
+                {
+                  if (precision-- <= 0)
+                    break;
+                  width--;
+                  fputc (*s++, f);
+                  count++;
+                }
+              while (width > 0)
+                {
+                  width--;
+                  fputc (pad, f);
+                  count++;
+                }
+              break;
+            }
          case 'n':
            {
              int *n = va_arg (ap, int *);
--- a/lib/stdio/vsnprintf.c
+++ b/lib/stdio/vsnprintf.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -114,7 +114,7 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
            {
              long d = va_arg (ap, long);
              int base = c == 'o' ? 8 : c == 'x' || c == 'X' ? 16 : 10;
-              char const *s = ntoab (d, base, c != 'u' && c != 'x' && c != 'X');
+              char *s = ntoab (d, base, c != 'u' && c != 'x' && c != 'X');
              if (c == 'X')
                strupr (s);
              int length = strlen (s);
@ -198,6 +198,55 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
                }
              break;
            }
+          case 'f':
+          case 'e':
+          case 'E':
+          case 'g':
+          case 'G':
+            {
+              double d = va_arg8 (ap, double);
+              char *s = dtoab (d, 10, 1);
+              if (c == 'E' || c == 'G')
+                strupr (s);
+              int length = strlen (s);
+              if (precision == -1)
+                precision = length;
+              if (!left_p)
+                {
+                  while (width-- > precision)
+                    {
+                      if (count < size)
+                        *str++ = pad;
+                      count++;
+                    }
+                  while (precision > length)
+                    {
+                      if (count < size)
+                        *str++ = ' ';
+                      precision--;
+                      width--;
+                      count++;
+                    }
+                }
+              while (*s)
+                {
+                  if (precision-- <= 0)
+                    break;
+                  width--;
+                  c = *s++;
+                  if (count < size)
+                    *str++ = c;
+                  count++;
+                }
+              while (width > 0)
+                {
+                  width--;
+                  if (count < size)
+                    *str++ = pad;
+                  count++;
+                }
+              break;
+            }
          case 'n':
            {
              int *n = va_arg (ap, int *);
--- a/lib/stdio/vsscanf.c
+++ b/lib/stdio/vsscanf.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -66,6 +66,17 @@ vsscanf (char const *s, char const *template, va_list ap)
              count++;
              break;
            }
+          case 'e':
+          case 'f':
+          case 'g':
+          case 'E':
+          case 'G':
+            {
+              float *f = va_arg (ap, float *);
+              *f = strtod (p, &p);
+              count++;
+              break;
+            }
          default:
            {
              eputs ("vsscanf: not supported: %:");
--- a/lib/stdlib/__exit.c
+++ b/lib/stdlib/__exit.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,6 +18,8 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <stdlib.h>
+
 int
 __exit (int status)
 {
--- a/lib/stdlib/abort.c
+++ b/lib/stdlib/abort.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,6 +18,8 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <stdlib.h>
+
 void
 abort (void)
 {
--- a/lib/stdlib/atof.c
+++ b/lib/stdlib/atof.c
@ -20,12 +20,9 @@

 #include <mes/lib.h>

-int
-atof (int x)
+double
+atof (char const *string)
 {
-  static int stub = 0;
-  if (__mes_debug () && !stub)
-    eputs ("atof stub\n");
-  stub = 1;
-  return 0;
+  char const *p = string;
+  return abtod (&p, 0);
 }
--- a/lib/stdlib/atoi.c
+++ b/lib/stdlib/atoi.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -21,8 +21,8 @@
 #include <mes/lib.h>

 int
-atoi (char const *s)
+atoi (char const *string)
 {
-  char const *p = s;
+  char const *p = string;
  return abtol (&p, 0);
 }
--- a/lib/stdlib/malloc.c
+++ b/lib/stdlib/malloc.c
@ -27,10 +27,10 @@ void *
 malloc (size_t size)
 {
  if (!__brk)
-    __brk = (char *) brk (0);
+    __brk = brk (0);
  if (brk (__brk + size) == -1)
    return 0;
  char *p = __brk;
-  __brk += size;
+  __brk = __brk + size;
  return p;
 }
--- a/lib/stdlib/mbstowcs.c
+++ b/lib/stdlib/mbstowcs.c
@ -18,10 +18,10 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <mes/lib.h>
+#include <stdio.h>
 #include <stdlib.h>
-
-#if !__MESC__
-typedef char wchar_t[];
+#include <string.h>

 size_t
 mbstowcs (wchar_t * wstring, char const *string, size_t size)
@ -33,4 +33,3 @@ mbstowcs (wchar_t * wstring, char const *string, size_t size)
  strcpy (wstring, string);
  return strlen (string);
 }
-#endif
--- a/Show More
+++ b/Show More