lib: test: Add 80-qsort-stress.

* lib/tests/stdlib/80-qsort-stress.c: New test.
* build-aux/check-mescc.sh (tcc_tests): Add it.

HACKING

@@ -5,7 +5,8 @@
     guix shell #64 bit + 32bit
 
     CC=i686-unknown-linux-gnu-gcc ./configure
-    CC=arm-unknown-linux-gnu-gcc ./configure
+    CC=arm-unknown-linux-gnueabihf-gcc ./configure
+
 or
     ./configure
 

build-aux/bootstrap.sh.in

@@ -1,7 +1,7 @@
 #! @SHELL@
 
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -54,16 +54,18 @@ AM_CPPFLAGS="-D HAVE_CONFIG_H=1 -I ${srcdest}include -I ${srcdest}include/$mes_k
 AM_CFLAGS="-L ${srcdest}lib"
 
 mkdir -p $mes_cpu-mes
-$CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c
+cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c .
+$CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS crt1.c
 cp crt1.o $mes_cpu-mes
 cp crt1.s $mes_cpu-mes
 
 objects=
 for c in $libc_mini_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
     if test ! -e $o -o ${srcdest}$c -nt $o; then
         echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
     fi
     objects="$objects $o"
 done
@@ -72,10 +74,11 @@ $AR crD $mes_cpu-mes/libc-mini.a $objects
 
 objects=
 for c in $libmescc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
     if test ! -e $o -o ${srcdest}$c -nt $o; then
         echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
     fi
     objects="$objects $o"
 done
@@ -84,10 +87,11 @@ $AR crD $mes_cpu-mes/libmescc.a $objects
 
 objects=
 for c in $libc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
     if test ! -e $o -o ${srcdest}$c -nt $o; then
         echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
     fi
     objects="$objects $o"
 done
@@ -96,10 +100,11 @@ $AR crD $mes_cpu-mes/libc.a $objects
 
 objects=
 for c in $libc_tcc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
     if test ! -e $o -o ${srcdest}$c -nt $o; then
         echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
     fi
     objects="$objects $o"
 done
@@ -113,10 +118,11 @@ AM_CFLAGS="-L ${srcdest}lib"
 
 objects=
 for c in $mes_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
     if test ! -e $o -o ${srcdest}$c -nt $o; then
         echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
     fi
     objects="$objects $o"
 done

build-aux/build-lib.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -26,7 +26,8 @@
 trap 'test -f .log && cat .log' EXIT
 
 mkdir -p $mes_cpu-mes
-compile lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c
+cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c .
+compile crt1.c
 cp crt1.o $mes_cpu-mes
 if test -e crt1.s; then
     cp crt1.s $mes_cpu-mes
@@ -64,16 +65,6 @@ if test -e libc+tcc.s; then
     cp libc+tcc.s $mes_cpu-mes
 fi
 
-if $courageous; then
-    exit 0
-fi
-
-archive libc+gnu.a $libc_gnu_SOURCES
-cp libc+gnu.a $mes_cpu-mes
-if test -e libc+gnu.s; then
-    cp libc+gnu.s $mes_cpu-mes
-fi
-
 archive libtcc1.a $libtcc1_SOURCES
 cp libtcc1.a $mes_cpu-mes
 if test -e libtcc1.s; then
@@ -85,3 +76,13 @@ cp libgetopt.a $mes_cpu-mes
 if test -e libgetopt.s; then
     cp libgetopt.s $mes_cpu-mes
 fi
+
+if $courageous; then
+    exit 0
+fi
+
+archive libc+gnu.a $libc_gnu_SOURCES
+cp libc+gnu.a $mes_cpu-mes
+if test -e libc+gnu.s; then
+    cp libc+gnu.s $mes_cpu-mes
+fi

build-aux/build.sh.in

@@ -151,7 +151,6 @@ fi
     ${SHELL} ${srcdest}build-aux/build-lib.sh
     ${SHELL} ${srcdest}build-aux/build-source-lib.sh
     if $bootstrap; then
-        rm -f globals.* # FIXME: avoid name clash with globals from lib
         ${SHELL} ${srcdest}build-aux/build-mes.sh
         cp -f bin/mes-mescc ../bin
         cp -f bin/mes ../bin

build-aux/cc.sh

@@ -1,5 +1,5 @@
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -18,8 +18,12 @@
 
 objects=
 compile () {
-    c=${srcdest}$1
-    b=$(basename $c .c)
+    if test $(dirname $1) = "."; then
+        c=$1
+    else
+        c=${srcdest}$1
+    fi
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
     o=$b.o
     objects="$objects $o"
     if test ! -e $o -o $c -nt $o; then
@@ -34,7 +38,7 @@ archive () {
     sources="$@"
     objects=
     for c in $sources; do
-        b=$(basename $c .c)
+        b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
         o=$b.o
         compile $c
     done

build-aux/check-mescc.sh

@@ -201,6 +201,7 @@ lib/tests/setjmp/80-setjmp.c
 lib/tests/stdio/80-sscanf.c
 lib/tests/stdlib/80-qsort.c
 lib/tests/stdlib/80-qsort-dupes.c
+lib/tests/stdlib/80-qsort-stress.c
 lib/tests/string/80-strncpy.c
 lib/tests/string/80-strrchr.c
 lib/tests/scaffold/82-define.c
@@ -215,6 +216,7 @@ 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-mmap.c
 lib/tests/posix/90-unsetenv.c
 lib/tests/signal/90-signal.c
 lib/tests/stdio/90-fopen.c
@@ -222,6 +224,7 @@ 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/stdio/90-sscanf.c
 lib/tests/stdlib/90-strtol.c
 lib/tests/string/90-snprintf.c
 lib/tests/string/90-strpbrk.c
@@ -290,6 +293,7 @@ lib/tests/scaffold/70-extern.c
 lib/tests/stdio/80-sscanf.c
 lib/tests/posix/90-execlp.c
 lib/tests/string/90-snprintf.c
+lib/tests/stdio/90-sscanf.c
 "
     fi
 fi

build-aux/configure-lib.sh

@@ -74,7 +74,7 @@ libc_mini_SOURCES="$libc_mini_shared_SOURCES"
 
 if test $mes_libc = mes; then
     libc_mini_SOURCES="$libc_mini_SOURCES
-lib/mes/mini-write.c
+lib/mes/write.c
 "
 fi
 
@@ -215,6 +215,7 @@ lib/linux/malloc.c
 lib/linux/_read.c
 lib/linux/time.c
 lib/linux/unlink.c
+lib/linux/wait4.c
 lib/linux/waitpid.c
 lib/linux/$mes_cpu-mes-$compiler/syscall.c
 lib/linux/getpid.c
@@ -322,6 +323,7 @@ lib/dirent/readdir.c
 lib/math/ceil.c
 lib/math/fabs.c
 lib/math/floor.c
+lib/math/labs.c
 lib/mes/fdgets.c
 lib/posix/alarm.c
 lib/posix/execl.c
@@ -337,6 +339,7 @@ lib/stdio/fileno.c
 lib/stdio/freopen.c
 lib/stdio/fscanf.c
 lib/stdio/perror.c
+lib/stdio/rewind.c
 lib/stdio/vfscanf.c
 lib/stdlib/__exit.c
 lib/stdlib/abort.c
@@ -357,7 +360,9 @@ lib/string/strerror.c
 lib/string/strncat.c
 lib/string/strpbrk.c
 lib/string/strspn.c
+lib/string/strtok.c
 lib/stub/__cleanup.c
+lib/stub/asctime.c
 lib/stub/atan2.c
 lib/stub/bsearch.c
 lib/stub/chown.c
@@ -382,7 +387,6 @@ lib/stub/pclose.c
 lib/stub/popen.c
 lib/stub/pow.c
 lib/stub/rand.c
-lib/stub/rewind.c
 lib/stub/setbuf.c
 lib/stub/setgrent.c
 lib/stub/setlocale.c
@@ -419,6 +423,8 @@ lib/linux/link.c
 lib/linux/lstat.c
 lib/linux/mkdir.c
 lib/linux/mknod.c
+lib/linux/mmap.c
+lib/linux/munmap.c
 lib/linux/nanosleep.c
 lib/linux/pipe.c
 lib/linux/readlink.c

build-aux/pointer.sh

@@ -48,7 +48,6 @@ sed -ri                                                         \
     include/mes/mes.h                                           \
     include/mes/symbols.h                                       \
     include/mes/builtins.h                                      \
-    include/m2/lib.h                                            \
     src/builtins.c                                              \
     src/cc.c                                                    \
     src/core.c                                                  \

configure.sh

@@ -77,8 +77,8 @@ GUILE=${GUILE-$(command -v guile)} || true
 HEX2=${HEX2-$(command -v hex2)}
 LDPFLAGS=${LDFLAGS-}
 M1=${M1-$(command -v M1)}
-M2_PLANET=${M1-$(command -v M2-Planet)}
-KAEM=${KAEM-$(command -v kaem)}
+M2_PLANET=${M2_PLANET-$(command -v M2-Planet)} || true
+KAEM=${KAEM-$(command -v kaem)} || true
 MES_FOR_BUILD=${MES_FOR_BUILD-$(command -v mes || command -v guile || echo mes)}
 GIT=${GIT-$(command -v git)} || true
 PERL=${PERL-$(command -v perl)} || true

doc/mes.texi

@@ -935,7 +935,7 @@ The @var{option}s can be among the following:
 align @var{symbol}, the default is @code{functions}; other valid values
 are: @code{globals}.
 
-@item --base-address=ADRRESS
+@item --base-address=ADDRESS
 use BaseAddress ADDRESS [0x1000000]
 
 @item -c

guix/git/mes.scm

@@ -87,7 +87,7 @@ get_machine.")
 (define-public m2-planet
   (package
     (name "m2-planet")
-    (version "1.9.0")
+    (version "1.10.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -97,7 +97,7 @@ get_machine.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0cgvvq91cbxxm93k8ayyvhpaf3c2lv10qw4wyqwn3hc1qb1cfyvr"))))
+                "03ixvfdzhyy1d94iqpwl0p924pdvdp7yq4ggm05w3c013kzy2y12"))))
     (native-inputs (list mescc-tools))
     (build-system gnu-build-system)
     (arguments
@@ -189,7 +189,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!# "0d855agwawjjzwbjmvb5xlbwg77zdpwbjm9kjxc2wqvn0vmhq4im"))))
+               (base32 #!mes!# "0246sy5zm49zw4zs87hrq1j1x74mchijh4rlj2mzlwjccha5cybs"))))
     (build-system gnu-build-system)
     (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux"))
     (propagated-inputs (list mescc-tools nyacc))

include/fcntl.h

@@ -69,8 +69,11 @@
 #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);
+
+#if !__M2__
 int fcntl (int filedes, int command, ...);
 int open (char const *s, int flags, ...);
+#endif
 
 #endif // ! SYSTEM_LIBC
 

include/float.h

@@ -29,6 +29,19 @@
 #define DBL_MIN_EXP -1021
 #define LDBL_MIN_EXP -1021
 
+// gcc-4.6
+#define DBL_EPSILON 1
+#define DBL_MANT_DIG 1
+#define DBL_MAX INT_MAX
+#define DBL_MIN INT_MIN
+
+#define FLT_RADIX 10
+
+#define LDBL_EPSILON 1
+#define LDBL_MANT_DIG 1
+#define LDBL_MAX INT_MAX
+#define LDBL_MIN INT_MIN
+
 #endif // ! SYSTEM_LIBC
 
 #endif // __MES_FLOAT_H

include/linux/arm/syscall.h

@@ -25,47 +25,29 @@
 
 /* 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 */
-// CONSTANT SYS_fork 0x02
 #define SYS_fork    0x02
-// CONSTANT SYS_read 0x03
 #define SYS_read    0x03
-// CONSTANT SYS_open 0x05
 #define SYS_open    0x05
 //#define SYS_waitpid
-// 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
-// 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 0x107
 #define SYS_clock_gettime 0x107
 
 /* libc+tcc */
@@ -109,4 +91,8 @@
 #define SYS_readlink  0x55
 #define SYS_mknod     0x0e
 
+// gcc-4.6.4
+#define SYS_mmap      0x5a
+#define SYS_munmap    0x5b
+
 #endif /* __MES_LINUX_ARM_SYSCALL_H */

include/linux/x86/syscall.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -22,50 +22,30 @@
 
 /* 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 */
-// 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
-// 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+tcc */
@@ -112,4 +92,8 @@
 #define SYS_readlink  0x55
 #define SYS_mknod     0x0e
 
+// gcc-4.6.4
+#define SYS_mmap      0x5a
+#define SYS_munmap    0x5b
+
 #endif /* __MES_LINUX_X86_SYSCALL_H */

include/linux/x86_64/syscall.h

@@ -85,4 +85,8 @@
 #define SYS_readlink  0x59
 #define SYS_mknod     0x85
 
+// gcc-4.6.4
+#define SYS_mmap      0x09
+#define SYS_munmap    0x0b
+
 #endif // __MES_LINUX_X86_64_SYSCALL_H

include/m2/lib.h

@@ -1,70 +0,0 @@
-/*
- * 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
-
-char* cast_intp_to_charp (int *i);
-char* cast_long_to_charp (long i);
-long cast_charp_to_long (char const *);
-long cast_int_to_long (int i);
-long cast_voidp_to_long (void const *);
-
-char *itoa (int number);
-char *ltoa (long number);
-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 */

include/math.h

@@ -31,6 +31,7 @@ double cos (double x);
 double exp (double x);
 double fabs (double number);
 double floor (double x);
+long int labs (long int number);
 double ldexp (double value, int exponent);
 double log (double x);
 double modf (double value, double *integer_part);

include/mes/constants.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -23,76 +23,32 @@
 
 /* Cell types */
 
-// CONSTANT TCHAR          0
 #define TCHAR              0
 
-// CONSTANT TBYTES         1
 #define TBYTES             1
-// CONSTANT TCLOSURE       2
 #define TCLOSURE           2
-// CONSTANT TCONTINUATION  3
 #define TCONTINUATION      3
-// CONSTANT TKEYWORD       4
 #define TKEYWORD           4
-// CONSTANT TMACRO         5
 #define TMACRO             5
-// CONSTANT TNUMBER        6
 #define TNUMBER            6
-// CONSTANT TPAIR          7
 #define TPAIR              7
-// CONSTANT TPORT          8
 #define TPORT              8
-// CONSTANT TREF           9
 #define TREF               9
-// CONSTANT TSPECIAL      10
 #define TSPECIAL          10
-// CONSTANT TSTRING       11
 #define TSTRING           11
-// CONSTANT TSTRUCT       12
 #define TSTRUCT           12
-// CONSTANT TSYMBOL       13
 #define TSYMBOL           13
-// CONSTANT TVALUES       14
 #define TVALUES           14
-// CONSTANT TVARIABLE     15
 #define TVARIABLE         15
-// CONSTANT TVECTOR       16
 #define TVECTOR           16
-// CONSTANT TBROKEN_HEART 17
 #define TBROKEN_HEART     17
 
 /* Struct types */
 
-// CONSTANT STRUCT_TYPE 0
 #define STRUCT_TYPE 0
-// CONSTANT STRUCT_PRINTER 1
 #define STRUCT_PRINTER 1
 
-// CONSTANT GC_FRAME_SIZE 5
 #define GC_FRAME_SIZE 5
-// CONSTANT GC_FRAME_PROCEDURE 4
 #define GC_FRAME_PROCEDURE 4
 
-// 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 */

include/mes/lib-mini.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -25,21 +25,27 @@
 #include <mes/config.h>
 #endif
 
-// CONSTANT STDIN 0
 #ifndef STDIN
 #define STDIN 0
 #endif
 
-// CONSTANT STDOUT 1
 #ifndef STDOUT
 #define STDOUT 1
 #endif
 
-// CONSTANT STDERR 2
 #ifndef STDERR
 #define STDERR 2
 #endif
 
+/* M2-Planet does not support pointer arithmetic.  Explicitly compensate
+   for that by multiplying with M2_PTR_SIZE when using (char)
+   pointers. */
+#if __M2__
+#define M2_PTR_SIZE 4
+#else
+#define M2_PTR_SIZE 1
+#endif
+
 extern char **environ;
 extern int __stdin;
 extern int __stdout;
@@ -63,10 +69,14 @@ int oputs (char const *s);
 #ifndef __MES_SIZE_T
 #define __MES_SIZE_T
 #undef size_t
+#if __M2__
+typedef unsigned size_t;
+#else
 typedef unsigned long size_t;
 #endif
 #endif
 #endif
+#endif
 
 #ifndef _SSIZE_T
 #define _SSIZE_T

include/mes/lib.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -23,6 +23,9 @@
 
 #include <mes/lib-mini.h>
 
+#define __FILEDES_MAX 512
+extern char *__brk;
+
 char *cast_intp_to_charp (int const *i);
 char *cast_long_to_charp (long i);
 long cast_charp_to_long (char const *);
@@ -34,14 +37,11 @@ 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);
 char *ntoab (long number, unsigned base, int signed_p);
-char *ultoa (unsigned long number);
 char *utoa (unsigned number);
 int eputc (int c);
 int fdgetc (int fd);
@@ -61,10 +61,12 @@ 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);
-
-#define __FILEDES_MAX 512
+long __mesabi_imod (long a, long b);
+long __mesabi_idiv (long a, long b);
+void *__memcpy (void *dest, void const *src, size_t n);
+void *__memmove (void *dest, void const *src, size_t n);
+void *__memset (void *s, int c, size_t n);
+int __raise (int signal);
 
 #if !SYSTEM_LIBC
 void __assert_fail (char *s);
@@ -74,16 +76,15 @@ void _exit (int code);
 long brk (void *addr);
 #endif // !SYSTEM_LIBC
 
-long __mesabi_imod (long a, long b);
-long __mesabi_idiv (long a, long b);
+#if !__M2__
+extern void (*__call_at_exit) (void);
+double abtod (char const **p, int base);
+char *dtoab (double number, int base, int signed_p);
+char *ultoa (unsigned long number);
 unsigned long __mesabi_umod (unsigned long a, unsigned long b);
 unsigned long __mesabi_udiv (unsigned long a, unsigned long b);
 unsigned long __mesabi_uldiv (unsigned long a, unsigned long b,
                               unsigned long *remainder);
-
-void *__memcpy (void *dest, void const *src, size_t n);
-void *__memmove (void *dest, void const *src, size_t n);
-void *__memset (void *s, int c, size_t n);
-int __raise (int signal);
+#endif
 
 #endif //__MES_LIB_H

include/mes/mes.h

@@ -53,6 +53,15 @@ struct scm
   };
 };
 
