Deduplicate arch/emscripten/bits directory

And resync Emscripten specific headers with arch/i386/bits (if possible).

Author: kleisauke

src/library_syscall.js

@@ -66,13 +66,13 @@ var SyscallsLibrary = {
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_size, 'stat.size', 'i64') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_blksize, '4096', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_blocks, 'stat.blocks', 'i32') }}};
+      {{{ makeSetValue('buf', C_STRUCTS.stat.st_ino, 'stat.ino', 'i64') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_sec, '(stat.atime.getTime() / 1000)|0', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_nsec, '0', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_sec, '(stat.mtime.getTime() / 1000)|0', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_nsec, '0', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_sec, '(stat.ctime.getTime() / 1000)|0', 'i32') }}};
       {{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_nsec, '0', 'i32') }}};
-      {{{ makeSetValue('buf', C_STRUCTS.stat.st_ino, 'stat.ino', 'i64') }}};
       return 0;
     },
     doMsync: function(addr, stream, len, flags, offset) {

src/struct_info.json

@@ -55,6 +55,7 @@
                 "st_size",
                 "st_blksize",
                 "st_blocks",
+                "st_ino",
                 {
                     "st_atim": [
                         "tv_sec",
@@ -72,8 +73,7 @@
                         "tv_sec",
                         "tv_nsec"
                     ]
-                },
-                "st_ino"
+                }
             ]
         }
     },

system/lib/libc/musl/arch/emscripten/bits/fenv.h

@@ -1,4 +1,14 @@
-#define FE_ALL_EXCEPT 0
+// XXX Emscripten in sync with musl/arch/x86_64/bits/fenv.h expect for these defines:
+// #define FE_INVALID    1
+// #define __FE_DENORM   2
+// #define FE_DIVBYZERO  4
+// #define FE_OVERFLOW   8
+// #define FE_UNDERFLOW  16
+// #define FE_INEXACT    32
+//
+// #define FE_ALL_EXCEPT 63
+#define FE_ALL_EXCEPT 0 // XXX Emscripten in sync with musl/arch/generic/bits/fenv.h
+// TODO(kleisauke): Perhaps we should sync this with musl/arch/i386/bits/fenv.h instead?
 
 #define FE_TONEAREST  0
 #define FE_DOWNWARD   0x400

system/lib/libc/musl/arch/emscripten/bits/mman.h

@@ -0,0 +1,2 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/mman.h
+#define MAP_32BIT      0x40

system/lib/libc/musl/arch/emscripten/bits/posix.h

@@ -1,2 +1,3 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/posix.h
 #define _POSIX_V6_ILP32_OFFBIG  1
 #define _POSIX_V7_ILP32_OFFBIG  1

system/lib/libc/musl/arch/emscripten/bits/reg.h

@@ -1,3 +1,4 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/reg.h
 #undef __WORDSIZE
 #define __WORDSIZE 32
 #define EBX 0

system/lib/libc/musl/arch/emscripten/bits/setjmp.h

@@ -1 +1,2 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/setjmp.h
 typedef unsigned long __jmp_buf[6];

system/lib/libc/musl/arch/emscripten/bits/signal.h

@@ -1,3 +1,4 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/signal.h
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
@@ -7,25 +8,44 @@
 #endif
 
 #ifdef _GNU_SOURCE
