Remove syscall shims; migrate wali from b64 to b32

Author: arjunr2

src/lib.rs

@@ -1,8 +1,6 @@
 //! libc - Raw FFI bindings to platforms' system libraries
 #![crate_name = "libc"]
 #![crate_type = "rlib"]
-#![feature(c_variadic)]
-#![feature(concat_idents)]
 #![allow(
     renamed_and_removed_lints, // Keep this order.
     unknown_lints, // Keep this order.

src/unix/linux_like/linux/mod.rs

@@ -6432,6 +6432,7 @@ extern "C" {
     pub fn vhangup() -> c_int;
     pub fn sync();
     pub fn syncfs(fd: c_int) -> c_int;
+    pub fn syscall(num: c_long, ...) -> c_long;
 
     pub fn sched_getaffinity(
         pid: crate::pid_t,
@@ -6839,23 +6840,6 @@ extern "C" {
     pub fn ioctl(fd: c_int, request: Ioctl, ...) -> c_int;
 }
 
-// Syscall libc stub for non-wasm32 (WALI) targets
-//
-// For wasm32, all syscalls are name-bound and typed.
-// The 'syscall' implementation from C library is avoided since
-// higher level libraries do not explicitly typecast arguments to
-// 64-bit register sizes, which is expected of C variadic arguments.
-// To overcome this, a wrapper 'syscall' method is implemented,
-// which binds the syscall types statically at compile time
-// and binds their numbers at runtime
-cfg_if!(
-    if #[cfg(not(target_arch = "wasm32"))] {
-        extern "C" {
-            pub fn syscall(num: c_long, ...) -> c_long;
-        }
-    }
-);
-
 // LFS64 extensions
 //
 // * musl has 64-bit versions only so aliases the LFS64 symbols to the standard ones

src/unix/linux_like/linux/musl/b32/mod.rs

@@ -1,47 +1,138 @@
 use crate::prelude::*;
 
-pub type c_long = i32;
-pub type c_ulong = u32;
-pub type nlink_t = u32;
-pub type blksize_t = c_long;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
-pub type regoff_t = c_int;
-
-s! {
-    pub struct pthread_attr_t {
-        __size: [u32; 9],
-    }
+cfg_if! {
+    if #[cfg(not(target_arch = "wasm32"))] {
+        pub type c_long = i32;
+        pub type c_ulong = u32;
+        pub type nlink_t = u32;
+        pub type blksize_t = c_long;
+        pub type __u64 = c_ulonglong;
+        pub type __s64 = c_longlong;
+        pub type regoff_t = c_int;
 
-    pub struct sigset_t {
-        __val: [c_ulong; 32],
-    }
+        s! {
+            pub struct pthread_attr_t {
+                __size: [u32; 9],
+            }
 
-    pub struct msghdr {
-        pub msg_name: *mut c_void,
-        pub msg_namelen: crate::socklen_t,
-        pub msg_iov: *mut crate::iovec,
-        pub msg_iovlen: c_int,
-        pub msg_control: *mut c_void,
-        pub msg_controllen: crate::socklen_t,
-        pub msg_flags: c_int,
-    }
+            pub struct sigset_t {
+                __val: [c_ulong; 32],
+            }
 
-    pub struct cmsghdr {
-        pub cmsg_len: crate::socklen_t,
-        pub cmsg_level: c_int,
-        pub cmsg_type: c_int,
+            pub struct msghdr {
+                pub msg_name: *mut c_void,
+                pub msg_namelen: crate::socklen_t,
+                pub msg_iov: *mut crate::iovec,
+                pub msg_iovlen: c_int,
+                pub msg_control: *mut c_void,
+                pub msg_controllen: crate::socklen_t,
+                pub msg_flags: c_int,
+            }
+
+            pub struct cmsghdr {
+                pub cmsg_len: crate::socklen_t,
+                pub cmsg_level: c_int,
+                pub cmsg_type: c_int,
+            }
+
+            pub struct sem_t {
+                __val: [c_int; 4],
+            }
+        }
+
+        pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
+        pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+        pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 20;
     }
+    else {
+        pub type c_long = i64;
+        pub type c_ulong = u64;
+        pub type regoff_t = c_long;
+
+        s! {
+            pub struct stack_t {
+                pub ss_sp: *mut c_void,
+                pub ss_flags: c_int,
+                pub ss_size: size_t,
+            }
 
-    pub struct sem_t {
-        __val: [c_int; 4],
+            pub struct pthread_attr_t {
+                __size: [u64; 7],
+            }
+
+            pub struct sigset_t {
+                __val: [c_ulong; 16],
+            }
+
+            pub struct shmid_ds {
+                pub shm_perm: crate::ipc_perm,
+                pub shm_segsz: size_t,
+                pub shm_atime: crate::time_t,
+                pub shm_dtime: crate::time_t,
+                pub shm_ctime: crate::time_t,
+                pub shm_cpid: crate::pid_t,
+                pub shm_lpid: crate::pid_t,
+                pub shm_nattch: c_ulong,
+                __pad1: c_ulong,
+                __pad2: c_ulong,
+            }
+
+            pub struct msqid_ds {
+                pub msg_perm: crate::ipc_perm,
+                pub msg_stime: crate::time_t,
+                pub msg_rtime: crate::time_t,
+                pub msg_ctime: crate::time_t,
+                __msg_cbytes: c_ulong,
+                pub msg_qnum: crate::msgqnum_t,
+                pub msg_qbytes: crate::msglen_t,
+                pub msg_lspid: crate::pid_t,
+                pub msg_lrpid: crate::pid_t,
+                __pad1: c_ulong,
+                __pad2: c_ulong,
+            }
+
+            pub struct msghdr {
+                pub msg_name: *mut c_void,
+                pub msg_namelen: crate::socklen_t,
+                pub msg_iov: *mut crate::iovec,
+                #[cfg(target_endian = "big")]
+                __pad1: c_int,
+                pub msg_iovlen: c_int,
+                #[cfg(target_endian = "little")]
+                __pad1: c_int,
+                pub msg_control: *mut c_void,
+                #[cfg(target_endian = "big")]
+                __pad2: c_int,
+                pub msg_controllen: crate::socklen_t,
+                #[cfg(target_endian = "little")]
+                __pad2: c_int,
+                pub msg_flags: c_int,
+            }
+
+            pub struct cmsghdr {
+                #[cfg(target_endian = "big")]
+                pub __pad1: c_int,
+                pub cmsg_len: crate::socklen_t,
+                #[cfg(target_endian = "little")]
+                pub __pad1: c_int,
+                pub cmsg_level: c_int,
+                pub cmsg_type: c_int,
+            }
+
+            pub struct sem_t {
+                __val: [c_int; 8],
+            }
+        }
+        pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
+        pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
+        pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 32;
+
+        extern "C" {
+            pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
+        }
     }
 }
 
-pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
-pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
-pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 20;
-
 cfg_if! {
     if #[cfg(any(target_arch = "x86"))] {
         mod x86;
@@ -61,6 +152,9 @@ cfg_if! {
     } else if #[cfg(any(target_arch = "riscv32"))] {
         mod riscv32;
         pub use self::riscv32::*;
+    } else if #[cfg(any(target_arch = "wasm32"))] {
+        mod wasm32;
+        pub use self::wasm32::*;
     } else {
         // Unknown target_arch
     }