The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-11 16:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Slightly cleanup of mmap(2) flags:

Browse Source 
Move MAP_32BIT to MemoryUtil.h.
MAP_VARIABLE is simply the absence of MAP_FIXED.
Replace MAP_ANONYMOUS with the more traditional MAP_ANON - Linux is compatible.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5899 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-18 05:15:16 +00:00
parent 8208903fed
commit caeabf8bea
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Common/Src/MemoryUtil.cpp
View File

@ -22,21 +22,11 @@
#ifdef _WIN32
#include <windows.h>
#include <psapi.h>
#elif __GNUC__
#include <sys/mman.h>
#else
#include <errno.h>
#include <stdio.h>
#endif
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
#define MAP_ANONYMOUS MAP_ANON
#endif
// MacOSX does not support MAP_VARIABLE
#ifndef MAP_VARIABLE
#define MAP_VARIABLE 0
#endif
// This is purposely not a full wrapper for virtualalloc/mmap, but it
// provides exactly the primitive operations that Dolphin needs.
@ -55,7 +45,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
#else
void* retval = mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_ANONYMOUS | MAP_PRIVATE
MAP_ANON | MAP_PRIVATE
#ifdef __x86_64__
| (low ? MAP_32BIT : 0)
#endif
@ -86,7 +76,7 @@ void* AllocateMemoryPages(size_t size)
#else
void* retval = mmap(0, size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); // | MAP_FIXED
MAP_ANON | MAP_PRIVATE, -1, 0); // | MAP_FIXED
// printf("Mapped memory at %p (size %i)\n", retval, size);
if (!retval)