diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-30 16:14:56 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-30 18:06:35 -0400 |
| commit | ba4934b75eb13cc04a54efd54a9d6f286d255083 (patch) | |
| tree | d6cf1cc67a447e8b68aed719f3161119f8a45258 /Source/Core/Common/MemArena.cpp | |
| parent | 77aef014a0352d819e8ea63bafb6262b9af485cb (diff) | |
Common: Clean up brace placements
Diffstat (limited to 'Source/Core/Common/MemArena.cpp')
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 1a00b7033c..193c4ce9b6 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -152,7 +152,8 @@ u8* MemArena::Find4GBBase() #endif const u32 MemSize = 0x31000000; void* base = mmap(0, MemSize, PROT_NONE, flags, -1, 0); - if (base == MAP_FAILED) { + if (base == MAP_FAILED) + { PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno)); return 0; } @@ -170,7 +171,8 @@ u8* MemArena::Find4GBBase() continue; \ -static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) { +static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 flags, MemArena *arena) +{ // OK, we know where to find free space. Now grab it! // We just mimic the popular BAT setup. u32 position = 0; @@ -189,9 +191,12 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 for (i = 0; i < num_views; i++) { SKIP(flags, views[i].flags); - if (views[i].flags & MV_MIRROR_PREVIOUS) { + if (views[i].flags & MV_MIRROR_PREVIOUS) + { position = last_position; - } else { + } + else + { *(views[i].out_ptr_low) = (u8*)arena->CreateView(position, views[i].size); if (!*views[i].out_ptr_low) goto bail; @@ -200,10 +205,13 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32 *views[i].out_ptr = (u8*)arena->CreateView( position, views[i].size, base + views[i].virtual_address); #else - if (views[i].flags & MV_MIRROR_PREVIOUS) { + if (views[i].flags & MV_MIRROR_PREVIOUS) + { // No need to create multiple identical views. *views[i].out_ptr = *views[i - 1].out_ptr; - } else { + } + else + { *views[i].out_ptr = (u8*)arena->CreateView( position, views[i].size, base + (views[i].virtual_address & 0x3FFFFFFF)); if (!*views[i].out_ptr) |