lifning/gpsp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dynamic recompiler now works when the core is compiled as a shared

Browse source 
library.
This commit is contained in:
aliaspider 2014-12-09 09:54:33 +01:00
parent a859afadfd
commit 1a6a136801
4 changed files with 126 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -42,7 +42,7 @@ endif
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
INCDIRS := -I. INCDIRS := -I.
LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T -fPIC
LDLIBS += -lz LDLIBS += -lz
all: $(TARGET) all: $(TARGET)

6
cpu.h
View file

@ -152,9 +152,15 @@ s32 translate_block_thumb(u32 pc, translation_region_type translation_region,
#endif #endif
#ifdef __LIBRETRO__
extern u8* rom_translation_cache;
extern u8* ram_translation_cache;
extern u8* bios_translation_cache;
#else
extern u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; extern u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE];
extern u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE]; extern u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE];
extern u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE]; extern u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE];
#endif
extern u8 *rom_translation_ptr; extern u8 *rom_translation_ptr;
extern u8 *ram_translation_ptr; extern u8 *ram_translation_ptr;
extern u8 *bios_translation_ptr; extern u8 *bios_translation_ptr;

17
cpu_threaded.c
View file

@ -23,18 +23,27 @@
#include "common.h" #include "common.h"
#ifdef __LIBRETRO__
u8* rom_translation_cache;
u8* ram_translation_cache;
u8* bios_translation_cache;
u8 *rom_translation_ptr;
u8 *ram_translation_ptr;
u8 *bios_translation_ptr;
#else
u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE];
u8 *rom_translation_ptr = rom_translation_cache;
u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE]; u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE];
u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE];
u8 *rom_translation_ptr = rom_translation_cache;
u8 *ram_translation_ptr = ram_translation_cache; u8 *ram_translation_ptr = ram_translation_cache;
u8 *bios_translation_ptr = bios_translation_cache;
#endif
u32 iwram_code_min = 0xFFFFFFFF; u32 iwram_code_min = 0xFFFFFFFF;
u32 iwram_code_max = 0xFFFFFFFF; u32 iwram_code_max = 0xFFFFFFFF;
u32 ewram_code_min = 0xFFFFFFFF; u32 ewram_code_min = 0xFFFFFFFF;
u32 ewram_code_max = 0xFFFFFFFF; u32 ewram_code_max = 0xFFFFFFFF;
u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE];
u8 *bios_translation_ptr = bios_translation_cache;
u32 *rom_branch_hash[ROM_BRANCH_HASH_SIZE]; u32 *rom_branch_hash[ROM_BRANCH_HASH_SIZE];

179
libretro.c
View file

