summaryrefslogtreecommitdiff
path: root/src/common/memory_util.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-20 19:12:21 -0500
committerGravatar GitHub2018-01-20 19:12:21 -0500
commit557b2496d7a83b26ad6737543a7da91826650fca (patch)
tree28c5d2fa3cba08f1f49f5c10fa16bfb94144d01c /src/common/memory_util.cpp
parentMerge pull request #120 from Rozelette/master (diff)
parentTravis: Add missing PPA for newer libstdc++ (diff)
downloadyuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.gz
yuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.xz
yuzu-557b2496d7a83b26ad6737543a7da91826650fca.zip
Merge pull request #117 from jroweboy/clang-format
Clang format as a build target
Diffstat (limited to 'src/common/memory_util.cpp')
-rw-r--r--src/common/memory_util.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index c19729b21..759ad02ca 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -40,11 +40,12 @@ void* AllocateExecutableMemory(size_t size, bool low) {
40 if (low && (!map_hint)) 40 if (low && (!map_hint))
41 map_hint = (char*)round_page(512 * 1024 * 1024); /* 0.5 GB rounded up to the next page */ 41 map_hint = (char*)round_page(512 * 1024 * 1024); /* 0.5 GB rounded up to the next page */
42#endif 42#endif
43 void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE 43 void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC,
44 MAP_ANON | MAP_PRIVATE
44#if defined(ARCHITECTURE_X64) && defined(MAP_32BIT) 45#if defined(ARCHITECTURE_X64) && defined(MAP_32BIT)
45 | (low ? MAP_32BIT : 0) 46 | (low ? MAP_32BIT : 0)
46#endif 47#endif
47 , 48 ,
48 -1, 0); 49 -1, 0);
49#endif /* defined(_WIN32) */ 50#endif /* defined(_WIN32) */
50 51