yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-07-06 16:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-syscall-support: pull in latest version

Browse source 
The sys_mmap/sys_mmap2 weirdness has been cleaned up in lss now and there
is only one API now for everyone -- sys_mmap.

R=mseaborn@chromium.org

Review URL: https://codereview.chromium.org/2065493006 .
This commit is contained in:
Mike Frysinger 2016-06-14 14:17:56 -04:00
parent c44217f646
commit 67f738b7ad
3 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -59,7 +59,7 @@ deps = {
# Linux syscall support. # Linux syscall support.
"src/src/third_party/lss": "src/src/third_party/lss":
"https://chromium.googlesource.com/linux-syscall-support/" + "https://chromium.googlesource.com/linux-syscall-support/" +
"@9292030109847793f7a6689adac1ddafb412fe14" "@3f6478ac95edf86cd3da300c2c0d34a438f5dbeb",
} }
hooks = [ hooks = [

11
src/common/linux/memory_mapped_file.cc
View file

@ -87,18 +87,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
return true; return true;
} }
#if defined(__x86_64__) || defined(__aarch64__) || \
(defined(__mips__) && _MIPS_SIM == _ABI64)
void* data = sys_mmap(NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset); void* data = sys_mmap(NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset);
#else
if ((offset & 4095) != 0) {
// Not page aligned.
sys_close(fd);
return false;
}
void* data = sys_mmap2(
NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset >> 12);
#endif
sys_close(fd); sys_close(fd);
if (data == MAP_FAILED) { if (data == MAP_FAILED) {
return false; return false;

7
src/common/memory.h
View file

@ -44,7 +44,6 @@
#ifdef __APPLE__ #ifdef __APPLE__
#define sys_mmap mmap #define sys_mmap mmap
#define sys_mmap2 mmap
#define sys_munmap munmap #define sys_munmap munmap
#define MAP_ANONYMOUS MAP_ANON #define MAP_ANONYMOUS MAP_ANON
#else #else
@ -117,14 +116,8 @@ class PageAllocator {
private: private:
uint8_t *GetNPages(size_t num_pages) { uint8_t *GetNPages(size_t num_pages) {
#if defined(__x86_64__) || defined(__aarch64__) || defined(__aarch64__) || \
((defined(__mips__) && _MIPS_SIM == _ABI64))
void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
#else
void *a = sys_mmap2(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
#endif
if (a == MAP_FAILED) if (a == MAP_FAILED)
return NULL; return NULL;