Permalink
Browse files

Merge pull request #6865 from lioncash/namespace

Common: Add MemArena.h/cpp to the Common namespace
  • Loading branch information...
degasus committed May 16, 2018
2 parents 51ce30e + 947fa27 commit b4572233c43ee3fb8998ef22df56eb40cb09a243
Showing with 10 additions and 3 deletions.
  1. +4 −0 Source/Core/Common/MemArena.cpp
  2. +4 −1 Source/Core/Common/MemArena.h
  3. +2 −2 Source/Core/Core/HW/Memmap.cpp
@@ -28,6 +28,8 @@
#endif
#endif
namespace Common
{
#ifdef ANDROID
#define ASHMEM_DEVICE "/dev/ashmem"
@@ -154,3 +156,5 @@ u8* MemArena::FindMemoryBase()
return static_cast<u8*>(base);
#endif
}
} // namespace Common
@@ -12,11 +12,12 @@
#include "Common/CommonTypes.h"
namespace Common
{
// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
// Multiple views can mirror the same section of the block, which makes it very convenient for
// emulating
// memory mirrors.
class MemArena
{
public:
@@ -35,3 +36,5 @@ class MemArena
int fd;
#endif
};
} // namespace Common
@@ -44,7 +44,7 @@ u8* physical_base = nullptr;
u8* logical_base = nullptr;
// The MemArena class
static MemArena g_arena;
static Common::MemArena g_arena;
// ==============
// STATE_TO_SAVE
@@ -190,7 +190,7 @@ void Init()
mem_size += region.size;
}
g_arena.GrabSHMSegment(mem_size);
physical_base = MemArena::FindMemoryBase();
physical_base = Common::MemArena::FindMemoryBase();
for (PhysicalMemoryRegion& region : physical_regions)
{

0 comments on commit b457223

Please sign in to comment.