summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-05-15 17:28:41 -0400
committerLioncash <mathew1800@gmail.com>2018-05-15 18:27:32 -0400
commit947fa271bec7e512eddaf7e5d6ffecef49c88361 (patch)
treee6ef8ee9d8d818bcdf7ba6efb0aa9d857141bf13 /Source
parent51ce30e09d662c11a5fcc4f534f0ff5c6b62b7a8 (diff)
Common: Add MemArena.h/cpp to the Common namespace
Brings more common code under the Common namespace.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Common/MemArena.cpp4
-rw-r--r--Source/Core/Common/MemArena.h5
-rw-r--r--Source/Core/Core/HW/Memmap.cpp4
3 files changed, 10 insertions, 3 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
index 750a240e19..fcd18892ba 100644
--- a/Source/Core/Common/MemArena.cpp
+++ b/Source/Core/Common/MemArena.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
diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h
index 9018c061dd..21295ce6a5 100644
--- a/Source/Core/Common/MemArena.h
+++ b/Source/Core/Common/MemArena.h
@@ -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 @@ private:
int fd;
#endif
};
+
+} // namespace Common
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index 804cee9cb1..493849c7f3 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -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)
{