frontend: allow sstates without cd img
[pcsx_rearmed.git] / frontend / main.c
index 7b45983..29d2c25 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010-2011
+ * (C) notaz, 2010-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
+#include <time.h>
 
 #include "main.h"
 #include "plugin.h"
+#include "plugin_lib.h"
 #include "pcnt.h"
 #include "menu.h"
+#include "plat.h"
 #include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/cheat.h"
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
-#include "common/plat.h"
-#include "common/input.h"
+#include "revision.h"
+
+#ifndef NO_FRONTEND
+#include "libpicofe/input.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/readpng.h"
+#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();
+
+// sound plugin
+extern int iUseReverb;
+extern int iUseInterpolation;
+extern int iXAPitch;
+extern int iVolume;
 
 int ready_to_go;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
-static char *(*real_getenv)(const char *name);
+int state_slot;
+enum sched_action emu_action, emu_action_old;
+char hud_msg[64];
+int hud_new_msg;
+
+static void toggle_fast_forward(int force_off);
 
 static void make_path(char *buf, size_t size, const char *dir, const char *fname)
 {
@@ -57,19 +85,36 @@ static void CheckSubDir() {
        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;
+
+       strncpy(trimlabel, CdromLabel, 32);
+       trimlabel[32] = 0;
+       for (j = 31; j >= 0; j--)
+               if (trimlabel[j] == ' ')
+                       trimlabel[j] = 0;
+               else
+                       continue;
+
+       snprintf(buf, size, fmt, trimlabel, CdromId, i);
+
+       return 0;
 }
 
 void set_cd_image(const char *fname)
 {
-       const char *ext;
-       int len;
+       const char *ext = NULL;
        
-       len = strlen(fname);
-       ext = fname;
-       if (len > 2)
-               ext = fname + len - 2;
+       if (fname != NULL)
+               ext = strrchr(fname, '.');
 
-       if (strcasecmp(ext, ".z") == 0) {
+       if (ext && (
+           strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
+           strcasecmp(ext, ".znx") == 0 /*|| strcasecmp(ext, ".pbp") == 0*/)) {
                SetIsoFile(NULL);
                cdrcimg_set_fname(fname);
                strcpy(Config.Cdr, "builtin_cdrcimg");
@@ -79,26 +124,312 @@ void set_cd_image(const char *fname)
        }
 }
 
-int main(int argc, char *argv[])
+static void set_default_paths(void)
 {
-       char file[MAXPATHLEN] = "";
-       char path[MAXPATHLEN];
-       const char *cdfile = NULL;
-       int loadst = 0;
-       void *tmp;
+       MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
+       MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
+       strcpy(Config.BiosDir, "bios");
+
+       strcpy(Config.PluginsDir, "plugins");
+       strcpy(Config.Gpu, "builtin_gpu");
+       strcpy(Config.Spu, "builtin_spu");
+       strcpy(Config.Cdr, "builtin_cdr");
+       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.CdrReschedule = 0;
+       Config.PsxAuto = 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;
+       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;
+#endif
+       new_dynarec_hacks = 0;
+       cycle_multiplier = 200;
+
+       in_type1 = PSE_PAD_TYPE_STANDARD;
+       in_type2 = PSE_PAD_TYPE_STANDARD;
+}
+
+static void check_memcards(void)
+{
+       char buf[MAXPATHLEN];
+       FILE *f;
        int i;
 
-       tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
-       if (tmp == NULL)
-               tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY);
-       if (tmp != NULL)
-               real_getenv = dlsym(tmp, "getenv");
-       if (real_getenv == NULL) {
-               fprintf(stderr, "%s\n", dlerror());
-               return 1;
+       for (i = 1; i <= 9; i++) {
+               snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+               f = fopen(buf, "rb");
+               if (f == NULL) {
+                       printf("Creating memcard: %s\n", buf);
+                       CreateMcd(buf);
+               }
+               else
+                       fclose(f);
+       }
+}
+
+void do_emu_action(void)
+{
+       int ret;
+
+       emu_action_old = emu_action;
+
+       switch (emu_action) {
+       case SACTION_LOAD_STATE:
+               ret = emu_load_state(state_slot);
+               snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!");
+               break;
+       case SACTION_SAVE_STATE:
+               ret = emu_save_state(state_slot);
+               snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "SAVED" : "FAIL!");
+               break;
+#ifndef NO_FRONTEND
+       case SACTION_ENTER_MENU:
+               toggle_fast_forward(1);
+               menu_loop();
+               return;
+       case SACTION_NEXT_SSLOT:
+               state_slot++;
+               if (state_slot > 9)
+                       state_slot = 0;
+               goto do_state_slot;
+       case SACTION_PREV_SSLOT:
+               state_slot--;
+               if (state_slot < 0)
+                       state_slot = 9;
+do_state_slot:
+               snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot,
+                       emu_check_state(state_slot) == 0 ? "USED" : "FREE");
+               hud_new_msg = 3;
+               printf("* %s\n", hud_msg);
+               break;
+       case SACTION_TOGGLE_FSKIP:
+               pl_rearmed_cbs.fskip_advice = 0;
+               pl_rearmed_cbs.frameskip++;
+               if (pl_rearmed_cbs.frameskip > 1)
+                       pl_rearmed_cbs.frameskip = -1;
+               snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP: %s",
+                       pl_rearmed_cbs.frameskip == -1 ? "AUTO" :
+                       pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" );
+               plugin_call_rearmed_cbs();
+               break;
+       case SACTION_SWITCH_DISPMODE:
+               pl_switch_dispmode();
+               plugin_call_rearmed_cbs();
+               if (GPU_open != NULL && GPU_close != NULL) {
+                       GPU_close();
+                       GPU_open(&gpuDisp, "PCSX", NULL);
+               }
+               break;
+       case SACTION_FAST_FORWARD:
+               toggle_fast_forward(0);
+               plugin_call_rearmed_cbs();
+               break;
+       case SACTION_TOGGLE_FPS:
+               if ((g_opts & (OPT_SHOWFPS|OPT_SHOWCPU))
+                   == (OPT_SHOWFPS|OPT_SHOWCPU))
+                       g_opts &= ~(OPT_SHOWFPS|OPT_SHOWCPU);
+               else if (g_opts & OPT_SHOWFPS)
+                       g_opts |= OPT_SHOWCPU;
+               else
+                       g_opts |= OPT_SHOWFPS;
+               break;
+       case SACTION_TOGGLE_FULLSCREEN:
+               g_fullscreen = !g_fullscreen;
+               if (GPU_open != NULL && GPU_close != NULL) {
+                       GPU_close();
+                       GPU_open(&gpuDisp, "PCSX", NULL);
+               }
+               break;
+       case SACTION_SCREENSHOT:
+               {
+                       char buf[MAXPATHLEN];
+                       void *scrbuf;
+                       int w, h, bpp;
+                       time_t t = time(NULL);
+                       struct tm *tb = localtime(&t);
+                       int ti = tb->tm_yday * 1000000 + tb->tm_hour * 10000 +
+                               tb->tm_min * 100 + tb->tm_sec;
+
+                       scrbuf = pl_prepare_screenshot(&w, &h, &bpp);
+                       get_gameid_filename(buf, sizeof(buf),
+                               "screenshots/%.32s-%.9s.%d.png", ti);
+                       ret = -1;
+                       if (scrbuf != 0 && bpp == 16)
+                               ret = writepng(buf, scrbuf, w, h);
+                       if (ret == 0)
+                               snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN");
+                       break;
+               }
+       case SACTION_VOLUME_UP:
+       case SACTION_VOLUME_DOWN:
+               plat_target_step_volume(emu_action == SACTION_VOLUME_UP);
+               return;
+       case SACTION_MINIMIZE:
+               if (GPU_close != NULL)
+                       GPU_close();
+
+               plat_minimize();
+
+               if (GPU_open != NULL) {
+                       ret = GPU_open(&gpuDisp, "PCSX", NULL);
+                       if (ret)
+                               fprintf(stderr, "GPU_open returned %d\n", ret);
+               }
+               return;
+#endif
+       default:
+               return;
+       }
+
+       hud_new_msg = 3;
+}
+
+static int cdidcmp(const char *id1, const char *id2)
+{
+       while (*id1 != 0 && *id2 != 0) {
+               if (*id1 == '_') { id1++; continue; }
+               if (*id2 == '_') { id2++; continue; }
+               if (*id1 != *id2)
+                       break;
+               id1++;
+               id2++;
        }
-       dlclose(tmp);
 
+       return *id1 - *id2;
+}
+
+static void parse_cwcheat(void)
+{
+       char line[256], buf[64], name[64], *p;
+       int newcheat = 1;
+       u32 a, v;
+       FILE *f;
+
+       f = fopen("cheatpops.db", "r");
+       if (f == NULL)
+               return;
+
+       /* find the game */
+       while (fgets(line, sizeof(line), f)) {
+               if (sscanf(line, "_S %63s", buf) != 1)
+                       continue;
+               if (cdidcmp(buf, CdromId) == 0)
+                       break;
+       }
+
+       if (feof(f))
+               goto out;
+
+       printf("cwcheat section found for %s\n", CdromId);
+       while (fgets(line, sizeof(line), f))
+       {
+               p = line + strlen(line);
+               for (p--; p >= line && (*p == '\r' || *p == '\n' || *p == ' '); p--)
+                       *p = 0;
+               if (*p == 0 || *p == '#' || *p == ';')
+                       continue;
+
+               if (strncmp(line, "_S", 2) == 0)
+                       break;
+               if (strncmp(line, "_G", 2) == 0) {
+                       printf("  cwcheat game name: '%s'\n", line + 3);
+                       continue;
+               }
+               if (strncmp(line, "_C0", 3) == 0) {
+                       if (!newcheat && Cheats[NumCheats - 1].n == 0) {
+                               printf("cheat '%s' failed to parse\n", name);
+                               free(Cheats[NumCheats - 1].Descr);
+                               NumCheats--;
+                       }
+                       snprintf(name, sizeof(name), "%s", line + 4);
+                       newcheat = 1;
+                       continue;
+               }
+               if (sscanf(line, "_L %x %x", &a, &v) != 2) {
+                       printf("line failed to parse: '%s'\n", line);
+                       continue;
+               }
+
+               if (newcheat) {
+                       if (NumCheats >= NumCheatsAllocated) {
+                               NumCheatsAllocated += 16;
+                               Cheats = realloc(Cheats, sizeof(Cheat) *
+                                               NumCheatsAllocated);
+                               if (Cheats == NULL)
+                                       break;
+                       }
+                       Cheats[NumCheats].Descr = strdup(name);
+                       Cheats[NumCheats].Enabled = 0;
+                       Cheats[NumCheats].WasEnabled = 0;
+                       Cheats[NumCheats].First = NumCodes;
+                       Cheats[NumCheats].n = 0;
+                       NumCheats++;
+                       newcheat = 0;
+               }
+
+               if (NumCodes >= NumCodesAllocated) {
+                       NumCodesAllocated += 16;
+                       CheatCodes = realloc(CheatCodes, sizeof(CheatCode) *
+                               NumCodesAllocated);
+                       if (CheatCodes == NULL)
+                               break;
+               }
+               CheatCodes[NumCodes].Addr = a;
+               CheatCodes[NumCodes].Val = v;
+               NumCodes++;
+               Cheats[NumCheats - 1].n++;
+       }
+
+out:
+       fclose(f);
+}
+
+void emu_on_new_cd(int show_hud_msg)
+{
+       ClearAllCheats();
+       parse_cwcheat();
+
+       if (Config.HLE) {
+               printf("note: running with HLE BIOS, expect compatibility problems\n");
+               printf("----------------------------------------------------------\n");
+       }
+
+       if (show_hud_msg) {
+               snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+               hud_new_msg = 3;
+       }
+}
+
+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");
@@ -106,9 +437,50 @@ int main(int argc, char *argv[])
        emuLog = stdout;
        SetIsoFile(NULL);
 
