X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=43a55481b940420edc4794eb8b8e03ed859e9e10;hp=0f0e641bce0e88c82f5404c0c2aed694600b051d;hb=HEAD;hpb=e6495add01b91c6ebb9fdb15920fc7fa431d647e

diff --git a/frontend/main.c b/frontend/main.c
index 0f0e641b..ce7eca6c 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -8,12 +8,12 @@
 #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"
@@ -23,10 +23,22 @@
 #include "plat.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cheat.h"
+#include "../libpcsxcore/sio.h"
+#include "../libpcsxcore/database.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"
@@ -41,16 +53,10 @@ static void check_memcards(void);
 #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_resetting;
+int ready_to_go, g_emu_want_quit, g_emu_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
 int state_slot;
@@ -125,35 +131,49 @@ static void set_default_paths(void)
 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;
+	Config.FractionalFramerate = -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_unai.abe_hack =
-	pl_rearmed_cbs.gpu_unai.no_light =
-	pl_rearmed_cbs.gpu_unai.no_blend = 0;
+	pl_rearmed_cbs.gpu_unai.ilace_force = 0;
+	pl_rearmed_cbs.gpu_unai.pixel_skip = 0;
+	pl_rearmed_cbs.gpu_unai.lighting = 1;
+	pl_rearmed_cbs.gpu_unai.fast_lighting = 0;
+	pl_rearmed_cbs.gpu_unai.blending = 1;
+	pl_rearmed_cbs.gpu_unai.dithering = 0;
+	pl_rearmed_cbs.gpu_unai_old.abe_hack =
+	pl_rearmed_cbs.gpu_unai_old.no_light =
+	pl_rearmed_cbs.gpu_unai_old.no_blend = 0;
 	memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
 	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)
@@ -251,7 +271,11 @@ do_state_slot:
 		}
 	case SACTION_VOLUME_UP:
 	case SACTION_VOLUME_DOWN:
-		plat_target_step_volume(emu_action == SACTION_VOLUME_UP);
+		{
+			static int volume;
+			plat_target_step_volume(&volume,
+				emu_action == SACTION_VOLUME_UP ? 1 : -1);
+		}
 		return;
 	case SACTION_MINIMIZE:
 		if (GPU_close != NULL)
@@ -265,6 +289,10 @@ do_state_slot:
 				SysMessage("GPU_open returned %d", ret);
 		}
 		return;
+	case SACTION_ANALOG_TOGGLE:
+		ret = padToggleAnalog(0);
+		snprintf(hud_msg, sizeof(hud_msg), "ANALOG %s", ret ? "ON" : "OFF");
+		break;
 #endif
 	default:
 		return;
@@ -296,7 +324,7 @@ static int cdidcmp(const char *id1, const char *id2)
 
 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;
@@ -391,18 +419,92 @@ void emu_on_new_cd(int show_hud_msg)
 	}
 
 	if (show_hud_msg) {
-		snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+		if (check_unsatisfied_libcrypt())
+			snprintf(hud_msg, sizeof(hud_msg),
+				"LibCrypt protected game with missing SBI detected");
+		else
+			snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
 		hud_new_msg = 3;
 	}
 }
 
+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
+}
+
+#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?
 	// it may be redefined by -cfg on the command line
 	strcpy(cfgfile_basename, "pcsx.cfg");
 
+#ifdef IOS
+	emuLog = fopen("/User/Documents/pcsxr.log", "w");
+	if (emuLog == NULL)
+		emuLog = fopen("pcsxr.log", "w");
+	if (emuLog == NULL)
+#endif
 	emuLog = stdout;
+
+	log_wrong_cpu();
+
 	SetIsoFile(NULL);
 
 	memset(&Config, 0, sizeof(Config));
@@ -416,7 +518,7 @@ int emu_core_preinit(void)
 
 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();
@@ -437,7 +539,17 @@ int emu_core_init(void)
 	return 0;
 }
 
+void emu_core_ask_exit(void)
+{
+	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];
 
@@ -483,6 +595,7 @@ int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
+	char isofilename[MAXPATHLEN];
 	const char *cdfile = NULL;
 	const char *loadst_f = NULL;
 	int psxout = 0;
@@ -501,8 +614,6 @@ int main(int argc, char *argv[])
 			SysPrintf("Using config file %s.\n", cfgfile_basename);
 		}
 		else if (!strcmp(argv[i], "-cdfile")) {
-			char isofilename[MAXPATHLEN];
-
 			if (i+1 >= argc) break;
 			strncpy(isofilename, argv[++i], MAXPATHLEN);
 			if (isofilename[0] != '/') {
@@ -608,6 +719,8 @@ int main(int argc, char *argv[])
 	}
 
 	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
@@ -622,7 +735,7 @@ int main(int argc, char *argv[])
 
 	pl_start_watchdog();
 
-	while (1)
+	while (!g_emu_want_quit)
 	{
 		stop = 0;
 		emu_action = SACTION_NONE;
@@ -632,6 +745,12 @@ int main(int argc, char *argv[])
 			do_emu_action();
 	}
 
+	printf("Exit..\n");
+	ClosePlugins();
+	SysClose();
+	menu_finish();
+	plat_finish();
+
 	return 0;
 }
 
