diff options
| author | mathieui <mathieui@mathieui.net> | 2016-01-21 21:16:51 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2016-01-21 21:16:51 +0100 |
| commit | 3e283ea9f17aa779832db065b2ecc4b19cf03e83 (patch) | |
| tree | a7e5db6d6550487db024bc9b7b5dd9fa96198aa4 /Source/Core/Common/MemArena.cpp | |
| parent | 78aa398e7c09adc4fb9318a4c497e8fd1bcd58ba (diff) | |
More asterisks
Diffstat (limited to 'Source/Core/Common/MemArena.cpp')
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 9d03227f71..008b49de0c 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -95,12 +95,12 @@ void MemArena::ReleaseSHMSegment() } -void *MemArena::CreateView(s64 offset, size_t size, void *base) +void* MemArena::CreateView(s64 offset, size_t size, void* base) { #ifdef _WIN32 return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base); #else - void *retval = mmap( + void* retval = mmap( base, size, PROT_READ | PROT_WRITE, MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), @@ -172,7 +172,7 @@ u8* MemArena::FindMemoryBase() if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) \ continue; \ -static bool Memory_TryBase(u8 *base, MemoryView *views, int num_views, u32 flags, MemArena *arena) +static bool Memory_TryBase(u8* base, 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. @@ -223,7 +223,7 @@ static bool Memory_TryBase(u8 *base, MemoryView *views, int num_views, u32 flags return true; } -static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags) +static u32 MemoryMap_InitializeViews(MemoryView* views, int num_views, u32 flags) { u32 shm_position = 0; u32 last_position = 0; @@ -245,14 +245,14 @@ static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags return shm_position; } -u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena) +u8* MemoryMap_Setup(MemoryView* views, int num_views, u32 flags, MemArena* arena) { u32 total_mem = MemoryMap_InitializeViews(views, num_views, flags); arena->GrabSHMSegment(total_mem); // Now, create views in high memory where there's plenty of space. - u8 *base = MemArena::FindMemoryBase(); + u8* base = MemArena::FindMemoryBase(); // This really shouldn't fail - in 64-bit, there will always be enough // address space. if (!Memory_TryBase(base, views, num_views, flags, arena)) @@ -265,7 +265,7 @@ u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena return base; } -void MemoryMap_Shutdown(MemoryView *views, int num_views, u32 flags, MemArena *arena) +void MemoryMap_Shutdown(MemoryView* views, int num_views, u32 flags, MemArena* arena) { std::set<void*> freeset; for (int i = 0; i < num_views; i++) |