beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibC: Move mman.h to sys/mman.h

Browse source 
POSIX mandates that it is placed there.
This commit is contained in:
Jean-Baptiste Boric 2021-05-14 17:38:33 +02:00 committed by Andreas Kling
parent e16894af5a
commit eecf7a2097
Notes: sideshowbarker 2024-07-18 18:08:36 +09:00 
Author: https://github.com/boricj
Commit: https://github.com/SerenityOS/serenity/commit/eecf7a20972
Pull-request: https://github.com/SerenityOS/serenity/pull/7105
10 changed files with 45 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tests/Kernel/fuzz-syscalls.cpp
View file

@ -10,11 +10,11 @@
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
#include <errno.h>
#include <mman.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <syscall.h>
static bool is_deadly_syscall(int fn)

2
Tests/LibC/TestLibCMkTemp.cpp
View file

@ -9,10 +9,10 @@
#include <LibCore/File.h>
#include <LibTest/TestCase.h>
#include <fcntl.h>
#include <mman.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <unistd.h>

2
Tests/UserspaceEmulator/write-oob.cpp
View file

@ -6,10 +6,10 @@
#include <AK/Assertions.h>
#include <LibCore/ArgsParser.h>
#include <mman.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
static void write8(void* ptr) { *(volatile uint8_t*)ptr = 1; }
static void write16(void* ptr) { *(volatile uint16_t*)ptr = 1; }

2
Userland/Libraries/LibC/CMakeLists.txt
View file

@ -16,7 +16,6 @@ set(LIBC_SOURCES
link.cpp
locale.cpp
malloc.cpp
mman.cpp
mntent.cpp
net.cpp
netdb.cpp
@ -40,6 +39,7 @@ set(LIBC_SOURCES
strings.cpp
stubs.cpp
syslog.cpp
sys/mman.cpp
sys/prctl.cpp
sys/ptrace.cpp
sys/select.cpp

45
Userland/Libraries/LibC/mman.h
View file

@ -1,45 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <sys/cdefs.h>
#include <sys/types.h>
#define MAP_FILE 0x00
#define MAP_SHARED 0x01
#define MAP_PRIVATE 0x02
#define MAP_FIXED 0x10
#define MAP_ANONYMOUS 0x20
#define MAP_ANON MAP_ANONYMOUS
#define MAP_STACK 0x40
#define MAP_NORESERVE 0x80
#define MAP_RANDOMIZED 0x100
#define PROT_READ 0x1
#define PROT_WRITE 0x2
#define PROT_EXEC 0x4
#define PROT_NONE 0x0
#define MAP_FAILED ((void*)-1)
#define MADV_SET_VOLATILE 0x100
#define MADV_SET_NONVOLATILE 0x200
#define MADV_GET_VOLATILE 0x400
__BEGIN_DECLS
void* mmap(void* addr, size_t, int prot, int flags, int fd, off_t);
void* mmap_with_name(void* addr, size_t, int prot, int flags, int fd, off_t, const char* name);
void* serenity_mmap(void* addr, size_t, int prot, int flags, int fd, off_t, size_t alignment, const char* name);
void* mremap(void* old_address, size_t old_size, size_t new_size, int flags);
int munmap(void*, size_t);
int mprotect(void*, size_t, int prot);
int set_mmap_name(void*, size_t, const char*);
int madvise(void*, size_t, int advice);
void* allocate_tls(const char* initial_data, size_t);
__END_DECLS

2
Userland/Libraries/LibC/mman.cpp → Userland/Libraries/LibC/sys/mman.cpp
View file

@ -5,9 +5,9 @@
*/
#include <errno.h>
#include <mman.h>
#include <stdio.h>
#include <string.h>
#include <sys/mman.h>
#include <syscall.h>
extern "C" {

38
Userland/Libraries/LibC/sys/mman.h
View file

@ -6,4 +6,40 @@
#pragma once
#include <mman.h>
#include <sys/cdefs.h>
#include <sys/types.h>
#define MAP_FILE 0x00
#define MAP_SHARED 0x01
#define MAP_PRIVATE 0x02
#define MAP_FIXED 0x10
#define MAP_ANONYMOUS 0x20
#define MAP_ANON MAP_ANONYMOUS
#define MAP_STACK 0x40
#define MAP_NORESERVE 0x80
#define MAP_RANDOMIZED 0x100
#define PROT_READ 0x1
#define PROT_WRITE 0x2
#define PROT_EXEC 0x4
#define PROT_NONE 0x0
#define MAP_FAILED ((void*)-1)
#define MADV_SET_VOLATILE 0x100
#define MADV_SET_NONVOLATILE 0x200
#define MADV_GET_VOLATILE 0x400
__BEGIN_DECLS
void* mmap(void* addr, size_t, int prot, int flags, int fd, off_t);
void* mmap_with_name(void* addr, size_t, int prot, int flags, int fd, off_t, const char* name);
void* serenity_mmap(void* addr, size_t, int prot, int flags, int fd, off_t, size_t alignment, const char* name);
void* mremap(void* old_address, size_t old_size, size_t new_size, int flags);
int munmap(void*, size_t);
int mprotect(void*, size_t, int prot);
int set_mmap_name(void*, size_t, const char*);
int madvise(void*, size_t, int advice);
void* allocate_tls(const char* initial_data, size_t);
__END_DECLS

2
Userland/Libraries/LibELF/DynamicLinker.cpp
View file

@ -16,7 +16,7 @@
#include <AK/Vector.h>
#include <LibC/bits/pthread_integration.h>
#include <LibC/link.h>
#include <LibC/mman.h>
#include <LibC/sys/mman.h>
#include <LibC/unistd.h>
#include <LibDl/dlfcn.h>
#include <LibDl/dlfcn_integration.h>

2
Userland/Utilities/syscall.cpp
View file

@ -8,10 +8,10 @@
#include <AK/Iterator.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <mman.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <syscall.h>
#define SC_NARG 4

2
Userland/Utilities/tt.cpp
View file

@ -6,11 +6,11 @@
#include <LibCore/ArgsParser.h>
#include <errno.h>
#include <mman.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
static int mutex_test();