mescc: Mes C Library: Add x86_64 libc+tcc support.

* include/linux/x86/syscall.h: Move SYS_ defines from tcc.c.
* include/linux/x86_64/syscall.h: Add SYS_ defines for tcc.
* lib/x86-mes-gcc/setjmp.c: Rename from lib/libc+tcc-gcc.c
* lib/x86-mes/setjmp.c: Rename from lib/libc+tcc-mes.c
* lib/linux/tcc.c: Update.

.gitignore

@@ -41,8 +41,6 @@
 *.x86_64-out
 
 
-/lib/x86-mes-gcc
-/lib/x86-mes-tcc
 /src/*.h
 /src/*.i
 /src/mes

build-aux/build-cc.sh

@@ -53,11 +53,11 @@ ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/linux/x86_64-mes-gcc/c
 # ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/linux/x86_64/crtn
 ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libc-mini
 ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libc
-# ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libgetopt
-# ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libc+tcc
-# ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libtcc1
 # ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libc+gnu
 # ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libg
+ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libgetopt
+ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libc+tcc
+ARCHDIR=1 NOLINK=1 sh ${srcdest}build-aux/cc64-mes.sh lib/libtcc1
 
 sh ${srcdest}build-aux/cc64-mes.sh scaffold/main
 sh ${srcdest}build-aux/cc64-mes.sh scaffold/hello

include/linux/x86/syscall.h

@@ -20,9 +20,11 @@
 #ifndef __MES_LINUX_X86_SYSCALL_H
 #define __MES_LINUX_X86_SYSCALL_H 1
 
+// libc-mini
 // #define SYS_exit    0x01
 // #define SYS_write   0x04
 
+// libc
 #define SYS_fork    0x02
 #define SYS_read    0x03
 #define SYS_open    0x05
@@ -35,4 +37,12 @@
 #define SYS_ioctl   0x36
 #define SYS_fsync   0x76
 
+// libc+tcc
+#define SYS_close  0x06
+#define SYS_lseek  0x13
+#define SYS_unlink 0x0a
+#define SYS_rmdir  0x28
+#define SYS_stat   0x6a
+#define SYS_getcwd 0xb7
+
 #endif // __MES_LINUX_X86_SYSCALL_H

include/linux/x86_64/syscall.h

@@ -20,9 +20,11 @@
 #ifndef __MES_LINUX_X86_64_SYSCALL_H
 #define __MES_LINUX_X86_64_SYSCALL_H 1
 
+// libc-mini
 // #define SYS_write   0x01
 // #define SYS_exit    0x3c
 
+// libc
 #define SYS_fork    0x39
 #define SYS_read    0x00
 #define SYS_open    0x02
@@ -35,4 +37,12 @@
 #define SYS_ioctl   0x10
 #define SYS_fsync   0x4a
 
+// libc+tcc
+#define SYS_close  0x03
+#define SYS_lseek  0x08
+#define SYS_unlink 0x57
+#define SYS_rmdir  0x54
+#define SYS_stat   0x04
+#define SYS_getcwd 0x4f
+
 #endif // __MES_LINUX_X86_64_SYSCALL_H

lib/libc+tcc.c

@@ -46,14 +46,14 @@
 #endif
 
 #if __MESC__
-
+#include <x86-mes/setjmp.c>
-#include <libc+tcc-mes.c>
+#elif __i386__
-
+#include <x86-mes-gcc/setjmp.c>
-#else // !__MESC__
+#elif __x86_64__
-
+#include <x86_64-mes-gcc/setjmp.c>
-#include <libc+tcc-gcc.c>
+#else
-
+#error arch not supported
-#endif // !__MESC__
+#endif
 
 char *
 search_path (char const *file_name)

lib/linux/tcc.c

@@ -18,13 +18,6 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define SYS_close  0x06
-#define SYS_lseek  0x13
-#define SYS_unlink 0x0a
-#define SYS_rmdir  0x28
-#define SYS_stat   0x6a
-#define SYS_getcwd 0xb7
-
 int
 close (int filedes)
 {

lib/x86-mes/setjmp.c

@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -70,6 +70,6 @@ setjmp (__jmp_buf *env)
   int *p = (int*)&env;
   env[0].__bp = p[-2];
   env[0].__pc = p[-1];
-  env[0].__sp = (int)&env;
+  env[0].__sp = (long)&env;
   return 0;
 }

lib/x86_64-mes-gcc/setjmp.c

@@ -0,0 +1,75 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+int errno;
+
+void
+longjmp (jmp_buf env, int val)
+{
+  val = val == 0 ? 1 : val;
+  asm ("mov    %esi,%eax\n\t"           // val
+
+       "mov    0x00(%rdi),%rbp\n\t"     // env->__bp
+       "mov    0x08(%rdi),%rbx\n\t"     // env->__pc
+       "mov    0x16(%rdi),%rsp\n\t"     // env->__sp
+       "jmp    *%rbx\n\t"               // jmp *PC
+       );
+  // not reached
+  exit (42);
+}
+
+#if 0
+int
+setjmp_debug (jmp_buf env, int val)
+{
+  int i;
+#if 1
+  i = env->__bp;
+  i = env->__pc;
+  i = env->__sp;
+#else
+  i = env[0].__bp;
+  i = env[0].__pc;
+  i = env[0].__sp;
+#endif
+  return val == 0 ? 1 : val;
+}
+#endif
+
+int
+setjmp (jmp_buf env)
+{
+  int *p = (int*)&env;
+  env[0].__bp = p[-2];
+  env[0].__pc = p[-1];
+  env[0].__sp = (long)&env;
+  return 0;
+}