Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -13,43 +13,45 @@
#include "Common/CommonTypes.h"
// 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
// Multiple views can mirror the same section of the block, which makes it very convenient for
// emulating
// memory mirrors.
class MemArena
{
public:
void GrabSHMSegment(size_t size);
void ReleaseSHMSegment();
void* CreateView(s64 offset, size_t size, void* base = nullptr);
void ReleaseView(void* view, size_t size);
void GrabSHMSegment(size_t size);
void ReleaseSHMSegment();
void* CreateView(s64 offset, size_t size, void* base = nullptr);
void ReleaseView(void* view, size_t size);
// This finds 1 GB in 32-bit, 16 GB in 64-bit.
static u8* FindMemoryBase();
// This finds 1 GB in 32-bit, 16 GB in 64-bit.
static u8* FindMemoryBase();
private:
#ifdef _WIN32
HANDLE hMemoryMapping;
HANDLE hMemoryMapping;
#else
int fd;
int fd;
#endif
};
enum {
MV_MIRROR_PREVIOUS = 1,
MV_FAKE_VMEM = 2,
MV_WII_ONLY = 4,
enum
{
MV_MIRROR_PREVIOUS = 1,
MV_FAKE_VMEM = 2,
MV_WII_ONLY = 4,
};
struct MemoryView
{
u8** out_ptr;
u64 virtual_address;
u32 size;
u32 flags;
void* mapped_ptr;
void* view_ptr;
u32 shm_position;
u8** out_ptr;
u64 virtual_address;
u32 size;
u32 flags;
void* mapped_ptr;
void* view_ptr;
u32 shm_position;
};
// Uses a memory arena to set up an emulator-friendly memory map according to