#include <unistd.h>
#include <signal.h>
#include <time.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(NO_DYLIB)
#include <dlfcn.h>
#endif
#include "plat.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/cheat.h"
+#include "../libpcsxcore/sio.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/cdrcimg/cdrcimg.h"
#include "../plugins/dfsound/spu_config.h"
Config.icache_emulation = 0;
Config.PsxAuto = 1;
Config.cycle_multiplier = CYCLE_MULT_DEFAULT;
+ Config.GpuListWalking = -1;
pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
pl_rearmed_cbs.gpu_neon.enhancement_enable =
spu_config.iXAPitch = 0;
spu_config.iVolume = 768;
spu_config.iTempo = 0;
- spu_config.iUseThread = 1; // no effect if only 1 core is detected
-#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+ // may cause issues, no effect if only 1 core is detected
+ spu_config.iUseThread = 0;
+#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */
spu_config.iUseReverb = 0;
spu_config.iUseInterpolation = 0;
+#ifndef HAVE_LIBRETRO
spu_config.iTempo = 1;
+#endif
#endif
new_dynarec_hacks = 0;
- in_type1 = PSE_PAD_TYPE_STANDARD;
- in_type2 = PSE_PAD_TYPE_STANDARD;
+ in_type[0] = PSE_PAD_TYPE_STANDARD;
+ in_type[1] = PSE_PAD_TYPE_STANDARD;
}
void do_emu_action(void)
static void parse_cwcheat(void)
{
- char line[256], buf[64], name[64], *p;
+ char line[256], buf[256], name[256], *p;
int newcheat = 1;
u32 a, v;
FILE *f;
#endif // DO_CPU_CHECKS
}
+#define MKSTR2(x) #x
+#define MKSTR(x) MKSTR2(x)
+static const char *get_build_info(void)
+{
+ return " ("
+#ifdef __VERSION__
+ "cc " __VERSION__ " "
+#endif
+#if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
+ "64bit "
+#elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4
+ "32bit "
+#endif
+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+ "be "
+#endif
+#if defined(__PIC__) || defined(__pic__)
+ "pic "
+#endif
+#if defined(__aarch64__)
+ "arm64"
+#elif defined(__arm__)
+ "arm"
+#endif
+#ifdef __ARM_ARCH
+ "v" MKSTR(__ARM_ARCH) " "
+#endif
+#if defined(__AVX__)
+ "avx "
+#elif defined(__SSSE3__)
+ "ssse3 "
+#elif defined(__ARM_NEON) || defined(__ARM_NEON__)
+ "neon "
+#endif
+#if defined(LIGHTREC)
+ "lightrec "
+#elif !defined(DRC_DISABLE)
+ "ari64 "
+#endif
+ "gpu=" MKSTR(BUILTIN_GPU)
+ ")";
+}
+
int emu_core_preinit(void)
{
// what is the name of the config file?
int emu_core_init(void)
{
- SysPrintf("Starting PCSX-ReARMed " REV "\n");
+ SysPrintf("Starting PCSX-ReARMed " REV "%s\n", get_build_info());
#ifndef NO_FRONTEND
check_profile();
void emu_core_ask_exit(void)
{
- stop = 1;
+ stop++;
g_emu_want_quit = 1;
}
}
if (ready_to_go) {
+ if (menu_load_config(1) != 0)
+ menu_load_config(0);
menu_prepare_emu();
// If a state has been specified, then load that
{
static int fast_forward;
static int normal_g_opts;
- static int normal_frameskip;
static int normal_enhancement_enable;
+ //static int normal_frameskip;
if (force_off && !fast_forward)
return;
fast_forward = !fast_forward;
if (fast_forward) {
normal_g_opts = g_opts;
- normal_frameskip = pl_rearmed_cbs.frameskip;
+ //normal_frameskip = pl_rearmed_cbs.frameskip;
normal_enhancement_enable =
pl_rearmed_cbs.gpu_neon.enhancement_enable;
g_opts |= OPT_NO_FRAMELIM;
- pl_rearmed_cbs.frameskip = 3;
+ // pl_rearmed_cbs.frameskip = 3; // too broken
pl_rearmed_cbs.gpu_neon.enhancement_enable = 0;
} else {
g_opts = normal_g_opts;
- pl_rearmed_cbs.frameskip = normal_frameskip;
+ //pl_rearmed_cbs.frameskip = normal_frameskip;
pl_rearmed_cbs.gpu_neon.enhancement_enable =
normal_enhancement_enable;
static void SignalExit(int sig) {
// only to restore framebuffer/resolution on some devices
plat_finish();
- exit(1);
+ _exit(1);
}
#endif
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
- EmuReset();
-
// hmh core forgets this
CDR_stop();
+
+ EmuReset();
GPU_updateLace = real_lace;
g_emu_resetting = 0;
}
}
-void SysUpdate() {
-}
-
int get_state_filename(char *buf, int size, int i) {
return get_gameid_filename(buf, size,
"." STATES_DIR "%.32s-%.9s.%3.3d", i);
return ret;
ret = SaveState(fname);
-#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(__SWITCH__) /* XXX GPH hack */
sync();
#endif
SysPrintf("* %s \"%s\" [%d]\n",
return LoadState(fname);
}
+#ifndef HAVE_LIBRETRO
#ifndef ANDROID
void SysPrintf(const char *fmt, ...) {
}
#endif
+#endif /* HAVE_LIBRETRO */
void SysMessage(const char *fmt, ...) {
va_list list;
signal(SIGPIPE, SignalExit);
#endif
- GPU_clearDynarec(clearDynarec);
-
ret = CDR_open();
if (ret < 0) { SysMessage(_("Error opening CD-ROM plugin!")); return -1; }
ret = SPU_open();
if (Config.UseNet && !NetOpened) {
netInfo info;
- char path[MAXPATHLEN];
+ char path[MAXPATHLEN * 2];
char dotdir[MAXPATHLEN];
MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
strcpy(info.EmuName, "PCSX");
- strncpy(info.CdromID, CdromId, 9);
- strncpy(info.CdromLabel, CdromLabel, 9);
+ memcpy(info.CdromID, CdromId, 9); /* no \0 trailing character? */
+ memcpy(info.CdromLabel, CdromLabel, 9);
+ info.CdromLabel[9] = '\0';
info.psxMem = psxM;
info.GPU_showScreenPic = GPU_showScreenPic;
info.GPU_displayText = GPU_displayText;
return (void *)(uintptr_t)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(NO_DYLIB)
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
SysMessage("dlopen: %s", dlerror());
if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
return plugin_link(plugid - PLUGIN_DL_BASE, sym);
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(NO_DYLIB)
return dlsym(lib, sym);
#else
return NULL;
}
const char *SysLibError() {
-#ifndef _WIN32
+#if defined(NO_DYLIB)
+ return NULL;
+#elif !defined(_WIN32)
return dlerror();
#else
return "not supported";
if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
return;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(NO_DYLIB)
dlclose(lib);
#endif
}
-