X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=144ce490a82780373f2a1d021172e86e71ab2614;hb=1f1128d05bddab7552b94a8963c050c75decc384;hp=8b35b09ab4a8e66c8df363a959493d06722088fa;hpb=45b97ede8128bd0217943e6b4b88a08a3c1a7003;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index 8b35b09a..144ce490 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>
+#ifndef _WIN32
+#include <dlfcn.h>
+#endif
 
 #include "main.h"
 #include "plugin.h"
@@ -25,30 +25,36 @@
 #include "../libpcsxcore/cheat.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"
 #include "libpicofe/readpng.h"
 
 static void toggle_fast_forward(int force_off);
+static void check_profile(void);
+static void check_memcards(void);
 #endif
 #ifndef BOOT_MSG
 #define BOOT_MSG "Booting up..."
 #endif
 
 // don't include debug.h - it breaks ARM build (R1 redefined)
-void StartDebugger();
-void StopDebugger();
+static void StartDebugger() {}
+static void StopDebugger() {}
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
-
-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;
@@ -66,28 +72,6 @@ static void make_path(char *buf, size_t size, const char *dir, const char *fname
 #define MAKE_PATH(buf, dir, fname) \
 	make_path(buf, sizeof(buf), dir, fname)
 
-static void create_profile_dir(const char *directory) {
-	char path[MAXPATHLEN];
-
-	MAKE_PATH(path, directory, NULL);
-	mkdir(path, S_IRWXU | S_IRWXG);
-}
-
-static void CheckSubDir() {
-	// make sure that ~/.pcsx exists
-	create_profile_dir(PCSX_DOT_DIR);
-
-	create_profile_dir(BIOS_DIR);
-	create_profile_dir(MEMCARD_DIR);
-	create_profile_dir(STATES_DIR);
-	create_profile_dir(PLUGINS_DIR);
-	create_profile_dir(PLUGINS_CFG_DIR);
-	create_profile_dir(CHEATS_DIR);
-	create_profile_dir(PATCHES_DIR);
-	create_profile_dir(PCSX_DOT_DIR "cfg");
-	create_profile_dir("/screenshots/");
-}
-
 static int get_gameid_filename(char *buf, int size, const char *fmt, int i) {
 	char trimlabel[33];
 	int j;
@@ -126,9 +110,12 @@ void set_cd_image(const char *fname)
 
 static void set_default_paths(void)
 {
+#ifndef NO_FRONTEND
+	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
 	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
 	strcpy(Config.BiosDir, "bios");
+#endif
 
 	strcpy(Config.PluginsDir, "plugins");
 	strcpy(Config.Gpu, "builtin_gpu");
@@ -137,15 +124,13 @@ static void set_default_paths(void)
 	strcpy(Config.Pad1, "builtin_pad");
 	strcpy(Config.Pad2, "builtin_pad");
 	strcpy(Config.Net, "Disabled");
-
-	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
 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.icache_emulation = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
 	Config.PsxAuto = 1;
 
 	pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
@@ -153,6 +138,12 @@ void emu_set_default_config(void)
 	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;
@@ -160,13 +151,16 @@ void emu_set_default_config(void)
 	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;
+	spu_config.iUseThread = 1; // no effect if only 1 core is detected
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+	spu_config.iUseReverb = 0;
+	spu_config.iUseInterpolation = 0;
+	spu_config.iTempo = 1;
 #endif
 	new_dynarec_hacks = 0;
 	cycle_multiplier = 200;
@@ -175,25 +169,6 @@ void emu_set_default_config(void)
 	in_type2 = PSE_PAD_TYPE_STANDARD;
 }
 
-static void check_memcards(void)
-{
-	char buf[MAXPATHLEN];
-	FILE *f;
-	int i;
-
-	for (i = 1; i <= 9; i++) {
-		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
-
-		f = fopen(buf, "rb");
-		if (f == NULL) {
-			SysPrintf("Creating memcard: %s\n", buf);
-			CreateMcd(buf);
-		}
-		else
-			fclose(f);
-	}
-}
-
 void do_emu_action(void)
 {
 	int ret;
@@ -289,7 +264,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)
@@ -434,13 +413,40 @@ void emu_on_new_cd(int show_hud_msg)
 	}
 }
 
+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?
 	// 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));