@@ -639,8 +758,8 @@ static void toggle_fast_forward(int force_off)
 {
 	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;
@@ -648,16 +767,16 @@ static void toggle_fast_forward(int force_off)
 	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;
 
@@ -668,13 +787,19 @@ static void toggle_fast_forward(int force_off)
 		snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s",
 			fast_forward ? "ON" : "OFF");
 }
+
+static void SignalExit(int sig) {
+	// only to restore framebuffer/resolution on some devices
+	plat_finish();
+	_exit(1);
+}
 #endif
 
 void SysRunGui() {
         printf("SysRunGui\n");
 }
 
-static void dummy_lace()
+static void CALLBACK dummy_lace()
 {
 }
 
@@ -684,18 +809,18 @@ void SysReset() {
 	// so we need to prevent updateLace() call..
 	void *real_lace = GPU_updateLace;
 	GPU_updateLace = dummy_lace;
-	g_resetting = 1;
+	g_emu_resetting = 1;
 
 	// 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_resetting = 0;
+	g_emu_resetting = 0;
 }
 
 void SysClose() {
@@ -704,20 +829,10 @@ void SysClose() {
 
 	StopDebugger();
 
-	if (emuLog != NULL) fclose(emuLog);
-}
-
-void SysUpdate() {
-}
-
-void OnFile_Exit() {
-	printf("OnFile_Exit\n");
-	SysClose();
-#ifndef NO_FRONTEND
-	menu_finish();
-	plat_finish();
-	exit(0);
-#endif
+	if (emuLog != NULL && emuLog != stdout && emuLog != stderr) {
+		fclose(emuLog);
+		emuLog = NULL;
+	}
 }
 
 int get_state_filename(char *buf, int size, int i) {
@@ -747,7 +862,7 @@ int emu_save_state(int slot)
 		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",
@@ -769,6 +884,7 @@ int emu_load_state(int slot)
 	return LoadState(fname);
 }
 
+#ifndef HAVE_LIBRETRO
 #ifndef ANDROID
 
 void SysPrintf(const char *fmt, ...) {
@@ -777,6 +893,7 @@ void SysPrintf(const char *fmt, ...) {
 	va_start(list, fmt);
 	vfprintf(emuLog, fmt, list);
 	va_end(list);
+	fflush(emuLog);
 }
 
 #else
@@ -792,6 +909,7 @@ void SysPrintf(const char *fmt, ...) {
 }
 
 #endif
+#endif /* HAVE_LIBRETRO */
 
 void SysMessage(const char *fmt, ...) {
 	va_list list;
@@ -808,11 +926,6 @@ void SysMessage(const char *fmt, ...) {
 	SysPrintf("%s\n", msg);
 }
 
-static void SignalExit(int sig) {
-	ClosePlugins();
-	OnFile_Exit();
-}
-
 #define PARSEPATH(dst, src) \
 	ptr = src + strlen(src); \
 	while (*ptr != '\\' && ptr != src) ptr--; \
@@ -823,16 +936,17 @@ static void SignalExit(int sig) {
 static int _OpenPlugins(void) {
 	int ret;
 
+#ifndef NO_FRONTEND
 	signal(SIGINT, SignalExit);
 	signal(SIGPIPE, SignalExit);
-
-	GPU_clearDynarec(clearDynarec);
+#endif
 
 	ret = CDR_open();
 	if (ret < 0) { SysMessage(_("Error opening CD-ROM plugin!")); return -1; }
 	ret = SPU_open();
 	if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; }
 	SPU_registerCallback(SPUirq);
+	SPU_registerScheduleCb(SPUschedule);
 	// pcsx-rearmed: we handle gpu elsewhere
 	//ret = GPU_open(&gpuDisp, "PCSX", NULL);
 	//if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
@@ -843,14 +957,15 @@ static int _OpenPlugins(void) {
 
 	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;
@@ -915,8 +1030,11 @@ int OpenPlugins() {
 void ClosePlugins() {
 	int ret;
 
+#ifndef NO_FRONTEND
 	signal(SIGINT, SIG_DFL);
 	signal(SIGPIPE, SIG_DFL);
+#endif
+
 	ret = CDR_close();
 	if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; }
 	ret = SPU_close();
@@ -947,7 +1065,7 @@ static const int builtin_plugin_ids[] = {
 
 void *SysLoadLibrary(const char *lib) {
 	const char *tmp = strrchr(lib, '/');
-	void *ret;
+	void *ret = NULL;
 	int i;
 
 	SysPrintf("plugin: %s\n", lib);
@@ -956,34 +1074,50 @@ void *SysLoadLibrary(const char *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
 }
-