summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorShizZy <shizzy@6bit.net>2013-09-06 05:04:04 +0200
committerShizZy <shizzy@6bit.net>2013-09-06 05:04:04 +0200
commit62d873da3ec77044d0135dbb2c6492eca29482fa (patch)
tree3a21f3df2e1784af68f2df5ac98ced6a73f43c20 /src/common
parentadded core and mem_map files to the project (diff)
downloadyuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar.gz
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar.bz2
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar.lz
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar.xz
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.tar.zst
yuzu-62d873da3ec77044d0135dbb2c6492eca29482fa.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/src/common_funcs.h2
-rw-r--r--src/common/src/mem_arena.cpp10
-rw-r--r--src/common/src/mem_arena.h3
3 files changed, 3 insertions, 12 deletions
diff --git a/src/common/src/common_funcs.h b/src/common/src/common_funcs.h
index 73320a3ac..9fa44c894 100644
--- a/src/common/src/common_funcs.h
+++ b/src/common/src/common_funcs.h
@@ -22,6 +22,8 @@ template<> struct CompileTimeAssert<true> {};
#define b32(x) (b16(x) | (b16(x) >>16) )
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC
#include <emmintrin.h>
static __inline __m128i __attribute__((__always_inline__))
diff --git a/src/common/src/mem_arena.cpp b/src/common/src/mem_arena.cpp
index 13cd00fd3..291103be7 100644
--- a/src/common/src/mem_arena.cpp
+++ b/src/common/src/mem_arena.cpp
@@ -163,14 +163,6 @@ u8* MemArena::Find4GBBase()
}
-// yeah, this could also be done in like two bitwise ops...
-#define SKIP(a_flags, b_flags) \
- if (!(a_flags & MV_WII_ONLY) && (b_flags & MV_WII_ONLY)) \
- continue; \
- if (!(a_flags & MV_FAKE_VMEM) && (b_flags & MV_FAKE_VMEM)) \
- continue; \
-
-
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.
@@ -189,7 +181,6 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32
int i;
for (i = 0; i < num_views; i++)
{
- SKIP(flags, views[i].flags);
if (views[i].flags & MV_MIRROR_PREVIOUS) {
position = last_position;
} else {
@@ -230,7 +221,6 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
for (int i = 0; i < num_views; i++)
{
- SKIP(flags, views[i].flags);
if ((views[i].flags & MV_MIRROR_PREVIOUS) == 0)
total_mem += views[i].size;
}
diff --git a/src/common/src/mem_arena.h b/src/common/src/mem_arena.h
index 4c3ded0df..3c14756db 100644
--- a/src/common/src/mem_arena.h
+++ b/src/common/src/mem_arena.h
@@ -37,8 +37,7 @@ private:
enum {
MV_MIRROR_PREVIOUS = 1,
- MV_FAKE_VMEM = 2,
- MV_WII_ONLY = 4,
+ MV_IS_PRIMARY_RAM = 0x100,
};
struct MemoryView