+       memset(&Config, 0, sizeof(Config));
+
+       set_default_paths();
+       emu_set_default_config();
+       strcpy(Config.Bios, "HLE");
+
+       return 0;
+}
+
+int emu_core_init(void)
+{
+       CheckSubDir();
+       check_memcards();
+
+       if (EmuInit() == -1) {
+               printf("PSX emulator couldn't be initialized.\n");
+               return -1;
+       }
+
+       LoadMcds(Config.Mcd1, Config.Mcd2);
+
+       if (Config.Debug) {
+               StartDebugger();
+       }
+
+       return 0;
+}
+
+#ifndef NO_FRONTEND
+int main(int argc, char *argv[])
+{
+       char file[MAXPATHLEN] = "";
+       char path[MAXPATHLEN];
+       const char *cdfile = NULL;
+       const char *loadst_f = NULL;
+       int psxout = 0;
+       int loadst = 0;
+       int i;
+
+       emu_core_preinit();
+
        // read command line options
        for (i = 1; i < argc; i++) {
-                    if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
+                    if (!strcmp(argv[i], "-psxout")) psxout = 1;
                else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]);
                else if (!strcmp(argv[i], "-cfg")) {
                        if (i+1 >= argc) break;
@@ -132,20 +504,23 @@ int main(int argc, char *argv[])
 
                        cdfile = isofilename;
                }
