#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include <dlfcn.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
#include <time.h>
+#if !defined(_WIN32) && !defined(NO_DYLIB)
+#include <dlfcn.h>
+#endif
#include "main.h"
#include "plugin.h"
#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"
+#include "arm_features.h"
#include "revision.h"
+#if defined(__has_builtin)
+#define DO_CPU_CHECKS __has_builtin(__builtin_cpu_init)
+#elif defined(__x86_64__) || defined(__i386__)
+#define DO_CPU_CHECKS 1
+#else
+#define DO_CPU_CHECKS 0
+#endif
+
#ifndef NO_FRONTEND
#include "libpicofe/input.h"
#include "libpicofe/plat.h"
#endif
// don't include debug.h - it breaks ARM build (R1 redefined)
-void StartDebugger();
-void StopDebugger();
-
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
+static void StartDebugger() {}
+static void StopDebugger() {}
int ready_to_go, g_emu_want_quit, g_emu_resetting;
unsigned long gpuDisp;
void emu_set_default_config(void)
{
// try to set sane config on which most games work
- Config.Xa = Config.Cdda = Config.Sio =
- Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
+ Config.Xa = Config.Cdda = 0;
+ 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 =
pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
pl_rearmed_cbs.gpu_peops.iUseDither = 0;
pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
+ pl_rearmed_cbs.gpu_senquack.ilace_force = 0;
+ pl_rearmed_cbs.gpu_senquack.pixel_skip = 0;
+ pl_rearmed_cbs.gpu_senquack.lighting = 1;
+ pl_rearmed_cbs.gpu_senquack.fast_lighting = 0;
+ pl_rearmed_cbs.gpu_senquack.blending = 1;
+ pl_rearmed_cbs.gpu_senquack.dithering = 0;
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
- iUseReverb = 2;
- iUseInterpolation = 1;
- iXAPitch = 0;
- iVolume = 768;
-#ifndef __ARM_ARCH_7A__ /* XXX */
- iUseReverb = 0;
- iUseInterpolation = 0;
+ spu_config.iUseReverb = 1;
+ spu_config.iUseInterpolation = 1;
+ spu_config.iXAPitch = 0;
+ spu_config.iVolume = 768;
+ spu_config.iTempo = 0;
+ // 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;
- cycle_multiplier = 200;
- 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;
}
}
+static void log_wrong_cpu(void)
+{
+#if DO_CPU_CHECKS
+ __builtin_cpu_init();
+ #define CHECK_CPU(name) if (!__builtin_cpu_supports(name)) \
+ SysPrintf("ERROR: compiled for " name ", which is unsupported by the CPU\n")
+#ifdef __SSE2__
+ CHECK_CPU("sse2");
+#endif
+#ifdef __SSSE3__
+ CHECK_CPU("ssse3");
+#endif
+#ifdef __SSE4_1__
+ CHECK_CPU("sse4.1");
+#endif
+#endif // DO_CPU_CHECKS
+}
+
int emu_core_preinit(void)
{
// what is the name of the config file?
#endif
emuLog = stdout;
+ log_wrong_cpu();
+
SetIsoFile(NULL);
memset(&Config, 0, sizeof(Config));
void emu_core_ask_exit(void)
{
- stop = 1;
+ stop++;
g_emu_want_quit = 1;
}
#ifndef NO_FRONTEND
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
static void create_profile_dir(const char *directory) {
char path[MAXPATHLEN];
{
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
printf("SysRunGui\n");
}
-static void dummy_lace()
+static void CALLBACK dummy_lace()
{
}
// 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);
-#ifndef __ARM_ARCH_7A__ /* XXX */
+#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;
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
- void *ret;
+ void *ret = NULL;
int i;
SysPrintf("plugin: %s\n", lib);
tmp++;
for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
if (strcmp(tmp, builtin_plugins[i]) == 0)
- return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
+ return (void *)(uintptr_t)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
+#if !defined(_WIN32) && !defined(NO_DYLIB)
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
SysMessage("dlopen: %s", dlerror());
+#else
+ /* no external plugin support, abi is no longer
+ * compatible with psemu/pcsx anyway */
+#endif
return ret;
}
void *SysLoadSym(void *lib, const char *sym) {
- unsigned int plugid = (unsigned int)(long)lib;
+ unsigned int plugid = (unsigned int)(uintptr_t)lib;
if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
return plugin_link(plugid - PLUGIN_DL_BASE, sym);
+#if !defined(_WIN32) && !defined(NO_DYLIB)
return dlsym(lib, sym);
+#else
+ return NULL;
+#endif
}
const char *SysLibError() {
+#if defined(NO_DYLIB)
+ return NULL;
+#elif !defined(_WIN32)
return dlerror();
+#else
+ return "not supported";
+#endif
}
void SysCloseLibrary(void *lib) {
- unsigned int plugid = (unsigned int)(long)lib;
+ unsigned int plugid = (unsigned int)(uintptr_t)lib;
if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
return;
+#if !defined(_WIN32) && !defined(NO_DYLIB)
dlclose(lib);
+#endif
}
-
notaz.gp2x.de / pcsx_rearmed.git / blobdiff