diff options
| author | 2018-01-20 00:48:02 -0700 | |
|---|---|---|
| committer | 2018-01-20 16:45:11 -0700 | |
| commit | 096be1663682f38d572e9816e3350e0dc9f13168 (patch) | |
| tree | a2f695170d9a3e0e98cebf823087cdb65d5af00f /src/common/memory_util.cpp | |
| parent | CMake: Conditionally turn on bundled libs for MSVC (diff) | |
| download | yuzu-096be1663682f38d572e9816e3350e0dc9f13168.tar.gz yuzu-096be1663682f38d572e9816e3350e0dc9f13168.tar.xz yuzu-096be1663682f38d572e9816e3350e0dc9f13168.zip | |
Format: Run the new clang format on everything
Diffstat (limited to 'src/common/memory_util.cpp')
| -rw-r--r-- | src/common/memory_util.cpp | 7 |
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 | ||