+               else if (!strcmp(argv[i], "-loadf")) {
+                       if (i+1 >= argc) break;
+                       loadst_f = argv[++i];
+               }
                else if (!strcmp(argv[i], "-h") ||
                         !strcmp(argv[i], "-help") ||
                         !strcmp(argv[i], "--help")) {
-                        printf(PACKAGE_NAME " " PACKAGE_VERSION "\n");
+                        printf("PCSX-ReARMed " REV "\n");
                         printf("%s\n", _(
                                                        " pcsx [options] [file]\n"
                                                        "\toptions:\n"
                                                        "\t-cdfile FILE\tRuns a CD image file\n"
-                                                       "\t-nogui\t\tDon't open the GTK GUI\n"
                                                        "\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
                                                        "\t-psxout\t\tEnable PSX output\n"
                                                        "\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
                                                        "\t-h -help\tDisplay this message\n"
-                                                       "\tfile\t\tLoads file\n"));
+                                                       "\tfile\t\tLoads a PSX EXE file\n"));
                         return 0;
                } else {
                        strncpy(file, argv[i], MAXPATHLEN);
@@ -161,46 +536,28 @@ int main(int argc, char *argv[])
                }
        }
 
-       memset(&Config, 0, sizeof(PcsxConfig));
-       strcpy(Config.Net, "Disabled");
-
-       CheckSubDir();
-
-       MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
-       MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
-       strcpy(Config.Bios, "HLE");
-       strcpy(Config.BiosDir, "./");
-
-       strcpy(Config.PluginsDir, "plugins");
-       strcpy(Config.Gpu, "builtin_gpu");
-       strcpy(Config.Spu, "builtin_spu");
-       strcpy(Config.Cdr, "builtin_cdr");
-       strcpy(Config.Pad1, "builtin_pad");
-       strcpy(Config.Pad2, "builtin_pad");
-       Config.PsxAuto = 1;
-
-       snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
-/*
-       // switch to plugin dotdir
-       // this lets plugins work without modification!
-       gchar *plugin_default_dir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
-       chdir(plugin_default_dir);
-       g_free(plugin_default_dir);
-*/
-
        if (cdfile)
                set_cd_image(cdfile);
 