+/* M2-Planet does not support pointer arithmetic.  Explicitly compensate
+   for that by multiplying with M2_CELL_SIZE when using cell
+   pointers. */
+#if __M2__
+#define M2_CELL_SIZE 12
+#else
+#define M2_CELL_SIZE 1
+#endif
+
 /* mes */
 extern char *g_datadir;
 extern int g_debug;

include/mes/symbols.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -137,14 +137,8 @@ extern struct scm *cell_type_broken_heart;
 extern struct scm *cell_symbol_program;
 extern struct 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 */

include/signal.h

@@ -29,9 +29,12 @@
 
 #define _SIGSET_NITEMS (_NSIG / (8 * sizeof(unsigned long)))
 
-typedef struct {
+#if !__M2__
+typedef struct
+{
   unsigned long items[_SIGSET_NITEMS];
 } sigset_t;
+#endif
 typedef long stack_t;
 
 #include <sys/types.h>
@@ -91,6 +94,7 @@ typedef long stack_t;
 #define SA_NOMASK  SA_NODEFER
 #define SA_ONESHOT SA_RESETHAND
 
+#if !__M2__ // lacks short, casts
 typedef struct siginfo_t
 {
   int          si_signo;
@@ -120,7 +124,7 @@ typedef struct siginfo_t
 } siginfo_t;
 // *INDENT-ON*
 
-#if __MESC__
+#if __M2__ || __MESC__
 typedef long sighandler_t;
 #else
 typedef void (*sighandler_t) (int);
@@ -255,6 +259,7 @@ int sigemptyset (sigset_t * set);
 #endif
 int sigprocmask (int how, sigset_t const *set, sigset_t * oldset);
 
+#endif // !__M2__
 #endif //! SYSTEM_LIBC
 
 #endif // __MES_SIGNAL_H

include/stdint.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  * Copyright © 2018 Peter De Wachter <pdewacht@gmail.com>
  *
  * This file is part of GNU Mes.
@@ -87,6 +87,12 @@ typedef unsigned uintmax_t;
 
 #define INT_MIN -2147483648
 #define INT_MAX 2147483647
+
+#define SHRT_MAX INT16_MAX
+#define SHRT_MIN INT16_MIN
+#define USHRT_MAX UINT16_MAX
+#define USHRT_MIN UINT16_MIN
+
 #if __i386__ || __arm__
 #define LONG_MIN INT_MIN
 #define LONG_MAX INT_MAX
@@ -105,6 +111,8 @@ typedef unsigned uintmax_t;
 #define SIZE_MAX UINT64_MAX
 #endif
 
+#define SSIZE_MAX LONG_MAX
+
 #endif // ! SYSTEM_LIBC
 
 #endif // __MES_STDINT_H

include/stdio.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -65,30 +65,35 @@ int ferror (FILE * stream);
 int fflush (FILE * stream);
 int fgetc (FILE * stream);
 char *fgets (char *s, int size, FILE * stream);
-int fprintf (FILE * stream, char const *format, ...);
+int fileno (FILE *);
 int fpurge (FILE * stream);
 int fputc (int c, FILE * stream);
 int fputs (char const *s, FILE * stream);
-int fscanf (FILE * stream, char const *template, ...);
 int fseek (FILE * stream, long offset, int whence);
 int getc (FILE * stream);
 int getchar (void);
 char *getlogin (void);
-int printf (char const *format, ...);
 int putc (int c, FILE * stream);
 int putchar (int c);
 int puts (char const *s);
 int remove (char const *file_name);
+void rewind (FILE * stream);
 int setvbuf (FILE * stream, char *buf, int mode, size_t size);
-int snprintf (char *str, size_t size, char const *format, ...);
-int sprintf (char *str, char const *format, ...);
-int sscanf (char const *str, char const *format, ...);
 int ungetc (int c, FILE * stream);
 long ftell (FILE * stream);
 size_t fread (void *ptr, size_t size, size_t count, FILE * stream);
 size_t freadahead (FILE * fp);
 size_t fwrite (void const *ptr, size_t size, size_t count, FILE * stream);
 
+#if !__M2__
+int fprintf (FILE * stream, char const *format, ...);
+int fscanf (FILE * stream, char const *template, ...);
+int printf (char const *format, ...);
+int snprintf (char *str, size_t size, char const *format, ...);
+int sprintf (char *str, char const *format, ...);
+int sscanf (char const *str, char const *format, ...);
+#endif // !__M2__
+
 #endif // ! SYSTEM_LIBC
 
 #endif // __MES_STDIO_H

include/string.h

@@ -48,6 +48,7 @@ char *strncpy (char *to, char const *from, size_t size);
 int strncmp (char const *, char const *, size_t);
 char *strrchr (char const *s, int c);
 char *strstr (char const *haystack, char const *needle);
+char *strtok (char *new_string, char const *delimiters);
 char *strlwr (char *string);
 char *strupr (char *string);
 

include/sys/ioctl.h

@@ -28,8 +28,13 @@
 
 #define TCGETS 0x5401
 #define TCGETA 0x5405
+#if __M2__
+int ioctl (int fd, unsigned request, long data);
+int ioctl3 (int fd, unsigned request, long data);
+#else
 int ioctl (int fd, unsigned long request, ...);
 int ioctl3 (int fd, unsigned long request, long data);
+#endif
 
 #endif // ! SYSTEM_LIBC
 

include/sys/mman.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -25,19 +25,25 @@
 #include_next <sys/mman.h>
 #else // ! SYSTEM_LIBC
 
-#ifndef __MES_SIZE_T
-#define __MES_SIZE_T
-typedef unsigned long size_t;
-#endif
+#include <sys/types.h>
+
+#define MAP_SHARED    0x01
+#define MAP_PRIVATE   0x02
+#define MAP_ANONYMOUS 0x20
+#define MAP_POPULATE  0x08000
+
+#define MAP_ANON MAP_ANONYMOUS
+#define MAP_FAILED ((void*)-1)
 
 #define PROT_NONE 0
 #define PROT_READ 1
 #define PROT_WRITE 2
 #define PROT_EXEC 4
 
+void *mmap (void *address, size_t length, int protect, int flags, int filedes, off_t offset);
 int mprotect (void *addr, size_t len, int prot);
+int munmap (void *addr, size_t length);
 
 #endif // ! SYSTEM_LIBC
 
 #endif // __MES_SYS_MMAN_H
-

include/sys/resource.h

@@ -32,20 +32,20 @@ struct rusage
 {
   struct timeval ru_utime;
   struct timeval ru_stime;
-  long int ru_maxrss;
-  long int ru_ixrss;
-  long int ru_idrss;
-  long int ru_isrss;
-  long int ru_minflt;
-  long int ru_majflt;
-  long int ru_nswap;
-  long int ru_inblock;
-  long int ru_oublock;
-  long int ru_msgsnd;
-  long int ru_msgrcv;
-  long int ru_nsignals;
-  long int ru_nvcsw;
-  long int ru_nivcsw;
+  long ru_maxrss;
+  long ru_ixrss;
+  long ru_idrss;
+  long ru_isrss;
+  long ru_minflt;
+  long ru_majflt;
+  long ru_nswap;
+  long ru_inblock;
+  long ru_oublock;
+  long ru_msgsnd;
+  long ru_msgrcv;
+  long ru_nsignals;
+  long ru_nvcsw;
+  long ru_nivcsw;
 };
 
 #define RUSAGE_SELF 0

include/sys/stat.h

@@ -36,7 +36,29 @@ typedef int mode_t;
 #endif
 
 // *INDENT-OFF*
-#if __i386__ || __arm__
+#if __M2__
+struct stat
+{
+  unsigned  st_dev;
+  unsigned  st_ino;
+  char st_mode[2];
+  char st_nlink[2];
+  char st_uid[2];
+  char st_gid[2];
+  unsigned st_rdev;
+  long     st_size; /* Linux: unsigned long; glibc: off_t (i.e. signed) */
+  unsigned st_blksize;
+  unsigned st_blocks;
+  time_t   st_atime; /* Linux: unsigned long; glibc: time_t */
+  unsigned st_atime_usec;
+  time_t   st_mtime; /* Linux: unsigned long; glibc: time_t */
+  unsigned st_mtime_usec;
+  time_t   st_ctime; /* Linux: unsigned long; glibc: time_t */
+  unsigned st_ctime_usec;
+  unsigned __foo0;
+  unsigned __foo1;
+};
+#elif __i386__ || __arm__
 struct stat
 {
   unsigned long  st_dev;

include/sys/types.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -32,7 +32,12 @@
 #endif
 
 #ifndef EOF
-#define EOF -1
+// FIXME M2_Planet chokes on -1, even inside #if ! __M2__
+#if __arm__ || __i386__
+#define EOF 0xffffffff
+#else
+#define EOF 0xffffffffffffffff
+#endif
 #endif
 
 #ifndef NULL
@@ -66,15 +71,23 @@ typedef unsigned gid_t;
 #ifndef __MES_INO_T
 #define __MES_INO_T
 #undef ino_t
+#if __M2__
+typedef unsigned ino_t;
+#else
 typedef unsigned long ino_t;
 #endif
+#endif
 
 #if __SIZEOF_LONG_LONG__ == 8
 #ifndef __MES_INO64_T
 #define __MES_INO64_T
 #undef ino64_t
+#if __M2__
+typedef unsigned ino64_t;
+#else
 typedef unsigned long long ino64_t;
 #endif
+#endif
 #endif // __SIZEOF_LONG_LONG__ == 8
 
 #if !defined (__MES_INTPTR_T) && !defined (__intptr_t_defined)
@@ -83,8 +96,12 @@ typedef unsigned long long ino64_t;
 #undef intptr_t
 typedef long intptr_t;
 #undef uintptr_t
+#if __M2__
+typedef unsigned uintptr_t;
+#else
 typedef unsigned long uintptr_t;
 #endif
+#endif
 
 #ifndef __MES_OFF_T
 #define __MES_OFF_T
@@ -96,8 +113,12 @@ typedef long off_t;
 #ifndef __MES_OFF64_T
 #define __MES_OFF64_T
 #undef off64_t
+#if __M2__
+typedef unsigned off64_t;
+#else
 typedef unsigned long long off64_t;
 #endif
+#endif
 #endif // __SIZEOF_LONG_LONG__ == 8
 
 #ifndef __MES_PID_T
@@ -126,9 +147,13 @@ typedef long sigval_t;
 #ifndef __MES_SIZE_T
 #define __MES_SIZE_T
 #undef size_t
+#if __M2__
+typedef unsigned size_t;
+#else
 typedef unsigned long size_t;
 #endif
 #endif
+#endif
 
 #ifndef __MES_SSIZE_T
 #define __MES_SSIZE_T

include/sys/wait.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -20,6 +20,8 @@
 #ifndef __MES_SYS_WAIT_H
 #define __MES_SYS_WAIT_H 1
 
+#include <sys/resource.h>
+
 #if SYSTEM_LIBC
 #undef __MES_SYS_WAIT_H
 #include_next <sys/wait.h>
@@ -35,6 +37,8 @@ typedef int pid_t;
 
 pid_t waitpid (pid_t pid, int *status_ptr, int options);
 pid_t wait (int *status_ptr);
+pid_t wait4 (pid_t pid, int *wstatus, int options,
+             struct rusage *rusage);
 
 #endif // ! SYSTEM_LIBC
 

include/time.h

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -27,8 +27,8 @@
 
 #ifndef __MES_TIME_T
 #define __MES_TIME_T 1
-typedef long int clockid_t;
-typedef long int time_t;
+typedef long clockid_t;
+typedef long time_t;
 #endif
 
 struct tm
@@ -56,6 +56,7 @@ struct timespec
 #endif // __MES_STRUCT_TIMESPEC
 
 #define CLOCK_PROCESS_CPUTIME_ID 2
+char *asctime (struct tm const *broken_time);
 int clock_gettime (clockid_t clk_id, struct timespec *tp);
 struct tm *localtime (time_t const *timep);
 struct tm *gmtime (time_t const *time);

kaem.arm

@@ -0,0 +1,24 @@
+#! /bin/sh
+# Copyright © 2022 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
+
+mes_cpu=arm
+stage0_cpu=armv7l
+kaem --verbose --strict

kaem.run

@@ -25,34 +25,41 @@ stage0_cpu=${stage0_cpu:-x86}
 mkdir -p m2
 
 M2-Planet                                       \
-    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -D __linux__=1                              \
+    -f include/mes/config.h                     \
+    -f include/mes/lib-mini.h                   \
+    -f include/mes/lib.h                        \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
     -f lib/mes/globals.c                        \
     -f lib/m2/cast.c                            \
-    -f lib/m2/exit.c                            \
-    -f lib/mes/mini-write.c                     \
-    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
+    -f lib/stdlib/exit.c                        \
+    -f lib/mes/write.c                          \
     -f include/linux/${mes_cpu}/syscall.h       \
+    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
     -f lib/stub/__raise.c                       \
     -f lib/linux/brk.c                          \
-    -f lib/m2/malloc.c                          \
+    -f lib/linux/malloc.c                       \
     -f lib/string/memset.c                      \
-    -f lib/m2/read.c                            \
+    -f lib/linux/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/stub/__buffered_read.c               \
+    -f lib/linux/_open3.c                       \
+    -f lib/linux/open.c                         \
+    -f lib/mes/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/time.h                           \
+    -f include/sys/time.h                       \
+    -f include/sys/types.h                      \
     -f include/mes/mes.h                        \
     -f include/mes/builtins.h                   \
     -f include/mes/constants.h                  \
@@ -81,17 +88,22 @@ M2-Planet                                       \
     -f lib/mes/fdungetc.c                       \
     -f lib/posix/setenv.c                       \
     -f lib/linux/access.c                       \
-    -f lib/m2/chmod.c                           \
+    -f include/sys/stat.h                       \
+    -f lib/linux/chmod.c                        \
     -f lib/linux/ioctl3.c                       \
+    -f include/sys/ioctl.h                      \
     -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 include/sys/resource.h                   \
+    -f lib/linux/wait4.c                        \
+    -f lib/linux/waitpid.c                      \
     -f lib/linux/gettimeofday.c                 \
-    -f lib/m2/clock_gettime.c                   \
+    -f lib/linux/clock_gettime.c                \
     -f lib/m2/time.c                            \
     -f lib/linux/_getcwd.c                      \
+    -f include/limits.h                         \
     -f lib/m2/getcwd.c                          \
     -f lib/linux/dup.c                          \
     -f lib/linux/dup2.c                         \
@@ -102,6 +114,7 @@ M2-Planet                                       \
     -f src/core.c                               \
     -f src/display.c                            \
     -f src/eval-apply.c                         \
+    -f include/fcntl.h                          \
     -f src/gc.c                                 \
     -f src/hash.c                               \
     -f src/lib.c                                \
@@ -109,6 +122,7 @@ M2-Planet                                       \
     -f src/math.c                               \
     -f src/mes.c                                \
     -f src/module.c                             \
+    -f include/signal.h                         \
     -f src/posix.c                              \
     -f src/reader.c                             \
     -f src/stack.c                              \

kaem.x86

@@ -0,0 +1,24 @@
+#! /bin/sh
+# Copyright © 2022 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
+
+mes_cpu=x86
+stage0_cpu=x86
+kaem --verbose --strict

lib/linux/_open3.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -26,7 +26,9 @@
 int
 _open3 (char const *file_name, int flags, int mask)
 {
-  int r = _sys_call3 (SYS_open, (long) file_name, (int) flags, (int) mask);
+  long long_file_name = cast_voidp_to_long (file_name);
+  int r = _sys_call3 (SYS_open, long_file_name, flags, mask);
+  __ungetc_init ();
   if (r > 2)
     {
       __ungetc_clear (r);

lib/linux/arm-mes-gcc/syscall.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -19,7 +19,7 @@
  */
 
 #include <errno.h>
-#include <linux/x86/syscall.h>
+#include <linux/arm/syscall.h>
 
 #if !__TINYC__
 // *INDENT-OFF*
@@ -187,7 +187,6 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
 }
 #endif //__TINYC__
 
-#if 0
 long
 __sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
 {
@@ -208,7 +207,6 @@ __sys_call6 (long sys_call, long one, long two, long three, long four, long five
        );
   return r;
 }
-#endif
 
 // *INDENT-ON*
 
@@ -282,7 +280,6 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
   return r;
 }
 
-#if 0
 long
 _sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
 {
@@ -296,4 +293,3 @@ _sys_call6 (long sys_call, long one, long two, long three, long four, long five,
     errno = 0;
   return r;
 }
-#endif

lib/linux/lseek.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -24,23 +24,23 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#if !__MESC__ /* FIXME: We want bin/mes-mescc's x86-linux sha256sum to stay the same. */
 off_t
 _lseek (int filedes, off_t offset, int whence)
 {
-  return _sys_call3 (SYS_lseek, (int) filedes, (long) offset, (int) whence);
+  long long_offset = offset;
+  return _sys_call3 (SYS_lseek, filedes, long_offset, whence);
 }
-#endif
 
 off_t
 lseek (int filedes, off_t offset, int whence)
 {
-#if !__MESC__ /* FIXME: We want bin/mes-mescc's x86-linux sha256sum to stay the same. */
+#if !__MESC__ && !__M2__
   if (_lseek (filedes, 0, SEEK_CUR) == -1)
     return -1;
 #endif
   size_t skip = __buffered_read_clear (filedes);
   if (whence == SEEK_CUR)
     offset -= skip;
-  return _sys_call3 (SYS_lseek, (int) filedes, (long) offset, (int) whence);
+  long long_offset = offset;
+  return _sys_call3 (SYS_lseek, filedes, long_offset, whence);
 }

lib/linux/malloc.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  * Copyright © 2021 Danny Milosavljevic <dannym@scratchpost.org>
  *
  * This file is part of GNU Mes.
@@ -31,9 +31,11 @@ malloc (size_t size)
 {
   if (!__brk)
     __brk = cast_long_to_charp (brk (0));
+#if !__M2__
   /* align what we give back. */
   __brk = (char*) (((uintptr_t) __brk
                     + sizeof (max_align_t) - 1) & -sizeof (max_align_t));
+#endif
   if (brk (__brk + size) == -1)
     return 0;
   char *p = __brk;

lib/linux/mmap.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -20,12 +20,10 @@
 
 #include <linux/syscall.h>
 #include <syscall.h>
-#include <sys/stat.h>
+#include <sys/mman.h>
 
-int
-chmod (char const *file_name, int mask)
+void *
+mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
-  long long_file_name = file_name;
-  long long_mask = mask;
-  return _sys_call2 (SYS_chmod, long_file_name, long_mask);
+  return (void *)_sys_call6 (SYS_mmap, (long) addr, (long) len, (int) prot, (int) flags, (int) fd, (long) offset);
 }

lib/linux/munmap.c

@@ -20,11 +20,10 @@
 
 #include <linux/syscall.h>
 #include <syscall.h>
-#include <time.h>
+#include <sys/mman.h>
 
 int
-clock_gettime (long clk_id, struct timespec *tp)
+munmap (void *addr, size_t length)
 {
-  long long_tp = tp;
-  return _sys_call2 (SYS_clock_gettime, clk_id, tp);
+  return _sys_call2 (SYS_munmap, (long) addr, (long) length);
 }

lib/linux/open.c

@@ -0,0 +1,47 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019,2022 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>
+
+#if __M2__
+int
+open (char *file_name, int flags, int mask)
+{
+  int r = _sys_call3 (SYS_open, file_name, flags, mask);
+  if (r > 2)
+    __ungetc_clear (r);
+  return r;
+}
+#else // !__M2__
+int
+open (char const *file_name, int flags, ...)
+{
+  va_list ap;
+  va_start (ap, flags);
+  int mask = va_arg (ap, int);
+  int r = _sys_call3 (SYS_open, (long) file_name, flags, mask);
+  va_end (ap);
+  if (r > 2)
+    __ungetc_clear (r);
+  return r;
+}
+#endif // __M2__

lib/linux/read.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,16 +18,18 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <mes/lib.h>
 #include <linux/syscall.h>
 #include <syscall.h>
-#include <mes/lib.h>
 #include <fcntl.h>
 
 ssize_t
 read (int filedes, void *buffer, size_t size)
 {
   long long_filedes = filedes;
-  ssize_t bytes = _sys_call3 (SYS_read, long_filedes, buffer, size);
+  long long_buffer = cast_voidp_to_long (buffer);
+  ssize_t bytes = _sys_call3 (SYS_read, long_filedes, long_buffer, size);
+#if !__M2__
   if (__mes_debug () > 4)
     {
       if (bytes == 1)
@@ -48,5 +50,6 @@ read (int filedes, void *buffer, size_t size)
           eputs ("\n");
         }
     }
+#endif
   return bytes;
 }

lib/linux/time.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -21,14 +21,8 @@
 #include <linux/syscall.h>
 #include <syscall.h>
 #include <time.h>
-#include <stdlib.h>
-
-/* Linux' SYS_time syscall is a compatibility shim for SYS_gettimeofday.
-Therefore, prefer SYS_gettimeofday. */
-
-#if defined (SYS_gettimeofday)
-
 #include <sys/time.h>
+#include <stdlib.h>
 
 time_t
 time (time_t * result)
@@ -41,31 +35,3 @@ time (time_t * result)
     *result = tv.tv_sec;
   return tv.tv_sec;
 }
-
-#elif defined (SYS_time)
-
-time_t
-time (time_t * result)
-{
-  return _sys_call1 (SYS_time, (long) result);
-}
-
-#else
-
-#warning there is no time
-
-#include <mes/lib.h>
-
-time_t
-time (time_t * result)
-{
-  static int stub = 0;
-  if (__mes_debug () && !stub)
-    eputs ("time stub\n");
-  stub = 1;
-  if (result)
-    *result = 0;
-  return 0;
-}
-
-#endif

lib/linux/wait4.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -22,18 +22,15 @@
 #include <linux/syscall.h>
 #include <syscall.h>
 #include <sys/types.h>
+#include <sys/resource.h>
 
-int
-waitpid (int pid, int *status_ptr, int options)
+pid_t
+wait4 (pid_t pid, int *status_ptr, int options, struct rusage *rusage)
 {
   long long_pid = pid;
   long long_status_ptr = cast_voidp_to_long (status_ptr);
   long long_options = options;
-//##if __i386__
-//#  return _sys_call3 (SYS_waitpid, long_pid, long_status_ptr, long_options);
-//##elif __x86_64__ || __arm__
-  return _sys_call4 (SYS_wait4, long_pid, long_status_ptr, long_options, 0);
-//##else
-//##error arch not supported
-//##endif
+  long long_rusage = cast_voidp_to_long (rusage);
+  return _sys_call4 (SYS_wait4, long_pid, long_status_ptr, long_options,
+                     long_rusage);
 }

lib/linux/waitpid.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,6 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <mes/lib.h>
 #include <linux/syscall.h>
 #include <syscall.h>
 #include <sys/types.h>
@@ -25,11 +26,12 @@
 pid_t
 waitpid (pid_t pid, int *status_ptr, int options)
 {
-#if __i386__
-  return _sys_call3 (SYS_waitpid, (long) pid, (long) status_ptr, (int) options);
-#elif __x86_64__ || __arm__
-  return _sys_call4 (SYS_wait4, (long) pid, (long) status_ptr, (int) options, 0);
-#else
-#error arch not supported
+  long long_pid = pid;
+  long long_status_ptr = cast_voidp_to_long (status_ptr);
+  long long_options = options;
+#if SYS_waitpid
+  return _sys_call3 (SYS_waitpid, long_pid, long_status_ptr, long_options);
+#elif SYS_wait4
+  return wait4 (pid, status_ptr, options, 0);
 #endif
 }

lib/linux/x86-mes-gcc/syscall.c

@@ -177,3 +177,20 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
     errno = 0;
   return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  long r;
+  asm (
+       "mov    %1,%%eax\n\t"
+       "mov    %%ebp,%%ebx\n\t"
+       "add    $0x0c,%%ebx\n\t"
+       "int    $0x80\n\t"
+       "mov    %%eax,%0\n\t"
+       : "=r" (r)
+       : "rm" (sys_call)
+       : "eax", "ebx"
+       );
+  return r;
+}

