mirror of
https://github.com/FunKey-Project/gpsp_libretro.git
synced 2025-12-12 10:18:51 +01:00
args passed as static var in retro_init_emu_thread, otherwise the stack is not reliable and dynarec could end up not being activated
This commit is contained in:
Vincent-FK
parent
76ecae0961
commit
d235d8c2a6
102
Makefile
102
Makefile
@ -405,56 +405,60 @@ else ifeq ($(platform), funkey)
|
||||
AR = $(OD_TOOLCHAIN)bin/arm-funkey-linux-musleabihf-ar
|
||||
|
||||
|
||||
# fpic := -fPIC
|
||||
# SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined -fPIC
|
||||
# #CFLAGS += -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -Ofast -fno-PIC -fdata-sections -ffunction-sections -fsingle-precision-constant -fno-common -fno-builtin -DFUNKEY
|
||||
# CFLAGS += -Ofast \
|
||||
# -flto=4 -fwhole-program -fuse-linker-plugin \
|
||||
# -fdata-sections -ffunction-sections -Wl,--gc-sections \
|
||||
# -fno-stack-protector -fno-ident -fomit-frame-pointer \
|
||||
# -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
|
||||
# -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
|
||||
# -fmerge-all-constants -fno-math-errno \
|
||||
# -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7-a
|
||||
# # HAVE_NEON = 1
|
||||
# # ARCH = arm
|
||||
# # BUILTIN_GPU = neon
|
||||
# # HAVE_DYNAREC := 1
|
||||
# # CFLAGS += -DARM_MEMORY_DYNAREC
|
||||
# CFLAGS += -DARM -DARM_ARCH
|
||||
# # USE_LIBCO = 1
|
||||
# #LDFLAGS += -static-libgcc -static-libstdc++
|
||||
fpic := -fPIC
|
||||
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined -fPIC
|
||||
#CFLAGS += -march=armv7-a+neon-vfpv4 -mtune=cortex-a7 -mfpu=neon-vfpv4 -Ofast -fno-PIC -fdata-sections -ffunction-sections -fsingle-precision-constant -fno-common -fno-builtin -DFUNKEY
|
||||
CFLAGS += -Ofast \
|
||||
-flto=4 -fwhole-program -fuse-linker-plugin \
|
||||
-fdata-sections -ffunction-sections -Wl,--gc-sections \
|
||||
-fno-stack-protector -fno-ident -fomit-frame-pointer \
|
||||
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
|
||||
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
|
||||
-fmerge-all-constants -fno-math-errno \
|
||||
-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -march=armv7-a
|
||||
CXXFLAGS = $(CFLAGS) -std=gnu++11
|
||||
CPPFLAGS += $(CFLAGS)
|
||||
ASFLAGS += $(CFLAGS)
|
||||
HAVE_NEON = 1
|
||||
ARCH = arm
|
||||
BUILTIN_GPU = neon
|
||||
CPU_ARCH := arm
|
||||
HAVE_DYNAREC := 1
|
||||
CFLAGS += -DARM_MEMORY_DYNAREC
|
||||
CFLAGS += -DARM -DARM_ARCH
|
||||
USE_LIBCO = 0
|
||||
|
||||
|
||||
pic := -fPIC
|
||||
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined -fPIC
|
||||
CFLAGS += -Ofast \
|
||||
-flto=4 -fwhole-program -fuse-linker-plugin \
|
||||
-fdata-sections -ffunction-sections -Wl,--gc-sections \
|
||||
-fno-stack-protector -fno-ident -fomit-frame-pointer \
|
||||
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
|
||||
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
|
||||
-fmerge-all-constants -fno-math-errno \
|
||||
-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
|
||||
CXXFLAGS = $(CFLAGS) -std=gnu++11
|
||||
CPPFLAGS += $(CFLAGS)
|
||||
ASFLAGS += $(CFLAGS)
|
||||
HAVE_NEON = 1
|
||||
ARCH = arm
|
||||
BUILTIN_GPU = neon
|
||||
CPU_ARCH := arm
|
||||
HAVE_DYNAREC = 1
|
||||
USE_LIBCO = 0 ## IMPORTANT to be 0!
|
||||
CFLAGS += -DARM -DARM_ARCH
|
||||
CFLAGS += -DARM_MEMORY_DYNAREC
|
||||
ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
|
||||
CFLAGS += -march=armv7-a
|
||||
else
|
||||
CFLAGS += -march=armv7ve
|
||||
# If gcc is 5.0 or later
|
||||
ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
|
||||
LDFLAGS += -static-libgcc -static-libstdc++
|
||||
endif
|
||||
endif
|
||||
# pic := -fPIC
|
||||
# SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined -fPIC
|
||||
# CFLAGS += -Ofast \
|
||||
# -flto=4 -fwhole-program -fuse-linker-plugin \
|
||||
# -fdata-sections -ffunction-sections -Wl,--gc-sections \
|
||||
# -fno-stack-protector -fno-ident -fomit-frame-pointer \
|
||||
# -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
|
||||
# -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
|
||||
# -fmerge-all-constants -fno-math-errno \
|
||||
# -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
|
||||
# CXXFLAGS = $(CFLAGS) -std=gnu++11
|
||||
# CPPFLAGS += $(CFLAGS)
|
||||
# ASFLAGS += $(CFLAGS)
|
||||
# HAVE_NEON = 1
|
||||
# ARCH = arm
|
||||
# BUILTIN_GPU = neon
|
||||
# CPU_ARCH := arm
|
||||
# HAVE_DYNAREC = 1
|
||||
# USE_LIBCO = 0 ## IMPORTANT to be 0!
|
||||
# CFLAGS += -DARM -DARM_ARCH
|
||||
# CFLAGS += -DARM_MEMORY_DYNAREC
|
||||
# ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
|
||||
# CFLAGS += -march=armv7-a
|
||||
# else
|
||||
# CFLAGS += -march=armv7ve
|
||||
# # If gcc is 5.0 or later
|
||||
# ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
|
||||
# LDFLAGS += -static-libgcc -static-libstdc++
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# Windows
|
||||
else
|
||||
|
||||
90
libretro.c
90
libretro.c
@ -13,6 +13,9 @@
|
||||
#include "gba_memory.h"
|
||||
#include "gba_cc_lut.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
|
||||
#if defined(VITA) && defined(HAVE_DYNAREC)
|
||||
#include <psp2/kernel/sysmem.h>
|
||||
static int translation_caches_inited = 0;
|
||||
@ -48,7 +51,7 @@ static int translation_caches_inited = 0;
|
||||
#endif
|
||||
|
||||
#ifndef MAX_PATH
|
||||
#define MAX_PATH (1024)
|
||||
#define MAX_PATH (512)
|
||||
#endif
|
||||
|
||||
// 59.72750057 hz
|
||||
@ -848,19 +851,14 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
if (!info)
|
||||
return false;
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
use_libretro_save_method = 0;
|
||||
check_variables(1);
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
set_input_descriptors();
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
#if defined(HAVE_DYNAREC)
|
||||
if (dynarec_enable)
|
||||
{
|
||||
#if defined(HAVE_MMAP)
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
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,
|
||||
@ -868,7 +866,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
bios_translation_cache = mmap(NULL, BIOS_TRANSLATION_CACHE_SIZE,
|
||||
PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
rom_translation_ptr = rom_translation_cache;
|
||||
ram_translation_ptr = ram_translation_cache;
|
||||
bios_translation_ptr = bios_translation_cache;
|
||||
@ -890,7 +887,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
dynarec_enable = 0;
|
||||
#endif
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
char filename_bios[MAX_PATH];
|
||||
const char* dir = NULL;
|
||||
|
||||
@ -900,7 +896,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
|
||||
extract_directory(main_path, info->path, sizeof(main_path));
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
|
||||
strncpy(filename_bios, dir, sizeof(filename_bios));
|
||||
else
|
||||
@ -908,8 +903,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
|
||||
strncat(filename_bios, "/gba_bios.bin", sizeof(filename_bios));
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir)
|
||||
strncpy(save_path, dir, sizeof(save_path));
|
||||
else
|
||||
@ -922,7 +915,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
return false;
|
||||
}
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
if (bios_rom[0] != 0x18)
|
||||
{
|
||||
info_msg("You have an incorrect BIOS image.");
|
||||
@ -930,7 +922,6 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
info_msg("It is strongly recommended that you obtain the correct BIOS file.");
|
||||
}
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
memset(gamepak_backup, -1, sizeof(gamepak_backup));
|
||||
gamepak_filename[0] = 0;
|
||||
if (load_gamepak(info, info->path) != 0)
|
||||
@ -938,17 +929,13 @@ bool retro_load_game(const struct retro_game_info* info)
|
||||
error_msg("Could not load the game file.");
|
||||
return false;
|
||||
}
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
|
||||
reset_gba();
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
init_context_switch();
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
set_memory_descriptors();
|
||||
|
||||
printf("in %s l.%d\n", __func__, __LINE__);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1030,10 +1017,20 @@ size_t retro_get_memory_size(unsigned id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
//#define DEBUG_TIME
|
||||
|
||||
void retro_run(void)
|
||||
{
|
||||
bool updated = false;
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
static struct timeval start_t, last_t, current_t;
|
||||
gettimeofday(&start_t, NULL);
|
||||
memcpy(&last_t, &start_t, sizeof(struct timeval));
|
||||
printf("Starting %s, time passed = %lu us\n", __func__,
|
||||
(start_t.tv_sec - last_t.tv_sec)*1000000 + (start_t.tv_usec-last_t.tv_usec) );
|
||||
#endif //DEBUG_TIME
|
||||
|
||||
#if !defined(USE_LIBCO)
|
||||
if (!retro_is_emu_thread_initialized())
|
||||
{
|
||||
@ -1048,10 +1045,30 @@ void retro_run(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before update_input time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
|
||||
update_input();
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before input_poll_cb time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
input_poll_cb();
|
||||
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before frameskipping time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
/* Check whether current frame should
|
||||
* be skipped */
|
||||
skip_next_frame = 0;
|
||||
@ -1113,6 +1130,12 @@ void retro_run(void)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before update_audio_latency time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
/* If frameskip settings have changed, update
|
||||
* frontend audio latency */
|
||||
if (update_audio_latency)
|
||||
@ -1122,13 +1145,46 @@ void retro_run(void)
|
||||
update_audio_latency = false;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before switch_to_cpu_thread time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
switch_to_cpu_thread();
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before render_audio time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
render_audio();
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before video_run time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
video_run();
|
||||
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("before environ_cb time passed = %lu us\n",
|
||||
(current_t.tv_sec - last_t.tv_sec)*1000000 + (current_t.tv_usec-last_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
|
||||
check_variables(0);
|
||||
|
||||
#ifdef DEBUG_TIME
|
||||
gettimeofday(¤t_t, NULL);
|
||||
printf("Total time time passed = %lu us\n\n",
|
||||
(current_t.tv_sec - start_t.tv_sec)*1000000 + (current_t.tv_usec-start_t.tv_usec) );
|
||||
memcpy(&last_t, ¤t_t, sizeof(struct timeval));
|
||||
#endif //DEBUG_TIME
|
||||
}
|
||||
|
||||
unsigned retro_api_version(void)
|
||||
|
||||
@ -19,14 +19,18 @@ static void* retro_run_emulator(void *args)
|
||||
{
|
||||
char *args_str = (char *)args;
|
||||
bool dynarec = (*args_str++ == 1) ? true : false;
|
||||
|
||||
//printf("************ dynarec=%d, args[0]=%d\n", dynarec, args_str[0]);
|
||||
|
||||
u32 cycles = strtol(args_str, NULL, 10);
|
||||
|
||||
emu_has_exited = false;
|
||||
emu_thread_canceled = false;
|
||||
|
||||
#if defined(HAVE_DYNAREC)
|
||||
if (dynarec)
|
||||
if (dynarec){
|
||||
execute_arm_translate(cycles);
|
||||
}
|
||||
#endif
|
||||
execute_arm(cycles);
|
||||
|
||||
@ -76,7 +80,7 @@ void retro_switch_thread()
|
||||
|
||||
bool retro_init_emu_thread(bool dynarec, u32 cycles)
|
||||
{
|
||||
char args[256];
|
||||
static volatile char args[256];
|
||||
args[0] = '\0';
|
||||
|
||||
if (emu_thread_initialized)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user