diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-10-28 02:47:53 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-02 16:34:17 -0800 |
| commit | 48aff73b6ad60ebfa19df183f63ec8c58624d68d (patch) | |
| tree | 399f745eca03ecf2a682f8cd54db69034fa17bd9 /Source/Core/Common/MemArena.cpp | |
| parent | 81939e808f22276afc91aa1e770d1869b027eaf3 (diff) | |
MemArena: Remove duplicated code
I can't find any obvious difference between these two paths.
Diffstat (limited to 'Source/Core/Common/MemArena.cpp')
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 16eecf33d6..88cf92a70c 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -244,7 +244,6 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena arena->GrabLowMemSpace(total_mem); // Now, create views in high memory where there's plenty of space. -#if _ARCH_64 u8 *base = MemArena::Find4GBBase(); // This really shouldn't fail - in 64-bit, there will always be enough // address space. @@ -254,16 +253,6 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena exit(0); return nullptr; } -#else - // Linux32 is fine with the x64 method, although limited to 32-bit with no automirrors. - u8 *base = MemArena::Find4GBBase(); - if (!Memory_TryBase(base, views, num_views, flags, arena)) - { - PanicAlert("MemoryMap_Setup: Failed finding a memory base."); - exit(0); - return 0; - } -#endif return base; } |