lib/linux/x86-mes-mescc/syscall.c

@@ -66,6 +66,15 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
   asm ("int____$0x80");
 }
 
+long
+__sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  asm ("mov____0x8(%ebp),%eax !0x08");
+  asm ("mov____%ebp,%ebx");
+  asm ("add____$i8,%ebx !0x0c");
+  asm ("int____$0x80");
+}
+
 long
 _sys_call (long sys_call)
 {
@@ -135,3 +144,9 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
     errno = 0;
   return r;
 }
+
+int
+_sys_call6 (int sys_call, int one, int two, int three, int four, int five, int six)
+{
+  return __sys_call6 (sys_call, one, two, three, four, five, six);
+}

lib/linux/x86_64-mes-gcc/syscall.c

@@ -179,3 +179,26 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
     errno = 0;
   return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  long r;
+  asm (
+       "mov     %2,%%rdi\n\t"
+       "mov     %3,%%rsi\n\t"
+       "mov     %4,%%rdx\n\t"
+       "mov     %5,%%r10\n\t"
+       "mov     %6,%%r8\n\t"
+       "mov     %7,%%r9\n\t"
+       "mov     %1,%%rax\n\t"
+  //      );
+  // asm (
+       "syscall \n\t"
+       "mov     %%rax,%0\n\t"
+       : "=r" (r)
+       : "rm" (sys_call), "rm" (one), "rm" (two), "rm" (three), "rm" (four), "rm" (five), "rm" (six)
+       : "rax", "rdi", "rsi", "rdx", "r10", "r8", "r9"
+       );
+  return r;
+}

