frontend: add chan display option, for fun mostly
[pcsx_rearmed.git] / frontend / main.c
index e36ad48..b17df53 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010
+ * (C) notaz, 2010-2011
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <signal.h>
+#include <time.h>
 
+#include "main.h"
 #include "plugin.h"
-#include "../gui/Linux.h"
+#include "plugin_lib.h"
+#include "pcnt.h"
+#include "menu.h"
 #include "../libpcsxcore/misc.h"
-
-int UseGui;
+#include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../plugins/cdrcimg/cdrcimg.h"
+#include "common/plat.h"
+#include "common/input.h"
+#include "common/readpng.h"
+
+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 make_path(char *buf, size_t size, const char *dir, const char *fname)
 {
@@ -48,30 +64,155 @@ static void CheckSubDir() {
        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;
+
+       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 = NULL;
+       
+       if (fname != NULL)
+               ext = strrchr(fname, '.');
+
+       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");
+       } else {
+               SetIsoFile(fname);
+               strcpy(Config.Cdr, "builtin_cdr");
+       }
+}
+
+static void set_default_paths(void)
+{
+       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");
+       Config.PsxAuto = 1;
+
+       snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
-static void CreateMemcard(char *filename, char *conf_mcd) {
-       struct stat buf;
+static void check_memcards(void)
+{
+       char buf[MAXPATHLEN];
+       FILE *f;
+       int i;
 
-       make_path(conf_mcd, MAXPATHLEN, MEMCARD_DIR, filename);
+       for (i = 1; i <= 9; i++) {
+               snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
 
-       /* Only create a memory card if an existing one does not exist */
-       if (stat(conf_mcd, &buf) == -1) {
-               SysPrintf(_("Creating memory card: %s\n"), conf_mcd);
-               CreateMcd(conf_mcd);
+               f = fopen(buf, "rb");
+               if (f == NULL) {
+                       printf("Creating memcard: %s\n", buf);
+                       CreateMcd(buf);
+               }
+               else
+                       fclose(f);
        }
 }
 
+void do_emu_action(void)
+{
+       char buf[MAXPATHLEN];
+       int ret;
+
+       emu_action_old = emu_action;
+
+       switch (emu_action) {
+       case SACTION_NONE:
+               return;
+       case SACTION_ENTER_MENU:
+               menu_loop();
+               return;
+       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;
+       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;
+               goto do_state_slot;
+       case SACTION_TOGGLE_FSKIP:
+               pl_rearmed_cbs.frameskip ^= 1;
+               snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
+                       pl_rearmed_cbs.frameskip ? "ON" : "OFF");
+               break;
+       case SACTION_SCREENSHOT:
+               {
+                       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;
+               }
+       }
+       hud_new_msg = 3;
+       return;
+
+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;
+}
+
 int main(int argc, char *argv[])
 {
-       char file[MAXPATHLEN] = "";
-       char path[MAXPATHLEN];
-       int runcd = 0;
-       int loadst = 0;
        void *tmp;
-       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) {
@@ -86,11 +227,29 @@ int main(int argc, char *argv[])
 
        emuLog = stdout;
        SetIsoFile(NULL);
-       Config.PsxOut = 1;
+
+       memset(&Config, 0, sizeof(Config));
+
+       CheckSubDir();
+       set_default_paths();
+       check_memcards();
+       strcpy(Config.Bios, "HLE");
+
+#ifdef MAEMO
+       extern int maemo_main(int argc, char **argv);
+       return maemo_main(argc, argv);
+#else
+       char file[MAXPATHLEN] = "";
+       char path[MAXPATHLEN];
+       const char *cdfile = NULL;
+       const char *loadst_f = NULL;
+       int psxout = 0;
+       int loadst = 0;
+       int i;
 
        // 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;
@@ -112,8 +271,11 @@ int main(int argc, char *argv[])
                                        isofilename[0] = 0;
                        }
 
-                       SetIsoFile(isofilename);
-                       runcd = 1;
+                       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") ||
@@ -144,86 +306,84 @@ int main(int argc, char *argv[])
                }
        }
 
-       memset(&Config, 0, sizeof(PcsxConfig));
-       strcpy(Config.Net, "Disabled");
+       if (cdfile)
+               set_cd_image(cdfile);
 
