void pl_frame_limit(void)
{
/* called once per frame, make psxCpu->Execute() above return */
- stop = 1;
+ stop++;
}
void pl_timing_prepare(int is_pal)
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
info->library_version = "r23l" GIT_VERSION;
- info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd";
+ info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd|iso|exe";
info->need_fullpath = true;
}
size_t i;
unsigned int cd_index = 0;
bool is_m3u = (strcasestr(info->path, ".m3u") != NULL);
+ bool is_exe = (strcasestr(info->path, ".exe") != NULL);
+ int ret;
struct retro_input_descriptor desc[] = {
#define JOYP(port) \
plugin_call_rearmed_cbs();
/* dfinput_activate(); */
- if (CheckCdrom() == -1)
+ if (!is_exe && CheckCdrom() == -1)
{
log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path);
return false;
SysReset();
- if (LoadCdrom() == -1)
+ if (is_exe)
+ ret = Load(info->path);
+ else
+ ret = LoadCdrom();
+ if (ret != 0)
{
- log_cb(RETRO_LOG_INFO, "could not load CD\n");
+ log_cb(RETRO_LOG_INFO, "could not load %s (%d)\n", is_exe ? "exe" : "CD", ret);
return false;
}
emu_on_new_cd(0);
#ifdef GPU_NEON
var.value = NULL;
- var.key = "pcsx_rearmed_neon_interlace_enable";
+ var.key = "pcsx_rearmed_neon_interlace_enable_v2";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
pl_rearmed_cbs.gpu_neon.allow_interlace = 0;
else if (strcmp(var.value, "enabled") == 0)
pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
+ else // auto
+ pl_rearmed_cbs.gpu_neon.allow_interlace = 2;
}
var.value = NULL;
Config.icache_emulation = 1;
}
+ var.value = NULL;
+ var.key = "pcsx_rearmed_exception_emulation";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ Config.PreciseExceptions = 1;
+ else
+ Config.PreciseExceptions = 0;
+ }
+
psxCpu->ApplyConfig();
// end of CPU emu config
spu_config.iUseThread = 0;
}
-#ifndef _WIN32
- var.value = NULL;
- var.key = "pcsx_rearmed_async_cd";
- if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
- {
- if (strcmp(var.value, "async") == 0)
- {
- Config.AsyncCD = 1;
- Config.CHD_Precache = 0;
- }
- else if (strcmp(var.value, "sync") == 0)
- {
- Config.AsyncCD = 0;
- Config.CHD_Precache = 0;
- }
- else if (strcmp(var.value, "precache") == 0)
- {
- Config.AsyncCD = 0;
- Config.CHD_Precache = 1;
- }
+ if (P_HAVE_PTHREAD) {
+ var.value = NULL;
+ var.key = "pcsx_rearmed_async_cd";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+ {
+ if (strcmp(var.value, "async") == 0)
+ {
+ Config.AsyncCD = 1;
+ Config.CHD_Precache = 0;
+ }
+ else if (strcmp(var.value, "sync") == 0)
+ {
+ Config.AsyncCD = 0;
+ Config.CHD_Precache = 0;
+ }
+ else if (strcmp(var.value, "precache") == 0)
+ {
+ Config.AsyncCD = 0;
+ Config.CHD_Precache = 1;
+ }
+ }
}
-#endif
var.value = NULL;
var.key = "pcsx_rearmed_noxadecoding";
{
rebootemu = 0;
SysReset();
- if (!Config.HLE && !Config.SlowBoot)
- {
- // skip BIOS logos
- psxRegs.pc = psxRegs.GPR.n.ra;
- }
- return;
+ if (Config.HLE)
+ LoadCdrom();
}
print_internal_fps();
static bool find_any_bios(const char *dirpath, char *path, size_t path_size)
{
+ static const char *substrings[] = { "scph", "ps", "openbios" };
DIR *dir;
struct dirent *ent;
bool ret = false;
+ size_t i;
dir = opendir(dirpath);
if (dir == NULL)
return false;
- while ((ent = readdir(dir)))
+ for (i = 0; i < (sizeof(substrings) / sizeof(substrings[0])); i++)
{
- if ((strncasecmp(ent->d_name, "scph", 4) != 0) && (strncasecmp(ent->d_name, "psx", 3) != 0))
- continue;
-
- snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
- ret = try_use_bios(path);
- if (ret)
- break;
+ const char *substr = substrings[i];
+ size_t len = strlen(substr);
+ rewinddir(dir);
+ while ((ent = readdir(dir)))
+ {
+ if ((strncasecmp(ent->d_name, substr, len) != 0))
+ continue;
+ if (strstr(ent->d_name, "unirom"))
+ continue;
+
+ snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
+ ret = try_use_bios(path);
+ if (ret)
+ {
+ closedir(dir);
+ return ret;
+ }
+ }
}
closedir(dir);
return ret;
#ifdef _3DS
vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80);
-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA) && !defined(__SWITCH__)
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && P_HAVE_POSIX_MEMALIGN
if (posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2) != 0)
vout_buf = (void *) 0;
#else
if (log_cb)
log_cb(RETRO_LOG_DEBUG, "%s", msg);
}
+
+// vim:sw=3:ts=3:expandtab