-       if (SysInit() == -1)
-               return 1;
-
        // frontend stuff
+       // init input but leave probing to platform code,
+       // they add input drivers and may need to modify them after probe
        in_init();
-       in_probe();
+       pl_init();
        plat_init();
-       menu_init();
+       menu_init(); // loads config
+
+       emu_core_init();
+
+       if (psxout)
+               Config.PsxOut = 1;
 
        if (LoadPlugins() == -1) {
+               // FIXME: this recovery doesn't work, just delete bad config and bail out
+               // SysMessage("could not load plugins, retrying with defaults\n");
+               set_default_paths();
+               snprintf(path, sizeof(path), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+               remove(path);
                SysMessage("Failed loading plugins!");
                return 1;
        }
@@ -224,61 +581,103 @@ int main(int argc, char *argv[])
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
+                       emu_on_new_cd(!loadst);
                        ready_to_go = 1;
                }
        }
 
-       // If a state has been specified, then load that
-       if (loadst) {
-               char state_filename[MAXPATHLEN];
-               int ret = get_state_filename(state_filename, sizeof(state_filename), loadst - 1);
-               if (ret == 0)
-                       ret = LoadState(state_filename);
-               printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename);
+       if (loadst_f) {
+               int ret = LoadState(loadst_f);
+               printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+               ready_to_go |= ret == 0;
        }
 
-       if (ready_to_go)
+       if (ready_to_go) {
                menu_prepare_emu();
+
+               // If a state has been specified, then load that
+               if (loadst) {
+                       int ret = emu_load_state(loadst - 1);
+                       printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
+               }
+       }
        else
                menu_loop();
 
+       pl_start_watchdog();
+
        while (1)
        {
+               stop = 0;
+               emu_action = SACTION_NONE;
+
                psxCpu->Execute();
-               menu_loop();
+               if (emu_action != SACTION_NONE)
+                       do_emu_action();
        }
 
        return 0;
 }
 