@ -23,10 +23,10 @@ static cothread_t cpu_thread;
/* to be removed */ /* to be removed */
u32 savestate_slot = 0; u32 savestate_slot = 0;
void get_savestate_filename_noshot(u32 slot, char *name_buffer) void get_savestate_filename_noshot(u32 slot, char* name_buffer)
{ {
(void) slot; (void) slot;
sprintf(name_buffer, "dummy.svs"); sprintf(name_buffer, "dummy.svs");
} }
/* ------------ */ /* ------------ */
@ -77,7 +77,7 @@ extern struct retro_perf_callback perf_cb;
#endif #endif
void retro_get_system_info(struct retro_system_info *info) void retro_get_system_info(struct retro_system_info* info)
{ {
info->library_name = "TempGBA"; info->library_name = "TempGBA";
info->library_version = "v0.0.1"; info->library_version = "v0.0.1";
@ -87,28 +87,45 @@ void retro_get_system_info(struct retro_system_info *info)
} }
void retro_get_system_av_info(struct retro_system_av_info *info) void retro_get_system_av_info(struct retro_system_av_info* info)
{ {
info->geometry.base_width = GBA_SCREEN_WIDTH; info->geometry.base_width = GBA_SCREEN_WIDTH;
info->geometry.base_height = GBA_SCREEN_HEIGHT; info->geometry.base_height = GBA_SCREEN_HEIGHT;
info->geometry.max_width = GBA_SCREEN_WIDTH; info->geometry.max_width = GBA_SCREEN_WIDTH;
info->geometry.max_height = GBA_SCREEN_HEIGHT; info->geometry.max_height = GBA_SCREEN_HEIGHT;
info->geometry.aspect_ratio = 0; info->geometry.aspect_ratio = 0;
info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz // 59.72750057 hz
info->timing.fps = ((float)(16 * 1024 * 1024)) / (308 * 228 * 4);
info->timing.sample_rate = GBA_SOUND_FREQUENCY; info->timing.sample_rate = GBA_SOUND_FREQUENCY;
} }
#include <sys/mman.h>
void retro_init() void retro_init()
{ {
init_gamepak_buffer(); init_gamepak_buffer();
init_sound(1); init_sound(1);
rom_translation_cache = mmap(NULL, ROM_TRANSLATION_CACHE_SIZE,
PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
ram_translation_cache = mmap(NULL, RAM_TRANSLATION_CACHE_SIZE,
PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
bios_translation_cache = mmap(NULL, BIOS_TRANSLATION_CACHE_SIZE,
PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
rom_translation_ptr = rom_translation_cache;
ram_translation_ptr = ram_translation_cache;
bios_translation_ptr = bios_translation_cache;
} }
void retro_deinit() void retro_deinit()
{ {
perf_cb.perf_log(); perf_cb.perf_log();
memory_term(); memory_term();
munmap(rom_translation_cache, ROM_TRANSLATION_CACHE_SIZE);
munmap(ram_translation_cache, RAM_TRANSLATION_CACHE_SIZE);
munmap(bios_translation_cache, BIOS_TRANSLATION_CACHE_SIZE);
} }
void retro_set_environment(retro_environment_t cb) void retro_set_environment(retro_environment_t cb)
@ -126,8 +143,14 @@ void retro_set_environment(retro_environment_t cb)
} }
void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; } void retro_set_video_refresh(retro_video_refresh_t cb)
void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; } {
video_cb = cb;
}
void retro_set_input_poll(retro_input_poll_t cb)
{
input_poll_cb = cb;
}
void retro_set_controller_port_device(unsigned port, unsigned device) {} void retro_set_controller_port_device(unsigned port, unsigned device) {}
@ -144,51 +167,51 @@ void retro_reset()
size_t retro_serialize_size() size_t retro_serialize_size()
{ {
// return SAVESTATE_SIZE; // return SAVESTATE_SIZE;
return 0; return 0;
} }
bool retro_serialize(void *data, size_t size) bool retro_serialize(void* data, size_t size)
{ {
// if (size < SAVESTATE_SIZE) // if (size < SAVESTATE_SIZE)
return false; return false;
// gba_save_state(data); // gba_save_state(data);
// return true; // return true;
} }
bool retro_unserialize(const void *data, size_t size) bool retro_unserialize(const void* data, size_t size)
{ {
// if (size < SAVESTATE_SIZE) // if (size < SAVESTATE_SIZE)
return false; return false;
// gba_load_state(data); // gba_load_state(data);
// return true; // return true;
} }
void retro_cheat_reset() {} void retro_cheat_reset() {}
void retro_cheat_set(unsigned index, bool enabled, const char *code) {} void retro_cheat_set(unsigned index, bool enabled, const char* code) {}
void error_msg(const char *text) void error_msg(const char* text)
{ {
if (log_cb) if (log_cb)
log_cb(RETRO_LOG_ERROR, text); log_cb(RETRO_LOG_ERROR, text);
} }
void info_msg(const char *text) void info_msg(const char* text)
{ {
if (log_cb) if (log_cb)
log_cb(RETRO_LOG_INFO, text); log_cb(RETRO_LOG_INFO, text);
} }
static void extract_directory(char *buf, const char *path, size_t size) static void extract_directory(char* buf, const char* path, size_t size)
{ {
strncpy(buf, path, size - 1); strncpy(buf, path, size - 1);
buf[size - 1] = '\0'; buf[size - 1] = '\0';
char *base = strrchr(buf, '/'); char* base = strrchr(buf, '/');
if (base) if (base)
*base = '\0'; *base = '\0';
@ -196,10 +219,10 @@ static void extract_directory(char *buf, const char *path, size_t size)
strncpy(buf, ".", size); strncpy(buf, ".", size);
} }
bool retro_load_game(const struct retro_game_info *info) bool retro_load_game(const struct retro_game_info* info)
{ {
char filename_bios[MAX_PATH]; char filename_bios[MAX_PATH];
const char *dir = NULL; const char* dir = NULL;
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
@ -209,45 +232,45 @@ bool retro_load_game(const struct retro_game_info *info)
return false; return false;
} }
extract_directory(main_path,info->path,sizeof(main_path)); extract_directory(main_path, info->path, sizeof(main_path));
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
strncpy(filename_bios, dir, sizeof(filename_bios)); strncpy(filename_bios, dir, sizeof(filename_bios));
else else
strncpy(filename_bios, main_path, sizeof(filename_bios)); strncpy(filename_bios, main_path, sizeof(filename_bios));
strncat(filename_bios, "/gba_bios.bin",sizeof(filename_bios)); strncat(filename_bios, "/gba_bios.bin", sizeof(filename_bios));
// if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) // if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir)
// strncpy(dir_save, dir, sizeof(dir_save)); // strncpy(dir_save, dir, sizeof(dir_save));
// else // else
// strncpy(dir_save, main_path, sizeof(dir_save)); // strncpy(dir_save, main_path, sizeof(dir_save));
// strncat(dir_save, "/",sizeof(dir_save)); // strncat(dir_save, "/",sizeof(dir_save));
// strncat(main_path, "/",sizeof(main_path)); // strncat(main_path, "/",sizeof(main_path));
if (load_bios(filename_bios) != 0) if (load_bios(filename_bios) != 0)
{ {
error_msg("Could not load BIOS image file.\n"); error_msg("Could not load BIOS image file.\n");
return false; return false;
} }
if(bios_rom[0] != 0x18) if (bios_rom[0] != 0x18)
{ {
info_msg("You have an incorrect BIOS image.\n"); info_msg("You have an incorrect BIOS image.\n");
info_msg("While many games will work fine, some will not. It\n"); info_msg("While many games will work fine, some will not. It\n");
info_msg("is strongly recommended that you obtain the\n"); info_msg("is strongly recommended that you obtain the\n");
info_msg("correct BIOS file.\n"); info_msg("correct BIOS file.\n");
} }
gamepak_filename[0] = 0; gamepak_filename[0] = 0;
if (load_gamepak(info->path) != 0) if (load_gamepak(info->path) != 0)
{ {
error_msg("Could not load the game file.\n"); error_msg("Could not load the game file.\n");
return false; return false;
} }
reset_gba(); reset_gba();
@ -258,8 +281,11 @@ bool retro_load_game(const struct retro_game_info *info)
} }
bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info) bool retro_load_game_special(unsigned game_type,
{ return false; } const struct retro_game_info* info, size_t num_info)
{
return false;
}
void retro_unload_game() void retro_unload_game()
{ {
@ -267,42 +293,45 @@ void retro_unload_game()
update_backup(); update_backup();
} }
unsigned retro_get_region() { return RETRO_REGION_NTSC; } unsigned retro_get_region()
void *retro_get_memory_data(unsigned id)
{ {
// switch (id) return RETRO_REGION_NTSC;
// { }
// case RETRO_MEMORY_SAVE_RAM:
// return gamepak_backup; void* retro_get_memory_data(unsigned id)
// } {
// switch (id)
// {
// case RETRO_MEMORY_SAVE_RAM:
// return gamepak_backup;
// }
return 0; return 0;
} }
size_t retro_get_memory_size(unsigned id) size_t retro_get_memory_size(unsigned id)
{ {
// switch (id) // switch (id)
// { // {
// case RETRO_MEMORY_SAVE_RAM: // case RETRO_MEMORY_SAVE_RAM:
// switch(backup_type) // switch(backup_type)
// { // {
// case BACKUP_SRAM: // case BACKUP_SRAM:
// return sram_size; // return sram_size;
// case BACKUP_FLASH: // case BACKUP_FLASH:
// return flash_size; // return flash_size;
// case BACKUP_EEPROM: // case BACKUP_EEPROM:
// return eeprom_size; // return eeprom_size;
// case BACKUP_NONE: // case BACKUP_NONE:
// return 0x0; // return 0x0;
// default: // default:
// return 0x8000; // return 0x8000;
// } // }
// } // }
return 0; return 0;
} }
@ -324,11 +353,15 @@ void retro_run()
render_audio(); render_audio();
video_cb(gba_screen_pixels, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, GBA_SCREEN_PITCH * 2); video_cb(gba_screen_pixels, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT,
GBA_SCREEN_PITCH * 2);
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
check_variables(); check_variables();
} }
unsigned retro_api_version() { return RETRO_API_VERSION; } unsigned retro_api_version()
{
return RETRO_API_VERSION;
}