summaryrefslogtreecommitdiff
path: root/src/common/memory_util.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-08-14 22:29:08 -0400
committerGravatar bunnei2015-08-15 18:03:27 -0400
commitb39c053785abc4a94ce380885a846c5d8be89675 (patch)
tree42911208a051652a7452c8bbbd35ec91aa2d4e20 /src/common/memory_util.cpp
parentCommon: Cleanup CPU capability detection code. (diff)
downloadyuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.gz
yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.xz
yuzu-b39c053785abc4a94ce380885a846c5d8be89675.zip
Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64.
Diffstat (limited to 'src/common/memory_util.cpp')
-rw-r--r--src/common/memory_util.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index 2b3ace528..5ef784224 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -16,7 +16,7 @@
16 #include <sys/mman.h> 16 #include <sys/mman.h>
17#endif 17#endif
18 18
19#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) 19#if !defined(_WIN32) && defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
20#include <unistd.h> 20#include <unistd.h>
21#define PAGE_MASK (getpagesize() - 1) 21#define PAGE_MASK (getpagesize() - 1)
22#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) 22#define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK))
@@ -31,7 +31,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
31 void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); 31 void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
32#else 32#else
33 static char *map_hint = 0; 33 static char *map_hint = 0;
34#if defined(__x86_64__) && !defined(MAP_32BIT) 34#if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
35 // This OS has no flag to enforce allocation below the 4 GB boundary, 35 // This OS has no flag to enforce allocation below the 4 GB boundary,
36 // but if we hint that we want a low address it is very likely we will 36 // but if we hint that we want a low address it is very likely we will
37 // get one. 37 // get one.
@@ -43,7 +43,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
43#endif 43#endif
44 void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, 44 void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC,
45 MAP_ANON | MAP_PRIVATE 45 MAP_ANON | MAP_PRIVATE
46#if defined(__x86_64__) && defined(MAP_32BIT) 46#if defined(ARCHITECTURE_X64) && defined(MAP_32BIT)
47 | (low ? MAP_32BIT : 0) 47 | (low ? MAP_32BIT : 0)
48#endif 48#endif
49 , -1, 0); 49 , -1, 0);
@@ -62,7 +62,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
62#endif 62#endif
63 LOG_ERROR(Common_Memory, "Failed to allocate executable memory"); 63 LOG_ERROR(Common_Memory, "Failed to allocate executable memory");
64 } 64 }
65#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) 65#if !defined(_WIN32) && defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
66 else 66 else
67 { 67 {
68 if (low) 68 if (low)