archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 10:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Conflicts fixed

Browse source
This commit is contained in:
Nekotekina 2014-10-02 16:19:52 +04:00
commit 6b0857dcff
43 changed files with 2938 additions and 1752 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Memory/Memory.h
View file

@ -7,7 +7,7 @@ using std::nullptr_t;
#define safe_delete(x) do {delete (x);(x)=nullptr;} while(0)
#define safe_free(x) do {free(x);(x)=nullptr;} while(0)
extern void* const m_base_addr;
extern void* const g_base_addr;
enum MemoryType
{
@ -69,7 +69,7 @@ public:
static void* const GetBaseAddr()
{
return m_base_addr;
return g_base_addr;
}
__noinline void InvalidAddress(const char* func, const u64 addr);