RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

32x: drc: mmap dram+rom for direct dereference

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@851 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-01-02 21:03:04 +00:00
parent f6c49d38cb
commit b081408f66
8 changed files with 200 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pico/32x/32x.c
View file

@ -129,7 +129,7 @@ void PicoPower32x(void)
void PicoUnload32x(void)
{
if (Pico32xMem != NULL)
free(Pico32xMem);
plat_munmap(Pico32xMem, sizeof(*Pico32xMem));
Pico32xMem = NULL;
sh2_finish(&msh2);
sh2_finish(&ssh2);

2
pico/32x/memory.c
View file

@ -1419,7 +1419,7 @@ void PicoMemSetup32x(void)
unsigned int rs;
int i;
Pico32xMem = calloc(1, sizeof(*Pico32xMem));
Pico32xMem = plat_mmap(0x06000000, sizeof(*Pico32xMem));
if (Pico32xMem == NULL) {
elprintf(EL_STATUS, "OOM");
return;

34
pico/cart.c
View file

@ -13,6 +13,7 @@
#include "../unzip/unzip_stream.h"
static int rom_alloc_size;
static const char *rom_exts[] = { "bin", "gen", "smd", "iso", "sms", "gg", "sg" };
void (*PicoCartUnloadHook)(void);
@ -425,22 +426,10 @@ static int DecodeSmd(unsigned char *data,int len)
return 0;
}
static unsigned char *cd_realloc(void *old, int filesize)
{
unsigned char *rom;
rom=realloc(old, sizeof(mcd_state));
if (rom) memset(rom+0x20000, 0, sizeof(mcd_state)-0x20000);
return rom;
}
static unsigned char *PicoCartAlloc(int filesize, int is_sms)
{
int alloc_size;
unsigned char *rom;
if (PicoAHW & PAHW_MCD)
return cd_realloc(NULL, filesize);
if (is_sms) {
// make size power of 2 for easier banking handling
int s = 0, tmp = filesize;
@ -448,18 +437,24 @@ static unsigned char *PicoCartAlloc(int filesize, int is_sms)
s++;
if (filesize > (1 << s))
s++;
alloc_size = 1 << s;
rom_alloc_size = 1 << s;
}
else {
// make alloc size at least sizeof(mcd_state),
// in case we want to switch to CD mode
if (filesize < sizeof(mcd_state))
filesize = sizeof(mcd_state);
// align to 512K for memhandlers
alloc_size = (filesize + 0x7ffff) & ~0x7ffff;
rom_alloc_size = (filesize + 0x7ffff) & ~0x7ffff;
}
if (alloc_size - filesize < 4)
alloc_size += 4; // padding for out-of-bound exec protection
if (rom_alloc_size - filesize < 4)
rom_alloc_size += 4; // padding for out-of-bound exec protection
// Allocate space for the rom plus padding
rom = calloc(alloc_size, 1);
// use special address for 32x dynarec
rom = plat_mmap(0x02000000, rom_alloc_size);
return rom;
}
@ -513,7 +508,6 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms)
if (!(PicoAHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||
!strncmp((char *)rom+0x128, "BOOT", 4))) {
PicoAHW |= PAHW_MCD;
rom = cd_realloc(rom, size);
}
// Check for SMD:
@ -608,8 +602,8 @@ void PicoCartUnload(void)
if (Pico.rom != NULL) {
SekFinishIdleDet();
free(Pico.rom);
Pico.rom=NULL;
plat_munmap(Pico.rom, rom_alloc_size);
Pico.rom = NULL;
}
}

7
pico/pico.h
View file

@ -28,9 +28,14 @@ extern void mp3_update(int *buffer, int length, int stereo);
// this function should write-back d-cache and invalidate i-cache
// on a mem region [start_addr, end_addr)
// used by SVP dynarec
// used by dynarecs
extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
// attempt to alloc mem at specified address.
// alloc anywhere else if that fails (callers should handle that)
extern void *plat_mmap(unsigned long addr, size_t size);
extern void plat_munmap(void *ptr, size_t size);
// this one should handle display mode changes
extern void emu_video_mode_change(int start_line, int line_count, int is_32cols);