diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-06-02 07:36:20 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-06-02 07:36:20 +0200 |
| commit | 1ef7dd68ef870bb25d43d19eb3474d27a3df4bd5 (patch) | |
| tree | 1166c3814c1e8b048772d81c2e41e1e1bf6a7395 /Source/Core/Common/MemoryUtil.cpp | |
| parent | 31eedb2f79318002a4772087f96eb034f94787a1 (diff) | |
| parent | 87e671404aa75bf3f1ba013daa0a13165ab4827c (diff) | |
Merge pull request #446 from Sonicadvance1/Memoryutil-fix
Make MemoryUtil.cpp use the correct x86_64 define.
Diffstat (limited to 'Source/Core/Common/MemoryUtil.cpp')
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 8e8d27b520..bb3ddf58a4 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -17,7 +17,7 @@ #include <sys/mman.h> #endif -#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT) #include <unistd.h> #define PAGE_MASK (getpagesize() - 1) #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) @@ -32,7 +32,7 @@ void* AllocateExecutableMemory(size_t size, bool low) void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #else static char *map_hint = nullptr; -#if defined(__x86_64__) && !defined(MAP_32BIT) +#if defined(_M_X86_64) && !defined(MAP_32BIT) // This OS has no flag to enforce allocation below the 4 GB boundary, // but if we hint that we want a low address it is very likely we will // get one. @@ -44,7 +44,7 @@ void* AllocateExecutableMemory(size_t size, bool low) #endif void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE -#if defined(__x86_64__) && defined(MAP_32BIT) +#if defined(_M_X86_64) && defined(MAP_32BIT) | (low ? MAP_32BIT : 0) #endif , -1, 0); @@ -63,7 +63,7 @@ void* AllocateExecutableMemory(size_t size, bool low) #endif PanicAlert("Failed to allocate executable memory"); } -#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT) else { if (low) @@ -75,7 +75,7 @@ void* AllocateExecutableMemory(size_t size, bool low) } #endif -#if _ARCH_64 +#if _M_X86_64 if ((u64)ptr >= 0x80000000 && low == true) PanicAlert("Executable memory ended up above 2GB!"); #endif |