The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

MemArena: Remove duplicated code

Browse Source 
I can't find any obvious difference between these two paths.
This commit is contained in:
Jasper St. Pierre 2014-10-28 02:47:53 -07:00
parent 81939e808f
commit 48aff73b6a
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Common/MemArena.cpp
View File

@ -244,7 +244,6 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
arena->GrabLowMemSpace(total_mem); arena->GrabLowMemSpace(total_mem);
// Now, create views in high memory where there's plenty of space. // Now, create views in high memory where there's plenty of space.
#if _ARCH_64
u8 *base = MemArena::Find4GBBase(); u8 *base = MemArena::Find4GBBase();
// This really shouldn't fail - in 64-bit, there will always be enough // This really shouldn't fail - in 64-bit, there will always be enough
// address space. // address space.
@ -254,16 +253,6 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
exit(0); exit(0);
return nullptr; 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; return base;
} }