notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #139 from retro-wertz/patch-3
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
5bc5443
..
940ff05
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-10,6
+10,10
@@
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
+#ifdef __MACH__
+#include <unistd.h>
+#include <sys/syscall.h>
+#endif
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/psxcounters.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/psxcounters.h"
@@
-25,6
+29,7
@@
#include "main.h"
#include "plugin.h"
#include "plugin_lib.h"
#include "main.h"
#include "plugin.h"
#include "plugin_lib.h"
+#include "arm_features.h"
#include "revision.h"
#include "libretro.h"
#include "revision.h"
#include "libretro.h"
@@
-283,7
+288,7
@@
void retro_get_system_info(struct retro_system_info *info)
{
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
{
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
- info->library_version = "r2
0
";
+ info->library_version = "r2
2
";
info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
info->need_fullpath = true;
}
info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
info->need_fullpath = true;
}
@@
-1201,6
+1206,11
@@
void retro_init(void)
int i, ret;
bool found_bios = false;
int i, ret;
bool found_bios = false;
+#ifdef __MACH__
+ // magic sauce to make the dynarec work on iOS
+ syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0);
+#endif
+
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
@@
-1249,12
+1259,12
@@
void retro_init(void)
/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
* we have to do this because cache misses and some IO penalties
* are not emulated. Warning: changing this may break compatibility. */
/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
* we have to do this because cache misses and some IO penalties
* are not emulated. Warning: changing this may break compatibility. */
-#if !defined(__arm__) || defined(__ARM_ARCH_7A__)
cycle_multiplier = 175;
cycle_multiplier = 175;
-#
else
+#
ifdef HAVE_PRE_ARMV7
cycle_multiplier = 200;
#endif
pl_rearmed_cbs.gpu_peops.iUseDither = 1;
cycle_multiplier = 200;
#endif
pl_rearmed_cbs.gpu_peops.iUseDither = 1;
+ spu_config.iUseFixedUpdates = 1;
McdDisable[0] = 0;
McdDisable[1] = 1;
McdDisable[0] = 0;
McdDisable[1] = 1;