-int SysInit() {
-       if (EmuInit() == -1) {
-               printf("PSX emulator couldn't be initialized.\n");
-               return -1;
-       }
+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;
+
+       if (force_off && !fast_forward)
+               return;
 
-       LoadMcds(Config.Mcd1, Config.Mcd2);     /* TODO Do we need to have this here, or in the calling main() function?? */
+       fast_forward = !fast_forward;
+       if (fast_forward) {
+               normal_g_opts = g_opts;
+               normal_frameskip = pl_rearmed_cbs.frameskip;
+               normal_enhancement_enable =
+                       pl_rearmed_cbs.gpu_neon.enhancement_enable;
 
-       if (Config.Debug) {
-               StartDebugger();
+               g_opts |= OPT_NO_FRAMELIM;
+               pl_rearmed_cbs.frameskip = 3;
+               pl_rearmed_cbs.gpu_neon.enhancement_enable = 0;
+       } else {
+               g_opts = normal_g_opts;
+               pl_rearmed_cbs.frameskip = normal_frameskip;
+               pl_rearmed_cbs.gpu_neon.enhancement_enable =
+                       normal_enhancement_enable;
+
+               pl_timing_prepare(Config.PsxType);
        }
 
-       return 0;
+       if (!force_off)
+               snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s",
+                       fast_forward ? "ON" : "OFF");
 }
+#endif
 
 void SysRunGui() {
         printf("SysRunGui\n");
 }
 
-void StartGui() {
-        printf("StartGui\n");
+static void dummy_lace()
+{
 }
 
 void SysReset() {
+       // rearmed hack: EmuReset() runs some code when real BIOS is used,
+       // but we usually do reset from menu while GPU is not open yet,
+       // so we need to prevent updateLace() call..
+       void *real_lace = GPU_updateLace;
+       GPU_updateLace = dummy_lace;
+
+       // reset can run code, timing must be set
+       pl_timing_prepare(Config.PsxType);
+
        EmuReset();
 
        // hmh core forgets this
        CDR_stop();
+
+       GPU_updateLace = real_lace;
 }
 
 void SysClose() {
@@ -295,28 +694,60 @@ void SysUpdate() {
 
 void OnFile_Exit() {
        printf("OnFile_Exit\n");
+       SysClose();
+#ifndef NO_FRONTEND
        menu_finish();
        plat_finish();
-       SysClose();
        exit(0);
+#endif
 }
 
 int get_state_filename(char *buf, int size, int i) {
-       char trimlabel[33];
-       int j;
+       return get_gameid_filename(buf, size,
+               "." STATES_DIR "%.32s-%.9s.%3.3d", i);
+}
 
-       strncpy(trimlabel, CdromLabel, 32);
-       trimlabel[32] = 0;
-       for (j = 31; j >= 0; j--)
-               if (trimlabel[j] == ' ')
-                       trimlabel[j] = 0;
-               else
-                       continue;
+int emu_check_state(int slot)
+{
+       char fname[MAXPATHLEN];
+       int ret;
 
-       snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d",
-               trimlabel, CdromId, i);
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
 
-       return 0;
+       return CheckState(fname);
+}
+
+int emu_save_state(int slot)
+{
+       char fname[MAXPATHLEN];
+       int ret;
+
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
+
+       ret = SaveState(fname);
+#ifndef __ARM_ARCH_7A__ /* XXX */
+       sync();
+#endif
+       printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+       return ret;
+}
+
+int emu_load_state(int slot)
+{
+       char fname[MAXPATHLEN];
+       int ret;
+
+       hud_msg[0] = 0;
+
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
+
+       return LoadState(fname);
 }
 
 void SysPrintf(const char *fmt, ...) {
@@ -384,7 +815,7 @@ static int _OpenPlugins(void) {
 
                MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
 
-               strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+               strcpy(info.EmuName, "PCSX");
                strncpy(info.CdromID, CdromId, 9);
                strncpy(info.CdromLabel, CdromLabel, 9);
                info.psxMem = psxM;
@@ -470,20 +901,6 @@ void ClosePlugins() {
        }
 }
 
-#if 1
-/* this is to avoid having to hack every plugin to stop using $HOME */
-char *getenv(const char *name)
-{
-       static char ret[8] = ".";
-
-       if (name && strcmp(name, "HOME") == 0 &&
-                       ((int)name >> 28) == 0) // HACK: let libs find home
-               return ret;
-
-       return real_getenv(name);
-}
-#endif
-
 /* we hook statically linked plugins here */
 static const char *builtin_plugins[] = {
        "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad",
@@ -509,13 +926,6 @@ void *SysLoadLibrary(const char *lib) {
                                return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
        }
 
-#if defined(__x86_64__) || defined(__i386__)
-       // convenience hack
-       char name[MAXPATHLEN];
-       snprintf(name, sizeof(name), "%s.x86", lib);
-       lib = name;
-#endif
-
        ret = dlopen(lib, RTLD_NOW);
        if (ret == NULL)
                fprintf(stderr, "dlopen: %s\n", dlerror());