lib/linux/x86_64-mes-mescc/syscall.c

@@ -96,6 +96,8 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
   asm ("mov____0x8(%rbp),%rsi !0x20");
   asm ("mov____0x8(%rbp),%rdx !0x28");
   asm ("mov____0x8(%rbp),%r10 !0x30");
+  asm ("mov____0x8(%rbp),%r8  !0x38");
+  asm ("mov____0x8(%rbp),%r9  !0x40");
 #endif
 
   asm ("syscall");
@@ -170,3 +172,12 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
     errno = 0;
   return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  // long rax = sys_call;
+  // long r = __sys_call6 (one, two, three, four, five, six);
+  long r = __sys_call (sys_call, one, two, three, four, five, six);
+  return r;
+}

lib/m2/getcwd.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-// CONSTANT PATH_MAX 1024
-
 char *__getcwd_buf;
 
 char *

lib/m2/isatty.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <termio.h>
 
-// CONSTANT TCGETS 0x5401
 #define TCGETS 0x5401
 
 struct ktermios

lib/m2/mes_open.c

@@ -1,28 +0,0 @@
-/* -*-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)
-{
-  int filedes = open (file_name, flags, mask);
-  if (filedes > 2)
-    __ungetc_clear (filedes);
-  return filedes;
-}

lib/math/labs.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 © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,12 +18,12 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mes/lib.h>
+#include <math.h>
 
-void _exit (int code);
-
-void
-exit (int code)
+long int
+labs (long int number)
 {
-  _exit (code);
+  if (number < 0)
+    return -number;
+  return number;
 }

lib/mes/ntoab.c

@@ -23,7 +23,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if __M2_PLANET__ || (!(__MESC__ && __arm__) && !(__TINYC__ && __arm__ && BOOTSTRAP))
+#if __MESC__ && __arm__
+#define __MESC__and__arm__
+#endif
+
+#if __TINYC__ && __arm__ && BOOTSTRAP
+#define __TINYC__and__arm__and__BOOTSTRAP
+#endif
+
+#define __not__MESC__arm__and__not__TINYC__arm__BOOTSTRAP !defined (__MESC__and__arm__) && !defined (__TINYC__and__arm__and__BOOTSTRAP)
+
+// FIXME: M2-Planet 1.10.0 crashes on this...
+// #if __M2__ || (!defined (__MESC__and__arm__) && !defined (__TINYC__and__arm__and__BOOTSTRAP))
+#if __M2__ || __not__MESC__arm__and__not__TINYC__arm__BOOTSTRAP
 size_t
 __mesabi_uldiv (size_t a, size_t b, size_t *remainder)
 {

lib/posix/getcwd.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -23,8 +23,6 @@
 #include <sys/types.h>
 #include <mes/lib.h>
 
-char *__getcwd_buf;
-
 char *
 getcwd (char *buffer, size_t size)
 {

lib/posix/getenv.c

@@ -1,6 +1,6 @@
 /*
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -22,9 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-// CONSTANT M2_PTR_SIZE 4
-#define M2_PTR_SIZE 1
-
 char *
 getenv (char const *s)
 {

lib/posix/open.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -29,6 +29,13 @@ _open2 (char const *file_name, int flags)
   return _open3 (file_name, flags, mask);
 }
 
+#if __M2__
+int
+open (char const *file_name, int flags, int mask)
+{
+  return _open3 (file_name, flags, mask);
+}
+#else // !__M2__
 int
 open (char const *file_name, int flags, ...)
 {
@@ -44,3 +51,4 @@ open (char const *file_name, int flags, ...)
   else
     return _open2 (file_name, flags);
 }
+#endif // !__M2__

lib/posix/setenv.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -22,9 +22,6 @@
 #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)
 {

lib/stdio/rewind.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,16 +18,10 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mes/lib.h>
-#include <errno.h>
+#include <stdio.h>
 
-int
-rewind (int x)
+void
+rewind (FILE * stream)
 {
-  static int stub = 0;
-  if (__mes_debug () && !stub)
-    eputs ("rewind stub\n");
-  stub = 1;
-  errno = 0;
-  return 0;
+  fseek (stream, 0, SEEK_SET);
 }

lib/stdio/vfprintf.c

@@ -26,7 +26,7 @@
 int
 vfprintf (FILE * f, char const *format, va_list ap)
 {
-  int fd = (long) f;
+  int fd = fileno (f);
   char const *p = format;
   int count = 0;
   while (*p)
@@ -41,6 +41,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
         char c = *p;
         int left_p = 0;
         int precision = -1;
+        int prefix_p = 0;
         int width = -1;
         if (c == '-')
           {
@@ -51,12 +52,17 @@ vfprintf (FILE * f, char const *format, va_list ap)
         if (c == ' ')
           {
             pad = c;
-            c = *p++;
+            c = *++p;
+          }
+        if (c == '#')
+          {
+            prefix_p = 1;
+            c = *++p;
           }
         if (c == '0')
           {
             pad = c;
-            c = *p++;
+            c = *++p;
           }
         if (c >= '0' && c <= '9')
           {
@@ -134,6 +140,18 @@ vfprintf (FILE * f, char const *format, va_list ap)
                       count++;
                     }
                 }
+              if (prefix_p && *s && c == 'o')
+                {
+                  fputc ('0', f);
+                  width--;
+                }
+              if (prefix_p && *s && (c == 'x' || c == 'X'))
+                {
+                  fputc ('0', f);
+                  width--;
+                  fputc ('x', f);
+                  width--;
+                }
               while (*s)
                 {
                   if (precision-- <= 0)
@@ -194,6 +212,9 @@ vfprintf (FILE * f, char const *format, va_list ap)
           case 'G':
             {
               double d = va_arg8 (ap, double);
+#if 1
+              fputs ("0.0", f);
+#else
               char *s = dtoab (d, 10, 1);
               if (c == 'E' || c == 'G')
                 strupr (s);
@@ -229,6 +250,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
                   fputc (pad, f);
                   count++;
                 }
+#endif
               break;
             }
           case 'n':
@@ -241,6 +263,8 @@ vfprintf (FILE * f, char const *format, va_list ap)
             {
               eputs ("vfprintf: not supported: %:");
               eputc (c);
+              eputs (", in format: ");
+              eputs (format);
               eputs ("\n");
               p++;
             }
@@ -248,5 +272,5 @@ vfprintf (FILE * f, char const *format, va_list ap)
         p++;
       }
   va_end (ap);
-  return 0;
+  return count;
 }

lib/stdio/vfscanf.c

@@ -1,6 +1,7 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
  * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
  *
  * This file is part of GNU Mes.
  *
@@ -22,62 +23,82 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 
 int
 vfscanf (FILE * stream, char const *template, va_list ap)
 {
-  char p = fgetc (stream);
+  char r = fgetc (stream);
   char const *t = template;
   int count = 0;
-  while (*t && p != EOF)
+  while (*t && r != EOF)
     if (*t != '%')
       {
         t++;
-        p = fgetc (stream);
+        r = fgetc (stream);
       }
     else
       {
         t++;
         char c = *t;
+        int skip_p = 0;
+        int length = -1;
+        if (c == '*')
+          skip_p = 1;
+        if (c >= '0' && c <= '9')
+          {
+            length = abtol (&t, 10);
+            c = *t;
+          }
         if (c == 'l')
           c = *++t;
         switch (c)
           {
           case '%':
             {
-              p = fgetc (stream);
+              r = fgetc (stream);
               break;
             }
           case 'c':
             {
-              char *c = va_arg (ap, char *);
-              *c = p;
-              p = fgetc (stream);
-              count++;
+              r = fgetc (stream);
+              if (!skip_p)
+                {
+                  char *c = va_arg (ap, char *);
+                  *c = r;
+                  count++;
+                }
               break;
             }
           case 'd':
           case 'i':
           case 'u':
             {
-              int *d = va_arg (ap, int *);
+              int *d = skip_p ? 0 : va_arg (ap, int *);
               char buf[20];
               char *q = buf;
-              if (p == '+' || p == '-')
+              if (r == '+' || r == '-')
                 {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                 }
-              while (isdigit (p))
+              while (isdigit (r))
                 {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                 }
-              ungetc (p, stream);
+              ungetc (r, stream);
               *q = 0;
               q = buf;
-              *d = abtol (&q, 10);
-              count++;
+              if (skip_p)
+                abtol ((char const **) &q, 10);
+              else
+                {
+                  *d = abtol ((char const **) &q, 10);
+                  count++;
+                }
               break;
             }
           case 'e':
@@ -86,33 +107,100 @@ vfscanf (FILE * stream, char const *template, va_list ap)
           case 'E':
           case 'G':
             {
-              float *f = va_arg (ap, float *);
+              float *f = skip_p ? 0 : va_arg (ap, float *);
               char buf[20];
               char *q = buf;
-              if (p == '+' || p == '-')
+              if (r == '+' || r == '-')
                 {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                 }
-              while (isdigit (p))
+              while (isdigit (r))
                 {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                 }
-              ungetc (p, stream);
+              ungetc (r, stream);
               *q = 0;
               q = buf;
-              *f = strtod (q, &q);
-              count++;
+              if (skip_p)
+                strtod (q, &q);
+              else
+                {
+                  *f = strtod (q, &q);
+                  count++;
+                }
+              break;
+            }
+          case 's':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              while (r && !isspace (r) && (length == -1 || length--))
+                {
+                  if (!skip_p)
+                    *s++ = r;
+                  r = fgetc (stream);
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
+              break;
+            }
+          case '[':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char set[1024];
+              int i = 0;
+              int not_in_set_p = 0;
+              t++;
+              if (*t == '^')
+                {
+                  not_in_set_p = 1;
+                  t++;
+                }
+              if (*t == ']' || *t == '-')
+                set[i++] = *t++;
+              while (*t && *t != ']')
+                {
+                  if (*t == '-')
+                    {
+                      char end = *t++;
+                      for (char x = set[i - 1] + 1; x < end; x++)
+                        set[i++] = x;
+                    }
+                  else
+                    set[i++] = *t++;
+                }
+              set[i] = 0;
+              while (r && (length == -1 || length--))
+                {
+                  int match = (int) (long) strchr (set, r);
+                  if (not_in_set_p)
+                    match = !match;
+                  if (!match)
+                    break;
+                  if (!skip_p)
+                    *s++ = r;
+                  r = fgetc (stream);
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
               break;
             }
           default:
             {
               eputs ("vsscanf: not supported: %:");
               eputc (c);
+              eputs (", in template: ");
+              eputs (template);
               eputs ("\n");
               t++;
-              p = fgetc (stream);
+              r = fgetc (stream);
             }
           }
         t++;

lib/stdio/vsnprintf.c

@@ -43,6 +43,7 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
         c = *p;
         int left_p = 0;
         int precision = -1;
+        int prefix_p = 0;
         int width = -1;
         if (c == '-')
           {
@@ -53,12 +54,17 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
         if (c == ' ')
           {
             pad = c;
-            c = *p++;
+            c = *++p;
+          }
+        if (c == '#')
+          {
+            prefix_p = 1;
+            c = *++p;
           }
         if (c == '0')
           {
             pad = c;
-            c = *p++;
+            c = *++p;
           }
         if (c >= '0' && c <= '9')
           {
@@ -142,6 +148,18 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
                       count++;
                     }
                 }
+              if (prefix_p && *s && c == 'o')
+                {
+                  *s++ = '0';
+                  width--;
+                }
+              if (prefix_p && *s && (c == 'x' || c == 'X'))
+                {
+                  *s++ = '0';
+                  width--;
+                  *s++ = 'x';
+                  width--;
+                }
               while (*s)
                 {
                   if (precision-- <= 0)
@@ -210,6 +228,11 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
           case 'G':
             {
               double d = va_arg8 (ap, double);
+#if 1
+              *str++ = '0';
+              *str++ = '.';
+              *str++ = '0';
+#else
               char *s = dtoab (d, 10, 1);
               if (c == 'E' || c == 'G')
                 strupr (s);
@@ -250,6 +273,7 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
                     *str++ = pad;
                   count++;
                 }
+#endif
               break;
             }
           case 'n':
@@ -262,6 +286,8 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
             {
               eputs ("vsnprintf: not supported: %:");
               eputc (c);
+              eputs (", in format: ");
+              eputs (format);
               eputs ("\n");
               p++;
             }

lib/stdio/vsscanf.c

@@ -41,6 +41,15 @@ vsscanf (char const *s, char const *template, va_list ap)
       {
         t++;
         char c = *t;
+        int skip_p = 0;
+        int length = -1;
+        if (c == '*')
+          skip_p = 1;
+        if (c >= '0' && c <= '9')
+          {
+            length = abtol (&t, 10);
+            c = *t;
+          }
         if (c == 'l')
           c = *++t;
         switch (c)
@@ -52,18 +61,27 @@ vsscanf (char const *s, char const *template, va_list ap)
             }
           case 'c':
             {
-              char *c = va_arg (ap, char *);
-              *c = *p++;
-              count++;
+              char r = *p++;
+              if (!skip_p)
+                {
+                  char *c = va_arg (ap, char *);
+                  *c = r;
+                  count++;
+                }
               break;
             }
           case 'd':
           case 'i':
           case 'u':
             {
-              int *d = va_arg (ap, int *);
-              *d = abtol ((char const **)&p, 10);
-              count++;
+              if (skip_p)
+                abtol ((char const **) &p, 10);
+              else
+                {
+                  int *d = va_arg (ap, int *);
+                  *d = abtol ((char const **) &p, 10);
+                  count++;
+                }
               break;
             }
           case 'e':
@@ -72,15 +90,84 @@ vsscanf (char const *s, char const *template, va_list ap)
           case 'E':
           case 'G':
             {
-              float *f = va_arg (ap, float *);
-              *f = strtod (p, &p);
-              count++;
+              if (skip_p)
+                strtod (p, &p);
+              else
+                {
+                  float *f = va_arg (ap, float *);
+                  *f = strtod (p, &p);
+                  count++;
+                }
+              break;
+            }
+          case 's':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char r = *p;
+              while (r && !isspace (r) && (length == -1 || length--))
+                {
+                  if (!skip_p)
+                    *s++ = r;
+                  r = *++p;
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
+              break;
+            }
+          case '[':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char set[1024];
+              int i = 0;
+              int not_in_set_p = 0;
+              t++;
+              if (*t == '^')
+                {
+                  not_in_set_p = 1;
+                  t++;
+                }
+              if (*t == ']' || *t == '-')
+                set[i++] = *t++;
+              while (*t && *t != ']')
+                {
+                  if (*t == '-')
+                    {
+                      char end = *t++;
+                      for (char x = set[i - 1] + 1; x < end; x++)
+                        set[i++] = x;
+                    }
+                  else
+                    set[i++] = *t++;
+                }
+              set[i] = 0;
+              char r = *p;
+              while (r && (length == -1 || length--))
+                {
+                  int match = (int) (long) strchr (set, r);
+                  if (not_in_set_p)
+                    match = !match;
+                  if (!match)
+                    break;
+                  if (!skip_p)
+                    *s++ = r;
+                  r = *++p;
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
               break;
             }
           default:
             {
               eputs ("vsscanf: not supported: %:");
               eputc (c);
+              eputs (", in template: ");
+              eputs (template);
               eputs ("\n");
               t++;
               p++;

lib/stdlib/atexit.c

@@ -25,4 +25,5 @@ int
 atexit (void (*function) (void))
 {
   __call_at_exit = function;
+  return 0;
 }

lib/stdlib/exit.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,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -20,12 +20,16 @@
 
 #include <mes/lib.h>
 
+#if !__M2__
 void (*__call_at_exit) (void);
+#endif
 
 void
 exit (int code)
 {
+#if !__M2__
   if (__call_at_exit)
     (*__call_at_exit) ();
+#endif
   _exit (code);
 }

lib/stdlib/qsort.c

@@ -19,62 +19,69 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-void
-qswap (void *a, void *b, size_t size)
+#if 1
+static void
+qswap (char *a, char *b, size_t size)
 {
-  char *pa = a;
-  char *pb = b;
-  do
-  {
-    char tmp = *pa;
-    *pa++ = *pb;
-    *pb++ = tmp;
-  } while (--size > 0);
+  while (size-- > 0);
+    {
+      char tmp = *a;
+      *a++ = *b;
+      *b++ = tmp;
+    }
 }
-
-size_t
-qpart (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
+#else
+static void
+qswap (void *a, void *b, int size)
 {
-  void *p = base + count * size;
+  assert (a != b);
+  char buffer[size];
+  memcpy (buffer, a, size);
+  memcpy (a, b, size);
+  memcpy (b, buffer, size);
+}
+#endif
+
+static size_t
+qpart (char *base, size_t count, size_t size,
+       int (*compare) (void const *, void const *))
+{
+  void *p1 = base + count * size;
   size_t i = 0;
   for (size_t j = 0; j < count; j++)
     {
-      int c = compare (base + j * size, p);
-      if (c < 0)
+      char *p2 = base + j * size;
+      int c = p1 == p2 ? 0 : compare (p2, p1);
+      if (c == 0)
+        i++;
+      else if (c < 0)
         {
-#if 1                           //__x86_64__
-          qswap (base + i * size, base + j * size, size);
-#else
-          int p1 = base + i * size;
-          int p2 = base + j * size;
+          char *p1 = base + i * size;
           qswap (p1, p2, size);
-#endif
           i++;
         }
-      else if (c == 0)
-        i++;
     }
-  if (compare (base + count * size, base + i * size) < 0)
-    qswap (base + i * size, base + count * size, size);
+
+  char *p2 = base + i * size;
+  if (p1 != p2 && compare (p1, p2) < 0)
+    qswap (p1, p2, size);
   return i;
 }
 
 void
-qsort (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
+qsort (void *base, size_t count, size_t size,
+       int (*compare) (void const *, void const *))
 {
-  if (count > 1)
-    {
-      int p = qpart (base, count - 1, size, compare);
-      qsort (base, p, size, compare);
-#if 1                           //__x86_64__
-      qsort (base + p * size, count - p, size, compare);
-#else
-      int p1 = base + p * size;
-      int p2 = count - p;
-      qsort (p1, p2, size, compare);
-#endif
-    }
+  if (count <= 1)
+    return;
+  size_t p = qpart (base, count - 1, size, compare);
+  qsort (base, p, size, compare);
+  char *pbase = base;
+  char *p1 = pbase + p * size;
+  size_t c1 = count - p;
+  qsort (p1, c1, size, compare);
 }

lib/string/strtok.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,19 +18,25 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mes/lib.h>
 #include <string.h>
 
-char *__brk = 0;
-
-void *
-malloc (size_t size)
+char *
+strtok (char *new_string, char const *delimiters)
 {
-  if (!__brk)
-    __brk = cast_long_to_charp (brk (0));
-  if (brk (__brk + size) == -1)
+  static char *mark;
+  if (new_string)
+    mark = new_string;
+  if (!*mark)
     return 0;
-  char *p = __brk;
-  __brk = __brk + size;
-  return p;
+  while (strchr (delimiters, *mark))
+    mark++;
+  char *point = mark;
+  while (*mark && !strchr (delimiters, *mark))
+    mark++;
+  if (*mark)
+    {
+      *mark = 0;
+      mark++;
+    }
+  return point;
 }

lib/stub/__buffered_read.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,14 +18,16 @@
  * along 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>
+#include <stdlib.h>
+#include <string.h>
 
-long
-read (int filedes, void *buffer, long size)
+void
+__buffered_read_init (int filedes)
+{
+}
+
+size_t
+__buffered_read_clear (int filedes)
 {
-  long bytes = _sys_call3 (SYS_read, filedes, buffer, size);
-  return bytes;
 }

lib/stub/__raise.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,8 +18,6 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// CONSTANT SIGABRT 0
-
 int
 __raise (int signum)
 {

lib/stub/asctime.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -19,14 +19,16 @@
  */
 
 #include <mes/lib.h>
