more various refactors to memory interface
This commit is contained in:
parent
ae99574b6d
commit
09ffe87360
@ -17,20 +17,23 @@ u8* g_base = NULL; ///< The base pointer to the aut
|
|||||||
MemArena g_arena; ///< The MemArena class
|
MemArena g_arena; ///< The MemArena class
|
||||||
|
|
||||||
u8* g_bootrom = NULL; ///< Bootrom physical memory
|
u8* g_bootrom = NULL; ///< Bootrom physical memory
|
||||||
u8* g_fcram = NULL; ///< Main memory (FCRAM) pointer
|
u8* g_heap_gsp = NULL;
|
||||||
|
u8* g_heap = NULL;
|
||||||
u8* g_vram = NULL; ///< Video memory (VRAM) pointer
|
u8* g_vram = NULL; ///< Video memory (VRAM) pointer
|
||||||
|
|
||||||
u8* g_physical_bootrom = NULL; ///< Bootrom physical memory
|
u8* g_physical_bootrom = NULL; ///< Bootrom physical memory
|
||||||
u8* g_uncached_bootrom = NULL;
|
u8* g_uncached_bootrom = NULL;
|
||||||
|
|
||||||
u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM)
|
u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM)
|
||||||
|
u8* g_physical_heap_gsp = NULL;
|
||||||
u8* g_physical_vram = NULL; ///< Video physical memory (VRAM)
|
u8* g_physical_vram = NULL; ///< Video physical memory (VRAM)
|
||||||
u8* g_physical_scratchpad = NULL; ///< Scratchpad memory used for main thread stack
|
u8* g_physical_scratchpad = NULL; ///< Scratchpad memory used for main thread stack
|
||||||
|
|
||||||
// We don't declare the IO region in here since its handled by other means.
|
// We don't declare the IO region in here since its handled by other means.
|
||||||
static MemoryView g_views[] = {
|
static MemoryView g_views[] = {
|
||||||
{ &g_vram, &g_physical_vram, MEM_VRAM_VADDR, MEM_VRAM_SIZE, 0 },
|
{&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
|
||||||
{ &g_fcram, &g_physical_fcram, MEM_FCRAM_VADDR, MEM_FCRAM_SIZE, MV_IS_PRIMARY_RAM },
|
{&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0},
|
||||||
|
{&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
|
||||||
};
|
};
|
||||||
|
|
||||||
/*static MemoryView views[] =
|
/*static MemoryView views[] =
|
||||||
@ -54,12 +57,12 @@ void Init() {
|
|||||||
|
|
||||||
for (size_t i = 0; i < ARRAY_SIZE(g_views); i++) {
|
for (size_t i = 0; i < ARRAY_SIZE(g_views); i++) {
|
||||||
if (g_views[i].flags & MV_IS_PRIMARY_RAM)
|
if (g_views[i].flags & MV_IS_PRIMARY_RAM)
|
||||||
g_views[i].size = MEM_FCRAM_SIZE;
|
g_views[i].size = FCRAM_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena);
|
g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena);
|
||||||
|
|
||||||
NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_fcram,
|
NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_heap,
|
||||||
g_physical_fcram);
|
g_physical_fcram);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,25 +12,38 @@
|
|||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
MEM_BOOTROM_SIZE = 0x00010000, ///< Bootrom (super secret code/data @ 0x8000) size
|
BOOTROM_SIZE = 0x00010000, ///< Bootrom (super secret code/data @ 0x8000) size
|
||||||
MEM_MPCORE_PRIV_SIZE = 0x00002000, ///< MPCore private memory region size
|
MPCORE_PRIV_SIZE = 0x00002000, ///< MPCore private memory region size
|
||||||
MEM_VRAM_SIZE = 0x00600000, ///< VRAM size
|
VRAM_SIZE = 0x00600000, ///< VRAM size
|
||||||
MEM_DSP_SIZE = 0x00080000, ///< DSP memory size
|
DSP_SIZE = 0x00080000, ///< DSP memory size
|
||||||
MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size
|
AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size
|
||||||
MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size
|
FCRAM_SIZE = 0x08000000, ///< FCRAM size
|
||||||
MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader
|
SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader
|
||||||
|
HEAP_GSP_SIZE = 0x02000000, ///< GSP heap size... TODO: Define correctly?
|
||||||
|
HEAP_SIZE = FCRAM_SIZE, ///< Application heap size
|
||||||
|
|
||||||
MEM_VRAM_MASK = 0x007FFFFF,
|
HEAP_PADDR = HEAP_GSP_SIZE,
|
||||||
MEM_FCRAM_MASK = (MEM_FCRAM_SIZE - 1), ///< FCRAM mask
|
HEAP_PADDR_END = (HEAP_PADDR + HEAP_SIZE),
|
||||||
MEM_SCRATCHPAD_MASK = (MEM_SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask
|
HEAP_VADDR = 0x08000000,
|
||||||
|
HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE),
|
||||||
|
HEAP_GSP_VADDR = 0x14000000,
|
||||||
|
HEAP_GSP_VADDR_END = (HEAP_GSP_VADDR + HEAP_GSP_SIZE),
|
||||||
|
HEAP_GSP_PADDR = 0x00000000,
|
||||||
|
HEAP_GSP_PADDR_END = (HEAP_GSP_PADDR + HEAP_GSP_SIZE),
|
||||||
|
|
||||||
MEM_FCRAM_PADDR = 0x20000000, ///< FCRAM physical address
|
VRAM_MASK = 0x007FFFFF,
|
||||||
MEM_FCRAM_PADDR_END = (MEM_FCRAM_PADDR + MEM_FCRAM_SIZE), ///< FCRAM end of physical space
|
FCRAM_MASK = (FCRAM_SIZE - 1), ///< FCRAM mask
|
||||||
MEM_FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address
|
SCRATCHPAD_MASK = (SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask
|
||||||
MEM_FCRAM_VADDR_END = (MEM_FCRAM_VADDR + MEM_FCRAM_SIZE), ///< FCRAM end of virtual space
|
HEAP_MASK = (HEAP_SIZE - 1),
|
||||||
|
|
||||||
MEM_VRAM_VADDR = 0x1F000000,
|
FCRAM_PADDR = 0x20000000, ///< FCRAM physical address
|
||||||
MEM_SCRATCHPAD_VADDR = (0x10000000 - MEM_SCRATCHPAD_SIZE), ///< Scratchpad virtual address
|
FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE), ///< FCRAM end of physical space
|
||||||
|
FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address
|
||||||
|
FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space
|
||||||
|
|
||||||
|
VRAM_VADDR = 0x1F000000,
|
||||||
|
SCRATCHPAD_VADDR_END = 0x10000000,
|
||||||
|
SCRATCHPAD_VADDR = (SCRATCHPAD_VADDR_END - SCRATCHPAD_SIZE), ///< Stack space
|
||||||
};
|
};
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -49,7 +62,7 @@ extern u8 *g_base;
|
|||||||
// These are guaranteed to point to "low memory" addresses (sub-32-bit).
|
// These are guaranteed to point to "low memory" addresses (sub-32-bit).
|
||||||
// 64-bit: Pointers to low-mem (sub-0x10000000) mirror
|
// 64-bit: Pointers to low-mem (sub-0x10000000) mirror
|
||||||
// 32-bit: Same as the corresponding physical/virtual pointers.
|
// 32-bit: Same as the corresponding physical/virtual pointers.
|
||||||
extern u8* g_fcram; ///< Main memory
|
extern u8* g_heap; ///< Main memory
|
||||||
extern u8* g_vram; ///< Video memory (VRAM)
|
extern u8* g_vram; ///< Video memory (VRAM)
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
|
@ -15,8 +15,8 @@ u32 _AddressPhysicalToVirtual(const u32 addr) {
|
|||||||
// Our memory interface read/write functions assume virtual addresses. Put any physical address
|
// Our memory interface read/write functions assume virtual addresses. Put any physical address
|
||||||
// to virtual address translations here. This is obviously quite hacky... But we're not doing
|
// to virtual address translations here. This is obviously quite hacky... But we're not doing
|
||||||
// any MMU emulation yet or anything
|
// any MMU emulation yet or anything
|
||||||
if (((addr & 0xF0000000) == MEM_FCRAM_PADDR) && (addr < (MEM_FCRAM_PADDR_END))) {
|
if ((addr >= FCRAM_PADDR) && (addr < (FCRAM_PADDR_END))) {
|
||||||
return (addr & MEM_FCRAM_MASK) | MEM_FCRAM_VADDR;
|
return (addr & FCRAM_MASK) | FCRAM_VADDR;
|
||||||
}
|
}
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
@ -40,15 +40,15 @@ inline void _Read(T &var, const u32 addr) {
|
|||||||
} else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) {
|
} else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) {
|
||||||
HW::Read<T>(var, vaddr);
|
HW::Read<T>(var, vaddr);
|
||||||
|
|
||||||
// FCRAM
|
// FCRAM - application heap
|
||||||
} else if ((vaddr > MEM_FCRAM_VADDR) && (vaddr < MEM_FCRAM_VADDR_END)) {
|
} else if ((vaddr > HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) {
|
||||||
var = *((const T*)&g_fcram[vaddr & MEM_FCRAM_MASK]);
|
var = *((const T*)&g_heap[vaddr & HEAP_MASK]);
|
||||||
|
|
||||||
/*else if ((vaddr & 0x3F800000) == 0x04000000) {
|
/*else if ((vaddr & 0x3F800000) == 0x04000000) {
|
||||||
var = *((const T*)&m_pVRAM[vaddr & VRAM_MASK]);*/
|
var = *((const T*)&m_pVRAM[vaddr & VRAM_MASK]);*/
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
_assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr);
|
//_assert_msg_(MEMMAP, false, "unknown Read%d @ 0x%08X", sizeof(var) * 8, vaddr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,19 +67,13 @@ inline void _Write(u32 addr, const T data) {
|
|||||||
} else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) {
|
} else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) {
|
||||||
HW::Write<T>(vaddr, data);
|
HW::Write<T>(vaddr, data);
|
||||||
|
|
||||||
// ExeFS:/.code is loaded here:
|
// FCRAM - GSP heap
|
||||||
} else if ((vaddr & 0xFFF00000) == 0x00100000) {
|
//} else if ((vaddr > HEAP_GSP_VADDR) && (vaddr < HEAP_VADDR_GSP_END)) {
|
||||||
// TODO(ShizZy): This is dumb... handle correctly. From 3DBrew:
|
// *(T*)&g_heap_gsp[vaddr & FCRAM_MASK] = data;
|
||||||
// http://3dbrew.org/wiki/Memory_layout#ARM11_User-land_memory_regions
|
|
||||||
// The ExeFS:/.code is loaded here, executables must be loaded to the 0x00100000 region when
|
|
||||||
// the exheader "special memory" flag is clear. The 0x03F00000-byte size restriction only
|
|
||||||
// applies when this flag is clear. Executables are usually loaded to 0x14000000 when the
|
|
||||||
// exheader "special memory" flag is set, however this address can be arbitrary.
|
|
||||||
*(T*)&g_fcram[vaddr & MEM_FCRAM_MASK] = data;
|
|
||||||
|
|
||||||
// FCRAM
|
// FCRAM - application heap
|
||||||
} else if ((vaddr > MEM_FCRAM_VADDR) && (vaddr < MEM_FCRAM_VADDR_END)) {
|
} else if ((vaddr > HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) {
|
||||||
*(T*)&g_fcram[vaddr & MEM_FCRAM_MASK] = data;
|
*(T*)&g_heap[vaddr & HEAP_MASK] = data;
|
||||||
|
|
||||||
} else if ((vaddr & 0xFF000000) == 0x14000000) {
|
} else if ((vaddr & 0xFF000000) == 0x14000000) {
|
||||||
_assert_msg_(MEMMAP, false, "umimplemented write to GSP heap");
|
_assert_msg_(MEMMAP, false, "umimplemented write to GSP heap");
|
||||||
@ -104,9 +98,9 @@ inline void _Write(u32 addr, const T data) {
|
|||||||
u8 *GetPointer(const u32 addr) {
|
u8 *GetPointer(const u32 addr) {
|
||||||
const u32 vaddr = _AddressPhysicalToVirtual(addr);
|
const u32 vaddr = _AddressPhysicalToVirtual(addr);
|
||||||
|
|
||||||
// FCRAM
|
// FCRAM - application heap
|
||||||
if ((vaddr > MEM_FCRAM_VADDR) && (vaddr < MEM_FCRAM_VADDR_END)) {
|
if ((vaddr > HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) {
|
||||||
return g_fcram + (vaddr & MEM_FCRAM_MASK);
|
return g_heap + (vaddr & HEAP_MASK);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ERROR_LOG(MEMMAP, "Unknown GetPointer @ 0x%08x", vaddr);
|
ERROR_LOG(MEMMAP, "Unknown GetPointer @ 0x%08x", vaddr);
|
||||||
|
Loading…
Reference in New Issue
Block a user