-#define REG_GS          0
-#define REG_FS          1
-#define REG_ES          2
-#define REG_DS          3
-#define REG_EDI         4
-#define REG_ESI         5
-#define REG_EBP         6
-#define REG_ESP         7
-#define REG_EBX         8
-#define REG_EDX         9
-#define REG_ECX         10
-#define REG_EAX         11
-#define REG_TRAPNO      12
-#define REG_ERR         13
-#define REG_EIP         14
-#define REG_CS          15
-#define REG_EFL         16
-#define REG_UESP        17
-#define REG_SS          18
+enum { REG_GS = 0 };
+#define REG_GS REG_GS
+enum { REG_FS = 1 };
+#define REG_FS REG_FS
+enum { REG_ES = 2 };
+#define REG_ES REG_ES
+enum { REG_DS = 3 };
+#define REG_DS REG_DS
+enum { REG_EDI = 4 };
+#define REG_EDI REG_EDI
+enum { REG_ESI = 5 };
+#define REG_ESI REG_ESI
+enum { REG_EBP = 6 };
+#define REG_EBP REG_EBP
+enum { REG_ESP = 7 };
+#define REG_ESP REG_ESP
+enum { REG_EBX = 8 };
+#define REG_EBX REG_EBX
+enum { REG_EDX = 9 };
+#define REG_EDX REG_EDX
+enum { REG_ECX = 10 };
+#define REG_ECX REG_ECX
+enum { REG_EAX = 11 };
+#define REG_EAX REG_EAX
+enum { REG_TRAPNO = 12 };
+#define REG_TRAPNO REG_TRAPNO
+enum { REG_ERR = 13 };
+#define REG_ERR REG_ERR
+enum { REG_EIP = 14 };
+#define REG_EIP REG_EIP
+enum { REG_CS = 15 };
+#define REG_CS REG_CS
+enum { REG_EFL = 16 };
+#define REG_EFL REG_EFL
+enum { REG_UESP = 17 };
+#define REG_UESP REG_UESP
+enum { REG_SS = 18 };
+#define REG_SS REG_SS
 #endif
 
 struct sigaltstack {

system/lib/libc/musl/arch/emscripten/bits/stat.h

@@ -1,8 +1,8 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/stat.h expect for the _REDIR_TIME64 change.
+
 /* copied from kernel definition, but with padding replaced
  * by the corresponding correctly-sized userspace types. */
-
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	int __st_dev_padding;
 	long __st_ino_truncated;
@@ -15,8 +15,14 @@ struct stat
 	off_t st_size;
 	blksize_t st_blksize;
 	blkcnt_t st_blocks;
+#if _REDIR_TIME64 // XXX Emscripten no need to activate the symbol redirections for 64-bit time_t.
+	struct {
+		long tv_sec;
+		long tv_nsec;
+	} __st_atim32, __st_mtim32, __st_ctim32;
+#endif
+	ino_t st_ino;
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	ino_t st_ino;
 };

system/lib/libc/musl/arch/emscripten/bits/stdarg.h

@@ -1,3 +1,5 @@
+// XXX Emscripten in sync with musl/arch/x86_64/bits/stdint.h
+// TODO(kleisauke): Perhaps we should sync this with musl/arch/i386/bits/stdint.h instead?
 typedef int32_t int_fast16_t;
 typedef int32_t int_fast32_t;
 typedef uint32_t uint_fast16_t;

system/lib/libc/musl/arch/emscripten/bits/stdint.h

@@ -1,3 +1,4 @@
+// XXX Emscripten in sync with musl/arch/i386/bits/user.h
 #undef __WORDSIZE
 #define __WORDSIZE 32
 
@@ -41,8 +42,8 @@ struct user
 	int				u_debugreg[8];
 };
 
-#define PAGE_MASK		(~(PAGE_SIZE-1))
-#define NBPG			PAGE_SIZE
+#define PAGE_MASK		(~(PAGESIZE-1))
+#define NBPG			PAGESIZE
 #define UPAGES			1
 #define HOST_TEXT_START_ADDR	(u.start_code)
 #define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)

system/lib/libc/musl/arch/emscripten/bits/user.h

@@ -128,6 +128,8 @@ long __syscall_recvfrom(long sockfd, long level, long optname, long optval, long
 long __syscall_recvmsg(long sockfd, long level, long optname, long optval, long optlen, long dummy);
 long __syscall_shutdown(long sockfd, long level, long optname, long optval, long optlen, long dummy);
 
+#define IPC_64 0
+
 #ifdef __cplusplus
 }
 #endif