From af1b082226d67a705c55b294550ddf01a5ba5bdf Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 12 Sep 2022 22:39:15 +0200 Subject: [PATCH] Replace libc crate with a budget version Try to improve compile times by copy-pasting the handful of libc definitions that we actually need. This is going to be a bit broken for non-x86_64 platforms for now. --- ffi/renderdoc-sys/Cargo.toml | 3 +- ffi/renderdoc-sys/src/lib.rs | 12 + ffi/sdl2-sys/Cargo.toml | 4 +- ffi/sdl2-sys/src/lib.rs | 9 - ffi/stb_image-sys/Cargo.toml | 3 +- ffi/stb_image-sys/src/lib.rs | 18 +- ffi/vulkan-sys/Cargo.toml | 5 +- ffi/vulkan-sys/examples/triangle.rs | 14 +- narcissus-core/Cargo.toml | 3 +- narcissus-core/src/lib.rs | 5 +- narcissus-core/src/libc.rs | 445 ++++++++++++++++++++++++++++ narcissus-core/src/virtual_mem.rs | 2 + narcissus-core/src/waiter.rs | 2 + narcissus-gpu/Cargo.toml | 1 - narcissus/Cargo.toml | 1 - 15 files changed, 494 insertions(+), 33 deletions(-) create mode 100644 narcissus-core/src/libc.rs diff --git a/ffi/renderdoc-sys/Cargo.toml b/ffi/renderdoc-sys/Cargo.toml index 0a2275c..be925c7 100644 --- a/ffi/renderdoc-sys/Cargo.toml +++ b/ffi/renderdoc-sys/Cargo.toml @@ -5,5 +5,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] -libc = "0.2" \ No newline at end of file +[dependencies] \ No newline at end of file diff --git a/ffi/renderdoc-sys/src/lib.rs b/ffi/renderdoc-sys/src/lib.rs index 436b5e8..80bc22c 100644 --- a/ffi/renderdoc-sys/src/lib.rs +++ b/ffi/renderdoc-sys/src/lib.rs @@ -314,6 +314,18 @@ pub type FnSetCaptureFileComments = extern "system" fn(filepath: *const c_char, comments: *const c_char); pub type FnShowReplayUI = extern "system" fn() -> u32; +mod libc { + use std::os::raw::{c_char, c_int, c_void}; + + pub const RTLD_NOW: c_int = 0x2; + pub const RTLD_NOLOAD: c_int = 0x4; + + extern "C" { + pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void; + pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void; + } +} + #[repr(C)] pub struct RenderdocApi1_5_0 { get_api_version: FnGetApiVersion, diff --git a/ffi/sdl2-sys/Cargo.toml b/ffi/sdl2-sys/Cargo.toml index 91ea693..44e60d1 100644 --- a/ffi/sdl2-sys/Cargo.toml +++ b/ffi/sdl2-sys/Cargo.toml @@ -6,6 +6,4 @@ links = "SDL2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] - -[build-dependencies] +[dependencies] \ No newline at end of file diff --git a/ffi/sdl2-sys/src/lib.rs b/ffi/sdl2-sys/src/lib.rs index 4f48ff6..2e46a15 100644 --- a/ffi/sdl2-sys/src/lib.rs +++ b/ffi/sdl2-sys/src/lib.rs @@ -935,12 +935,3 @@ pub const INIT_VIDEO: u32 = 0x0000_0020; pub const WINDOW_SHOWN: u32 = 0x0000_0004; pub const WINDOW_RESIZABLE: u32 = 0x0000_0020; pub const WINDOW_VULKAN: u32 = 0x1000_0000; - -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - let result = 2 + 2; - assert_eq!(result, 4); - } -} diff --git a/ffi/stb_image-sys/Cargo.toml b/ffi/stb_image-sys/Cargo.toml index 012a5ca..94d2889 100644 --- a/ffi/stb_image-sys/Cargo.toml +++ b/ffi/stb_image-sys/Cargo.toml @@ -5,5 +5,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] -libc = "0.2" \ No newline at end of file +[dependencies] \ No newline at end of file diff --git a/ffi/stb_image-sys/src/lib.rs b/ffi/stb_image-sys/src/lib.rs index 57bd4f4..ef08dd6 100644 --- a/ffi/stb_image-sys/src/lib.rs +++ b/ffi/stb_image-sys/src/lib.rs @@ -1,6 +1,14 @@ use std::os::raw::{c_char, c_float, c_int, c_uchar, c_void}; -use libc::FILE; +mod libc { + pub enum FILE {} + impl Copy for FILE {} + impl Clone for FILE { + fn clone(&self) -> FILE { + *self + } + } +} #[repr(C)] pub struct stbi_io_callbacks { @@ -31,7 +39,7 @@ extern "C" { ) -> *mut c_uchar; pub fn stbi_load_from_file( - f: *mut FILE, + f: *mut libc::FILE, x: *mut c_int, y: *mut c_int, comp: *mut c_int, @@ -65,7 +73,7 @@ extern "C" { ) -> *mut c_float; pub fn stbi_loadf_from_file( - f: *mut FILE, + f: *mut libc::FILE, x: *mut c_int, y: *mut c_int, comp: *mut c_int, @@ -95,7 +103,7 @@ extern "C" { pub fn stbi_is_hdr(filename: *const c_char) -> c_int; - pub fn stbi_is_hdr_from_file(f: *mut FILE) -> c_int; + pub fn stbi_is_hdr_from_file(f: *mut libc::FILE) -> c_int; pub fn stbi_failure_reason() -> *const c_char; @@ -125,7 +133,7 @@ extern "C" { ) -> c_int; pub fn stbi_info_from_file( - f: *mut FILE, + f: *mut libc::FILE, x: *mut c_int, y: *mut c_int, comp: *mut c_int, diff --git a/ffi/vulkan-sys/Cargo.toml b/ffi/vulkan-sys/Cargo.toml index 882f86d..5bbf4d3 100644 --- a/ffi/vulkan-sys/Cargo.toml +++ b/ffi/vulkan-sys/Cargo.toml @@ -5,7 +5,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] - -[dev-dependencies] -libc = "0.2" \ No newline at end of file +[dependencies] \ No newline at end of file diff --git a/ffi/vulkan-sys/examples/triangle.rs b/ffi/vulkan-sys/examples/triangle.rs index b90d86d..864f1e6 100644 --- a/ffi/vulkan-sys/examples/triangle.rs +++ b/ffi/vulkan-sys/examples/triangle.rs @@ -1,8 +1,20 @@ -use libc::c_void; +use std::os::raw::c_void; use vulkan_sys as vk; use vulkan_sys::cstr; +mod libc { + use std::os::raw::{c_char, c_int, c_void}; + + pub const RTLD_NOW: c_int = 0x2; + pub const RTLD_LOCAL: c_int = 0; + + extern "C" { + pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void; + pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void; + } +} + macro_rules! vk_check { ($e:expr) => ({ #[allow(unused_unsafe)] diff --git a/narcissus-core/Cargo.toml b/narcissus-core/Cargo.toml index 5b9068f..cd14ed5 100644 --- a/narcissus-core/Cargo.toml +++ b/narcissus-core/Cargo.toml @@ -5,5 +5,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] -libc = "0.2.112" \ No newline at end of file +[dependencies] \ No newline at end of file diff --git a/narcissus-core/src/lib.rs b/narcissus-core/src/lib.rs index 3c50605..c20a0af 100644 --- a/narcissus-core/src/lib.rs +++ b/narcissus-core/src/lib.rs @@ -1,5 +1,6 @@ mod bitset; mod fixed_vec; +mod libc; pub mod manual_arc; mod mutex; mod pool; @@ -274,10 +275,8 @@ pub fn align_offset(x: usize, align: usize) -> usize { (x + align - 1) & !(align - 1) } -#[cold] -#[inline(never)] pub fn page_size() -> usize { - unsafe { libc::sysconf(libc::_SC_PAGESIZE) as usize } + 4096 } #[cfg(test)] diff --git a/narcissus-core/src/libc.rs b/narcissus-core/src/libc.rs new file mode 100644 index 0000000..c933bb9 --- /dev/null +++ b/narcissus-core/src/libc.rs @@ -0,0 +1,445 @@ +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] +#![allow(unused)] + +use std::os::raw::{c_int, c_long, c_void}; + +pub type size_t = usize; +pub type ptrdiff_t = isize; +pub type intptr_t = isize; +pub type uintptr_t = usize; +pub type ssize_t = isize; + +pub type pid_t = i32; +pub type off_t = i64; + +#[cfg(all(target_arch = "aarch64", target_pointer_width = "32"))] +pub type clock_t = i32; +#[cfg(all(target_arch = "aarch64", target_pointer_width = "32"))] +pub type time_t = i32; + +#[cfg(not(all(target_arch = "aarch64", target_pointer_width = "32")))] +pub type clock_t = i64; +#[cfg(not(all(target_arch = "aarch64", target_pointer_width = "32")))] +pub type time_t = i64; + +pub struct timespec { + pub tv_sec: time_t, + #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] + pub tv_nsec: i64, + #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] + pub tv_nsec: c_long, +} + +pub const FUTEX_WAIT: c_int = 0; +pub const FUTEX_WAKE: c_int = 1; +pub const FUTEX_FD: c_int = 2; +pub const FUTEX_REQUEUE: c_int = 3; +pub const FUTEX_CMP_REQUEUE: c_int = 4; +pub const FUTEX_WAKE_OP: c_int = 5; +pub const FUTEX_LOCK_PI: c_int = 6; +pub const FUTEX_UNLOCK_PI: c_int = 7; +pub const FUTEX_TRYLOCK_PI: c_int = 8; +pub const FUTEX_WAIT_BITSET: c_int = 9; +pub const FUTEX_WAKE_BITSET: c_int = 10; +pub const FUTEX_WAIT_REQUEUE_PI: c_int = 11; +pub const FUTEX_CMP_REQUEUE_PI: c_int = 12; + +pub const FUTEX_PRIVATE_FLAG: c_int = 128; +pub const FUTEX_CLOCK_REALTIME: c_int = 256; +pub const FUTEX_CMD_MASK: c_int = !(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME); + +pub const MAP_HUGETLB: c_int = 0x040000; +pub const MAP_LOCKED: c_int = 0x02000; +pub const MAP_NORESERVE: c_int = 0x04000; +pub const MAP_32BIT: c_int = 0x0040; +pub const MAP_ANON: c_int = 0x0020; +pub const MAP_ANONYMOUS: c_int = 0x0020; +pub const MAP_DENYWRITE: c_int = 0x0800; +pub const MAP_EXECUTABLE: c_int = 0x01000; +pub const MAP_POPULATE: c_int = 0x08000; +pub const MAP_NONBLOCK: c_int = 0x010000; +pub const MAP_STACK: c_int = 0x020000; +pub const MAP_SYNC: c_int = 0x080000; + +pub const MAP_FILE: c_int = 0x0000; +pub const MAP_SHARED: c_int = 0x0001; +pub const MAP_PRIVATE: c_int = 0x0002; +pub const MAP_FIXED: c_int = 0x0010; + +pub const MAP_FAILED: *mut c_void = !0 as *mut c_void; + +pub const PROT_NONE: c_int = 0; +pub const PROT_READ: c_int = 1; +pub const PROT_WRITE: c_int = 2; +pub const PROT_EXEC: c_int = 4; + +pub const SYS_read: c_long = 0; +pub const SYS_write: c_long = 1; +pub const SYS_open: c_long = 2; +pub const SYS_close: c_long = 3; +pub const SYS_stat: c_long = 4; +pub const SYS_fstat: c_long = 5; +pub const SYS_lstat: c_long = 6; +pub const SYS_poll: c_long = 7; +pub const SYS_lseek: c_long = 8; +pub const SYS_mmap: c_long = 9; +pub const SYS_mprotect: c_long = 10; +pub const SYS_munmap: c_long = 11; +pub const SYS_brk: c_long = 12; +pub const SYS_rt_sigaction: c_long = 13; +pub const SYS_rt_sigprocmask: c_long = 14; +pub const SYS_rt_sigreturn: c_long = 15; +pub const SYS_ioctl: c_long = 16; +pub const SYS_pread64: c_long = 17; +pub const SYS_pwrite64: c_long = 18; +pub const SYS_readv: c_long = 19; +pub const SYS_writev: c_long = 20; +pub const SYS_access: c_long = 21; +pub const SYS_pipe: c_long = 22; +pub const SYS_select: c_long = 23; +pub const SYS_sched_yield: c_long = 24; +pub const SYS_mremap: c_long = 25; +pub const SYS_msync: c_long = 26; +pub const SYS_mincore: c_long = 27; +pub const SYS_madvise: c_long = 28; +pub const SYS_shmget: c_long = 29; +pub const SYS_shmat: c_long = 30; +pub const SYS_shmctl: c_long = 31; +pub const SYS_dup: c_long = 32; +pub const SYS_dup2: c_long = 33; +pub const SYS_pause: c_long = 34; +pub const SYS_nanosleep: c_long = 35; +pub const SYS_getitimer: c_long = 36; +pub const SYS_alarm: c_long = 37; +pub const SYS_setitimer: c_long = 38; +pub const SYS_getpid: c_long = 39; +pub const SYS_sendfile: c_long = 40; +pub const SYS_socket: c_long = 41; +pub const SYS_connect: c_long = 42; +pub const SYS_accept: c_long = 43; +pub const SYS_sendto: c_long = 44; +pub const SYS_recvfrom: c_long = 45; +pub const SYS_sendmsg: c_long = 46; +pub const SYS_recvmsg: c_long = 47; +pub const SYS_shutdown: c_long = 48; +pub const SYS_bind: c_long = 49; +pub const SYS_listen: c_long = 50; +pub const SYS_getsockname: c_long = 51; +pub const SYS_getpeername: c_long = 52; +pub const SYS_socketpair: c_long = 53; +pub const SYS_setsockopt: c_long = 54; +pub const SYS_getsockopt: c_long = 55; +pub const SYS_clone: c_long = 56; +pub const SYS_fork: c_long = 57; +pub const SYS_vfork: c_long = 58; +pub const SYS_execve: c_long = 59; +pub const SYS_exit: c_long = 60; +pub const SYS_wait4: c_long = 61; +pub const SYS_kill: c_long = 62; +pub const SYS_uname: c_long = 63; +pub const SYS_semget: c_long = 64; +pub const SYS_semop: c_long = 65; +pub const SYS_semctl: c_long = 66; +pub const SYS_shmdt: c_long = 67; +pub const SYS_msgget: c_long = 68; +pub const SYS_msgsnd: c_long = 69; +pub const SYS_msgrcv: c_long = 70; +pub const SYS_msgctl: c_long = 71; +pub const SYS_fcntl: c_long = 72; +pub const SYS_flock: c_long = 73; +pub const SYS_fsync: c_long = 74; +pub const SYS_fdatasync: c_long = 75; +pub const SYS_truncate: c_long = 76; +pub const SYS_ftruncate: c_long = 77; +pub const SYS_getdents: c_long = 78; +pub const SYS_getcwd: c_long = 79; +pub const SYS_chdir: c_long = 80; +pub const SYS_fchdir: c_long = 81; +pub const SYS_rename: c_long = 82; +pub const SYS_mkdir: c_long = 83; +pub const SYS_rmdir: c_long = 84; +pub const SYS_creat: c_long = 85; +pub const SYS_link: c_long = 86; +pub const SYS_unlink: c_long = 87; +pub const SYS_symlink: c_long = 88; +pub const SYS_readlink: c_long = 89; +pub const SYS_chmod: c_long = 90; +pub const SYS_fchmod: c_long = 91; +pub const SYS_chown: c_long = 92; +pub const SYS_fchown: c_long = 93; +pub const SYS_lchown: c_long = 94; +pub const SYS_umask: c_long = 95; +pub const SYS_gettimeofday: c_long = 96; +pub const SYS_getrlimit: c_long = 97; +pub const SYS_getrusage: c_long = 98; +pub const SYS_sysinfo: c_long = 99; +pub const SYS_times: c_long = 100; +pub const SYS_ptrace: c_long = 101; +pub const SYS_getuid: c_long = 102; +pub const SYS_syslog: c_long = 103; +pub const SYS_getgid: c_long = 104; +pub const SYS_setuid: c_long = 105; +pub const SYS_setgid: c_long = 106; +pub const SYS_geteuid: c_long = 107; +pub const SYS_getegid: c_long = 108; +pub const SYS_setpgid: c_long = 109; +pub const SYS_getppid: c_long = 110; +pub const SYS_getpgrp: c_long = 111; +pub const SYS_setsid: c_long = 112; +pub const SYS_setreuid: c_long = 113; +pub const SYS_setregid: c_long = 114; +pub const SYS_getgroups: c_long = 115; +pub const SYS_setgroups: c_long = 116; +pub const SYS_setresuid: c_long = 117; +pub const SYS_getresuid: c_long = 118; +pub const SYS_setresgid: c_long = 119; +pub const SYS_getresgid: c_long = 120; +pub const SYS_getpgid: c_long = 121; +pub const SYS_setfsuid: c_long = 122; +pub const SYS_setfsgid: c_long = 123; +pub const SYS_getsid: c_long = 124; +pub const SYS_capget: c_long = 125; +pub const SYS_capset: c_long = 126; +pub const SYS_rt_sigpending: c_long = 127; +pub const SYS_rt_sigtimedwait: c_long = 128; +pub const SYS_rt_sigqueueinfo: c_long = 129; +pub const SYS_rt_sigsuspend: c_long = 130; +pub const SYS_sigaltstack: c_long = 131; +pub const SYS_utime: c_long = 132; +pub const SYS_mknod: c_long = 133; +pub const SYS_uselib: c_long = 134; +pub const SYS_personality: c_long = 135; +pub const SYS_ustat: c_long = 136; +pub const SYS_statfs: c_long = 137; +pub const SYS_fstatfs: c_long = 138; +pub const SYS_sysfs: c_long = 139; +pub const SYS_getpriority: c_long = 140; +pub const SYS_setpriority: c_long = 141; +pub const SYS_sched_setparam: c_long = 142; +pub const SYS_sched_getparam: c_long = 143; +pub const SYS_sched_setscheduler: c_long = 144; +pub const SYS_sched_getscheduler: c_long = 145; +pub const SYS_sched_get_priority_max: c_long = 146; +pub const SYS_sched_get_priority_min: c_long = 147; +pub const SYS_sched_rr_get_interval: c_long = 148; +pub const SYS_mlock: c_long = 149; +pub const SYS_munlock: c_long = 150; +pub const SYS_mlockall: c_long = 151; +pub const SYS_munlockall: c_long = 152; +pub const SYS_vhangup: c_long = 153; +pub const SYS_modify_ldt: c_long = 154; +pub const SYS_pivot_root: c_long = 155; +pub const SYS__sysctl: c_long = 156; +pub const SYS_prctl: c_long = 157; +pub const SYS_arch_prctl: c_long = 158; +pub const SYS_adjtimex: c_long = 159; +pub const SYS_setrlimit: c_long = 160; +pub const SYS_chroot: c_long = 161; +pub const SYS_sync: c_long = 162; +pub const SYS_acct: c_long = 163; +pub const SYS_settimeofday: c_long = 164; +pub const SYS_mount: c_long = 165; +pub const SYS_umount2: c_long = 166; +pub const SYS_swapon: c_long = 167; +pub const SYS_swapoff: c_long = 168; +pub const SYS_reboot: c_long = 169; +pub const SYS_sethostname: c_long = 170; +pub const SYS_setdomainname: c_long = 171; +pub const SYS_iopl: c_long = 172; +pub const SYS_ioperm: c_long = 173; +pub const SYS_create_module: c_long = 174; +pub const SYS_init_module: c_long = 175; +pub const SYS_delete_module: c_long = 176; +pub const SYS_get_kernel_syms: c_long = 177; +pub const SYS_query_module: c_long = 178; +pub const SYS_quotactl: c_long = 179; +pub const SYS_nfsservctl: c_long = 180; +pub const SYS_getpmsg: c_long = 181; +pub const SYS_putpmsg: c_long = 182; +pub const SYS_afs_syscall: c_long = 183; +pub const SYS_tuxcall: c_long = 184; +pub const SYS_security: c_long = 185; +pub const SYS_gettid: c_long = 186; +pub const SYS_readahead: c_long = 187; +pub const SYS_setxattr: c_long = 188; +pub const SYS_lsetxattr: c_long = 189; +pub const SYS_fsetxattr: c_long = 190; +pub const SYS_getxattr: c_long = 191; +pub const SYS_lgetxattr: c_long = 192; +pub const SYS_fgetxattr: c_long = 193; +pub const SYS_listxattr: c_long = 194; +pub const SYS_llistxattr: c_long = 195; +pub const SYS_flistxattr: c_long = 196; +pub const SYS_removexattr: c_long = 197; +pub const SYS_lremovexattr: c_long = 198; +pub const SYS_fremovexattr: c_long = 199; +pub const SYS_tkill: c_long = 200; +pub const SYS_time: c_long = 201; +pub const SYS_futex: c_long = 202; +pub const SYS_sched_setaffinity: c_long = 203; +pub const SYS_sched_getaffinity: c_long = 204; +pub const SYS_set_thread_area: c_long = 205; +pub const SYS_io_setup: c_long = 206; +pub const SYS_io_destroy: c_long = 207; +pub const SYS_io_getevents: c_long = 208; +pub const SYS_io_submit: c_long = 209; +pub const SYS_io_cancel: c_long = 210; +pub const SYS_get_thread_area: c_long = 211; +pub const SYS_lookup_dcookie: c_long = 212; +pub const SYS_epoll_create: c_long = 213; +pub const SYS_epoll_ctl_old: c_long = 214; +pub const SYS_epoll_wait_old: c_long = 215; +pub const SYS_remap_file_pages: c_long = 216; +pub const SYS_getdents64: c_long = 217; +pub const SYS_set_tid_address: c_long = 218; +pub const SYS_restart_syscall: c_long = 219; +pub const SYS_semtimedop: c_long = 220; +pub const SYS_fadvise64: c_long = 221; +pub const SYS_timer_create: c_long = 222; +pub const SYS_timer_settime: c_long = 223; +pub const SYS_timer_gettime: c_long = 224; +pub const SYS_timer_getoverrun: c_long = 225; +pub const SYS_timer_delete: c_long = 226; +pub const SYS_clock_settime: c_long = 227; +pub const SYS_clock_gettime: c_long = 228; +pub const SYS_clock_getres: c_long = 229; +pub const SYS_clock_nanosleep: c_long = 230; +pub const SYS_exit_group: c_long = 231; +pub const SYS_epoll_wait: c_long = 232; +pub const SYS_epoll_ctl: c_long = 233; +pub const SYS_tgkill: c_long = 234; +pub const SYS_utimes: c_long = 235; +pub const SYS_vserver: c_long = 236; +pub const SYS_mbind: c_long = 237; +pub const SYS_set_mempolicy: c_long = 238; +pub const SYS_get_mempolicy: c_long = 239; +pub const SYS_mq_open: c_long = 240; +pub const SYS_mq_unlink: c_long = 241; +pub const SYS_mq_timedsend: c_long = 242; +pub const SYS_mq_timedreceive: c_long = 243; +pub const SYS_mq_notify: c_long = 244; +pub const SYS_mq_getsetattr: c_long = 245; +pub const SYS_kexec_load: c_long = 246; +pub const SYS_waitid: c_long = 247; +pub const SYS_add_key: c_long = 248; +pub const SYS_request_key: c_long = 249; +pub const SYS_keyctl: c_long = 250; +pub const SYS_ioprio_set: c_long = 251; +pub const SYS_ioprio_get: c_long = 252; +pub const SYS_inotify_init: c_long = 253; +pub const SYS_inotify_add_watch: c_long = 254; +pub const SYS_inotify_rm_watch: c_long = 255; +pub const SYS_migrate_pages: c_long = 256; +pub const SYS_openat: c_long = 257; +pub const SYS_mkdirat: c_long = 258; +pub const SYS_mknodat: c_long = 259; +pub const SYS_fchownat: c_long = 260; +pub const SYS_futimesat: c_long = 261; +pub const SYS_newfstatat: c_long = 262; +pub const SYS_unlinkat: c_long = 263; +pub const SYS_renameat: c_long = 264; +pub const SYS_linkat: c_long = 265; +pub const SYS_symlinkat: c_long = 266; +pub const SYS_readlinkat: c_long = 267; +pub const SYS_fchmodat: c_long = 268; +pub const SYS_faccessat: c_long = 269; +pub const SYS_pselect6: c_long = 270; +pub const SYS_ppoll: c_long = 271; +pub const SYS_unshare: c_long = 272; +pub const SYS_set_robust_list: c_long = 273; +pub const SYS_get_robust_list: c_long = 274; +pub const SYS_splice: c_long = 275; +pub const SYS_tee: c_long = 276; +pub const SYS_sync_file_range: c_long = 277; +pub const SYS_vmsplice: c_long = 278; +pub const SYS_move_pages: c_long = 279; +pub const SYS_utimensat: c_long = 280; +pub const SYS_epoll_pwait: c_long = 281; +pub const SYS_signalfd: c_long = 282; +pub const SYS_timerfd_create: c_long = 283; +pub const SYS_eventfd: c_long = 284; +pub const SYS_fallocate: c_long = 285; +pub const SYS_timerfd_settime: c_long = 286; +pub const SYS_timerfd_gettime: c_long = 287; +pub const SYS_accept4: c_long = 288; +pub const SYS_signalfd4: c_long = 289; +pub const SYS_eventfd2: c_long = 290; +pub const SYS_epoll_create1: c_long = 291; +pub const SYS_dup3: c_long = 292; +pub const SYS_pipe2: c_long = 293; +pub const SYS_inotify_init1: c_long = 294; +pub const SYS_preadv: c_long = 295; +pub const SYS_pwritev: c_long = 296; +pub const SYS_rt_tgsigqueueinfo: c_long = 297; +pub const SYS_perf_event_open: c_long = 298; +pub const SYS_recvmmsg: c_long = 299; +pub const SYS_fanotify_init: c_long = 300; +pub const SYS_fanotify_mark: c_long = 301; +pub const SYS_prlimit64: c_long = 302; +pub const SYS_name_to_handle_at: c_long = 303; +pub const SYS_open_by_handle_at: c_long = 304; +pub const SYS_clock_adjtime: c_long = 305; +pub const SYS_syncfs: c_long = 306; +pub const SYS_sendmmsg: c_long = 307; +pub const SYS_setns: c_long = 308; +pub const SYS_getcpu: c_long = 309; +pub const SYS_process_vm_readv: c_long = 310; +pub const SYS_process_vm_writev: c_long = 311; +pub const SYS_kcmp: c_long = 312; +pub const SYS_finit_module: c_long = 313; +pub const SYS_sched_setattr: c_long = 314; +pub const SYS_sched_getattr: c_long = 315; +pub const SYS_renameat2: c_long = 316; +pub const SYS_seccomp: c_long = 317; +pub const SYS_getrandom: c_long = 318; +pub const SYS_memfd_create: c_long = 319; +pub const SYS_kexec_file_load: c_long = 320; +pub const SYS_bpf: c_long = 321; +pub const SYS_execveat: c_long = 322; +pub const SYS_userfaultfd: c_long = 323; +pub const SYS_membarrier: c_long = 324; +pub const SYS_mlock2: c_long = 325; +pub const SYS_copy_file_range: c_long = 326; +pub const SYS_preadv2: c_long = 327; +pub const SYS_pwritev2: c_long = 328; +pub const SYS_pkey_mprotect: c_long = 329; +pub const SYS_pkey_alloc: c_long = 330; +pub const SYS_pkey_free: c_long = 331; +pub const SYS_statx: c_long = 332; +pub const SYS_pidfd_send_signal: c_long = 424; +pub const SYS_io_uring_setup: c_long = 425; +pub const SYS_io_uring_enter: c_long = 426; +pub const SYS_io_uring_register: c_long = 427; +pub const SYS_open_tree: c_long = 428; +pub const SYS_move_mount: c_long = 429; +pub const SYS_fsopen: c_long = 430; +pub const SYS_fsconfig: c_long = 431; +pub const SYS_fsmount: c_long = 432; +pub const SYS_fspick: c_long = 433; +pub const SYS_pidfd_open: c_long = 434; +pub const SYS_clone3: c_long = 435; +pub const SYS_close_range: c_long = 436; +pub const SYS_openat2: c_long = 437; +pub const SYS_pidfd_getfd: c_long = 438; +pub const SYS_faccessat2: c_long = 439; +pub const SYS_process_madvise: c_long = 440; +pub const SYS_epoll_pwait2: c_long = 441; +pub const SYS_mount_setattr: c_long = 442; + +extern "C" { + pub fn gettid() -> pid_t; + pub fn syscall(num: c_long, ...) -> c_long; + + pub fn mmap( + addr: *mut c_void, + len: size_t, + prot: c_int, + flags: c_int, + fd: c_int, + offset: off_t, + ) -> *mut c_void; + pub fn munmap(addr: *mut c_void, len: size_t) -> c_int; + + pub fn mprotect(addr: *mut c_void, len: size_t, prot: c_int) -> c_int; +} diff --git a/narcissus-core/src/virtual_mem.rs b/narcissus-core/src/virtual_mem.rs index bd43f75..16faa9c 100644 --- a/narcissus-core/src/virtual_mem.rs +++ b/narcissus-core/src/virtual_mem.rs @@ -1,3 +1,5 @@ +use crate::libc; + #[cold] #[inline(never)] pub unsafe fn virtual_reserve(size: usize) -> *mut std::ffi::c_void { diff --git a/narcissus-core/src/waiter.rs b/narcissus-core/src/waiter.rs index ba09597..6e43411 100644 --- a/narcissus-core/src/waiter.rs +++ b/narcissus-core/src/waiter.rs @@ -1,3 +1,5 @@ +use crate::libc; + use std::{sync::atomic::AtomicI32, time::Duration}; pub fn wait(futex: &AtomicI32, expected: i32, timeout: Option) { diff --git a/narcissus-gpu/Cargo.toml b/narcissus-gpu/Cargo.toml index a51e444..3dff76d 100644 --- a/narcissus-gpu/Cargo.toml +++ b/narcissus-gpu/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libc = "0.2" narcissus-core = { path = "../narcissus-core" } narcissus-app = { path = "../narcissus-app" } vulkan-sys = { path = "../ffi/vulkan-sys" } \ No newline at end of file diff --git a/narcissus/Cargo.toml b/narcissus/Cargo.toml index fdc624b..8605f27 100644 --- a/narcissus/Cargo.toml +++ b/narcissus/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libc = "0.2" narcissus-core = { path = "../narcissus-core" } narcissus-maths = { path = "../narcissus-maths" } narcissus-app = { path = "../narcissus-app" } -- 2.49.0