Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Memory Map Setup #545

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Add Memory Map Setup #545

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ce47d9
add memory map setup
JoshuaEagles Jul 23, 2024
709e5a6
move retroarch memory map setup to device.c
JoshuaEagles Jul 23, 2024
ff47bd2
update retroarch memory map setup to map address space properly
JoshuaEagles Jul 27, 2024
3339d71
add memory map flags for the retroarch memory maps
JoshuaEagles Jul 27, 2024
18203f1
refactor to map the entirety of KSEG0 and KSEG1
JoshuaEagles Aug 1, 2024
55f3802
finish mapping the whole KSEG1 address space and improve code readabi…
JoshuaEagles Aug 2, 2024
208d403
remove the -1 for the romsize mapping
JoshuaEagles Aug 2, 2024
c6d2042
set dd_rom_size when setting the pointer for it
JoshuaEagles Aug 2, 2024
b5d7ca7
fix pointers to dd regs and rom
JoshuaEagles Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions mupen64plus-core/src/device/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@

#include "device.h"

#include <libretro_private.h>

#ifdef __LIBRETRO__
#include <mupen64plus-next_common.h>
#endif // __LIBRETRO__

#include "memory/memory.h"
#include "pif/pif.h"
#include "r4300/r4300_core.h"
Expand Down Expand Up @@ -77,6 +83,82 @@ static void get_pi_dma_handler(struct cart* cart, struct dd_controller* dd, uint
#undef RW
}

struct n64_to_retroarch_memory_map {
size_t start;
size_t len;
void* ptr;
bool isAccessibleCached;
uint64_t flags;
};

void setup_retroarch_memory_map(struct device* dev, size_t rom_size, size_t dd_rom_size) {
struct n64_to_retroarch_memory_map n64_to_retroarch_mappings[] = {
{ MM_RDRAM_DRAM, 0x3efffff, dev->rdram.dram, true, RETRO_MEMDESC_SYSTEM_RAM },
{ MM_RDRAM_REGS, 0xfffff, dev->rdram.regs, false },
{ MM_RSP_MEM, 0xffff, dev->sp.mem, false },
{ MM_RSP_REGS, 0xffff, dev->sp.regs, false },
{ MM_RSP_REGS2, 0xffff, dev->sp.regs2, false },
{ MM_DPC_REGS, 0xffff, dev->dp.dpc_regs, false },
{ MM_DPS_REGS, 0xffff, dev->dp.dps_regs, false },
{ MM_MI_REGS, 0xffff, dev->mi.regs, false },
{ MM_VI_REGS, 0xffff, dev->vi.regs, false },
{ MM_AI_REGS, 0xffff, dev->ai.regs, false },
{ MM_PI_REGS, 0xffff, dev->pi.regs, false },
{ MM_RI_REGS, 0xffff, dev->ri.regs, false },
{ MM_SI_REGS, 0xffff, dev->si.regs, false },
{ MM_DOM2_ADDR1, 0xffffff, NULL, false },
{ MM_DD_ROM, 0x1ffffff, NULL, false, RETRO_MEMDESC_CONST },
{ MM_DOM2_ADDR2, 0x1ffff, NULL, false },
{ MM_CART_ROM, rom_size, dev->cart.cart_rom.rom, false, RETRO_MEMDESC_CONST },
{ MM_PIF_MEM, PIF_ROM_SIZE, dev->pif.base, false, RETRO_MEMDESC_CONST },
{ MM_PIF_MEM + PIF_ROM_SIZE, PIF_RAM_SIZE, dev->pif.ram, false },
};
size_t n64_to_retroarch_mapping_count = ARRAY_SIZE(n64_to_retroarch_mappings);

if (dd_rom_size > 0) {
n64_to_retroarch_mappings[13].ptr = dev->dd.regs;
n64_to_retroarch_mappings[14].ptr = dev->dd.rom;
n64_to_retroarch_mappings[14].len = dd_rom_size;
}

if (dev->cart.use_flashram == -1) {
n64_to_retroarch_mappings[15].ptr = &dev->cart.sram;
}
else {
n64_to_retroarch_mappings[15].ptr = &dev->cart.flashram;
}

struct retro_memory_descriptor descs[n64_to_retroarch_mapping_count * 2];
struct retro_memory_map retromap;

memset(descs, 0, sizeof(descs));

for (int i = 0; i < n64_to_retroarch_mapping_count; i++) {
struct n64_to_retroarch_memory_map mapping = n64_to_retroarch_mappings[i];

if (mapping.ptr == NULL) {
continue;
}

if (mapping.isAccessibleCached) {
descs[i].ptr = mapping.ptr;
descs[i].start = R4300_KSEG0 + mapping.start;
descs[i].len = mapping.len;
descs[i].flags = mapping.flags;
}

descs[i + n64_to_retroarch_mapping_count].ptr = mapping.ptr;
descs[i + n64_to_retroarch_mapping_count].start = R4300_KSEG1 + mapping.start;
descs[i + n64_to_retroarch_mapping_count].len = mapping.len;
descs[i + n64_to_retroarch_mapping_count].flags = mapping.flags;
}

retromap.descriptors = descs;
retromap.num_descriptors = ARRAY_SIZE(descs);

environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &retromap);
}

void init_device(struct device* dev,
/* memory */
void* base,
Expand Down Expand Up @@ -220,6 +302,8 @@ void init_device(struct device* dev,
flashram_type, flashram_storage, iflashram_storage,
(const uint8_t*)dev->rdram.dram,
sram_storage, isram_storage);

setup_retroarch_memory_map(dev, rom_size, dd_rom_size);
}

void poweron_device(struct device* dev)
Expand Down