From b68962ecdd823fe7d4df1352ecfbaffa032db764 Mon Sep 17 00:00:00 2001 From: niansa Date: Wed, 3 Apr 2024 10:39:59 +0200 Subject: [PATCH] Use crosslibc instead of nolibc for the most part --- .gitmodules | 3 + Makefile | 37 +- crosslibc | 1 + include/getdelim.h | 2 - nolibc/arch-x86_64.h | 82 --- nolibc/arch.h | 83 ++- nolibc/compiler.h | 25 - nolibc/ctype.h | 102 --- nolibc/errno.h | 13 +- nolibc/nolibc.h | 112 --- nolibc/signal.h | 25 - nolibc/stackprotector.h | 50 -- nolibc/std.h | 36 - nolibc/stdint.h | 113 --- nolibc/stdio.h | 356 ---------- nolibc/stdlib.h | 452 ------------ nolibc/string.h | 294 -------- nolibc/sys.h | 1432 --------------------------------------- nolibc/time.h | 31 - nolibc/types.h | 5 +- nolibc/unistd.h | 1399 +++++++++++++++++++++++++++++++++++++- prep.sh | 8 +- src/clibc-user-impl.c | 18 + src/main.c | 2 +- 24 files changed, 1514 insertions(+), 3167 deletions(-) create mode 100644 .gitmodules create mode 160000 crosslibc delete mode 100644 nolibc/arch-x86_64.h delete mode 100644 nolibc/compiler.h delete mode 100644 nolibc/ctype.h delete mode 100644 nolibc/nolibc.h delete mode 100644 nolibc/signal.h delete mode 100644 nolibc/stackprotector.h delete mode 100644 nolibc/std.h delete mode 100644 nolibc/stdint.h delete mode 100644 nolibc/stdio.h delete mode 100644 nolibc/stdlib.h delete mode 100644 nolibc/string.h delete mode 100644 nolibc/sys.h delete mode 100644 nolibc/time.h create mode 100644 src/clibc-user-impl.c diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..86cf35b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "crosslibc"] + path = crosslibc + url = https://gitlab.com/niansa/crosslibc.git diff --git a/Makefile b/Makefile index 2c98ce4..aeaece9 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,43 @@ all: link -compile: obj/linux-uefi-c.o obj/main-c.o +compile: obj/clibc-user-impl-c.o obj/linux-uefi-c.o obj/main-c.o obj/atof-c.o obj/heap-c.o obj/math-c.o obj/stdio-c.o obj/string-c.o obj/strtod-c.o obj/printf-c.o obj/cppbase-cpp.o link: compile - ld -o bin/efitest -m elf_x86_64 obj/linux-uefi-c.o obj/main-c.o -znocombreloc -T /usr/lib/elf_x86_64_efi.lds -shared -Bsymbolic -L /usr/lib /usr/lib/crt0-efi-x86_64.o -lefi -lgnuefi -nostdlib + ld -o bin/efitest -m elf_x86_64 obj/clibc-user-impl-c.o obj/linux-uefi-c.o obj/main-c.o obj/atof-c.o obj/heap-c.o obj/math-c.o obj/stdio-c.o obj/string-c.o obj/strtod-c.o obj/printf-c.o obj/cppbase-cpp.o -znocombreloc -T /usr/lib/elf_x86_64_efi.lds -shared -Bsymbolic -L /usr/lib /usr/lib/crt0-efi-x86_64.o -lefi -lgnuefi -nostdlib clean: - rm -f obj/linux-uefi-c.o obj/main-c.o bin/efitest + rm -f obj/clibc-user-impl-c.o obj/linux-uefi-c.o obj/main-c.o obj/atof-c.o obj/heap-c.o obj/math-c.o obj/stdio-c.o obj/string-c.o obj/strtod-c.o obj/printf-c.o obj/cppbase-cpp.o bin/efitest +obj/clibc-user-impl-c.o: src/clibc-user-impl.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/clibc-user-impl.c -o obj/clibc-user-impl-c.o + obj/linux-uefi-c.o: src/linux-uefi.c - gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/linux-uefi.c -o obj/linux-uefi-c.o + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/linux-uefi.c -o obj/linux-uefi-c.o obj/main-c.o: src/main.c - gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/main.c -o obj/main-c.o + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c src/main.c -o obj/main-c.o + +obj/atof-c.o: crosslibc/atof.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/atof.c -o obj/atof-c.o + +obj/heap-c.o: crosslibc/heap.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/heap.c -o obj/heap-c.o + +obj/math-c.o: crosslibc/math.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/math.c -o obj/math-c.o + +obj/stdio-c.o: crosslibc/stdio.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/stdio.c -o obj/stdio-c.o + +obj/string-c.o: crosslibc/string.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/string.c -o obj/string-c.o + +obj/strtod-c.o: crosslibc/strtod.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/strtod.c -o obj/strtod-c.o + +obj/printf-c.o: crosslibc/printf/printf.c + gcc -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/printf/printf.c -o obj/printf-c.o + +obj/cppbase-cpp.o: crosslibc/cppbase.cpp + gcc -std=c++17 -DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch -fno-rtti -nostdinc++ -Iinclude -Iinclude/compat -Inolibc -Icrosslibc -Icrosslibc/STL -I/usr/include/efi -I/usr/include/efi/x86_64 -I/usr/include/efi/protocol -c crosslibc/cppbase.cpp -o obj/cppbase-cpp.o efi: bin/efitest.efi diff --git a/crosslibc b/crosslibc new file mode 160000 index 0000000..faea33e --- /dev/null +++ b/crosslibc @@ -0,0 +1 @@ +Subproject commit faea33e55eca7346604afe6281244ba651ab2300 diff --git a/include/getdelim.h b/include/getdelim.h index 63cfb24..5969109 100644 --- a/include/getdelim.h +++ b/include/getdelim.h @@ -11,8 +11,6 @@ static __attribute__((unused)) ssize_t my_getdelim(char **out, size_t *out_size, int delim, int in) { size_t out_idx = 0; - // Flush stdout - fflush(stdout); // Allocate buffer if needed if (*out == NULL) { *out = malloc(2); diff --git a/nolibc/arch-x86_64.h b/nolibc/arch-x86_64.h deleted file mode 100644 index ce319d6..0000000 --- a/nolibc/arch-x86_64.h +++ /dev/null @@ -1,82 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * x86_64 specific definitions for NOLIBC - * Copyright (C) 2017-2022 Willy Tarreau - */ - -#ifndef _NOLIBC_ARCH_X86_64_H -#define _NOLIBC_ARCH_X86_64_H - -#include "compiler.h" -#include "linux-uefi-syscalls.h" - -/* The struct returned by the stat() syscall, equivalent to stat64(). The - * syscall returns 116 bytes and stops in the middle of __unused. - */ -struct sys_stat_struct { - unsigned long st_dev; - unsigned long st_ino; - unsigned long st_nlink; - unsigned int st_mode; - unsigned int st_uid; - - unsigned int st_gid; - unsigned int __pad0; - unsigned long st_rdev; - long st_size; - long st_blksize; - - long st_blocks; - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; - - unsigned long st_mtime_nsec; - unsigned long st_ctime; - unsigned long st_ctime_nsec; - long __unused[3]; -}; - -/* Syscalls for x86_64 : - * - registers are 64-bit - * - syscall number is passed in rax - * - arguments are in rdi, rsi, rdx, r10, r8, r9 respectively - * - the system call is performed by calling the syscall instruction - * - syscall return comes in rax - * - rcx and r11 are clobbered, others are preserved. - * - the arguments are cast to long and assigned into the target registers - * which are then simply passed as registers to the asm code, so that we - * don't have to experience issues with register constraints. - * - the syscall number is always specified last in order to allow to force - * some registers before (gcc refuses a %-register at the last position). - * - see also x86-64 ABI section A.2 AMD64 Linux Kernel Conventions, A.2.1 - * Calling Conventions. - * - * Link x86-64 ABI: https://gitlab.com/x86-psABIs/x86-64-ABI/-/wikis/home - * - */ - -#define my_syscall0(num) \ -({ \ - uint64_t args[] = {0}; \ - long _ret = syscall_emu_x86_64(num, args); \ - _ret; \ -}) - -#define my_syscall1(num, ...) \ -({ \ - uint64_t args[] = {__VA_ARGS__}; \ - long _ret = syscall_emu_x86_64(num, args); \ - _ret; \ -}) - -#define my_syscall2 my_syscall1 -#define my_syscall3 my_syscall1 -#define my_syscall4 my_syscall1 -#define my_syscall5 my_syscall1 -#define my_syscall6 my_syscall1 - -char **environ __attribute__((weak)); -const unsigned long *_auxv __attribute__((weak)); - -#endif /* _NOLIBC_ARCH_X86_64_H */ diff --git a/nolibc/arch.h b/nolibc/arch.h index 61cb563..30c8aaa 100644 --- a/nolibc/arch.h +++ b/nolibc/arch.h @@ -1,20 +1,81 @@ /* SPDX-License-Identifier: LGPL-2.1 OR MIT */ /* + * x86_64 specific definitions for NOLIBC * Copyright (C) 2017-2022 Willy Tarreau */ -/* Below comes the architecture-specific code. For each architecture, we have - * the syscall declarations and the _start code definition. This is the only - * global part. On all architectures the kernel puts everything in the stack - * before jumping to _start just above us, without any return address (_start - * is not a function but an entry point). So at the stack pointer we find argc. - * Then argv[] begins, and ends at the first NULL. Then we have envp which - * starts and ends with a NULL as well. So envp=argv+argc+1. +#ifndef _NOLIBC_ARCH_X86_64_H +#define _NOLIBC_ARCH_X86_64_H + +#include "linux-uefi-syscalls.h" + +/* The struct returned by the stat() syscall, equivalent to stat64(). The + * syscall returns 116 bytes and stops in the middle of __unused. + */ +struct sys_stat_struct { + unsigned long st_dev; + unsigned long st_ino; + unsigned long st_nlink; + unsigned int st_mode; + unsigned int st_uid; + + unsigned int st_gid; + unsigned int __pad0; + unsigned long st_rdev; + long st_size; + long st_blksize; + + long st_blocks; + unsigned long st_atime; + unsigned long st_atime_nsec; + unsigned long st_mtime; + + unsigned long st_mtime_nsec; + unsigned long st_ctime; + unsigned long st_ctime_nsec; + long __unused[3]; +}; + +/* Syscalls for x86_64 : + * - registers are 64-bit + * - syscall number is passed in rax + * - arguments are in rdi, rsi, rdx, r10, r8, r9 respectively + * - the system call is performed by calling the syscall instruction + * - syscall return comes in rax + * - rcx and r11 are clobbered, others are preserved. + * - the arguments are cast to long and assigned into the target registers + * which are then simply passed as registers to the asm code, so that we + * don't have to experience issues with register constraints. + * - the syscall number is always specified last in order to allow to force + * some registers before (gcc refuses a %-register at the last position). + * - see also x86-64 ABI section A.2 AMD64 Linux Kernel Conventions, A.2.1 + * Calling Conventions. + * + * Link x86-64 ABI: https://gitlab.com/x86-psABIs/x86-64-ABI/-/wikis/home + * */ -#ifndef _NOLIBC_ARCH_H -#define _NOLIBC_ARCH_H +#define my_syscall0(num) \ +({ \ + uint64_t args[] = {0}; \ + long _ret = syscall_emu_x86_64(num, args); \ + _ret; \ +}) -#include "arch-x86_64.h" +#define my_syscall1(num, ...) \ +({ \ + uint64_t args[] = {__VA_ARGS__}; \ + long _ret = syscall_emu_x86_64(num, args); \ + _ret; \ +}) -#endif /* _NOLIBC_ARCH_H */ +#define my_syscall2 my_syscall1 +#define my_syscall3 my_syscall1 +#define my_syscall4 my_syscall1 +#define my_syscall5 my_syscall1 +#define my_syscall6 my_syscall1 + +char **environ __attribute__((weak)); +const unsigned long *_auxv __attribute__((weak)); + +#endif /* _NOLIBC_ARCH_X86_64_H */ diff --git a/nolibc/compiler.h b/nolibc/compiler.h deleted file mode 100644 index beddc36..0000000 --- a/nolibc/compiler.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * NOLIBC compiler support header - * Copyright (C) 2023 Thomas Weißschuh - */ -#ifndef _NOLIBC_COMPILER_H -#define _NOLIBC_COMPILER_H - -#if defined(__SSP__) || defined(__SSP_STRONG__) || defined(__SSP_ALL__) || defined(__SSP_EXPLICIT__) - -#define _NOLIBC_STACKPROTECTOR - -#endif /* defined(__SSP__) ... */ - -#if defined(__has_attribute) -# if __has_attribute(no_stack_protector) -# define __no_stack_protector __attribute__((no_stack_protector)) -# else -# define __no_stack_protector __attribute__((__optimize__("-fno-stack-protector"))) -# endif -#else -# define __no_stack_protector __attribute__((__optimize__("-fno-stack-protector"))) -#endif /* defined(__has_attribute) */ - -#endif /* _NOLIBC_COMPILER_H */ diff --git a/nolibc/ctype.h b/nolibc/ctype.h deleted file mode 100644 index 6f90706..0000000 --- a/nolibc/ctype.h +++ /dev/null @@ -1,102 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * ctype function definitions for NOLIBC - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_CTYPE_H -#define _NOLIBC_CTYPE_H - -#include "std.h" - -/* - * As much as possible, please keep functions alphabetically sorted. - */ - -static __attribute__((unused)) -int isascii(int c) -{ - /* 0x00..0x7f */ - return (unsigned int)c <= 0x7f; -} - -static __attribute__((unused)) -int isblank(int c) -{ - return c == '\t' || c == ' '; -} - -static __attribute__((unused)) -int iscntrl(int c) -{ - /* 0x00..0x1f, 0x7f */ - return (unsigned int)c < 0x20 || c == 0x7f; -} - -static __attribute__((unused)) -int isdigit(int c) -{ - return (unsigned int)(c - '0') < 10; -} - -static __attribute__((unused)) -int isgraph(int c) -{ - /* 0x21..0x7e */ - return (unsigned int)(c - 0x21) < 0x5e; -} - -static __attribute__((unused)) -int islower(int c) -{ - return (unsigned int)(c - 'a') < 26; -} - -static __attribute__((unused)) -int isprint(int c) -{ - /* 0x20..0x7e */ - return (unsigned int)(c - 0x20) < 0x5f; -} - -static __attribute__((unused)) -int isspace(int c) -{ - /* \t is 0x9, \n is 0xA, \v is 0xB, \f is 0xC, \r is 0xD */ - return ((unsigned int)c == ' ') || (unsigned int)(c - 0x09) < 5; -} - -static __attribute__((unused)) -int isupper(int c) -{ - return (unsigned int)(c - 'A') < 26; -} - -static __attribute__((unused)) -int isxdigit(int c) -{ - return isdigit(c) || (unsigned int)(c - 'A') < 6 || (unsigned int)(c - 'a') < 6; -} - -static __attribute__((unused)) -int isalpha(int c) -{ - return islower(c) || isupper(c); -} - -static __attribute__((unused)) -int isalnum(int c) -{ - return isalpha(c) || isdigit(c); -} - -static __attribute__((unused)) -int ispunct(int c) -{ - return isgraph(c) && !isalnum(c); -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_CTYPE_H */ diff --git a/nolibc/errno.h b/nolibc/errno.h index a44486f..d970930 100644 --- a/nolibc/errno.h +++ b/nolibc/errno.h @@ -7,14 +7,11 @@ #ifndef _NOLIBC_ERRNO_H #define _NOLIBC_ERRNO_H +#include #include -#ifndef NOLIBC_IGNORE_ERRNO #define SET_ERRNO(v) do { errno = (v); } while (0) int errno __attribute__((weak)); -#else -#define SET_ERRNO(v) do { } while (0) -#endif /* errno codes all ensure that they will not conflict with a valid pointer @@ -22,7 +19,11 @@ int errno __attribute__((weak)); */ #define MAX_ERRNO 4095 -/* make sure to include all global symbols */ -#include "nolibc.h" + +static __attribute__((unused)) +void perror(const char *msg) +{ + fprintf(stderr, "%s%serrno=%d\n", (msg && *msg) ? msg : "", (msg && *msg) ? ": " : "", errno); +} #endif /* _NOLIBC_ERRNO_H */ diff --git a/nolibc/nolibc.h b/nolibc/nolibc.h deleted file mode 100644 index 05a228a..0000000 --- a/nolibc/nolibc.h +++ /dev/null @@ -1,112 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* nolibc.h - * Copyright (C) 2017-2018 Willy Tarreau - */ - -/* - * This file is designed to be used as a libc alternative for minimal programs - * with very limited requirements. It consists of a small number of syscall and - * type definitions, and the minimal startup code needed to call main(). - * All syscalls are declared as static functions so that they can be optimized - * away by the compiler when not used. - * - * Syscalls are split into 3 levels: - * - The lower level is the arch-specific syscall() definition, consisting in - * assembly code in compound expressions. These are called my_syscall0() to - * my_syscall6() depending on the number of arguments. The MIPS - * implementation is limited to 5 arguments. All input arguments are cast - * to a long stored in a register. These expressions always return the - * syscall's return value as a signed long value which is often either a - * pointer or the negated errno value. - * - * - The second level is mostly architecture-independent. It is made of - * static functions called sys_() which rely on my_syscallN() - * depending on the syscall definition. These functions are responsible - * for exposing the appropriate types for the syscall arguments (int, - * pointers, etc) and for setting the appropriate return type (often int). - * A few of them are architecture-specific because the syscalls are not all - * mapped exactly the same among architectures. For example, some archs do - * not implement select() and need pselect6() instead, so the sys_select() - * function will have to abstract this. - * - * - The third level is the libc call definition. It exposes the lower raw - * sys_() calls in a way that looks like what a libc usually does, - * takes care of specific input values, and of setting errno upon error. - * There can be minor variations compared to standard libc calls. For - * example the open() call always takes 3 args here. - * - * The errno variable is declared static and unused. This way it can be - * optimized away if not used. However this means that a program made of - * multiple C files may observe different errno values (one per C file). For - * the type of programs this project targets it usually is not a problem. The - * resulting program may even be reduced by defining the NOLIBC_IGNORE_ERRNO - * macro, in which case the errno value will never be assigned. - * - * Some stdint-like integer types are defined. These are valid on all currently - * supported architectures, because signs are enforced, ints are assumed to be - * 32 bits, longs the size of a pointer and long long 64 bits. If more - * architectures have to be supported, this may need to be adapted. - * - * Some macro definitions like the O_* values passed to open(), and some - * structures like the sys_stat struct depend on the architecture. - * - * The definitions start with the architecture-specific parts, which are picked - * based on what the compiler knows about the target architecture, and are - * completed with the generic code. Since it is the compiler which sets the - * target architecture, cross-compiling normally works out of the box without - * having to specify anything. - * - * Finally some very common libc-level functions are provided. It is the case - * for a few functions usually found in string.h, ctype.h, or stdlib.h. - * - * The nolibc.h file is only a convenient entry point which includes all other - * files. It also defines the NOLIBC macro, so that it is possible for a - * program to check this macro to know if it is being built against and decide - * to disable some features or simply not to include some standard libc files. - * - * A simple static executable may be built this way : - * $ gcc -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \ - * -static -include nolibc.h -o hello hello.c -lgcc - * - * Simple programs meant to be reasonably portable to various libc and using - * only a few common includes, may also be built by simply making the include - * path point to the nolibc directory: - * $ gcc -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \ - * -I../nolibc -o hello hello.c -lgcc - * - * The available standard (but limited) include files are: - * ctype.h, errno.h, signal.h, stdio.h, stdlib.h, string.h, time.h - * - * In addition, the following ones are expected to be provided by the compiler: - * float.h, stdarg.h, stddef.h - * - * The following ones which are part to the C standard are not provided: - * assert.h, locale.h, math.h, setjmp.h, limits.h - * - * A very useful calling convention table may be found here : - * http://man7.org/linux/man-pages/man2/syscall.2.html - * - * This doc is quite convenient though not necessarily up to date : - * https://w3challs.com/syscalls/ - * - */ -#ifndef _NOLIBC_H -#define _NOLIBC_H - -#include "std.h" -#include "arch.h" -#include "types.h" -#include "sys.h" -#include "ctype.h" -#include "signal.h" -#include "unistd.h" -#include "stdio.h" -#include "stdlib.h" -#include "string.h" -#include "time.h" -#include "stackprotector.h" - -/* Used by programs to avoid std includes */ -#define NOLIBC - -#endif /* _NOLIBC_H */ diff --git a/nolibc/signal.h b/nolibc/signal.h deleted file mode 100644 index 1375522..0000000 --- a/nolibc/signal.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * signal function definitions for NOLIBC - * Copyright (C) 2017-2022 Willy Tarreau - */ - -#ifndef _NOLIBC_SIGNAL_H -#define _NOLIBC_SIGNAL_H - -#include "std.h" -#include "arch.h" -#include "types.h" -#include "sys.h" - -/* This one is not marked static as it's needed by libgcc for divide by zero */ -__attribute__((weak,unused,section(".text.nolibc_raise"))) -int raise(int signal) -{ - return sys_kill(sys_getpid(), signal); -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_SIGNAL_H */ diff --git a/nolibc/stackprotector.h b/nolibc/stackprotector.h deleted file mode 100644 index 88f7b2d..0000000 --- a/nolibc/stackprotector.h +++ /dev/null @@ -1,50 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * Stack protector support for NOLIBC - * Copyright (C) 2023 Thomas Weißschuh - */ - -#ifndef _NOLIBC_STACKPROTECTOR_H -#define _NOLIBC_STACKPROTECTOR_H - -#include "compiler.h" - -#if defined(_NOLIBC_STACKPROTECTOR) - -#include "sys.h" -#include "stdlib.h" - -/* The functions in this header are using raw syscall macros to avoid - * triggering stack protector errors themselves - */ - -__attribute__((weak,noreturn,section(".text.nolibc_stack_chk"))) -void __stack_chk_fail(void) -{ - pid_t pid; - my_syscall3(__NR_write, STDERR_FILENO, "!!Stack smashing detected!!\n", 28); - pid = my_syscall0(__NR_getpid); - my_syscall2(__NR_kill, pid, SIGABRT); - for (;;); -} - -__attribute__((weak,noreturn,section(".text.nolibc_stack_chk"))) -void __stack_chk_fail_local(void) -{ - __stack_chk_fail(); -} - -__attribute__((weak,section(".data.nolibc_stack_chk"))) -uintptr_t __stack_chk_guard; - -__attribute__((weak,section(".text.nolibc_stack_chk"))) __no_stack_protector -void __stack_chk_init(void) -{ - my_syscall3(__NR_getrandom, &__stack_chk_guard, sizeof(__stack_chk_guard), 0); - /* a bit more randomness in case getrandom() fails, ensure the guard is never 0 */ - if (__stack_chk_guard != (uintptr_t) &__stack_chk_guard) - __stack_chk_guard ^= (uintptr_t) &__stack_chk_guard; -} -#endif /* defined(_NOLIBC_STACKPROTECTOR) */ - -#endif /* _NOLIBC_STACKPROTECTOR_H */ diff --git a/nolibc/std.h b/nolibc/std.h deleted file mode 100644 index 933bc0b..0000000 --- a/nolibc/std.h +++ /dev/null @@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * Standard definitions and types for NOLIBC - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_STD_H -#define _NOLIBC_STD_H - -/* Declare a few quite common macros and types that usually are in stdlib.h, - * stdint.h, ctype.h, unistd.h and a few other common locations. Please place - * integer type definitions and generic macros here, but avoid OS-specific and - * syscall-specific stuff, as this file is expected to be included very early. - */ - -/* note: may already be defined */ -#ifndef NULL -#define NULL ((void *)0) -#endif - -#include "stdint.h" - -/* those are commonly provided by sys/types.h */ -typedef unsigned int dev_t; -typedef unsigned long ino_t; -typedef unsigned int mode_t; -typedef signed int pid_t; -typedef unsigned int uid_t; -typedef unsigned int gid_t; -typedef unsigned long nlink_t; -typedef signed long off_t; -typedef signed long blksize_t; -typedef signed long blkcnt_t; -typedef signed long time_t; - -#endif /* _NOLIBC_STD_H */ diff --git a/nolibc/stdint.h b/nolibc/stdint.h deleted file mode 100644 index 4b28243..0000000 --- a/nolibc/stdint.h +++ /dev/null @@ -1,113 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * Standard definitions and types for NOLIBC - * Copyright (C) 2023 Vincent Dagonneau - */ - -#ifndef _NOLIBC_STDINT_H -#define _NOLIBC_STDINT_H - -typedef unsigned char uint8_t; -typedef signed char int8_t; -typedef unsigned short uint16_t; -typedef signed short int16_t; -typedef unsigned int uint32_t; -typedef signed int int32_t; -typedef unsigned long long uint64_t; -typedef signed long long int64_t; -typedef unsigned long size_t; -typedef signed long ssize_t; -typedef unsigned long uintptr_t; -typedef signed long intptr_t; -typedef signed long ptrdiff_t; - -typedef int8_t int_least8_t; -typedef uint8_t uint_least8_t; -typedef int16_t int_least16_t; -typedef uint16_t uint_least16_t; -typedef int32_t int_least32_t; -typedef uint32_t uint_least32_t; -typedef int64_t int_least64_t; -typedef uint64_t uint_least64_t; - -typedef int8_t int_fast8_t; -typedef uint8_t uint_fast8_t; -typedef ssize_t int_fast16_t; -typedef size_t uint_fast16_t; -typedef ssize_t int_fast32_t; -typedef size_t uint_fast32_t; -typedef int64_t int_fast64_t; -typedef uint64_t uint_fast64_t; - -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - -/* limits of integral types */ - -#define INT8_MIN (-128) -#define INT16_MIN (-32767-1) -#define INT32_MIN (-2147483647-1) -#define INT64_MIN (-9223372036854775807LL-1) - -#define INT8_MAX (127) -#define INT16_MAX (32767) -#define INT32_MAX (2147483647) -#define INT64_MAX (9223372036854775807LL) - -#define UINT8_MAX (255) -#define UINT16_MAX (65535) -#define UINT32_MAX (4294967295U) -#define UINT64_MAX (18446744073709551615ULL) - -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST64_MIN INT64_MIN - -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MAX INT64_MAX - -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -#define SIZE_MAX ((size_t)(__LONG_MAX__) * 2 + 1) -#define INTPTR_MIN (-__LONG_MAX__ - 1) -#define INTPTR_MAX __LONG_MAX__ -#define PTRDIFF_MIN INTPTR_MIN -#define PTRDIFF_MAX INTPTR_MAX -#define UINTPTR_MAX SIZE_MAX - -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST16_MIN INTPTR_MIN -#define INT_FAST32_MIN INTPTR_MIN -#define INT_FAST64_MIN INT64_MIN - -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MAX INTPTR_MAX -#define INT_FAST32_MAX INTPTR_MAX -#define INT_FAST64_MAX INT64_MAX - -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX SIZE_MAX -#define UINT_FAST32_MAX SIZE_MAX -#define UINT_FAST64_MAX UINT64_MAX - -#ifndef INT_MIN -#define INT_MIN (-__INT_MAX__ - 1) -#endif -#ifndef INT_MAX -#define INT_MAX __INT_MAX__ -#endif - -#ifndef LONG_MIN -#define LONG_MIN (-__LONG_MAX__ - 1) -#endif -#ifndef LONG_MAX -#define LONG_MAX __LONG_MAX__ -#endif - -#endif /* _NOLIBC_STDINT_H */ diff --git a/nolibc/stdio.h b/nolibc/stdio.h deleted file mode 100644 index 0eef91d..0000000 --- a/nolibc/stdio.h +++ /dev/null @@ -1,356 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * minimal stdio function definitions for NOLIBC - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_STDIO_H -#define _NOLIBC_STDIO_H - -#include - -#include "std.h" -#include "arch.h" -#include "errno.h" -#include "types.h" -#include "sys.h" -#include "stdlib.h" -#include "string.h" - -#ifndef EOF -#define EOF (-1) -#endif - -/* just define FILE as a non-empty type. The value of the pointer gives - * the FD: FILE=~fd for fd>=0 or NULL for fd<0. This way positive FILE - * are immediately identified as abnormal entries (i.e. possible copies - * of valid pointers to something else). - */ -typedef struct FILE { - char dummy[1]; -} FILE; - -static __attribute__((unused)) FILE* const stdin = (FILE*)(intptr_t)~STDIN_FILENO; -static __attribute__((unused)) FILE* const stdout = (FILE*)(intptr_t)~STDOUT_FILENO; -static __attribute__((unused)) FILE* const stderr = (FILE*)(intptr_t)~STDERR_FILENO; - -/* provides a FILE* equivalent of fd. The mode is ignored. */ -static __attribute__((unused)) -FILE *fdopen(int fd, const char *mode __attribute__((unused))) -{ - if (fd < 0) { - SET_ERRNO(EBADF); - return NULL; - } - return (FILE*)(intptr_t)~fd; -} - -/* provides the fd of stream. */ -static __attribute__((unused)) -int fileno(FILE *stream) -{ - intptr_t i = (intptr_t)stream; - - if (i >= 0) { - SET_ERRNO(EBADF); - return -1; - } - return ~i; -} - -/* flush a stream. */ -static __attribute__((unused)) -int fflush(FILE *stream) -{ - intptr_t i = (intptr_t)stream; - - /* NULL is valid here. */ - if (i > 0) { - SET_ERRNO(EBADF); - return -1; - } - - /* Don't do anything, nolibc does not support buffering. */ - return 0; -} - -/* flush a stream. */ -static __attribute__((unused)) -int fclose(FILE *stream) -{ - intptr_t i = (intptr_t)stream; - - if (i >= 0) { - SET_ERRNO(EBADF); - return -1; - } - - if (close(~i)) - return EOF; - - return 0; -} - -/* getc(), fgetc(), getchar() */ - -#define getc(stream) fgetc(stream) - -static __attribute__((unused)) -int fgetc(FILE* stream) -{ - unsigned char ch; - - if (read(fileno(stream), &ch, 1) <= 0) - return EOF; - return ch; -} - -static __attribute__((unused)) -int getchar(void) -{ - return fgetc(stdin); -} - - -/* putc(), fputc(), putchar() */ - -#define putc(c, stream) fputc(c, stream) - -static __attribute__((unused)) -int fputc(int c, FILE* stream) -{ - unsigned char ch = c; - - if (write(fileno(stream), &ch, 1) <= 0) - return EOF; - return ch; -} - -static __attribute__((unused)) -int putchar(int c) -{ - return fputc(c, stdout); -} - - -/* fwrite(), puts(), fputs(). Note that puts() emits '\n' but not fputs(). */ - -/* internal fwrite()-like function which only takes a size and returns 0 on - * success or EOF on error. It automatically retries on short writes. - */ -static __attribute__((unused)) -int _fwrite(const void *buf, size_t size, FILE *stream) -{ - ssize_t ret; - int fd = fileno(stream); - - while (size) { - ret = write(fd, buf, size); - if (ret <= 0) - return EOF; - size -= ret; - buf += ret; - } - return 0; -} - -static __attribute__((unused)) -size_t fwrite(const void *s, size_t size, size_t nmemb, FILE *stream) -{ - size_t written; - - for (written = 0; written < nmemb; written++) { - if (_fwrite(s, size, stream) != 0) - break; - s += size; - } - return written; -} - -static __attribute__((unused)) -int fputs(const char *s, FILE *stream) -{ - return _fwrite(s, strlen(s), stream); -} - -static __attribute__((unused)) -int puts(const char *s) -{ - if (fputs(s, stdout) == EOF) - return EOF; - return putchar('\n'); -} - - -/* fgets() */ -static __attribute__((unused)) -char *fgets(char *s, int size, FILE *stream) -{ - int ofs; - int c; - - for (ofs = 0; ofs + 1 < size;) { - c = fgetc(stream); - if (c == EOF) - break; - s[ofs++] = c; - if (c == '\n') - break; - } - if (ofs < size) - s[ofs] = 0; - return ofs ? s : NULL; -} - - -/* minimal vfprintf(). It supports the following formats: - * - %[l*]{d,u,c,x,p} - * - %s - * - unknown modifiers are ignored. - */ -static __attribute__((unused)) -int vfprintf(FILE *stream, const char *fmt, va_list args) -{ - char escape, lpref, c; - unsigned long long v; - unsigned int written; - size_t len, ofs; - char tmpbuf[21]; - const char *outstr; - - written = ofs = escape = lpref = 0; - while (1) { - c = fmt[ofs++]; - - if (escape) { - /* we're in an escape sequence, ofs == 1 */ - escape = 0; - if (c == 'c' || c == 'd' || c == 'u' || c == 'x' || c == 'p') { - char *out = tmpbuf; - - if (c == 'p') - v = va_arg(args, unsigned long); - else if (lpref) { - if (lpref > 1) - v = va_arg(args, unsigned long long); - else - v = va_arg(args, unsigned long); - } else - v = va_arg(args, unsigned int); - - if (c == 'd') { - /* sign-extend the value */ - if (lpref == 0) - v = (long long)(int)v; - else if (lpref == 1) - v = (long long)(long)v; - } - - switch (c) { - case 'c': - out[0] = v; - out[1] = 0; - break; - case 'd': - i64toa_r(v, out); - break; - case 'u': - u64toa_r(v, out); - break; - case 'p': - *(out++) = '0'; - *(out++) = 'x'; - /* fall through */ - default: /* 'x' and 'p' above */ - u64toh_r(v, out); - break; - } - outstr = tmpbuf; - } - else if (c == 's') { - outstr = va_arg(args, char *); - if (!outstr) - outstr="(null)"; - } - else if (c == '%') { - /* queue it verbatim */ - continue; - } - else { - /* modifiers or final 0 */ - if (c == 'l') { - /* long format prefix, maintain the escape */ - lpref++; - } - escape = 1; - goto do_escape; - } - len = strlen(outstr); - goto flush_str; - } - - /* not an escape sequence */ - if (c == 0 || c == '%') { - /* flush pending data on escape or end */ - escape = 1; - lpref = 0; - outstr = fmt; - len = ofs - 1; - flush_str: - if (_fwrite(outstr, len, stream) != 0) - break; - - written += len; - do_escape: - if (c == 0) - break; - fmt += ofs; - ofs = 0; - continue; - } - - /* literal char, just queue it */ - } - return written; -} - -static __attribute__((unused)) -int vprintf(const char *fmt, va_list args) -{ - return vfprintf(stdout, fmt, args); -} - -static __attribute__((unused, format(printf, 2, 3))) -int fprintf(FILE *stream, const char *fmt, ...) -{ - va_list args; - int ret; - - va_start(args, fmt); - ret = vfprintf(stream, fmt, args); - va_end(args); - return ret; -} - -static __attribute__((unused, format(printf, 1, 2))) -int printf(const char *fmt, ...) -{ - va_list args; - int ret; - - va_start(args, fmt); - ret = vfprintf(stdout, fmt, args); - va_end(args); - return ret; -} - -static __attribute__((unused)) -void perror(const char *msg) -{ - fprintf(stderr, "%s%serrno=%d\n", (msg && *msg) ? msg : "", (msg && *msg) ? ": " : "", errno); -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_STDIO_H */ diff --git a/nolibc/stdlib.h b/nolibc/stdlib.h deleted file mode 100644 index 902162f..0000000 --- a/nolibc/stdlib.h +++ /dev/null @@ -1,452 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * stdlib function definitions for NOLIBC - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_STDLIB_H -#define _NOLIBC_STDLIB_H - -#include "std.h" -#include "arch.h" -#include "types.h" -#include "sys.h" -#include "string.h" -#include - -struct nolibc_heap { - size_t len; - char user_p[] __attribute__((__aligned__)); -}; - -/* Buffer used to store int-to-ASCII conversions. Will only be implemented if - * any of the related functions is implemented. The area is large enough to - * store "18446744073709551615" or "-9223372036854775808" and the final zero. - */ -static __attribute__((unused)) char itoa_buffer[21]; - -/* - * As much as possible, please keep functions alphabetically sorted. - */ - -/* must be exported, as it's used by libgcc for various divide functions */ -__attribute__((weak,unused,noreturn,section(".text.nolibc_abort"))) -void abort(void) -{ - sys_kill(sys_getpid(), SIGABRT); - for (;;); -} - -static __attribute__((unused)) -long atol(const char *s) -{ - unsigned long ret = 0; - unsigned long d; - int neg = 0; - - if (*s == '-') { - neg = 1; - s++; - } - - while (1) { - d = (*s++) - '0'; - if (d > 9) - break; - ret *= 10; - ret += d; - } - - return neg ? -ret : ret; -} - -static __attribute__((unused)) -int atoi(const char *s) -{ - return atol(s); -} - -static __attribute__((unused)) -void free(void *ptr) -{ - struct nolibc_heap *heap; - - if (!ptr) - return; - - heap = container_of(ptr, struct nolibc_heap, user_p); - munmap(heap, heap->len); -} - -/* getenv() tries to find the environment variable named in the - * environment array pointed to by global variable "environ" which must be - * declared as a char **, and must be terminated by a NULL (it is recommended - * to set this variable to the "envp" argument of main()). If the requested - * environment variable exists its value is returned otherwise NULL is - * returned. getenv() is forcefully inlined so that the reference to "environ" - * will be dropped if unused, even at -O0. - */ -static __attribute__((unused)) -char *_getenv(const char *name, char **environ) -{ - int idx, i; - - if (environ) { - for (idx = 0; environ[idx]; idx++) { - for (i = 0; name[i] && name[i] == environ[idx][i];) - i++; - if (!name[i] && environ[idx][i] == '=') - return &environ[idx][i+1]; - } - } - return NULL; -} - -static __inline__ __attribute__((unused,always_inline)) -char *getenv(const char *name) -{ - extern char **environ; - return _getenv(name, environ); -} - -static __attribute__((unused)) -unsigned long getauxval(unsigned long type) -{ - const unsigned long *auxv = _auxv; - unsigned long ret; - - if (!auxv) - return 0; - - while (1) { - if (!auxv[0] && !auxv[1]) { - ret = 0; - break; - } - - if (auxv[0] == type) { - ret = auxv[1]; - break; - } - - auxv += 2; - } - - return ret; -} - -static __attribute__((unused)) -void *malloc(size_t len) -{ - struct nolibc_heap *heap; - - /* Always allocate memory with size multiple of 4096. */ - len = sizeof(*heap) + len; - len = (len + 4095UL) & -4096UL; - heap = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, - -1, 0); - if (__builtin_expect(heap == MAP_FAILED, 0)) - return NULL; - - heap->len = len; - return heap->user_p; -} - -static __attribute__((unused)) -void *calloc(size_t size, size_t nmemb) -{ - size_t x = size * nmemb; - - if (__builtin_expect(size && ((x / size) != nmemb), 0)) { - SET_ERRNO(ENOMEM); - return NULL; - } - - /* - * No need to zero the heap, the MAP_ANONYMOUS in malloc() - * already does it. - */ - return malloc(x); -} - -static __attribute__((unused)) -void *realloc(void *old_ptr, size_t new_size) -{ - struct nolibc_heap *heap; - size_t user_p_len; - void *ret; - - if (!old_ptr) - return malloc(new_size); - - heap = container_of(old_ptr, struct nolibc_heap, user_p); - user_p_len = heap->len - sizeof(*heap); - /* - * Don't realloc() if @user_p_len >= @new_size, this block of - * memory is still enough to handle the @new_size. Just return - * the same pointer. - */ - if (user_p_len >= new_size) - return old_ptr; - - ret = malloc(new_size); - if (__builtin_expect(!ret, 0)) - return NULL; - - memcpy(ret, heap->user_p, heap->len); - munmap(heap, heap->len); - return ret; -} - -/* Converts the unsigned long integer to its hex representation into - * buffer , which must be long enough to store the number and the - * trailing zero (17 bytes for "ffffffffffffffff" or 9 for "ffffffff"). The - * buffer is filled from the first byte, and the number of characters emitted - * (not counting the trailing zero) is returned. The function is constructed - * in a way to optimize the code size and avoid any divide that could add a - * dependency on large external functions. - */ -static __attribute__((unused)) -int utoh_r(unsigned long in, char *buffer) -{ - signed char pos = (~0UL > 0xfffffffful) ? 60 : 28; - int digits = 0; - int dig; - - do { - dig = in >> pos; - in -= (uint64_t)dig << pos; - pos -= 4; - if (dig || digits || pos < 0) { - if (dig > 9) - dig += 'a' - '0' - 10; - buffer[digits++] = '0' + dig; - } - } while (pos >= 0); - - buffer[digits] = 0; - return digits; -} - -/* converts unsigned long to an hex string using the static itoa_buffer - * and returns the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *utoh(unsigned long in) -{ - utoh_r(in, itoa_buffer); - return itoa_buffer; -} - -/* Converts the unsigned long integer to its string representation into - * buffer , which must be long enough to store the number and the - * trailing zero (21 bytes for 18446744073709551615 in 64-bit, 11 for - * 4294967295 in 32-bit). The buffer is filled from the first byte, and the - * number of characters emitted (not counting the trailing zero) is returned. - * The function is constructed in a way to optimize the code size and avoid - * any divide that could add a dependency on large external functions. - */ -static __attribute__((unused)) -int utoa_r(unsigned long in, char *buffer) -{ - unsigned long lim; - int digits = 0; - int pos = (~0UL > 0xfffffffful) ? 19 : 9; - int dig; - - do { - for (dig = 0, lim = 1; dig < pos; dig++) - lim *= 10; - - if (digits || in >= lim || !pos) { - for (dig = 0; in >= lim; dig++) - in -= lim; - buffer[digits++] = '0' + dig; - } - } while (pos--); - - buffer[digits] = 0; - return digits; -} - -/* Converts the signed long integer to its string representation into - * buffer , which must be long enough to store the number and the - * trailing zero (21 bytes for -9223372036854775808 in 64-bit, 12 for - * -2147483648 in 32-bit). The buffer is filled from the first byte, and the - * number of characters emitted (not counting the trailing zero) is returned. - */ -static __attribute__((unused)) -int itoa_r(long in, char *buffer) -{ - char *ptr = buffer; - int len = 0; - - if (in < 0) { - in = -in; - *(ptr++) = '-'; - len++; - } - len += utoa_r(in, ptr); - return len; -} - -/* for historical compatibility, same as above but returns the pointer to the - * buffer. - */ -static __inline__ __attribute__((unused)) -char *ltoa_r(long in, char *buffer) -{ - itoa_r(in, buffer); - return buffer; -} - -/* converts long integer to a string using the static itoa_buffer and - * returns the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *itoa(long in) -{ - itoa_r(in, itoa_buffer); - return itoa_buffer; -} - -/* converts long integer to a string using the static itoa_buffer and - * returns the pointer to that string. Same as above, for compatibility. - */ -static __inline__ __attribute__((unused)) -char *ltoa(long in) -{ - itoa_r(in, itoa_buffer); - return itoa_buffer; -} - -/* converts unsigned long integer to a string using the static itoa_buffer - * and returns the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *utoa(unsigned long in) -{ - utoa_r(in, itoa_buffer); - return itoa_buffer; -} - -/* Converts the unsigned 64-bit integer to its hex representation into - * buffer , which must be long enough to store the number and the - * trailing zero (17 bytes for "ffffffffffffffff"). The buffer is filled from - * the first byte, and the number of characters emitted (not counting the - * trailing zero) is returned. The function is constructed in a way to optimize - * the code size and avoid any divide that could add a dependency on large - * external functions. - */ -static __attribute__((unused)) -int u64toh_r(uint64_t in, char *buffer) -{ - signed char pos = 60; - int digits = 0; - int dig; - - do { - if (sizeof(long) >= 8) { - dig = (in >> pos) & 0xF; - } else { - /* 32-bit platforms: avoid a 64-bit shift */ - uint32_t d = (pos >= 32) ? (in >> 32) : in; - dig = (d >> (pos & 31)) & 0xF; - } - if (dig > 9) - dig += 'a' - '0' - 10; - pos -= 4; - if (dig || digits || pos < 0) - buffer[digits++] = '0' + dig; - } while (pos >= 0); - - buffer[digits] = 0; - return digits; -} - -/* converts uint64_t to an hex string using the static itoa_buffer and - * returns the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *u64toh(uint64_t in) -{ - u64toh_r(in, itoa_buffer); - return itoa_buffer; -} - -/* Converts the unsigned 64-bit integer to its string representation into - * buffer , which must be long enough to store the number and the - * trailing zero (21 bytes for 18446744073709551615). The buffer is filled from - * the first byte, and the number of characters emitted (not counting the - * trailing zero) is returned. The function is constructed in a way to optimize - * the code size and avoid any divide that could add a dependency on large - * external functions. - */ -static __attribute__((unused)) -int u64toa_r(uint64_t in, char *buffer) -{ - unsigned long long lim; - int digits = 0; - int pos = 19; /* start with the highest possible digit */ - int dig; - - do { - for (dig = 0, lim = 1; dig < pos; dig++) - lim *= 10; - - if (digits || in >= lim || !pos) { - for (dig = 0; in >= lim; dig++) - in -= lim; - buffer[digits++] = '0' + dig; - } - } while (pos--); - - buffer[digits] = 0; - return digits; -} - -/* Converts the signed 64-bit integer to its string representation into - * buffer , which must be long enough to store the number and the - * trailing zero (21 bytes for -9223372036854775808). The buffer is filled from - * the first byte, and the number of characters emitted (not counting the - * trailing zero) is returned. - */ -static __attribute__((unused)) -int i64toa_r(int64_t in, char *buffer) -{ - char *ptr = buffer; - int len = 0; - - if (in < 0) { - in = -in; - *(ptr++) = '-'; - len++; - } - len += u64toa_r(in, ptr); - return len; -} - -/* converts int64_t to a string using the static itoa_buffer and returns - * the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *i64toa(int64_t in) -{ - i64toa_r(in, itoa_buffer); - return itoa_buffer; -} - -/* converts uint64_t to a string using the static itoa_buffer and returns - * the pointer to that string. - */ -static __inline__ __attribute__((unused)) -char *u64toa(uint64_t in) -{ - u64toa_r(in, itoa_buffer); - return itoa_buffer; -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_STDLIB_H */ diff --git a/nolibc/string.h b/nolibc/string.h deleted file mode 100644 index 0c2e06c..0000000 --- a/nolibc/string.h +++ /dev/null @@ -1,294 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * string function definitions for NOLIBC - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_STRING_H -#define _NOLIBC_STRING_H - -#include "std.h" - -static void *malloc(size_t len); - -/* - * As much as possible, please keep functions alphabetically sorted. - */ - -static __attribute__((unused)) -int memcmp(const void *s1, const void *s2, size_t n) -{ - size_t ofs = 0; - int c1 = 0; - - while (ofs < n && !(c1 = ((unsigned char *)s1)[ofs] - ((unsigned char *)s2)[ofs])) { - ofs++; - } - return c1; -} - -static __attribute__((unused)) -void *_nolibc_memcpy_up(void *dst, const void *src, size_t len) -{ - size_t pos = 0; - - while (pos < len) { - ((char *)dst)[pos] = ((const char *)src)[pos]; - pos++; - } - return dst; -} - -static __attribute__((unused)) -void *_nolibc_memcpy_down(void *dst, const void *src, size_t len) -{ - while (len) { - len--; - ((char *)dst)[len] = ((const char *)src)[len]; - } - return dst; -} - -/* might be ignored by the compiler without -ffreestanding, then found as - * missing. - */ -__attribute__((weak,unused,section(".text.nolibc_memmove"))) -void *memmove(void *dst, const void *src, size_t len) -{ - size_t dir, pos; - - pos = len; - dir = -1; - - if (dst < src) { - pos = -1; - dir = 1; - } - - while (len) { - pos += dir; - ((char *)dst)[pos] = ((const char *)src)[pos]; - len--; - } - return dst; -} - -/* must be exported, as it's used by libgcc on ARM */ -__attribute__((weak,unused,section(".text.nolibc_memcpy"))) -void *memcpy(void *dst, const void *src, size_t len) -{ - return _nolibc_memcpy_up(dst, src, len); -} - -/* might be ignored by the compiler without -ffreestanding, then found as - * missing. - */ -__attribute__((weak,unused,section(".text.nolibc_memset"))) -void *memset(void *dst, int b, size_t len) -{ - char *p = dst; - - while (len--) { - /* prevent gcc from recognizing memset() here */ - __asm__ volatile(""); - *(p++) = b; - } - return dst; -} - -static __attribute__((unused)) -char *strchr(const char *s, int c) -{ - while (*s) { - if (*s == (char)c) - return (char *)s; - s++; - } - return NULL; -} - -static __attribute__((unused)) -int strcmp(const char *a, const char *b) -{ - unsigned int c; - int diff; - - while (!(diff = (unsigned char)*a++ - (c = (unsigned char)*b++)) && c) - ; - return diff; -} - -static __attribute__((unused)) -char *strcpy(char *dst, const char *src) -{ - char *ret = dst; - - while ((*dst++ = *src++)); - return ret; -} - -/* this function is only used with arguments that are not constants or when - * it's not known because optimizations are disabled. Note that gcc 12 - * recognizes an strlen() pattern and replaces it with a jump to strlen(), - * thus itself, hence the asm() statement below that's meant to disable this - * confusing practice. - */ -static __attribute__((unused)) -size_t strlen(const char *str) -{ - size_t len; - - for (len = 0; str[len]; len++) - __asm__(""); - return len; -} - -/* do not trust __builtin_constant_p() at -O0, as clang will emit a test and - * the two branches, then will rely on an external definition of strlen(). - */ -#if defined(__OPTIMIZE__) -#define nolibc_strlen(x) strlen(x) -#define strlen(str) ({ \ - __builtin_constant_p((str)) ? \ - __builtin_strlen((str)) : \ - nolibc_strlen((str)); \ -}) -#endif - -static __attribute__((unused)) -size_t strnlen(const char *str, size_t maxlen) -{ - size_t len; - - for (len = 0; (len < maxlen) && str[len]; len++); - return len; -} - -static __attribute__((unused)) -char *strdup(const char *str) -{ - size_t len; - char *ret; - - len = strlen(str); - ret = malloc(len + 1); - if (__builtin_expect(ret != NULL, 1)) - memcpy(ret, str, len + 1); - - return ret; -} - -static __attribute__((unused)) -char *strndup(const char *str, size_t maxlen) -{ - size_t len; - char *ret; - - len = strnlen(str, maxlen); - ret = malloc(len + 1); - if (__builtin_expect(ret != NULL, 1)) { - memcpy(ret, str, len); - ret[len] = '\0'; - } - - return ret; -} - -static __attribute__((unused)) -size_t strlcat(char *dst, const char *src, size_t size) -{ - size_t len; - char c; - - for (len = 0; dst[len]; len++) - ; - - for (;;) { - c = *src; - if (len < size) - dst[len] = c; - if (!c) - break; - len++; - src++; - } - - return len; -} - -static __attribute__((unused)) -size_t strlcpy(char *dst, const char *src, size_t size) -{ - size_t len; - char c; - - for (len = 0;;) { - c = src[len]; - if (len < size) - dst[len] = c; - if (!c) - break; - len++; - } - return len; -} - -static __attribute__((unused)) -char *strncat(char *dst, const char *src, size_t size) -{ - char *orig = dst; - - while (*dst) - dst++; - - while (size && (*dst = *src)) { - src++; - dst++; - size--; - } - - *dst = 0; - return orig; -} - -static __attribute__((unused)) -int strncmp(const char *a, const char *b, size_t size) -{ - unsigned int c; - int diff = 0; - - while (size-- && - !(diff = (unsigned char)*a++ - (c = (unsigned char)*b++)) && c) - ; - - return diff; -} - -static __attribute__((unused)) -char *strncpy(char *dst, const char *src, size_t size) -{ - size_t len; - - for (len = 0; len < size; len++) - if ((dst[len] = *src)) - src++; - return dst; -} - -static __attribute__((unused)) -char *strrchr(const char *s, int c) -{ - const char *ret = NULL; - - while (*s) { - if (*s == (char)c) - ret = s; - s++; - } - return (char *)ret; -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_STRING_H */ diff --git a/nolibc/sys.h b/nolibc/sys.h deleted file mode 100644 index 01dbdda..0000000 --- a/nolibc/sys.h +++ /dev/null @@ -1,1432 +0,0 @@ -#pragma GCC diagnostic ignored "-Wint-conversion" - -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * Syscall definitions for NOLIBC (those in man(2)) - * Copyright (C) 2017-2021 Willy Tarreau - */ - -#ifndef _NOLIBC_SYS_H -#define _NOLIBC_SYS_H - -#include -#include "std.h" - -/* system includes */ -#include -#include /* for SIGCHLD */ -#include -#include -#include -#include -#include -#include -#include /* for O_* and AT_* */ -#include /* for statx() */ -#include /* for LINUX_REBOOT_* */ -#include - -#include "arch.h" -#include "errno.h" -#include "types.h" - - -/* Functions in this file only describe syscalls. They're declared static so - * that the compiler usually decides to inline them while still being allowed - * to pass a pointer to one of their instances. Each syscall exists in two - * versions: - * - the "internal" ones, which matches the raw syscall interface at the - * kernel level, which may sometimes slightly differ from the documented - * libc-level ones. For example most of them return either a valid value - * or -errno. All of these are prefixed with "sys_". They may be called - * by non-portable applications if desired. - * - * - the "exported" ones, whose interface must closely match the one - * documented in man(2), that applications are supposed to expect. These - * ones rely on the internal ones, and set errno. - * - * Each syscall will be defined with the two functions, sorted in alphabetical - * order applied to the exported names. - * - * In case of doubt about the relevance of a function here, only those which - * set errno should be defined here. Wrappers like those appearing in man(3) - * should not be placed here. - */ - - -/* - * int brk(void *addr); - * void *sbrk(intptr_t inc) - */ - -static __attribute__((unused)) -void *sys_brk(void *addr) -{ - return (void *)my_syscall1(__NR_brk, addr); -} - -static __attribute__((unused)) -int brk(void *addr) -{ - void *ret = sys_brk(addr); - - if (!ret) { - SET_ERRNO(ENOMEM); - return -1; - } - return 0; -} - -static __attribute__((unused)) -void *sbrk(intptr_t inc) -{ - void *ret; - - /* first call to find current end */ - if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc)) - return ret + inc; - - SET_ERRNO(ENOMEM); - return (void *)-1; -} - - -/* - * int chdir(const char *path); - */ - -static __attribute__((unused)) -int sys_chdir(const char *path) -{ - return my_syscall1(__NR_chdir, path); -} - -static __attribute__((unused)) -int chdir(const char *path) -{ - int ret = sys_chdir(path); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int chmod(const char *path, mode_t mode); - */ - -static __attribute__((unused)) -int sys_chmod(const char *path, mode_t mode) -{ -#ifdef __NR_fchmodat - return my_syscall4(__NR_fchmodat, AT_FDCWD, path, mode, 0); -#elif defined(__NR_chmod) - return my_syscall2(__NR_chmod, path, mode); -#else -#error Neither __NR_fchmodat nor __NR_chmod defined, cannot implement sys_chmod() -#endif -} - -static __attribute__((unused)) -int chmod(const char *path, mode_t mode) -{ - int ret = sys_chmod(path, mode); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int chown(const char *path, uid_t owner, gid_t group); - */ - -static __attribute__((unused)) -int sys_chown(const char *path, uid_t owner, gid_t group) -{ -#ifdef __NR_fchownat - return my_syscall5(__NR_fchownat, AT_FDCWD, path, owner, group, 0); -#elif defined(__NR_chown) - return my_syscall3(__NR_chown, path, owner, group); -#else -#error Neither __NR_fchownat nor __NR_chown defined, cannot implement sys_chown() -#endif -} - -static __attribute__((unused)) -int chown(const char *path, uid_t owner, gid_t group) -{ - int ret = sys_chown(path, owner, group); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int chroot(const char *path); - */ - -static __attribute__((unused)) -int sys_chroot(const char *path) -{ - return my_syscall1(__NR_chroot, path); -} - -static __attribute__((unused)) -int chroot(const char *path) -{ - int ret = sys_chroot(path); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int close(int fd); - */ - -static __attribute__((unused)) -int sys_close(int fd) -{ - return my_syscall1(__NR_close, fd); -} - -static __attribute__((unused)) -int close(int fd) -{ - int ret = sys_close(fd); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int dup(int fd); - */ - -static __attribute__((unused)) -int sys_dup(int fd) -{ - return my_syscall1(__NR_dup, fd); -} - -static __attribute__((unused)) -int dup(int fd) -{ - int ret = sys_dup(fd); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int dup2(int old, int new); - */ - -static __attribute__((unused)) -int sys_dup2(int old, int new) -{ -#ifdef __NR_dup3 - return my_syscall3(__NR_dup3, old, new, 0); -#elif defined(__NR_dup2) - return my_syscall2(__NR_dup2, old, new); -#else -#error Neither __NR_dup3 nor __NR_dup2 defined, cannot implement sys_dup2() -#endif -} - -static __attribute__((unused)) -int dup2(int old, int new) -{ - int ret = sys_dup2(old, new); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int dup3(int old, int new, int flags); - */ - -#ifdef __NR_dup3 -static __attribute__((unused)) -int sys_dup3(int old, int new, int flags) -{ - return my_syscall3(__NR_dup3, old, new, flags); -} - -static __attribute__((unused)) -int dup3(int old, int new, int flags) -{ - int ret = sys_dup3(old, new, flags); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} -#endif - - -/* - * int execve(const char *filename, char *const argv[], char *const envp[]); - */ - -static __attribute__((unused)) -int sys_execve(const char *filename, char *const argv[], char *const envp[]) -{ - return my_syscall3(__NR_execve, filename, argv, envp); -} - -static __attribute__((unused)) -int execve(const char *filename, char *const argv[], char *const envp[]) -{ - int ret = sys_execve(filename, argv, envp); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * void exit(int status); - */ - -static __attribute__((noreturn,unused)) -void sys_exit(int status) -{ - my_syscall1(__NR_exit, status & 255); - while(1); /* shut the "noreturn" warnings. */ -} - -static __attribute__((noreturn,unused)) -void exit(int status) -{ - sys_exit(status); -} - - -/* - * pid_t fork(void); - */ - -#ifndef sys_fork -static __attribute__((unused)) -pid_t sys_fork(void) -{ -#ifdef __NR_clone - /* note: some archs only have clone() and not fork(). Different archs - * have a different API, but most archs have the flags on first arg and - * will not use the rest with no other flag. - */ - return my_syscall5(__NR_clone, SIGCHLD, 0, 0, 0, 0); -#elif defined(__NR_fork) - return my_syscall0(__NR_fork); -#else -#error Neither __NR_clone nor __NR_fork defined, cannot implement sys_fork() -#endif -} -#endif - -static __attribute__((unused)) -pid_t fork(void) -{ - pid_t ret = sys_fork(); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int fsync(int fd); - */ - -static __attribute__((unused)) -int sys_fsync(int fd) -{ - return my_syscall1(__NR_fsync, fd); -} - -static __attribute__((unused)) -int fsync(int fd) -{ - int ret = sys_fsync(fd); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int getdents64(int fd, struct linux_dirent64 *dirp, int count); - */ - -static __attribute__((unused)) -int sys_getdents64(int fd, struct linux_dirent64 *dirp, int count) -{ - return my_syscall3(__NR_getdents64, fd, dirp, count); -} - -static __attribute__((unused)) -int getdents64(int fd, struct linux_dirent64 *dirp, int count) -{ - int ret = sys_getdents64(fd, dirp, count); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * uid_t geteuid(void); - */ - -static __attribute__((unused)) -uid_t sys_geteuid(void) -{ -#ifdef __NR_geteuid32 - return my_syscall0(__NR_geteuid32); -#else - return my_syscall0(__NR_geteuid); -#endif -} - -static __attribute__((unused)) -uid_t geteuid(void) -{ - return sys_geteuid(); -} - - -/* - * pid_t getpgid(pid_t pid); - */ - -static __attribute__((unused)) -pid_t sys_getpgid(pid_t pid) -{ - return my_syscall1(__NR_getpgid, pid); -} - -static __attribute__((unused)) -pid_t getpgid(pid_t pid) -{ - pid_t ret = sys_getpgid(pid); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * pid_t getpgrp(void); - */ - -static __attribute__((unused)) -pid_t sys_getpgrp(void) -{ - return sys_getpgid(0); -} - -static __attribute__((unused)) -pid_t getpgrp(void) -{ - return sys_getpgrp(); -} - - -/* - * pid_t getpid(void); - */ - -static __attribute__((unused)) -pid_t sys_getpid(void) -{ - return my_syscall0(__NR_getpid); -} - -static __attribute__((unused)) -pid_t getpid(void) -{ - return sys_getpid(); -} - - -/* - * pid_t getppid(void); - */ - -static __attribute__((unused)) -pid_t sys_getppid(void) -{ - return my_syscall0(__NR_getppid); -} - -static __attribute__((unused)) -pid_t getppid(void) -{ - return sys_getppid(); -} - - -/* - * pid_t gettid(void); - */ - -static __attribute__((unused)) -pid_t sys_gettid(void) -{ - return my_syscall0(__NR_gettid); -} - -static __attribute__((unused)) -pid_t gettid(void) -{ - return sys_gettid(); -} - -static unsigned long getauxval(unsigned long key); - -/* - * long getpagesize(void); - */ - -static __attribute__((unused)) -long getpagesize(void) -{ - long ret; - - ret = getauxval(AT_PAGESZ); - if (!ret) { - SET_ERRNO(ENOENT); - return -1; - } - - return ret; -} - - -/* - * int gettimeofday(struct timeval *tv, struct timezone *tz); - */ - -static __attribute__((unused)) -int sys_gettimeofday(struct timeval *tv, struct timezone *tz) -{ - return my_syscall2(__NR_gettimeofday, tv, tz); -} - -static __attribute__((unused)) -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - int ret = sys_gettimeofday(tv, tz); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * uid_t getuid(void); - */ - -static __attribute__((unused)) -uid_t sys_getuid(void) -{ -#ifdef __NR_getuid32 - return my_syscall0(__NR_getuid32); -#else - return my_syscall0(__NR_getuid); -#endif -} - -static __attribute__((unused)) -uid_t getuid(void) -{ - return sys_getuid(); -} - - -/* - * int ioctl(int fd, unsigned long req, void *value); - */ - -static __attribute__((unused)) -int sys_ioctl(int fd, unsigned long req, void *value) -{ - return my_syscall3(__NR_ioctl, fd, req, value); -} - -static __attribute__((unused)) -int ioctl(int fd, unsigned long req, void *value) -{ - int ret = sys_ioctl(fd, req, value); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -/* - * int kill(pid_t pid, int signal); - */ - -static __attribute__((unused)) -int sys_kill(pid_t pid, int signal) -{ - return my_syscall2(__NR_kill, pid, signal); -} - -static __attribute__((unused)) -int kill(pid_t pid, int signal) -{ - int ret = sys_kill(pid, signal); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int link(const char *old, const char *new); - */ - -static __attribute__((unused)) -int sys_link(const char *old, const char *new) -{ -#ifdef __NR_linkat - return my_syscall5(__NR_linkat, AT_FDCWD, old, AT_FDCWD, new, 0); -#elif defined(__NR_link) - return my_syscall2(__NR_link, old, new); -#else -#error Neither __NR_linkat nor __NR_link defined, cannot implement sys_link() -#endif -} - -static __attribute__((unused)) -int link(const char *old, const char *new) -{ - int ret = sys_link(old, new); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * off_t lseek(int fd, off_t offset, int whence); - */ - -static __attribute__((unused)) -off_t sys_lseek(int fd, off_t offset, int whence) -{ - return my_syscall3(__NR_lseek, fd, offset, whence); -} - -static __attribute__((unused)) -off_t lseek(int fd, off_t offset, int whence) -{ - off_t ret = sys_lseek(fd, offset, whence); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int mkdir(const char *path, mode_t mode); - */ - -static __attribute__((unused)) -int sys_mkdir(const char *path, mode_t mode) -{ -#ifdef __NR_mkdirat - return my_syscall3(__NR_mkdirat, AT_FDCWD, path, mode); -#elif defined(__NR_mkdir) - return my_syscall2(__NR_mkdir, path, mode); -#else -#error Neither __NR_mkdirat nor __NR_mkdir defined, cannot implement sys_mkdir() -#endif -} - -static __attribute__((unused)) -int mkdir(const char *path, mode_t mode) -{ - int ret = sys_mkdir(path, mode); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int mknod(const char *path, mode_t mode, dev_t dev); - */ - -static __attribute__((unused)) -long sys_mknod(const char *path, mode_t mode, dev_t dev) -{ -#ifdef __NR_mknodat - return my_syscall4(__NR_mknodat, AT_FDCWD, path, mode, dev); -#elif defined(__NR_mknod) - return my_syscall3(__NR_mknod, path, mode, dev); -#else -#error Neither __NR_mknodat nor __NR_mknod defined, cannot implement sys_mknod() -#endif -} - -static __attribute__((unused)) -int mknod(const char *path, mode_t mode, dev_t dev) -{ - int ret = sys_mknod(path, mode, dev); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -#ifndef MAP_SHARED -#define MAP_SHARED 0x01 /* Share changes */ -#define MAP_PRIVATE 0x02 /* Changes are private */ -#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ -#endif - -#ifndef MAP_FAILED -#define MAP_FAILED ((void *)-1) -#endif - -#ifndef sys_mmap -static __attribute__((unused)) -void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd, - off_t offset) -{ -#ifndef my_syscall6 - /* Function not implemented. */ - return (void *)-ENOSYS; -#else - - int n; - -#if defined(__NR_mmap2) - n = __NR_mmap2; - offset >>= 12; -#else - n = __NR_mmap; -#endif - - return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset); -#endif -} -#endif - -static __attribute__((unused)) -void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) -{ - void *ret = sys_mmap(addr, length, prot, flags, fd, offset); - - if ((unsigned long)ret >= -4095UL) { - SET_ERRNO(-(long)ret); - ret = MAP_FAILED; - } - return ret; -} - -static __attribute__((unused)) -int sys_munmap(void *addr, size_t length) -{ - return my_syscall2(__NR_munmap, addr, length); -} - -static __attribute__((unused)) -int munmap(void *addr, size_t length) -{ - int ret = sys_munmap(addr, length); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -/* - * int mount(const char *source, const char *target, - * const char *fstype, unsigned long flags, - * const void *data); - */ -static __attribute__((unused)) -int sys_mount(const char *src, const char *tgt, const char *fst, - unsigned long flags, const void *data) -{ - return my_syscall5(__NR_mount, src, tgt, fst, flags, data); -} - -static __attribute__((unused)) -int mount(const char *src, const char *tgt, - const char *fst, unsigned long flags, - const void *data) -{ - int ret = sys_mount(src, tgt, fst, flags, data); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int open(const char *path, int flags[, mode_t mode]); - */ - -static __attribute__((unused)) -int sys_open(const char *path, int flags, mode_t mode) -{ -#ifdef __NR_openat - return my_syscall4(__NR_openat, AT_FDCWD, path, flags, mode); -#elif defined(__NR_open) - return my_syscall3(__NR_open, path, flags, mode); -#else -#error Neither __NR_openat nor __NR_open defined, cannot implement sys_open() -#endif -} - -static __attribute__((unused)) -int open(const char *path, int flags, ...) -{ - mode_t mode = 0; - int ret; - - if (flags & O_CREAT) { - va_list args; - - va_start(args, flags); - mode = va_arg(args, int); - va_end(args); - } - - ret = sys_open(path, flags, mode); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int prctl(int option, unsigned long arg2, unsigned long arg3, - * unsigned long arg4, unsigned long arg5); - */ - -static __attribute__((unused)) -int sys_prctl(int option, unsigned long arg2, unsigned long arg3, - unsigned long arg4, unsigned long arg5) -{ - return my_syscall5(__NR_prctl, option, arg2, arg3, arg4, arg5); -} - -static __attribute__((unused)) -int prctl(int option, unsigned long arg2, unsigned long arg3, - unsigned long arg4, unsigned long arg5) -{ - int ret = sys_prctl(option, arg2, arg3, arg4, arg5); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int pivot_root(const char *new, const char *old); - */ - -static __attribute__((unused)) -int sys_pivot_root(const char *new, const char *old) -{ - return my_syscall2(__NR_pivot_root, new, old); -} - -static __attribute__((unused)) -int pivot_root(const char *new, const char *old) -{ - int ret = sys_pivot_root(new, old); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int poll(struct pollfd *fds, int nfds, int timeout); - */ - -static __attribute__((unused)) -int sys_poll(struct pollfd *fds, int nfds, int timeout) -{ -#if defined(__NR_ppoll) - struct timespec t; - - if (timeout >= 0) { - t.tv_sec = timeout / 1000; - t.tv_nsec = (timeout % 1000) * 1000000; - } - return my_syscall5(__NR_ppoll, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0); -#elif defined(__NR_poll) - return my_syscall3(__NR_poll, fds, nfds, timeout); -#else -#error Neither __NR_ppoll nor __NR_poll defined, cannot implement sys_poll() -#endif -} - -static __attribute__((unused)) -int poll(struct pollfd *fds, int nfds, int timeout) -{ - int ret = sys_poll(fds, nfds, timeout); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * ssize_t read(int fd, void *buf, size_t count); - */ - -static __attribute__((unused)) -ssize_t sys_read(int fd, void *buf, size_t count) -{ - return my_syscall3(__NR_read, fd, buf, count); -} - -static __attribute__((unused)) -ssize_t read(int fd, void *buf, size_t count) -{ - ssize_t ret = sys_read(fd, buf, count); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int reboot(int cmd); - * is among LINUX_REBOOT_CMD_* - */ - -static __attribute__((unused)) -ssize_t sys_reboot(int magic1, int magic2, int cmd, void *arg) -{ - return my_syscall4(__NR_reboot, magic1, magic2, cmd, arg); -} - -static __attribute__((unused)) -int reboot(int cmd) -{ - int ret = sys_reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, 0); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int sched_yield(void); - */ - -static __attribute__((unused)) -int sys_sched_yield(void) -{ - return my_syscall0(__NR_sched_yield); -} - -static __attribute__((unused)) -int sched_yield(void) -{ - int ret = sys_sched_yield(); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int select(int nfds, fd_set *read_fds, fd_set *write_fds, - * fd_set *except_fds, struct timeval *timeout); - */ - -static __attribute__((unused)) -int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) -{ -#if defined(__ARCH_WANT_SYS_OLD_SELECT) && !defined(__NR__newselect) - struct sel_arg_struct { - unsigned long n; - fd_set *r, *w, *e; - struct timeval *t; - } arg = { .n = nfds, .r = rfds, .w = wfds, .e = efds, .t = timeout }; - return my_syscall1(__NR_select, &arg); -#elif defined(__ARCH_WANT_SYS_PSELECT6) && defined(__NR_pselect6) - struct timespec t; - - if (timeout) { - t.tv_sec = timeout->tv_sec; - t.tv_nsec = timeout->tv_usec * 1000; - } - return my_syscall6(__NR_pselect6, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL); -#elif defined(__NR__newselect) || defined(__NR_select) -#ifndef __NR__newselect -#define __NR__newselect __NR_select -#endif - return my_syscall5(__NR__newselect, nfds, rfds, wfds, efds, timeout); -#else -#error None of __NR_select, __NR_pselect6, nor __NR__newselect defined, cannot implement sys_select() -#endif -} - -static __attribute__((unused)) -int select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) -{ - int ret = sys_select(nfds, rfds, wfds, efds, timeout); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int setpgid(pid_t pid, pid_t pgid); - */ - -static __attribute__((unused)) -int sys_setpgid(pid_t pid, pid_t pgid) -{ - return my_syscall2(__NR_setpgid, pid, pgid); -} - -static __attribute__((unused)) -int setpgid(pid_t pid, pid_t pgid) -{ - int ret = sys_setpgid(pid, pgid); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * pid_t setsid(void); - */ - -static __attribute__((unused)) -pid_t sys_setsid(void) -{ - return my_syscall0(__NR_setsid); -} - -static __attribute__((unused)) -pid_t setsid(void) -{ - pid_t ret = sys_setsid(); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -#if defined(__NR_statx) -/* - * int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf); - */ - -static __attribute__((unused)) -int sys_statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf) -{ - return my_syscall5(__NR_statx, fd, path, flags, mask, buf); -} - -static __attribute__((unused)) -int statx(int fd, const char *path, int flags, unsigned int mask, struct statx *buf) -{ - int ret = sys_statx(fd, path, flags, mask, buf); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} -#endif - -/* - * int stat(const char *path, struct stat *buf); - * Warning: the struct stat's layout is arch-dependent. - */ - -#if defined(__NR_statx) && !defined(__NR_newfstatat) && !defined(__NR_stat) -/* - * Maybe we can just use statx() when available for all architectures? - */ -static __attribute__((unused)) -int sys_stat(const char *path, struct stat *buf) -{ - struct statx statx; - long ret; - - ret = sys_statx(AT_FDCWD, path, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &statx); - buf->st_dev = ((statx.stx_dev_minor & 0xff) - | (statx.stx_dev_major << 8) - | ((statx.stx_dev_minor & ~0xff) << 12)); - buf->st_ino = statx.stx_ino; - buf->st_mode = statx.stx_mode; - buf->st_nlink = statx.stx_nlink; - buf->st_uid = statx.stx_uid; - buf->st_gid = statx.stx_gid; - buf->st_rdev = ((statx.stx_rdev_minor & 0xff) - | (statx.stx_rdev_major << 8) - | ((statx.stx_rdev_minor & ~0xff) << 12)); - buf->st_size = statx.stx_size; - buf->st_blksize = statx.stx_blksize; - buf->st_blocks = statx.stx_blocks; - buf->st_atim.tv_sec = statx.stx_atime.tv_sec; - buf->st_atim.tv_nsec = statx.stx_atime.tv_nsec; - buf->st_mtim.tv_sec = statx.stx_mtime.tv_sec; - buf->st_mtim.tv_nsec = statx.stx_mtime.tv_nsec; - buf->st_ctim.tv_sec = statx.stx_ctime.tv_sec; - buf->st_ctim.tv_nsec = statx.stx_ctime.tv_nsec; - return ret; -} -#else -static __attribute__((unused)) -int sys_stat(const char *path, struct stat *buf) -{ - struct sys_stat_struct stat; - long ret; - -#ifdef __NR_newfstatat - /* only solution for arm64 */ - ret = my_syscall4(__NR_newfstatat, AT_FDCWD, path, &stat, 0); -#elif defined(__NR_stat) - ret = my_syscall2(__NR_stat, path, &stat); -#else -#error Neither __NR_newfstatat nor __NR_stat defined, cannot implement sys_stat() -#endif - buf->st_dev = stat.st_dev; - buf->st_ino = stat.st_ino; - buf->st_mode = stat.st_mode; - buf->st_nlink = stat.st_nlink; - buf->st_uid = stat.st_uid; - buf->st_gid = stat.st_gid; - buf->st_rdev = stat.st_rdev; - buf->st_size = stat.st_size; - buf->st_blksize = stat.st_blksize; - buf->st_blocks = stat.st_blocks; - buf->st_atim.tv_sec = stat.st_atime; - buf->st_atim.tv_nsec = stat.st_atime_nsec; - buf->st_mtim.tv_sec = stat.st_mtime; - buf->st_mtim.tv_nsec = stat.st_mtime_nsec; - buf->st_ctim.tv_sec = stat.st_ctime; - buf->st_ctim.tv_nsec = stat.st_ctime_nsec; - return ret; -} -#endif - -static __attribute__((unused)) -int stat(const char *path, struct stat *buf) -{ - int ret = sys_stat(path, buf); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int symlink(const char *old, const char *new); - */ - -static __attribute__((unused)) -int sys_symlink(const char *old, const char *new) -{ -#ifdef __NR_symlinkat - return my_syscall3(__NR_symlinkat, old, AT_FDCWD, new); -#elif defined(__NR_symlink) - return my_syscall2(__NR_symlink, old, new); -#else -#error Neither __NR_symlinkat nor __NR_symlink defined, cannot implement sys_symlink() -#endif -} - -static __attribute__((unused)) -int symlink(const char *old, const char *new) -{ - int ret = sys_symlink(old, new); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * mode_t umask(mode_t mode); - */ - -static __attribute__((unused)) -mode_t sys_umask(mode_t mode) -{ - return my_syscall1(__NR_umask, mode); -} - -static __attribute__((unused)) -mode_t umask(mode_t mode) -{ - return sys_umask(mode); -} - - -/* - * int umount2(const char *path, int flags); - */ - -static __attribute__((unused)) -int sys_umount2(const char *path, int flags) -{ - return my_syscall2(__NR_umount2, path, flags); -} - -static __attribute__((unused)) -int umount2(const char *path, int flags) -{ - int ret = sys_umount2(path, flags); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int unlink(const char *path); - */ - -static __attribute__((unused)) -int sys_unlink(const char *path) -{ -#ifdef __NR_unlinkat - return my_syscall3(__NR_unlinkat, AT_FDCWD, path, 0); -#elif defined(__NR_unlink) - return my_syscall1(__NR_unlink, path); -#else -#error Neither __NR_unlinkat nor __NR_unlink defined, cannot implement sys_unlink() -#endif -} - -static __attribute__((unused)) -int unlink(const char *path) -{ - int ret = sys_unlink(path); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * pid_t wait(int *status); - * pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); - * pid_t waitpid(pid_t pid, int *status, int options); - */ - -static __attribute__((unused)) -pid_t sys_wait4(pid_t pid, int *status, int options, struct rusage *rusage) -{ - return my_syscall4(__NR_wait4, pid, status, options, rusage); -} - -static __attribute__((unused)) -pid_t wait(int *status) -{ - pid_t ret = sys_wait4(-1, status, 0, NULL); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -static __attribute__((unused)) -pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage) -{ - pid_t ret = sys_wait4(pid, status, options, rusage); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -static __attribute__((unused)) -pid_t waitpid(pid_t pid, int *status, int options) -{ - pid_t ret = sys_wait4(pid, status, options, NULL); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * ssize_t write(int fd, const void *buf, size_t count); - */ - -static __attribute__((unused)) -ssize_t sys_write(int fd, const void *buf, size_t count) -{ - return my_syscall3(__NR_write, fd, buf, count); -} - -static __attribute__((unused)) -ssize_t write(int fd, const void *buf, size_t count) -{ - ssize_t ret = sys_write(fd, buf, count); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - - -/* - * int memfd_create(const char *name, unsigned int flags); - */ - -static __attribute__((unused)) -int sys_memfd_create(const char *name, unsigned int flags) -{ - return my_syscall2(__NR_memfd_create, name, flags); -} - -static __attribute__((unused)) -int memfd_create(const char *name, unsigned int flags) -{ - ssize_t ret = sys_memfd_create(name, flags); - - if (ret < 0) { - SET_ERRNO(-ret); - ret = -1; - } - return ret; -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_SYS_H */ diff --git a/nolibc/time.h b/nolibc/time.h deleted file mode 100644 index 8465536..0000000 --- a/nolibc/time.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1 OR MIT */ -/* - * time function definitions for NOLIBC - * Copyright (C) 2017-2022 Willy Tarreau - */ - -#ifndef _NOLIBC_TIME_H -#define _NOLIBC_TIME_H - -#include "std.h" -#include "arch.h" -#include "types.h" -#include "sys.h" - -static __attribute__((unused)) -time_t time(time_t *tptr) -{ - struct timeval tv; - - /* note, cannot fail here */ - sys_gettimeofday(&tv, NULL); - - if (tptr) - *tptr = tv.tv_sec; - return tv.tv_sec; -} - -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_TIME_H */ diff --git a/nolibc/types.h b/nolibc/types.h index f96e28b..6f95a31 100644 --- a/nolibc/types.h +++ b/nolibc/types.h @@ -7,7 +7,7 @@ #ifndef _NOLIBC_TYPES_H #define _NOLIBC_TYPES_H -#include "std.h" +#include #include #include @@ -219,7 +219,4 @@ struct stat { }) #endif -/* make sure to include all global symbols */ -#include "nolibc.h" - #endif /* _NOLIBC_TYPES_H */ diff --git a/nolibc/unistd.h b/nolibc/unistd.h index 0e832e1..1e65b83 100644 --- a/nolibc/unistd.h +++ b/nolibc/unistd.h @@ -1,21 +1,1384 @@ +#pragma GCC diagnostic ignored "-Wint-conversion" + /* SPDX-License-Identifier: LGPL-2.1 OR MIT */ /* - * unistd function definitions for NOLIBC - * Copyright (C) 2017-2022 Willy Tarreau + * Syscall definitions for NOLIBC (those in man(2)) + * Copyright (C) 2017-2021 Willy Tarreau */ -#ifndef _NOLIBC_UNISTD_H -#define _NOLIBC_UNISTD_H +#ifndef _NOLIBC_SYS_H +#define _NOLIBC_SYS_H + +#include + +/* system includes */ +#include +#include /* for SIGCHLD */ +#include +#include +#include +#include +#include +#include +#include /* for O_* and AT_* */ +#include /* for LINUX_REBOOT_* */ +#include -#include "std.h" #include "arch.h" #include "types.h" -#include "sys.h" +#include "errno.h" -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 +/* Functions in this file only describe syscalls. They're declared static so + * that the compiler usually decides to inline them while still being allowed + * to pass a pointer to one of their instances. Each syscall exists in two + * versions: + * - the "internal" ones, which matches the raw syscall interface at the + * kernel level, which may sometimes slightly differ from the documented + * libc-level ones. For example most of them return either a valid value + * or -errno. All of these are prefixed with "sys_". They may be called + * by non-portable applications if desired. + * + * - the "exported" ones, whose interface must closely match the one + * documented in man(2), that applications are supposed to expect. These + * ones rely on the internal ones, and set errno. + * + * Each syscall will be defined with the two functions, sorted in alphabetical + * order applied to the exported names. + * + * In case of doubt about the relevance of a function here, only those which + * set errno should be defined here. Wrappers like those appearing in man(3) + * should not be placed here. + */ + + +/* + * int brk(void *addr); + * void *sbrk(intptr_t inc) + */ + +static __attribute__((unused)) +void *sys_brk(void *addr) +{ + return (void *)my_syscall1(__NR_brk, addr); +} + +static __attribute__((unused)) +int brk(void *addr) +{ + void *ret = sys_brk(addr); + + if (!ret) { + SET_ERRNO(ENOMEM); + return -1; + } + return 0; +} + +static __attribute__((unused)) +void *sbrk(intptr_t inc) +{ + void *ret; + + /* first call to find current end */ + if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc)) + return ret + inc; + + SET_ERRNO(ENOMEM); + return (void *)-1; +} + + +/* + * int chdir(const char *path); + */ + +static __attribute__((unused)) +int sys_chdir(const char *path) +{ + return my_syscall1(__NR_chdir, path); +} + +static __attribute__((unused)) +int chdir(const char *path) +{ + int ret = sys_chdir(path); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int chmod(const char *path, mode_t mode); + */ + +static __attribute__((unused)) +int sys_chmod(const char *path, mode_t mode) +{ +#ifdef __NR_fchmodat + return my_syscall4(__NR_fchmodat, AT_FDCWD, path, mode, 0); +#elif defined(__NR_chmod) + return my_syscall2(__NR_chmod, path, mode); +#else +#error Neither __NR_fchmodat nor __NR_chmod defined, cannot implement sys_chmod() +#endif +} + +static __attribute__((unused)) +int chmod(const char *path, mode_t mode) +{ + int ret = sys_chmod(path, mode); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int chown(const char *path, uid_t owner, gid_t group); + */ + +static __attribute__((unused)) +int sys_chown(const char *path, uid_t owner, gid_t group) +{ +#ifdef __NR_fchownat + return my_syscall5(__NR_fchownat, AT_FDCWD, path, owner, group, 0); +#elif defined(__NR_chown) + return my_syscall3(__NR_chown, path, owner, group); +#else +#error Neither __NR_fchownat nor __NR_chown defined, cannot implement sys_chown() +#endif +} + +static __attribute__((unused)) +int chown(const char *path, uid_t owner, gid_t group) +{ + int ret = sys_chown(path, owner, group); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int chroot(const char *path); + */ + +static __attribute__((unused)) +int sys_chroot(const char *path) +{ + return my_syscall1(__NR_chroot, path); +} + +static __attribute__((unused)) +int chroot(const char *path) +{ + int ret = sys_chroot(path); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int close(int fd); + */ + +static __attribute__((unused)) +int sys_close(int fd) +{ + return my_syscall1(__NR_close, fd); +} + +static __attribute__((unused)) +int close(int fd) +{ + int ret = sys_close(fd); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int dup(int fd); + */ + +static __attribute__((unused)) +int sys_dup(int fd) +{ + return my_syscall1(__NR_dup, fd); +} + +static __attribute__((unused)) +int dup(int fd) +{ + int ret = sys_dup(fd); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int dup2(int old, int new); + */ + +static __attribute__((unused)) +int sys_dup2(int old, int new) +{ +#ifdef __NR_dup3 + return my_syscall3(__NR_dup3, old, new, 0); +#elif defined(__NR_dup2) + return my_syscall2(__NR_dup2, old, new); +#else +#error Neither __NR_dup3 nor __NR_dup2 defined, cannot implement sys_dup2() +#endif +} + +static __attribute__((unused)) +int dup2(int old, int new) +{ + int ret = sys_dup2(old, new); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int dup3(int old, int new, int flags); + */ + +#ifdef __NR_dup3 +static __attribute__((unused)) +int sys_dup3(int old, int new, int flags) +{ + return my_syscall3(__NR_dup3, old, new, flags); +} + +static __attribute__((unused)) +int dup3(int old, int new, int flags) +{ + int ret = sys_dup3(old, new, flags); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} +#endif + + +/* + * int execve(const char *filename, char *const argv[], char *const envp[]); + */ + +static __attribute__((unused)) +int sys_execve(const char *filename, char *const argv[], char *const envp[]) +{ + return my_syscall3(__NR_execve, filename, argv, envp); +} + +static __attribute__((unused)) +int execve(const char *filename, char *const argv[], char *const envp[]) +{ + int ret = sys_execve(filename, argv, envp); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * void exit(int status); + */ + +static __attribute__((noreturn,unused)) +void sys_exit(int status) +{ + my_syscall1(__NR_exit, status & 255); + while(1); /* shut the "noreturn" warnings. */ +} + +static __attribute__((noreturn,unused)) +void exit(int status) +{ + sys_exit(status); +} + + +/* + * pid_t fork(void); + */ + +#ifndef sys_fork +static __attribute__((unused)) +pid_t sys_fork(void) +{ +#ifdef __NR_clone + /* note: some archs only have clone() and not fork(). Different archs + * have a different API, but most archs have the flags on first arg and + * will not use the rest with no other flag. + */ + return my_syscall5(__NR_clone, SIGCHLD, 0, 0, 0, 0); +#elif defined(__NR_fork) + return my_syscall0(__NR_fork); +#else +#error Neither __NR_clone nor __NR_fork defined, cannot implement sys_fork() +#endif +} +#endif + +static __attribute__((unused)) +pid_t fork(void) +{ + pid_t ret = sys_fork(); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int fsync(int fd); + */ + +static __attribute__((unused)) +int sys_fsync(int fd) +{ + return my_syscall1(__NR_fsync, fd); +} + +static __attribute__((unused)) +int fsync(int fd) +{ + int ret = sys_fsync(fd); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int getdents64(int fd, struct linux_dirent64 *dirp, int count); + */ + +static __attribute__((unused)) +int sys_getdents64(int fd, struct linux_dirent64 *dirp, int count) +{ + return my_syscall3(__NR_getdents64, fd, dirp, count); +} + +static __attribute__((unused)) +int getdents64(int fd, struct linux_dirent64 *dirp, int count) +{ + int ret = sys_getdents64(fd, dirp, count); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * uid_t geteuid(void); + */ + +static __attribute__((unused)) +uid_t sys_geteuid(void) +{ +#ifdef __NR_geteuid32 + return my_syscall0(__NR_geteuid32); +#else + return my_syscall0(__NR_geteuid); +#endif +} + +static __attribute__((unused)) +uid_t geteuid(void) +{ + return sys_geteuid(); +} + + +/* + * pid_t getpgid(pid_t pid); + */ + +static __attribute__((unused)) +pid_t sys_getpgid(pid_t pid) +{ + return my_syscall1(__NR_getpgid, pid); +} + +static __attribute__((unused)) +pid_t getpgid(pid_t pid) +{ + pid_t ret = sys_getpgid(pid); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * pid_t getpgrp(void); + */ + +static __attribute__((unused)) +pid_t sys_getpgrp(void) +{ + return sys_getpgid(0); +} + +static __attribute__((unused)) +pid_t getpgrp(void) +{ + return sys_getpgrp(); +} + + +/* + * pid_t getpid(void); + */ + +static __attribute__((unused)) +pid_t sys_getpid(void) +{ + return my_syscall0(__NR_getpid); +} + +static __attribute__((unused)) +pid_t getpid(void) +{ + return sys_getpid(); +} + + +/* + * pid_t getppid(void); + */ + +static __attribute__((unused)) +pid_t sys_getppid(void) +{ + return my_syscall0(__NR_getppid); +} + +static __attribute__((unused)) +pid_t getppid(void) +{ + return sys_getppid(); +} + + +/* + * pid_t gettid(void); + */ + +static __attribute__((unused)) +pid_t sys_gettid(void) +{ + return my_syscall0(__NR_gettid); +} + +static __attribute__((unused)) +pid_t gettid(void) +{ + return sys_gettid(); +} + +/* + * int gettimeofday(struct timeval *tv, struct timezone *tz); + */ + +static __attribute__((unused)) +int sys_gettimeofday(struct timeval *tv, struct timezone *tz) +{ + return my_syscall2(__NR_gettimeofday, tv, tz); +} + +static __attribute__((unused)) +int gettimeofday(struct timeval *tv, struct timezone *tz) +{ + int ret = sys_gettimeofday(tv, tz); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * uid_t getuid(void); + */ + +static __attribute__((unused)) +uid_t sys_getuid(void) +{ +#ifdef __NR_getuid32 + return my_syscall0(__NR_getuid32); +#else + return my_syscall0(__NR_getuid); +#endif +} + +static __attribute__((unused)) +uid_t getuid(void) +{ + return sys_getuid(); +} + + +/* + * int ioctl(int fd, unsigned long req, void *value); + */ + +static __attribute__((unused)) +int sys_ioctl(int fd, unsigned long req, void *value) +{ + return my_syscall3(__NR_ioctl, fd, req, value); +} + +static __attribute__((unused)) +int ioctl(int fd, unsigned long req, void *value) +{ + int ret = sys_ioctl(fd, req, value); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + +/* + * int kill(pid_t pid, int signal); + */ + +static __attribute__((unused)) +int sys_kill(pid_t pid, int signal) +{ + return my_syscall2(__NR_kill, pid, signal); +} + +static __attribute__((unused)) +int kill(pid_t pid, int signal) +{ + int ret = sys_kill(pid, signal); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int link(const char *old, const char *new); + */ + +static __attribute__((unused)) +int sys_link(const char *old, const char *new) +{ +#ifdef __NR_linkat + return my_syscall5(__NR_linkat, AT_FDCWD, old, AT_FDCWD, new, 0); +#elif defined(__NR_link) + return my_syscall2(__NR_link, old, new); +#else +#error Neither __NR_linkat nor __NR_link defined, cannot implement sys_link() +#endif +} + +static __attribute__((unused)) +int link(const char *old, const char *new) +{ + int ret = sys_link(old, new); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * off_t lseek(int fd, off_t offset, int whence); + */ + +static __attribute__((unused)) +off_t sys_lseek(int fd, off_t offset, int whence) +{ + return my_syscall3(__NR_lseek, fd, offset, whence); +} + +static __attribute__((unused)) +off_t lseek(int fd, off_t offset, int whence) +{ + off_t ret = sys_lseek(fd, offset, whence); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int mkdir(const char *path, mode_t mode); + */ + +static __attribute__((unused)) +int sys_mkdir(const char *path, mode_t mode) +{ +#ifdef __NR_mkdirat + return my_syscall3(__NR_mkdirat, AT_FDCWD, path, mode); +#elif defined(__NR_mkdir) + return my_syscall2(__NR_mkdir, path, mode); +#else +#error Neither __NR_mkdirat nor __NR_mkdir defined, cannot implement sys_mkdir() +#endif +} + +static __attribute__((unused)) +int mkdir(const char *path, mode_t mode) +{ + int ret = sys_mkdir(path, mode); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int mknod(const char *path, mode_t mode, dev_t dev); + */ + +static __attribute__((unused)) +long sys_mknod(const char *path, mode_t mode, dev_t dev) +{ +#ifdef __NR_mknodat + return my_syscall4(__NR_mknodat, AT_FDCWD, path, mode, dev); +#elif defined(__NR_mknod) + return my_syscall3(__NR_mknod, path, mode, dev); +#else +#error Neither __NR_mknodat nor __NR_mknod defined, cannot implement sys_mknod() +#endif +} + +static __attribute__((unused)) +int mknod(const char *path, mode_t mode, dev_t dev) +{ + int ret = sys_mknod(path, mode, dev); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + +#ifndef MAP_SHARED +#define MAP_SHARED 0x01 /* Share changes */ +#define MAP_PRIVATE 0x02 /* Changes are private */ +#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ +#endif + +#ifndef MAP_FAILED +#define MAP_FAILED ((void *)-1) +#endif + +#ifndef sys_mmap +static __attribute__((unused)) +void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd, + off_t offset) +{ +#ifndef my_syscall6 + /* Function not implemented. */ + return (void *)-ENOSYS; +#else + + int n; + +#if defined(__NR_mmap2) + n = __NR_mmap2; + offset >>= 12; +#else + n = __NR_mmap; +#endif + + return (void *)my_syscall6(n, addr, length, prot, flags, fd, offset); +#endif +} +#endif + +static __attribute__((unused)) +void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t offset) +{ + void *ret = sys_mmap(addr, length, prot, flags, fd, offset); + + if ((unsigned long)ret >= -4095UL) { + SET_ERRNO(-(long)ret); + ret = MAP_FAILED; + } + return ret; +} + +static __attribute__((unused)) +int sys_munmap(void *addr, size_t length) +{ + return my_syscall2(__NR_munmap, addr, length); +} + +static __attribute__((unused)) +int munmap(void *addr, size_t length) +{ + int ret = sys_munmap(addr, length); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + +/* + * int mount(const char *source, const char *target, + * const char *fstype, unsigned long flags, + * const void *data); + */ +static __attribute__((unused)) +int sys_mount(const char *src, const char *tgt, const char *fst, + unsigned long flags, const void *data) +{ + return my_syscall5(__NR_mount, src, tgt, fst, flags, data); +} + +static __attribute__((unused)) +int mount(const char *src, const char *tgt, + const char *fst, unsigned long flags, + const void *data) +{ + int ret = sys_mount(src, tgt, fst, flags, data); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int open(const char *path, int flags[, mode_t mode]); + */ + +static __attribute__((unused)) +int sys_open(const char *path, int flags, mode_t mode) +{ +#ifdef __NR_openat + return my_syscall4(__NR_openat, AT_FDCWD, path, flags, mode); +#elif defined(__NR_open) + return my_syscall3(__NR_open, path, flags, mode); +#else +#error Neither __NR_openat nor __NR_open defined, cannot implement sys_open() +#endif +} + +static __attribute__((unused)) +int open(const char *path, int flags, ...) +{ + mode_t mode = 0; + int ret; + + if (flags & O_CREAT) { + va_list args; + + va_start(args, flags); + mode = va_arg(args, int); + va_end(args); + } + + ret = sys_open(path, flags, mode); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int prctl(int option, unsigned long arg2, unsigned long arg3, + * unsigned long arg4, unsigned long arg5); + */ + +static __attribute__((unused)) +int sys_prctl(int option, unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + return my_syscall5(__NR_prctl, option, arg2, arg3, arg4, arg5); +} + +static __attribute__((unused)) +int prctl(int option, unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + int ret = sys_prctl(option, arg2, arg3, arg4, arg5); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int pivot_root(const char *new, const char *old); + */ + +static __attribute__((unused)) +int sys_pivot_root(const char *new, const char *old) +{ + return my_syscall2(__NR_pivot_root, new, old); +} + +static __attribute__((unused)) +int pivot_root(const char *new, const char *old) +{ + int ret = sys_pivot_root(new, old); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int poll(struct pollfd *fds, int nfds, int timeout); + */ + +static __attribute__((unused)) +int sys_poll(struct pollfd *fds, int nfds, int timeout) +{ +#if defined(__NR_ppoll) + struct timespec t; + + if (timeout >= 0) { + t.tv_sec = timeout / 1000; + t.tv_nsec = (timeout % 1000) * 1000000; + } + return my_syscall5(__NR_ppoll, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0); +#elif defined(__NR_poll) + return my_syscall3(__NR_poll, fds, nfds, timeout); +#else +#error Neither __NR_ppoll nor __NR_poll defined, cannot implement sys_poll() +#endif +} + +static __attribute__((unused)) +int poll(struct pollfd *fds, int nfds, int timeout) +{ + int ret = sys_poll(fds, nfds, timeout); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * ssize_t read(int fd, void *buf, size_t count); + */ + +static __attribute__((unused)) +ssize_t sys_read(int fd, void *buf, size_t count) +{ + return my_syscall3(__NR_read, fd, buf, count); +} + +static __attribute__((unused)) +ssize_t read(int fd, void *buf, size_t count) +{ + ssize_t ret = sys_read(fd, buf, count); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int reboot(int cmd); + * is among LINUX_REBOOT_CMD_* + */ + +static __attribute__((unused)) +ssize_t sys_reboot(int magic1, int magic2, int cmd, void *arg) +{ + return my_syscall4(__NR_reboot, magic1, magic2, cmd, arg); +} + +static __attribute__((unused)) +int reboot(int cmd) +{ + int ret = sys_reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, 0); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int sched_yield(void); + */ + +static __attribute__((unused)) +int sys_sched_yield(void) +{ + return my_syscall0(__NR_sched_yield); +} + +static __attribute__((unused)) +int sched_yield(void) +{ + int ret = sys_sched_yield(); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int select(int nfds, fd_set *read_fds, fd_set *write_fds, + * fd_set *except_fds, struct timeval *timeout); + */ + +static __attribute__((unused)) +int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) +{ +#if defined(__ARCH_WANT_SYS_OLD_SELECT) && !defined(__NR__newselect) + struct sel_arg_struct { + unsigned long n; + fd_set *r, *w, *e; + struct timeval *t; + } arg = { .n = nfds, .r = rfds, .w = wfds, .e = efds, .t = timeout }; + return my_syscall1(__NR_select, &arg); +#elif defined(__ARCH_WANT_SYS_PSELECT6) && defined(__NR_pselect6) + struct timespec t; + + if (timeout) { + t.tv_sec = timeout->tv_sec; + t.tv_nsec = timeout->tv_usec * 1000; + } + return my_syscall6(__NR_pselect6, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL); +#elif defined(__NR__newselect) || defined(__NR_select) +#ifndef __NR__newselect +#define __NR__newselect __NR_select +#endif + return my_syscall5(__NR__newselect, nfds, rfds, wfds, efds, timeout); +#else +#error None of __NR_select, __NR_pselect6, nor __NR__newselect defined, cannot implement sys_select() +#endif +} + +static __attribute__((unused)) +int select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) +{ + int ret = sys_select(nfds, rfds, wfds, efds, timeout); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int setpgid(pid_t pid, pid_t pgid); + */ + +static __attribute__((unused)) +int sys_setpgid(pid_t pid, pid_t pgid) +{ + return my_syscall2(__NR_setpgid, pid, pgid); +} + +static __attribute__((unused)) +int setpgid(pid_t pid, pid_t pgid) +{ + int ret = sys_setpgid(pid, pgid); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * pid_t setsid(void); + */ + +static __attribute__((unused)) +pid_t sys_setsid(void) +{ + return my_syscall0(__NR_setsid); +} + +static __attribute__((unused)) +pid_t setsid(void) +{ + pid_t ret = sys_setsid(); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int stat(const char *path, struct stat *buf); + * Warning: the struct stat's layout is arch-dependent. + */ + +#if defined(__NR_statx) && !defined(__NR_newfstatat) && !defined(__NR_stat) +/* + * Maybe we can just use statx() when available for all architectures? + */ +static __attribute__((unused)) +int sys_stat(const char *path, struct stat *buf) +{ + struct statx statx; + long ret; + + ret = sys_statx(AT_FDCWD, path, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &statx); + buf->st_dev = ((statx.stx_dev_minor & 0xff) + | (statx.stx_dev_major << 8) + | ((statx.stx_dev_minor & ~0xff) << 12)); + buf->st_ino = statx.stx_ino; + buf->st_mode = statx.stx_mode; + buf->st_nlink = statx.stx_nlink; + buf->st_uid = statx.stx_uid; + buf->st_gid = statx.stx_gid; + buf->st_rdev = ((statx.stx_rdev_minor & 0xff) + | (statx.stx_rdev_major << 8) + | ((statx.stx_rdev_minor & ~0xff) << 12)); + buf->st_size = statx.stx_size; + buf->st_blksize = statx.stx_blksize; + buf->st_blocks = statx.stx_blocks; + buf->st_atim.tv_sec = statx.stx_atime.tv_sec; + buf->st_atim.tv_nsec = statx.stx_atime.tv_nsec; + buf->st_mtim.tv_sec = statx.stx_mtime.tv_sec; + buf->st_mtim.tv_nsec = statx.stx_mtime.tv_nsec; + buf->st_ctim.tv_sec = statx.stx_ctime.tv_sec; + buf->st_ctim.tv_nsec = statx.stx_ctime.tv_nsec; + return ret; +} +#else +static __attribute__((unused)) +int sys_stat(const char *path, struct stat *buf) +{ + struct sys_stat_struct stat; + long ret; + +#ifdef __NR_newfstatat + /* only solution for arm64 */ + ret = my_syscall4(__NR_newfstatat, AT_FDCWD, path, &stat, 0); +#elif defined(__NR_stat) + ret = my_syscall2(__NR_stat, path, &stat); +#else +#error Neither __NR_newfstatat nor __NR_stat defined, cannot implement sys_stat() +#endif + buf->st_dev = stat.st_dev; + buf->st_ino = stat.st_ino; + buf->st_mode = stat.st_mode; + buf->st_nlink = stat.st_nlink; + buf->st_uid = stat.st_uid; + buf->st_gid = stat.st_gid; + buf->st_rdev = stat.st_rdev; + buf->st_size = stat.st_size; + buf->st_blksize = stat.st_blksize; + buf->st_blocks = stat.st_blocks; + buf->st_atim.tv_sec = stat.st_atime; + buf->st_atim.tv_nsec = stat.st_atime_nsec; + buf->st_mtim.tv_sec = stat.st_mtime; + buf->st_mtim.tv_nsec = stat.st_mtime_nsec; + buf->st_ctim.tv_sec = stat.st_ctime; + buf->st_ctim.tv_nsec = stat.st_ctime_nsec; + return ret; +} +#endif + +static __attribute__((unused)) +int stat(const char *path, struct stat *buf) +{ + int ret = sys_stat(path, buf); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int symlink(const char *old, const char *new); + */ + +static __attribute__((unused)) +int sys_symlink(const char *old, const char *new) +{ +#ifdef __NR_symlinkat + return my_syscall3(__NR_symlinkat, old, AT_FDCWD, new); +#elif defined(__NR_symlink) + return my_syscall2(__NR_symlink, old, new); +#else +#error Neither __NR_symlinkat nor __NR_symlink defined, cannot implement sys_symlink() +#endif +} + +static __attribute__((unused)) +int symlink(const char *old, const char *new) +{ + int ret = sys_symlink(old, new); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * mode_t umask(mode_t mode); + */ + +static __attribute__((unused)) +mode_t sys_umask(mode_t mode) +{ + return my_syscall1(__NR_umask, mode); +} + +static __attribute__((unused)) +mode_t umask(mode_t mode) +{ + return sys_umask(mode); +} + + +/* + * int umount2(const char *path, int flags); + */ + +static __attribute__((unused)) +int sys_umount2(const char *path, int flags) +{ + return my_syscall2(__NR_umount2, path, flags); +} + +static __attribute__((unused)) +int umount2(const char *path, int flags) +{ + int ret = sys_umount2(path, flags); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int unlink(const char *path); + */ + +static __attribute__((unused)) +int sys_unlink(const char *path) +{ +#ifdef __NR_unlinkat + return my_syscall3(__NR_unlinkat, AT_FDCWD, path, 0); +#elif defined(__NR_unlink) + return my_syscall1(__NR_unlink, path); +#else +#error Neither __NR_unlinkat nor __NR_unlink defined, cannot implement sys_unlink() +#endif +} + +static __attribute__((unused)) +int unlink(const char *path) +{ + int ret = sys_unlink(path); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * pid_t wait(int *status); + * pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); + * pid_t waitpid(pid_t pid, int *status, int options); + */ + +static __attribute__((unused)) +pid_t sys_wait4(pid_t pid, int *status, int options, struct rusage *rusage) +{ + return my_syscall4(__NR_wait4, pid, status, options, rusage); +} + +static __attribute__((unused)) +pid_t wait(int *status) +{ + pid_t ret = sys_wait4(-1, status, 0, NULL); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + +static __attribute__((unused)) +pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage) +{ + pid_t ret = sys_wait4(pid, status, options, rusage); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +static __attribute__((unused)) +pid_t waitpid(pid_t pid, int *status, int options) +{ + pid_t ret = sys_wait4(pid, status, options, NULL); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * ssize_t write(int fd, const void *buf, size_t count); + */ + +static __attribute__((unused)) +ssize_t sys_write(int fd, const void *buf, size_t count) +{ + return my_syscall3(__NR_write, fd, buf, count); +} + +static __attribute__((unused)) +ssize_t write(int fd, const void *buf, size_t count) +{ + ssize_t ret = sys_write(fd, buf, count); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} + + +/* + * int memfd_create(const char *name, unsigned int flags); + */ + +static __attribute__((unused)) +int sys_memfd_create(const char *name, unsigned int flags) +{ + return my_syscall2(__NR_memfd_create, name, flags); +} + +static __attribute__((unused)) +int memfd_create(const char *name, unsigned int flags) +{ + ssize_t ret = sys_memfd_create(name, flags); + + if (ret < 0) { + SET_ERRNO(-ret); + ret = -1; + } + return ret; +} static __attribute__((unused)) @@ -56,22 +1419,10 @@ int tcsetpgrp(int fd, pid_t pid) return ioctl(fd, TIOCSPGRP, &pid); } -#define _syscall(N, ...) \ -({ \ - long _ret = my_syscall##N(__VA_ARGS__); \ - if (_ret < 0) { \ - SET_ERRNO(-_ret); \ - _ret = -1; \ - } \ - _ret; \ -}) - -#define _syscall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) #define __syscall_narg(_0, _1, _2, _3, _4, _5, _6, N, ...) N +#define _syscall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) +#define _syscall(N, ...) __sysret(my_syscall##N(__VA_ARGS__)) #define _syscall_n(N, ...) _syscall(N, __VA_ARGS__) #define syscall(...) _syscall_n(_syscall_narg(__VA_ARGS__), ##__VA_ARGS__) -/* make sure to include all global symbols */ -#include "nolibc.h" - -#endif /* _NOLIBC_UNISTD_H */ +#endif /* _NOLIBC_SYS_H */ diff --git a/prep.sh b/prep.sh index 9fa9833..8e1dcbb 100755 --- a/prep.sh +++ b/prep.sh @@ -1,15 +1,15 @@ #! /bin/bash # Paths -SOURCE_PATHS_C="src/*.c" -SOURCE_PATHS_CXX="src/*.cpp" +SOURCE_PATHS_C="src/*.c crosslibc/*.c crosslibc/printf/printf.c" +SOURCE_PATHS_CXX="src/*.cpp crosslibc/*.cpp" SOURCE_PATHS_ASM="src/*.s" -INCLUDE_PATHS="include include/compat nolibc /usr/include/efi /usr/include/efi/x86_64 /usr/include/efi/protocol" +INCLUDE_PATHS="include include/compat nolibc crosslibc crosslibc/STL /usr/include/efi /usr/include/efi/x86_64 /usr/include/efi/protocol" # Config ARCH="x86_64" # Warning: Also specified in Makefile_cst COMPILER="gcc" -COMPILER_FLAGS="-DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch" +COMPILER_FLAGS="-DEFI_FUNCTION_WRAPPER -DLINUX_UEFI_USE_INTERNAL_INTS -DCLIBC_NO_MEMCPY -DCLIBC_NO_MEMSET -mno-red-zone -fno-stack-protector -fpic -fshort-wchar -Wno-builtin-declaration-mismatch" COMPILER_FLAGS_CXX="-fno-rtti -nostdinc++" ASSEMBLER="nasm" ASSEMBLER_FLAGS="" diff --git a/src/clibc-user-impl.c b/src/clibc-user-impl.c new file mode 100644 index 0000000..c6d5923 --- /dev/null +++ b/src/clibc-user-impl.c @@ -0,0 +1,18 @@ +#include +#include +#include + +void _putchar(char c) { + write(1, &c, 1); +} + +char _getchar() { + char c; + read(0, &c, 1); + return c; +} + +void _puts(const char *str) { + write(1, str, strlen(str)); + _putchar('\n'); +} diff --git a/src/main.c b/src/main.c index a9a8e12..672fa3f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,8 @@ #include "getdelim.h" #include -#include #include +#include