@@ -456,8 +462,10 @@ int emu_core_init(void)
 {
 	SysPrintf("Starting PCSX-ReARMed " REV "\n");
 
-	CheckSubDir();
+#ifndef NO_FRONTEND
+	check_profile();
 	check_memcards();
+#endif
 
 	if (EmuInit() == -1) {
 		SysPrintf("PSX emulator couldn't be initialized.\n");
@@ -473,7 +481,58 @@ int emu_core_init(void)
 	return 0;
 }
 
+void emu_core_ask_exit(void)
+{
+	stop = 1;
+	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];
+
+	MAKE_PATH(path, directory, NULL);
+	mkdir(path, S_IRWXU | S_IRWXG);
+}
+
+static void check_profile(void) {
+	// make sure that ~/.pcsx exists
+	create_profile_dir(PCSX_DOT_DIR);
+
+	create_profile_dir(BIOS_DIR);
+	create_profile_dir(MEMCARD_DIR);
+	create_profile_dir(STATES_DIR);
+	create_profile_dir(PLUGINS_DIR);
+	create_profile_dir(PLUGINS_CFG_DIR);
+	create_profile_dir(CHEATS_DIR);
+	create_profile_dir(PATCHES_DIR);
+	create_profile_dir(PCSX_DOT_DIR "cfg");
+	create_profile_dir("/screenshots/");
+}
+
+static void check_memcards(void)
+{
+	char buf[MAXPATHLEN];
+	FILE *f;
+	int i;
+
+	for (i = 1; i <= 9; i++) {
+		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+		f = fopen(buf, "rb");
+		if (f == NULL) {
+			SysPrintf("Creating memcard: %s\n", buf);
+			CreateMcd(buf);
+		}
+		else
+			fclose(f);
+	}
+}
+
 int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
@@ -617,7 +676,7 @@ int main(int argc, char *argv[])
 
 	pl_start_watchdog();
 
-	while (1)
+	while (!g_emu_want_quit)
 	{
 		stop = 0;
 		emu_action = SACTION_NONE;
@@ -627,6 +686,12 @@ int main(int argc, char *argv[])
 			do_emu_action();
 	}
 
+	printf("Exit..\n");
+	ClosePlugins();
+	SysClose();
+	menu_finish();
+	plat_finish();
+
 	return 0;
 }
 
@@ -663,13 +728,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()
 {
 }
 
@@ -679,7 +750,7 @@ 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);
@@ -690,7 +761,7 @@ void SysReset() {
 	CDR_stop();
 
 	GPU_updateLace = real_lace;
-	g_resetting = 0;
+	g_emu_resetting = 0;
 }
 
 void SysClose() {
@@ -699,22 +770,15 @@ void SysClose() {
 
 	StopDebugger();
 
-	if (emuLog != NULL) fclose(emuLog);
+	if (emuLog != NULL && emuLog != stdout && emuLog != stderr) {
+		fclose(emuLog);
+		emuLog = NULL;
+	}
 }
 
 void SysUpdate() {
 }
 
-void OnFile_Exit() {
-	printf("OnFile_Exit\n");
-	SysClose();
-#ifndef NO_FRONTEND
-	menu_finish();
-	plat_finish();
-	exit(0);
-#endif
-}
-
 int get_state_filename(char *buf, int size, int i) {
 	return get_gameid_filename(buf, size,
 		"." STATES_DIR "%.32s-%.9s.%3.3d", i);
@@ -742,7 +806,7 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
-#ifndef __ARM_ARCH_7A__ /* XXX */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
 	sync();
 #endif
 	SysPrintf("* %s \"%s\" [%d]\n",
@@ -772,6 +836,7 @@ void SysPrintf(const char *fmt, ...) {
 	va_start(list, fmt);
 	vfprintf(emuLog, fmt, list);
 	va_end(list);
+	fflush(emuLog);
 }
 
 #else
@@ -803,11 +868,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--; \
@@ -818,8 +878,10 @@ static void SignalExit(int sig) {
 static int _OpenPlugins(void) {
 	int ret;
 
+#ifndef NO_FRONTEND
 	signal(SIGINT, SignalExit);
 	signal(SIGPIPE, SignalExit);
+#endif
 
 	GPU_clearDynarec(clearDynarec);
 
@@ -828,6 +890,7 @@ static int _OpenPlugins(void) {
 	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; }
@@ -910,8 +973,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();
@@ -942,7 +1008,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);
@@ -951,34 +1017,49 @@ 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]);
 	}
 
+#ifndef _WIN32
 	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);
 
+#ifndef _WIN32
 	return dlsym(lib, sym);
+#else
+	return NULL;
+#endif
 }
 
 const char *SysLibError() {
+#ifndef _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;
 
+#ifndef _WIN32
 	dlclose(lib);
+#endif
 }