-#include <fcntl.h>
-#include <stdarg.h>
+#include <errno.h>
+#include <time.h>
 
-int
-open (char *file_name, int flags, int mask)
+char *
+asctime (struct tm const *broken_time)
 {
-  int r = _sys_call3 (SYS_open, file_name, flags, mask);
-  if (r > 2)
-    __ungetc_clear (r);
-  return r;
+  static int stub = 0;
+  if (__mes_debug () && !stub)
+    eputs ("asctime stub\n");
+  stub = 1;
+  errno = 0;
+  return "now";
 }

lib/tests/posix/90-mmap.c

@@ -0,0 +1,75 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2022 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 <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+size_t file_size (char const* file_name)
+{
+  struct stat st;
+  stat (file_name, &st);
+  return st.st_size;
+}
+
+int
+main (int argc, char const *argv[])
+{
+  eputs ("test:mmap\n");
+#if __GNUC__ > 11
+  char* file_name = malloc (PATH_MAX);
+#else
+  // FIXME: gcc-12.2.0 fails open using this
+  char file_name[PATH_MAX];
+#endif
+  char *srcdir = getenv ("abs_top_srcdir");
+  if (! srcdir) // for running by hand
+    srcdir = ".";
+  eputs ("srcdir=");
+  eputs (srcdir);
+  eputs ("\n");
+  strcpy (file_name, srcdir);
+  strcpy (file_name + strlen (srcdir), "/lib/tests/posix/data/open-read");
+  eputs ("test mmap:");
+  eputs (file_name);
+  eputs ("\n");
+
+  size_t size = file_size (file_name);
+  int fd = open (file_name, O_RDONLY, 0);
+  assert (fd != -1);
+
+  void* data = mmap (NULL, size, PROT_READ, MAP_PRIVATE | MAP_POPULATE, fd, 0);
+  assert(data != MAP_FAILED);
+  write (1, data, size);
+
+  int rc = munmap (data, size);
+  assert (rc == 0);
+  close (fd);
+
+  return 0;
+}