-       CheckSubDir();
-//     ScanAllPlugins();
-
-       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");
-
-       // try to load config
-       // if the config file doesn't exist
-       if (LoadConfig() == -1) {
-               // Uh oh, no config file found, use some defaults
-               Config.PsxAuto = 1;
-
-               // create & load default memcards if they don't exist
-               CreateMemcard("card1.mcd", Config.Mcd1);
-               CreateMemcard("card2.mcd", Config.Mcd2);
-
-               LoadMcds(Config.Mcd1, Config.Mcd2);
+       if (SysInit() == -1)
+               return 1;
 
-               SaveConfig();
+       // frontend stuff
+       in_init();
+       //in_probe();
+       plat_init();
+       menu_init(); // loads config
+
+       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;
        }
+       pcnt_hook_plugins();
 
-       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 (SysInit() == -1) return 1;
-
-       // if !gui
-       {
-               // the following only occurs if the gui isn't started
-               if (LoadPlugins() == -1) {
-                       SysMessage("Failed loading plugins!");
-                       return 1;
-               }
-
-               if (OpenPlugins() == -1) {
-                       return 1;
-               }
+       if (OpenPlugins() == -1) {
+               return 1;
+       }
+       plugin_call_rearmed_cbs();
 
-               SysReset();
-               CheckCdrom();
+       CheckCdrom();
+       SysReset();
 
-               if (file[0] != '\0') {
-                       Load(file);
-               } else {
-                       if (runcd) {
-                               if (LoadCdrom() == -1) {
-                                       ClosePlugins();
-                                       printf(_("Could not load CD-ROM!\n"));
-                                       return -1;
-                               }
+       if (file[0] != '\0') {
+               if (Load(file) != -1)
+                       ready_to_go = 1;
+       } else {
+               if (cdfile) {
+                       if (LoadCdrom() == -1) {
+                               ClosePlugins();
+                               printf(_("Could not load CD-ROM!\n"));
+                               return -1;
                        }
+                       ready_to_go = 1;
                }
+       }
+
+       if (ready_to_go) {
+               menu_prepare_emu();
 
                // If a state has been specified, then load that
                if (loadst) {
-                       StatesC = loadst - 1;
-                       char *state_filename = get_state_filename(StatesC);
-                       LoadState(state_filename);
-                       free(state_filename);
+                       int ret = emu_load_state(loadst - 1);
+                       printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
                }
+               if (loadst_f) {
+                       int ret = LoadState(loadst_f);
+                       printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+               }
+       }
+       else
+               menu_loop();
+
+       pl_start_watchdog();
+
+       while (1)
+       {
+               stop = 0;
+               emu_action = SACTION_NONE;
 
                psxCpu->Execute();
+               if (emu_action != SACTION_NONE)
+                       do_emu_action();
        }
 
        return 0;
+#endif
 }
 
 int SysInit() {
@@ -232,7 +392,7 @@ int SysInit() {
                return -1;
        }
 
-       LoadMcds(Config.Mcd1, Config.Mcd2);     /* TODO Do we need to have this here, or in the calling main() function?? */
+       LoadMcds(Config.Mcd1, Config.Mcd2);
 
        if (Config.Debug) {
                StartDebugger();
@@ -249,8 +409,23 @@ 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;
+
        EmuReset();
+
+       // hmh core forgets this
+       CDR_stop();
+
+       GPU_updateLace = real_lace;
 }
 
 void SysClose() {
@@ -263,84 +438,59 @@ void SysClose() {
 }
 
 void SysUpdate() {
-       PADhandleKey(PAD1_keypressed());
-       PADhandleKey(PAD2_keypressed());
-}
-
-void UpdateMenuSlots() {
 }
 
 void OnFile_Exit() {
-        printf("OnFile_Exit\n");
+       printf("OnFile_Exit\n");
+#ifndef MAEMO
+       menu_finish();
+#endif
+       SysClose();
+       plat_finish();
        exit(0);
 }
 
-void state_save(gchar *state_filename) {
-        char Text[MAXPATHLEN + 20];
-
-        GPU_updateLace();
-
-        if (SaveState(state_filename) == 0)
-                sprintf(Text, _("Saved state %s."), state_filename);
-        else
-                sprintf(Text, _("Error saving state %s!"), state_filename);
-
-        GPU_displayText(Text);
+int get_state_filename(char *buf, int size, int i) {
+       return get_gameid_filename(buf, size,
+               "." STATES_DIR "%.32s-%.9s.%3.3d", i);
 }
 
-void state_load(gchar *state_filename) {
+int emu_check_state(int slot)
+{
+       char fname[MAXPATHLEN];
        int ret;
-       char Text[MAXPATHLEN + 20];
-       FILE *fp;
 
-       // check if the state file actually exists
-       fp = fopen(state_filename, "rb");
-       if (fp == NULL) {
-               // file does not exist
-               return;
-       }
-
-       fclose(fp);
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
 
-       ret = CheckState(state_filename);
+       return CheckState(fname);
+}
 
-       if (ret == 0) {
-               SysReset();
-               ret = LoadState(state_filename);
-       }
+int emu_save_state(int slot)
+{
+       char fname[MAXPATHLEN];
+       int ret;
 
-       if (ret == 0) {
-               // Check the CD-ROM is valid
-               if (CheckCdrom() == -1) {
-                       ClosePlugins();
-                       SysRunGui();
-                       return;
-               }
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
 
-               sprintf(Text, _("Loaded state %s."), state_filename);
-       } else {
-               sprintf(Text, _("Error loading state %s!"), state_filename);
-       }
-       GPU_displayText(Text);
+       ret = SaveState(fname);
+       printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+       return ret;
 }
 
-char *get_state_filename(int i) {
-       char SStateFile[256];
-       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;
+int emu_load_state(int slot)
+{
+       char fname[MAXPATHLEN];
+       int ret;
 
-       snprintf(SStateFile, sizeof(SStateFile), "." STATES_DIR "%.32s-%.9s.%3.3d",
-               trimlabel, CdromId, i);
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
+               return ret;
 
-       return strdup(SStateFile);
+       return LoadState(fname);
 }
 
 void SysPrintf(const char *fmt, ...) {
@@ -351,19 +501,6 @@ void SysPrintf(const char *fmt, ...) {
        vsprintf(msg, fmt, list);
        va_end(list);
 
-       if (Config.PsxOut) {
-               static char linestart = 1;
-               int l = strlen(msg);
-
-               printf(linestart ? " * %s" : "%s", msg);
-
-               if (l > 0 && msg[l - 1] == '\n') {
-                       linestart = 1;
-               } else {
-                       linestart = 0;
-               }
-       }
-
        fprintf(emuLog, "%s", msg);
 }
 
@@ -381,13 +518,140 @@ void SysMessage(const char *fmt, ...) {
        fprintf(stderr, "%s\n", msg);
 }
 
+static void SignalExit(int sig) {
+       ClosePlugins();
+       OnFile_Exit();
+}
+
+#define PARSEPATH(dst, src) \
+       ptr = src + strlen(src); \
+       while (*ptr != '\\' && ptr != src) ptr--; \
+       if (ptr != src) { \
+               strcpy(dst, ptr+1); \
+       }
+
+static int _OpenPlugins(void) {
+       int ret;
+
+       signal(SIGINT, SignalExit);
+       signal(SIGPIPE, SignalExit);
+
+       GPU_clearDynarec(clearDynarec);
+
+       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);
+       // pcsx-rearmed: we handle gpu elsewhere
+       //ret = GPU_open(&gpuDisp, "PCSX", NULL);
+       //if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
+       ret = PAD1_open(&gpuDisp);
+       if (ret < 0) { SysMessage(_("Error opening Controller 1 plugin!")); return -1; }
+       ret = PAD2_open(&gpuDisp);
+       if (ret < 0) { SysMessage(_("Error opening Controller 2 plugin!")); return -1; }
+
+       if (Config.UseNet && !NetOpened) {
+               netInfo info;
+               char path[MAXPATHLEN];
+               char dotdir[MAXPATHLEN];
+
+               MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
+
+               strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+               strncpy(info.CdromID, CdromId, 9);
+               strncpy(info.CdromLabel, CdromLabel, 9);
+               info.psxMem = psxM;
+               info.GPU_showScreenPic = GPU_showScreenPic;
+               info.GPU_displayText = GPU_displayText;
+               info.GPU_showScreenPic = GPU_showScreenPic;
+               info.PAD_setSensitive = PAD1_setSensitive;
+               sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
+               strcpy(info.BIOSpath, path);
+               strcpy(info.MCD1path, Config.Mcd1);
+               strcpy(info.MCD2path, Config.Mcd2);
+               sprintf(path, "%s%s", dotdir, Config.Gpu);
+               strcpy(info.GPUpath, path);
+               sprintf(path, "%s%s", dotdir, Config.Spu);
+               strcpy(info.SPUpath, path);
+               sprintf(path, "%s%s", dotdir, Config.Cdr);
+               strcpy(info.CDRpath, path);
+               NET_setInfo(&info);
+
+               ret = NET_open(&gpuDisp);
+               if (ret < 0) {
+                       if (ret == -2) {
+                               // -2 is returned when something in the info
+                               // changed and needs to be synced
+                               char *ptr;
+
+                               PARSEPATH(Config.Bios, info.BIOSpath);
+                               PARSEPATH(Config.Gpu,  info.GPUpath);
+                               PARSEPATH(Config.Spu,  info.SPUpath);
+                               PARSEPATH(Config.Cdr,  info.CDRpath);
+
+                               strcpy(Config.Mcd1, info.MCD1path);
+                               strcpy(Config.Mcd2, info.MCD2path);
+                               return -2;
+                       } else {
+                               Config.UseNet = FALSE;
+                       }
+               } else {
+                       if (NET_queryPlayer() == 1) {
+                               if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
+                       } else {
+                               if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
+                       }
+               }
+               NetOpened = TRUE;
+       } else if (Config.UseNet) {
+               NET_resume();
+       }
+
+       return 0;
+}
+
+int OpenPlugins() {
+       int ret;
+
+       while ((ret = _OpenPlugins()) == -2) {
+               ReleasePlugins();
+               LoadMcds(Config.Mcd1, Config.Mcd2);
+               if (LoadPlugins() == -1) return -1;
+       }
+       return ret;
+}
+
+void ClosePlugins() {
+       int ret;
+
+       signal(SIGINT, SIG_DFL);
+       signal(SIGPIPE, SIG_DFL);
+       ret = CDR_close();
+       if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; }
+       ret = SPU_close();
+       if (ret < 0) { SysMessage(_("Error closing SPU plugin!")); return; }
+       ret = PAD1_close();
+       if (ret < 0) { SysMessage(_("Error closing Controller 1 Plugin!")); return; }
+       ret = PAD2_close();
+       if (ret < 0) { SysMessage(_("Error closing Controller 2 plugin!")); return; }
+       // pcsx-rearmed: we handle gpu elsewhere
+       //ret = GPU_close();
+       //if (ret < 0) { SysMessage(_("Error closing GPU plugin!")); return; }
+
+       if (Config.UseNet) {
+               NET_pause();
+       }
+}
+
 #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)
+       if (name && strcmp(name, "HOME") == 0 &&
+                       ((int)name >> 28) == 0) // HACK: let libs find home
                return ret;
 
        return real_getenv(name);
@@ -396,18 +660,22 @@ char *getenv(const char *name)
 
 /* we hook statically linked plugins here */
 static const char *builtin_plugins[] = {
-       "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad"
+       "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad",
+       "builtin_cdrcimg",
 };
 
 static const int builtin_plugin_ids[] = {
        PLUGIN_GPU, PLUGIN_SPU, PLUGIN_CDR, PLUGIN_PAD,
+       PLUGIN_CDRCIMG,
 };
 
 void *SysLoadLibrary(const char *lib) {
        const char *tmp = strrchr(lib, '/');
+       void *ret;
        int i;
 
-       printf("dlopen %s\n", lib);
+       printf("plugin: %s\n", lib);
+
        if (tmp != NULL) {
                tmp++;
                for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
@@ -415,7 +683,17 @@ void *SysLoadLibrary(const char *lib) {
                                return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
        }
 
-       return dlopen(lib, RTLD_NOW);
+#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());
+       return ret;
 }
 
 void *SysLoadSym(void *lib, const char *sym) {
@@ -440,4 +718,3 @@ void SysCloseLibrary(void *lib) {
        dlclose(lib);
 }
 
-