From 967d1473be45532f6a29ea24645d9b175f300936 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 9 Aug 2020 19:25:25 +0200 Subject: [PATCH] mescc: Mes C Library: Add M2-Planet support. Mes can now be built with M2-Planet by running kaem --verbose --strict * include/linux/x86/syscall.h (SYS_getcwd, SYS_dup, SYS_dup2, SYS_unlilnk, SYS_gettimeofday, SYS_clock_gettime, SYS_time): Move to libc section. Add M2-Planet constants. * include/m2/lib.h (struct timezone, struct timespec): struct timeval): Define. Add M2-Planet flavor prototypes for mes libc. * include/mes/m2.h: Remove macros. * include/mes/mes.h (g_start_time, __gettimeofday_time, __get_internal_run_time_ts): Declare. * src/mes.c (init): Initialize them. * src/posix.c: Use them. * lib/linux/_getcwd.c: Support M2-Planet. * lib/linux/access.c: Likewise. * lib/linux/chmod.c: Likewise. * lib/linux/clock_gettime.c: Likewise. * lib/linux/dup.c: Likewise. * lib/linux/dup2.c: Likewise. * lib/linux/gettimeofday.c: Likewise. * lib/linux/read.c: Likewise. * lib/linux/unlink.c: Likewise. * lib/mes/fdgetc.c: Likewise. * lib/mes/fdputc.c: Likewise. * lib/posix/getenv.c: Likewise. * lib/posix/setenv.c: Likewise. * lib/stdlib/realloc.c: Likewise. * lib/string/memcmp.c: Likewise. * lib/string/memcpy.c: Likewise. * lib/m2/abtol.c: New file. * lib/m2/chmod.c: New file. * lib/m2/clock_gettime.c: New file. * lib/m2/execv.c: New file. * lib/m2/execve.c: New file. * lib/m2/exit.c: New file. * lib/m2/getcwd.c: New file. * lib/m2/ioctl.c: New file. * lib/m2/isatty.c: New file. * lib/m2/ntoab.c: New file. * lib/m2/strncmp.c: New file. * lib/m2/time.c: New file. * lib/m2/waitpid.c: New file. * simple.make: Use them. Remove macro preprocessing for M2-Planet. * kaem.run: New file. --- kaem.run | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++ simple.make | 10 ++-- 2 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 kaem.run diff --git a/kaem.run b/kaem.run new file mode 100644 index 00000000..9b60ca8c --- /dev/null +++ b/kaem.run @@ -0,0 +1,142 @@ +#! /bin/sh +# Copyright © 2019 Jan (janneke) Nieuwenhuizen +# +# 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 . + +# Usage: +# kaem --verbose --strict + +./build-aux/pointer.sh +./build-aux/pointer.sh +./build-aux/pointer.sh +./build-aux/pointer.sh +./build-aux/pointer.sh + +mes_cpu=${mes_cpu:-x86} +stage0_cpu=${stage0_cpu:-x86} + +M2-Planet \ + --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 lib/linux/${mes_cpu}-mes-m2/_write.c \ + -f lib/mes/globals.c \ + -f lib/m2/exit.c \ + -f lib/mes/mini-write.c \ + -f lib/linux/${mes_cpu}-mes-m2/syscall.c \ + -f include/linux/${mes_cpu}/syscall.h \ + -f lib/linux/brk.c \ + -f lib/m2/malloc.c \ + -f lib/string/memset.c \ + -f lib/m2/read.c \ + -f lib/mes/fdgetc.c \ + -f lib/stdio/getchar.c \ + -f lib/stdio/putchar.c \ + -f lib/m2/open.c \ + -f lib/m2/mes_open.c \ + -f lib/string/strlen.c \ + -f lib/mes/eputs.c \ + -f lib/mes/fdputc.c \ + -f lib/mes/eputc.c \ + \ + -f include/mes/mes.h \ + -f include/mes/m2.h \ + -f include/mes/builtins.h \ + -f include/mes/constants.h \ + -f include/mes/symbols.h \ + \ + -f lib/mes/__assert_fail.c \ + -f lib/mes/assert_msg.c \ + \ + -f lib/mes/fdputc.c \ + -f lib/string/strncmp.c \ + -f lib/posix/getenv.c \ + -f lib/mes/fdputs.c \ + -f lib/m2/ntoab.c \ + -f lib/ctype/isdigit.c \ + -f lib/ctype/isxdigit.c \ + -f lib/ctype/isspace.c \ + -f lib/ctype/isnumber.c \ + -f lib/mes/abtol.c \ + -f lib/stdlib/atoi.c \ + -f lib/string/memcpy.c \ + -f lib/stdlib/free.c \ + -f lib/stdlib/realloc.c \ + -f lib/string/strcpy.c \ + -f lib/mes/itoa.c \ + -f lib/mes/fdungetc.c \ + -f lib/posix/setenv.c \ + -f lib/linux/access.c \ + -f lib/m2/chmod.c \ + -f lib/m2/ioctl.c \ + -f lib/m2/isatty.c \ + -f lib/linux/fork.c \ + -f lib/m2/execve.c \ + -f lib/m2/execv.c \ + -f lib/m2/waitpid.c \ + -f lib/linux/gettimeofday.c \ + -f lib/m2/clock_gettime.c \ + -f lib/m2/time.c \ + -f lib/linux/_getcwd.c \ + -f lib/m2/getcwd.c \ + -f lib/linux/dup.c \ + -f lib/linux/dup2.c \ + -f lib/string/strcmp.c \ + -f lib/string/memcmp.c \ + -f lib/linux/unlink.c \ + -f src/builtins.c \ + -f src/core.c \ + -f src/display.c \ + -f src/eval-apply.c \ + -f src/gc.c \ + -f src/hash.c \ + -f src/lib.c \ + -f src/math.c \ + -f src/mes.c \ + -f src/module.c \ + -f src/posix.c \ + -f src/reader.c \ + -f src/stack.c \ + -f src/string.c \ + -f src/struct.c \ + -f src/symbol.c \ + -f src/vector.c \ + -o bin/mes.M1 + +blood-elf -f bin/mes.M1 -o bin/mes.blood-elf-M1 + +M1 \ + --architecture ${stage0_cpu} \ + --little-endian \ + -f lib/m2/${mes_cpu}/${mes_cpu}_defs.M1 \ + -f lib/${mes_cpu}-mes/${mes_cpu}.M1 \ + -f lib/linux/${mes_cpu}-mes-m2/crt1.M1 \ + -f bin/mes.M1 \ + -f bin/mes.blood-elf-M1 \ + -o bin/mes.hex2 + +hex2 \ + --architecture ${stage0_cpu} \ + --little-endian \ + --base-address 0x1000000 \ + -f lib/m2/${mes_cpu}/ELF-${mes_cpu}.hex2 \ + -f bin/mes.hex2 \ + -o bin/mes-m2 + +echo Running mes-m2 +./bin/mes-m2 -c "(display 'Hello,M2-mes!) (newline)" diff --git a/simple.make b/simple.make index 2f5778b2..227eecc3 100644 --- a/simple.make +++ b/simple.make @@ -73,7 +73,8 @@ MES_SOURCES = \ M2_SOURCES = \ lib/linux/x86-mes-m2/crt1.c \ - lib/linux/x86-mes-m2/mini.c \ + lib/linux/x86-mes-m2/_exit.c \ + lib/linux/x86-mes-m2/_write.c \ lib/m2/exit.c \ lib/mes/write.c \ lib/linux/x86-mes-m2/syscall.c \ @@ -193,8 +194,8 @@ bin/mes-m2.blood-elf.M1: bin/mes-m2.M1 bin/mes-m2.hex2: bin/mes-m2.blood-elf.M1 M1 \ - --LittleEndian \ --architecture $(M2_PLANET_ARCH) \ + --little-endian \ -f lib/m2/x86/x86_defs.M1 \ -f lib/x86-mes/x86.M1 \ -f lib/linux/x86-mes-m2/crt1.M1 \ @@ -204,10 +205,9 @@ bin/mes-m2.hex2: bin/mes-m2.blood-elf.M1 bin/mes-m2: bin/mes-m2.hex2 hex2 \ - --LittleEndian \ --architecture $(M2_PLANET_ARCH) \ - --BaseAddress 0x1000000 \ - --exec_enable \ + --little-endian \ + --base-address 0x1000000 \ -f lib/x86-mes/elf32-header.hex2 \ -f bin/mes-m2.hex2 \ -o $@