lib/tests/stdio/90-sscanf.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -18,39 +18,33 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if SYSTEM_LIBC
-#error "SYSTEM_LIBC not supported"
-#endif
-
 #include <mes/lib.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <string.h>
 
 int
-main (int argc, char *argv[])
+main ()
 {
-  int size = 5000;
-  puts ("m!\n");
-  //int *p = 0;
-  char *p = 0;
-  p = malloc (size);
-  size = 5000;
-  puts ("p=");
-  puts (itoa (p));
-  puts ("\n");
-  for (int i = 0; i < size; i++)
-    {
-      puts ("set ");
-      puts (itoa (i));
-      puts ("\n");
-      p[i] = i;
-    }
-  for (int i = 0; i < size; i++)
-    {
-      puts (itoa (i));
-      puts (": ");
-      puts (itoa (p[i]));
-      puts ("\n");
-    }
+  char buf_abc[20];
+  char buf_xxx[20];
+  char buf_0_9[20];
+  int i = sscanf ("@abcxxx x0", "@%5[a-bc]%s%[^0-9]", &buf_abc, &buf_xxx, &buf_0_9);
+  if (i != 3)
+    return 1;
+  eputs ("buf_abc=");
+  eputs (buf_abc);
+  eputs ("\n");
+  eputs ("buf_xxx=");
+  eputs (buf_xxx);
+  eputs ("\n");
+  eputs ("buf_0_9=");
+  eputs (buf_0_9);
+  eputs ("\n");
+  if (strcmp (buf_abc, "abc"))
+    return 2;
+  if (strcmp (buf_xxx, "xxx"))
+    return 3;
+  if (strcmp (buf_0_9, " x"))
+    return 4;
   return 0;
 }

lib/tests/stdlib/80-qsort-stress.c

@@ -0,0 +1,60 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2017,2022 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>
+#include <string.h>
+
+int
+compare_int (void const *a, void const *b)
+{
+  eputs ("compare: ");
+  eputs (itoa (*(int *) a));
+  eputs (" <? ");
+  eputs (itoa (*(int *) b));
+  eputs (" => ");
+  eputs (itoa (*(int *) a - *(int *) b));
+  eputs ("\n");
+  return *(int *) a - *(int *) b;
+}
+
+int
+main ()
+{
+  int lst[9] = { 0, 0, 5, 0, 0, 4, 3, 2, -1 };
+  qsort (lst, 9, sizeof (int), compare_int);
+  for (int i = 0; i < 9; i++)
+    {
+      eputs (itoa (i));
+      eputs (":");
+      eputs (itoa (lst[i]));
+      eputs ("\n");
+    }
+  if (lst[0] != -1)
+    return 1;
+  if (lst[9] != 5)
+    return 2;
+  int x = -2;
+  for (int i = 0; i < 9; i++)
+    if (x > lst[i])
+      return 3 + i;
+  return 0;
+}

lib/tests/stdlib/80-qsort.c

@@ -20,10 +20,11 @@
 
 #include <mes/lib.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 int
-compare_int (void *a, void *b)
+compare_int (void const *a, void const *b)
 {
   eputs ("compare: ");
   eputs (itoa (*(int *) a));

lib/x86-mes/x86.M1

@@ -85,6 +85,7 @@ DEFINE mov____$i32,0x8(%ebp) c745
 DEFINE mov____$i8,%al b0
 DEFINE mov____$i8,%eax b0
 DEFINE mov____%al,(%ebx) 8803
+DEFINE mov____%al,0x32(%ebp) 8885
 DEFINE mov____%al,0x8(%ebp) 8845
 DEFINE mov____%ax,(%ebx) 668903
 DEFINE mov____%ax,0x8(%ebp) 668945
@@ -163,6 +164,7 @@ DEFINE not____%ebx f7d3
 DEFINE or_____%ebx,%eax 09d8
 DEFINE pop____%eax 58
 DEFINE pop____%ebx 5b
+DEFINE pop____%ebp 5d
 DEFINE pop____%edx 5a
 DEFINE push___$i32 68
 DEFINE push___%eax 50

lib/x86_64-mes/x86_64.M1

@@ -1,6 +1,7 @@
 ### GNU Mes --- Maxwell Equations of Software
 ### Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ### Copyright © 2018 Peter De Wachter <pdewacht@gmail.com>
+### Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
 ###
 ### This file is part of GNU Mes.
 ###
@@ -123,10 +124,14 @@ DEFINE mov____%rdx,%rax 4889d0
 DEFINE mov____%rdx,%rdi 4889d7
 DEFINE mov____%rsi,(%rdi) 488937
 DEFINE mov____%rsp,%rbp 4889e5
+DEFINE mov____%si,(%rdi) 668937
+DEFINE mov____%sil,(%rdi) 448837
 DEFINE mov____(%rax),%eax 8b00
 DEFINE mov____(%rax),%esi 8b30
 DEFINE mov____(%rax),%rax 488b00
 DEFINE mov____(%rax),%rsi 488b30
+DEFINE mov____(%rax),%si 668b30
+DEFINE mov____(%rax),%sil 408a30
 DEFINE mov____(%rdi),%edi 8b3f
 DEFINE mov____(%rdi),%rdi 488b3f
 DEFINE mov____0x32(%rbp),%rax 488b85
@@ -136,6 +141,7 @@ DEFINE mov____0x32,%rdi 488b3c25
 DEFINE mov____0x8(%rbp),%eax 8b45
 DEFINE mov____0x8(%rbp),%r10 4c8b55
 DEFINE mov____0x8(%rbp),%r8 4c8b45
+DEFINE mov____0x8(%rbp),%r9 4c8b4d
 DEFINE mov____0x8(%rbp),%rax 488b45
 DEFINE mov____0x8(%rbp),%rbp 488b6d
 DEFINE mov____0x8(%rbp),%rbx 488b5d

module/mescc.scm

@@ -107,7 +107,7 @@ Options:
   --arch=ARCH         compile for ARCH [~a]
   --kernel=ARCH       compile for KERNEL [~a]
   -dumpmachine        display the compiler's target machine
-  --base-address=ADRRESS
+  --base-address=ADDRESS
                       use BaseAddress ADDRESS [0x1000000]
   --numbered-arch     mescc-tools use numbered arch
   -D DEFINE[=VALUE]   define DEFINE [VALUE=1]

module/mescc/mescc.scm

@@ -1,5 +1,5 @@
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 W. J. van der Laan <laanwj@protonmail.com>
 ;;;
 ;;; This file is part of GNU Mes.
@@ -22,7 +22,6 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 pretty-print)
   #:use-module (ice-9 getopt-long)
-  #:use-module (mes mes-0)
   #:use-module (mes misc)
 
   #:use-module (mescc info)
@@ -40,10 +39,9 @@
             mescc:link
             multi-opt))
 
-(define GUILE-with-output-to-file with-output-to-file)
-(define (with-output-to-file file-name thunk)
+(define (with-output-to-file* file-name thunk)
   (if (equal? file-name "-") (thunk)
-      (GUILE-with-output-to-file file-name thunk)))
+      (with-output-to-file file-name thunk)))
 
 (define (mescc:preprocess options)
   (let* ((pretty-print/write (string->symbol (option-ref options 'write (if guile? "pretty-print" "write"))))
@@ -64,7 +62,7 @@
          (arch (arch-get options))
          (defines (append (arch-get-defines options) defines))
          (verbose? (count-opt options 'verbose)))
-    (with-output-to-file ast-file-name
+    (with-output-to-file* ast-file-name
       (lambda _ (for-each (cut c->ast prefix defines includes arch pretty-print/write verbose? <>) files)))))
 
 (define (c->ast prefix defines includes arch write verbose? file-name)
@@ -89,7 +87,7 @@
                     (filter (negate (cut eq? <> 'functions)) align))))
     (when verbose?
       (format (current-error-port) "dumping: ~a\n" M1-file-name))
-    (with-output-to-file M1-file-name
+    (with-output-to-file* M1-file-name
       (cut infos->M1 M1-file-name infos #:align align #:verbose? verbose?))
     M1-file-name))
 
@@ -183,7 +181,7 @@
                     (filter (negate (cut eq? <> 'functions)) align))))
     (when verbose?
       (format (current-error-port) "dumping: ~a\n" M1-file-name))
-    (with-output-to-file M1-file-name
+    (with-output-to-file* M1-file-name
       (cut infos->M1 M1-file-name infos #:align align))
     (or (M1->hex2 options (list M1-file-name))
         (exit 1))))

scaffold/argv.kaem

@@ -24,15 +24,14 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
-    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -f include/mes/lib-mini.h                   \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
     -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/mes/eputs.c                          \
     -f lib/string/strcmp.c                      \
     -f scaffold/argv.c                          \

scaffold/global-array.kaem

@@ -30,7 +30,7 @@ M2-Planet                                       \
     -f lib/mes/globals.c                        \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/string/strlen.c                      \
     -f lib/string/strcpy.c                      \
     -f lib/mes/eputs.c                          \

scaffold/hello.kaem

@@ -24,15 +24,14 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
-    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -f include/mes/lib-mini.h                   \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
     -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/mes/eputs.c                          \
     -f scaffold/hello.c                         \
     -o scaffold/hello.M1

scaffold/local-array.kaem

@@ -30,7 +30,7 @@ M2-Planet                                       \
     -f lib/mes/globals.c                        \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/string/strlen.c                      \
     -f lib/string/strcpy.c                      \
     -f lib/mes/eputs.c                          \

scaffold/local-static-array.kaem

@@ -30,7 +30,7 @@ M2-Planet                                       \
     -f lib/mes/globals.c                        \
     -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/string/strlen.c                      \
     -f lib/string/strcpy.c                      \
     -f lib/mes/eputs.c                          \

scaffold/main.kaem

@@ -24,7 +24,6 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
-    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \

scaffold/read.kaem

@@ -24,28 +24,29 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}
 
 M2-Planet                                       \
-    --bootstrap-mode                            \
     --debug                                     \
     --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
     -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
-    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
+    -f include/mes/lib-mini.h                   \
     -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
+    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
     -f include/linux/${mes_cpu}/syscall.h       \
+    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
     -f lib/m2/cast.c                            \
+    -f include/mes/lib.h                        \
     -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
     -f lib/mes/eputs.c                          \
     -f lib/linux/brk.c                          \
-    -f lib/m2/malloc.c                          \
+    -f lib/linux/malloc.c                       \
     -f lib/string/memset.c                      \
-    -f lib/m2/read.c                            \
+    -f lib/linux/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/linux/open.c                         \
+    -f include/sys/types.h                      \
+    -f include/stdio.h                          \
     -f scaffold/read.c                          \
     -o scaffold/read.M1
 

simple.make

@@ -1,6 +1,6 @@
 # GNU Mes --- Maxwell Equations of Software
 # Copyright © 2019 Jeremiah Orians <jeremiah@pdp10.guru>
-# Copyright © 2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -76,20 +76,26 @@ M2_SOURCES =					\
  lib/linux/x86-mes-m2/crt1.c			\
  lib/linux/x86-mes-m2/_exit.c			\
  lib/linux/x86-mes-m2/_write.c			\
+ lib/mes/globals.c				\
  lib/m2/cast.c					\
- lib/m2/exit.c					\
- lib/mes/write.c				\
+ lib/stdlib/exit.c				\
+ lib/stub/__buffered_read.c			\
  lib/linux/x86-mes-m2/syscall.c			\
+ lib/stub/__raise.c				\
  lib/linux/brk.c				\
- lib/stdlib/malloc.c				\
+ lib/linux/malloc.c				\
  lib/string/memset.c				\
-						\
- lib/m2/read.c					\
+ lib/linux/read.c				\
  lib/mes/fdgetc.c				\
+ lib/linux/lseek.c				\
+ lib/posix/write.c				\
+						\
  lib/stdio/getchar.c				\
  lib/stdio/putchar.c				\
- lib/m2/open.c					\
- lib/m2/mes_open.c				\
+ lib/stub/__buffered_read.c			\
+ lib/linux/_open3.c				\
+ lib/linux/open.c				\
+ lib/mes/mes_open.c				\
  lib/string/strlen.c				\
  lib/mes/eputs.c				\
  lib/mes/fdputc.c				\
@@ -118,15 +124,16 @@ M2_SOURCES =					\
  lib/mes/fdungetc.c				\
  lib/posix/setenv.c				\
  lib/linux/access.c				\
- lib/m2/chmod.c					\
+ lib/linux/chmod.c				\
  lib/linux/ioctl3.c  				\
  lib/m2/isatty.c				\
  lib/linux/fork.c				\
  lib/m2/execve.c				\
  lib/m2/execv.c					\
- lib/m2/waitpid.c				\
+ lib/linux/wait4.c				\
+ lib/linux/waitpid.c				\
  lib/linux/gettimeofday.c			\
- lib/m2/clock_gettime.c				\
+ lib/linux/clock_gettime.c			\
  lib/m2/time.c					\
  lib/linux/_getcwd.c				\
  lib/m2/getcwd.c				\
@@ -137,12 +144,6 @@ M2_SOURCES =					\
  lib/linux/unlink.c				\
  src/m2.c
 
-M2_TODO =					\
- lib/m2/file_print.c				\
- lib/mes/ntoab.c				\
- lib/mes/fdgetc.c				\
- lib/mes/fdungetc.c
-
 INCLUDES =					\
  include/mes/builtins.h				\
  include/mes/constants.h			\
@@ -186,8 +187,19 @@ bin/gc-gcc: simple.make $(GCC_SOURCES) $(TEST_GC_SOURCES) $(INCLUDES) | bin
 	$(CC) $(CFLAGS) -D GC_TEST=1 $(GCC_SOURCES) $(TEST_GC_SOURCES) -o $@
 
 M2_PLANET_INCLUDES =				\
- include/m2/lib.h				\
+ include/mes/config.h				\
+ include/mes/lib-mini.h				\
+ include/mes/lib.h				\
  include/linux/x86/syscall.h			\
+ include/time.h					\
+ include/sys/time.h				\
+ include/sys/types.h				\
+ include/stdio.h				\
+ include/limits.h				\
+ include/sys/resource.h				\
+ include/sys/stat.h				\
+ include/fcntl.h				\
+ include/signal.h				\
  include/mes/mes.h				\
  include/mes/builtins.h				\
  include/mes/constants.h			\
@@ -216,12 +228,12 @@ m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1
 	    -o $@
 
 bin/mes-m2: m2/mes-m2.hex2
-	hex2					\
-	    --architecture $(M2_PLANET_ARCH)	\
-	    --little-endian			\
-	    --base-address 0x1000000		\
-	    -f lib/x86-mes/elf32-header.hex2	\
-	    -f m2/mes-m2.hex2			\
+	hex2						\
+	    --architecture $(M2_PLANET_ARCH)		\
+	    --little-endian				\
+	    --base-address 0x1000000			\
+	    -f lib/linux/x86-mes/elf32-header.hex2	\
+	    -f m2/mes-m2.hex2				\
 	    -o $@
 	cp -f $@ bin/mes
 

simple.sh

@@ -36,47 +36,48 @@ cat > include/mes/config.h <<EOF
 EOF
 
 ## Build ##
-gcc -g -D HAVE_CONFIG_H=1 -I include\
-    -o out-system-libc/mes\
-    \
-    lib/mes/eputs.c\
-    lib/mes/oputs.c\
-    \
-    lib/mes/cast.c\
-    lib/mes/itoa.c\
-    lib/mes/ltoa.c\
-    lib/mes/ltoab.c\
-    lib/mes/ultoa.c\
-    lib/mes/utoa.c\
-    lib/mes/eputc.c\
-    lib/mes/fdgetc.c\
-    lib/mes/fdputc.c\
-    lib/mes/fdputs.c\
-    lib/mes/fdungetc.c\
-    lib/mes/mes_open.c\
-    lib/mes/ntoab.c\
-    lib/mes/oputc.c\
-    \
-    lib/mes/__assert_fail.c\
-    lib/mes/assert_msg.c\
-    \
-    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/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\
+gcc -g -D HAVE_CONFIG_H=1 -I include            \
+    -o out-system-libc/mes                      \
+                                                \
+    lib/mes/eputs.c                             \
+    lib/mes/oputs.c                             \
+                                                \
+    lib/mes/cast.c                              \
+    lib/mes/itoa.c                              \
+    lib/mes/ltoa.c                              \
+    lib/mes/ltoab.c                             \
+    lib/mes/ultoa.c                             \
+    lib/mes/utoa.c                              \
+    lib/mes/eputc.c                             \
+    lib/mes/fdgetc.c                            \
+    lib/mes/fdputc.c                            \
+    lib/mes/fdputs.c                            \
+    lib/mes/fdungetc.c                          \
+    lib/mes/mes_open.c                          \
+    lib/mes/ntoab.c                             \
+    lib/mes/oputc.c                             \
+                                                \
+    lib/mes/__assert_fail.c                     \
+    lib/mes/assert_msg.c                        \
+                                                \
+    src/builtins.c                              \
+    src/cc.c                                    \
+    src/core.c                                  \
+    src/display.c                               \
+    src/eval-apply.c                            \
+    src/gc.c                                    \
+    src/globals.c                               \
+    src/hash.c                                  \
+    src/lib.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
 
 ## Check ##
@@ -106,7 +107,7 @@ MES_DEBUG=3 MES_ARENA=10000 MES_MAX_ARENA=10000 MES_BOOT=tests/gc.test out-syste
 #          lib/linux/$mes_cpu-mes-mescc/_write.c\
 #          \
 #          lib/mes/globals.c\
-#          lib/mes/mini-write.c\
+#          lib/mes/write.c\
 #          lib/string/strlen.c\
 #          \
 #          scaffold/hello.c
@@ -120,7 +121,7 @@ cat                                             \
     lib/linux/$mes_cpu-mes-mescc/_write.c       \
                                                 \
     lib/mes/globals.c                           \
-    lib/mes/mini-write.c                        \
+    lib/mes/write.c                             \
     lib/string/strlen.c                         \
                                                 \
     scaffold/hello.c                            \
@@ -164,115 +165,121 @@ EOF
 
 ## Build ##
 compiler=gcc     # not configurable
-$CC -g -D HAVE_CONFIG_H=1 -I include -I include/$mes_kernel/$mes_cpu\
-    -nostdinc -nostdlib -fno-builtin -fno-stack-protector\
-    -o out-mes/mes\
-    \
-    lib/linux/$mes_cpu-mes-gcc/crt1.c\
-    \
-    lib/mes/globals.c\
-    lib/mes/eputs.c\
-    lib/mes/oputs.c\
-    \
-    lib/posix/write.c\
-    lib/string/strlen.c\
-    lib/stdlib/puts.c\
-    lib/stdlib/exit.c\
-    lib/$mes_kernel/$mes_cpu-mes-$compiler/_exit.c\
-    lib/$mes_kernel/$mes_cpu-mes-$compiler/_write.c\
-    \
-    lib/mes/cast.c\
-    lib/mes/itoa.c\
-    lib/mes/ltoa.c\
-    lib/mes/ltoab.c\
-    lib/mes/ultoa.c\
-    lib/mes/utoa.c\
-    lib/mes/eputc.c\
-    lib/mes/fdgetc.c\
-    lib/mes/fdputc.c\
-    lib/mes/fdputs.c\
-    lib/mes/fdungetc.c\
-    lib/mes/mes_open.c\
-    lib/mes/ntoab.c\
-    lib/mes/oputc.c\
-    \
-    lib/stdlib/atoi.c\
-    lib/mes/abtol.c\
-    lib/ctype/isdigit.c\
-    lib/ctype/isnumber.c\
-    lib/ctype/isspace.c\
-    lib/ctype/isxdigit.c\
-    \
-    lib/mes/__assert_fail.c\
-    lib/mes/assert_msg.c\
-    lib/mes/__buffered_read.c\
-    lib/mes/__mes_debug.c\
-    lib/posix/execv.c\
-    lib/posix/getcwd.c\
-    lib/posix/getenv.c\
-    lib/posix/isatty.c\
-    lib/posix/open.c\
-    lib/posix/setenv.c\
-    lib/posix/wait.c\
-    lib/stdio/fgetc.c\
-    lib/stdio/fputc.c\
-    lib/stdio/fputs.c\
-    lib/stdio/getc.c\
-    lib/stdio/getchar.c\
-    lib/stdio/putc.c\
-    lib/stdio/putchar.c\
-    lib/stdio/ungetc.c\
-    lib/stdlib/free.c\
-    lib/stdlib/malloc.c\
-    lib/stdlib/realloc.c\
-    lib/string/memchr.c\
-    lib/string/memcmp.c\
-    lib/string/memcpy.c\
-    lib/string/memmove.c\
-    lib/string/memset.c\
-    lib/string/strcmp.c\
-    lib/string/strcpy.c\
-    lib/string/strncmp.c\
-    \
-    lib/linux/lseek.c\
-    \
-    lib/linux/access.c\
-    lib/linux/brk.c\
-    lib/linux/chmod.c\
-    lib/linux/clock_gettime.c\
-    lib/linux/dup.c\
-    lib/linux/dup2.c\
-    lib/linux/execve.c\
-    lib/linux/fork.c\
-    lib/linux/fsync.c\
-    lib/linux/_getcwd.c\
-    lib/linux/gettimeofday.c\
-    lib/linux/ioctl3.c\
-    lib/linux/_open3.c\
-    lib/linux/read.c\
-    lib/linux/_read.c\
-    lib/linux/time.c\
-    lib/linux/unlink.c\
-    lib/linux/waitpid.c\
-    lib/linux/$mes_cpu-mes-$compiler/syscall.c\
-    \
-    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/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\
+$CC -g -D HAVE_CONFIG_H=1                               \
+    -I include -I include/$mes_kernel/$mes_cpu          \
+       -nostdinc -nostdlib                              \
+    -fno-builtin -fno-stack-protector                   \
+    -o out-mes/mes                                      \
+                                                        \
+    lib/linux/$mes_cpu-mes-gcc/crt1.c                   \
+                                                        \
+    lib/mes/globals.c                                   \
+    lib/mes/eputs.c                                     \
+    lib/mes/oputs.c                                     \
+                                                        \
+    lib/posix/write.c                                   \
+    lib/string/strlen.c                                 \
+    lib/stdlib/puts.c                                   \
+    lib/stdlib/exit.c                                   \
+    lib/$mes_kernel/$mes_cpu-mes-$compiler/_exit.c      \
+    lib/$mes_kernel/$mes_cpu-mes-$compiler/_write.c     \
+                                                        \
+    lib/mes/cast.c                                      \
+    lib/mes/itoa.c                                      \
+    lib/mes/ltoa.c                                      \
+    lib/mes/ltoab.c                                     \
+    lib/mes/ultoa.c                                     \
+    lib/mes/utoa.c                                      \
+    lib/mes/eputc.c                                     \
+    lib/mes/fdgetc.c                                    \
+    lib/mes/fdputc.c                                    \
+    lib/mes/fdputs.c                                    \
+    lib/mes/fdungetc.c                                  \
+    lib/mes/mes_open.c                                  \
+    lib/mes/ntoab.c                                     \
+    lib/mes/oputc.c                                     \
+                                                        \
+    lib/stdlib/atoi.c                                   \
+    lib/mes/abtol.c                                     \
+    lib/ctype/isdigit.c                                 \
+    lib/ctype/isnumber.c                                \
+    lib/ctype/isspace.c                                 \
+    lib/ctype/isxdigit.c                                \
+                                                        \
+    lib/stub/__raise.c                                  \
+    lib/mes/__assert_fail.c                             \
+    lib/mes/assert_msg.c                                \
+    lib/mes/__buffered_read.c                           \
+    lib/mes/__mes_debug.c                               \
+    lib/posix/execv.c                                   \
+    lib/posix/getcwd.c                                  \
+    lib/posix/getenv.c                                  \
+    lib/posix/isatty.c                                  \
+    lib/posix/open.c                                    \
+    lib/posix/setenv.c                                  \
+    lib/posix/wait.c                                    \
+    lib/stdio/fgetc.c                                   \
+    lib/stdio/fputc.c                                   \
+    lib/stdio/fputs.c                                   \
+    lib/stdio/getc.c                                    \
+    lib/stdio/getchar.c                                 \
+    lib/stdio/putc.c                                    \
+    lib/stdio/putchar.c                                 \
+    lib/stdio/ungetc.c                                  \
+    lib/stdlib/free.c                                   \
+    lib/linux/malloc.c                                  \
+    lib/stdlib/realloc.c                                \
+    lib/string/memchr.c                                 \
+    lib/string/memcmp.c                                 \
+    lib/string/memcpy.c                                 \
+    lib/string/memmove.c                                \
+    lib/string/memset.c                                 \
+    lib/string/strcmp.c                                 \
+    lib/string/strcpy.c                                 \
+    lib/string/strncmp.c                                \
+                                                        \
+    lib/linux/lseek.c                                   \
+                                                        \
+    lib/linux/access.c                                  \
+    lib/linux/brk.c                                     \
+    lib/linux/chmod.c                                   \
+    lib/linux/clock_gettime.c                           \
+    lib/linux/dup.c                                     \
+    lib/linux/dup2.c                                    \
+    lib/linux/execve.c                                  \
+    lib/linux/fork.c                                    \
+    lib/linux/fsync.c                                   \
+    lib/linux/_getcwd.c                                 \
+    lib/linux/gettimeofday.c                            \
+    lib/linux/ioctl3.c                                  \
+    lib/linux/_open3.c                                  \
+    lib/linux/read.c                                    \
+    lib/linux/_read.c                                   \
+    lib/linux/time.c                                    \
+    lib/linux/unlink.c                                  \
+    include/sys/resource.h                              \
+    lib/linux/wait4.c                                   \
+    lib/linux/waitpid.c                                 \
+    lib/linux/$mes_cpu-mes-$compiler/syscall.c          \
+                                                        \
+    src/builtins.c                                      \
+    src/cc.c                                            \
+    src/core.c                                          \
+    src/display.c                                       \
+    src/eval-apply.c                                    \
+    src/gc.c                                            \
+    src/globals.c                                       \
+    src/hash.c                                          \
+    src/lib.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
 
 ## Check ##
@@ -302,7 +309,7 @@ MES_DEBUG=3 MES_ARENA=10000 MES_MAX_ARENA=10000 MES_BOOT=tests/gc.test out-mes/m
 #          lib/linux/$mes_cpu-mes-mescc/_write.c\
 #          \
 #          lib/mes/globals.c\
-#          lib/mes/mini-write.c\
+#          lib/mes/write.c\
 #          lib/string/strlen.c\
 #          \
 #          scaffold/hello.c
@@ -316,7 +323,7 @@ cat                                             \
     lib/linux/$mes_cpu-mes-mescc/_write.c       \
                                                 \
     lib/mes/globals.c                           \
-    lib/mes/mini-write.c                        \
+    lib/mes/write.c                             \
     lib/string/strlen.c                         \
                                                 \
     scaffold/hello.c                            \

src/core.c

@@ -148,7 +148,7 @@ length (struct scm *x)
 struct scm *
 error (struct scm *key, struct scm *x)
 {
-#if !__MESC_MES__ && !__M2_PLANET__
+#if !__MESC_MES__ && !__M2__
   struct scm *throw = module_ref (R0, cell_symbol_throw);
   if (throw != cell_undefined)
     return apply (throw, cons (key, cons (x, cell_nil)), R0);

src/gc.c

@@ -1,6 +1,7 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
  *
  * This file is part of GNU Mes.
  *
@@ -30,9 +31,6 @@
 
 int g_dump_filedes;
 
-#define M2_CELL_SIZE 1U
-// CONSTANT M2_CELL_SIZE 12
-
 char *
 cell_bytes (struct scm *x)
 {
@@ -40,16 +38,20 @@ cell_bytes (struct scm *x)
   return p + (2 * sizeof (long));
 }
 
+#if __M2__
+#define U10 10
+#define U100 100
+#else
 #define U10 10U
-// CONSTANT U10 10
 #define U100 100U
-// CONSTANT U100 100
+#endif
+
 void
 gc_init ()
 {
 #if SYSTEM_LIBC
   ARENA_SIZE = 100000000;       /* 2.3GiB */
-#elif ! __M2_PLANET__
+#elif ! __M2__
   ARENA_SIZE = 300000;          /* 32b: 3MiB, 64b: 6 MiB */
 #else
   ARENA_SIZE = 20000000;
@@ -326,11 +328,11 @@ void
 gc_up_arena ()
 {
   long old_arena_bytes = (ARENA_SIZE + JAM_SIZE) * sizeof (struct scm);
-  if (ARENA_SIZE >> 1 < MAX_ARENA_SIZE >> 2)
+  if (ARENA_SIZE / 2 < MAX_ARENA_SIZE / 4)
     {
-      ARENA_SIZE = ARENA_SIZE << 1;
-      JAM_SIZE = JAM_SIZE << 1;
-      GC_SAFETY = GC_SAFETY << 1;
+      ARENA_SIZE = ARENA_SIZE * 2;
+      JAM_SIZE = JAM_SIZE * 2;
+      GC_SAFETY = GC_SAFETY * 2;
     }
   else
     ARENA_SIZE = MAX_ARENA_SIZE - JAM_SIZE;
@@ -448,7 +450,7 @@ void
 gc_flip ()
 {
   if (g_free - g_news > JAM_SIZE)
-    JAM_SIZE = (g_free - g_news) + ((g_free - g_news) / 2);
+    JAM_SIZE = ((g_free - g_news) * 3) / 2;
 
   cell_arena = g_cells - M2_CELL_SIZE; /* For debugging. */
   gc_cellcpy (g_cells, g_news, (g_free - g_news) / M2_CELL_SIZE);

src/posix.c

@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #if SYSTEM_LIBC
-#define __raise(x) -1
+//#define __raise(x) -1
 #endif
 
 struct scm *
@@ -377,13 +377,14 @@ waitpid_ (struct scm *pid, struct scm *options)
   return cons (make_number (child), make_number (status));
 }
 
-#if __x86_64__
+#if __M2__
+/* Milliseconds for everyone else.  */
+#define TIME_UNITS_PER_SECOND 1000
+#elif __x86_64__
 /* Nanoseconds on 64-bit systems with POSIX timers.  */
-// CONSTANT TIME_UNITS_PER_SECOND 1000000000
 #define TIME_UNITS_PER_SECOND 1000000000U
 #else
 /* Milliseconds for everyone else.  */
-// CONSTANT TIME_UNITS_PER_SECOND 1000
 #define TIME_UNITS_PER_SECOND 1000U
 #endif
 
@@ -408,8 +409,12 @@ gettimeofday_ ()                /*:((name . "gettimeofday")) */
   return cons (make_number (time->tv_sec), make_number (time->tv_usec));
 }
 
+#if __M2__
+#define UL1000000000 1000000000
+#else
 #define UL1000000000 1000000000UL
-// CONSTANT UL1000000000 1000000000
+#endif
+
 long
 seconds_and_nanoseconds_to_long (long s, long ns)
 {

src/symbol.c

@@ -23,16 +23,6 @@
 
 #include <string.h>
 
-// char const *MES_VERSION = "0.24";
-
-#if __M2_PLANET__
-#define M2_CELL_SIZE 12
-// CONSTANT M2_CELL_SIZE 12
-#else
-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-#endif
-
 struct scm *
 init_symbol (struct scm *x, long type, char const *name)
 {

src/test/gc.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-
 int g_debug;
 
 void

src/vector.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -21,14 +21,6 @@
 #include "mes/lib.h"
 #include "mes/mes.h"
 
-#if __M2_PLANET__
-#define M2_CELL_SIZE 12
-// CONSTANT M2_CELL_SIZE 12
-#else
-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-#endif
-
 struct scm *
 make_vector_ (long k, struct scm *e)
 {