notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c2ca3b
)
yet more random armv5 tweaks
author
notaz
<notasas@gmail.com>
Fri, 30 Sep 2011 22:13:43 +0000
(
01:13
+0300)
committer
notaz
<notasas@gmail.com>
Sun, 2 Oct 2011 00:09:13 +0000
(
03:09
+0300)
frontend/main.c
patch
|
blob
|
blame
|
history
frontend/menu.c
patch
|
blob
|
blame
|
history
frontend/plat_pollux.c
patch
|
blob
|
blame
|
history
frontend/plugin_lib.c
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/assem_arm.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/emu_if.c
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/emu_if.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/new_dynarec.c
patch
|
blob
|
blame
|
history
diff --git
a/frontend/main.c
b/frontend/main.c
index
37a72ac
..
0a9bed6
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-121,6
+121,9
@@
static void set_default_paths(void)
strcpy(Config.Pad1, "builtin_pad");
strcpy(Config.Pad2, "builtin_pad");
strcpy(Config.Net, "Disabled");
strcpy(Config.Pad1, "builtin_pad");
strcpy(Config.Pad2, "builtin_pad");
strcpy(Config.Net, "Disabled");
+#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
+ strcpy(Config.Gpu, "gpuPCSX4ALL.so");
+#endif
Config.PsxAuto = 1;
snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
Config.PsxAuto = 1;
snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
diff --git
a/frontend/menu.c
b/frontend/menu.c
index
ce65ccf
..
36c9f91
100644
(file)
--- a/
frontend/menu.c
+++ b/
frontend/menu.c
@@
-192,6
+192,9
@@
static void menu_set_defconfig(void)
iXAPitch = 0;
iSPUIRQWait = 1;
iUseTimer = 2;
iXAPitch = 0;
iSPUIRQWait = 1;
iUseTimer = 2;
+#ifndef __ARM_ARCH_7A__ /* XXX */
+ iUseReverb = 0;
+#endif
menu_sync_config();
}
menu_sync_config();
}
diff --git
a/frontend/plat_pollux.c
b/frontend/plat_pollux.c
index
d214b63
..
4983ec7
100644
(file)
--- a/
frontend/plat_pollux.c
+++ b/
frontend/plat_pollux.c
@@
-24,6
+24,7
@@
#include "main.h"
#include "menu.h"
#include "plat.h"
#include "main.h"
#include "menu.h"
#include "plat.h"
+#include "pcnt.h"
static int fbdev = -1, memdev = -1, battdev = -1;
static volatile unsigned short *memregs;
static int fbdev = -1, memdev = -1, battdev = -1;
static volatile unsigned short *memregs;
@@
-320,6
+321,7
@@
static void raw_flip_dma(int x, int y)
int i;
warm_cache_op_all(WOP_D_CLEAN);
int i;
warm_cache_op_all(WOP_D_CLEAN);
+ pcnt_start(PCNT_BLIT);
dst &= ~7;
len &= ~7;
dst &= ~7;
len &= ~7;
@@
-354,6
+356,8
@@
static void raw_flip_dma(int x, int y)
g_menuscreen_ptr = fb_flip();
pl_flip_cnt++;
g_menuscreen_ptr = fb_flip();
pl_flip_cnt++;
+
+ pcnt_end(PCNT_BLIT);
}
static void raw_flip_soft(int x, int y)
}
static void raw_flip_soft(int x, int y)
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
239e852
..
c719f48
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-410,7
+410,7
@@
static void *watchdog_thread(void *unused)
int seen_dead = 0;
int sleep_time = 5;
int seen_dead = 0;
int sleep_time = 5;
-#if
ndef NDEBUG
+#if
!defined(NDEBUG) || defined(DRC_DBG)
// don't interfere with debug
return NULL;
#endif
// don't interfere with debug
return NULL;
#endif
diff --git
a/libpcsxcore/new_dynarec/assem_arm.h
b/libpcsxcore/new_dynarec/assem_arm.h
index
a289aa1
..
917d276
100644
(file)
--- a/
libpcsxcore/new_dynarec/assem_arm.h
+++ b/
libpcsxcore/new_dynarec/assem_arm.h
@@
-16,6
+16,12
@@
#define PCSX 1
#define RAM_SIZE 0x200000
#define PCSX 1
#define RAM_SIZE 0x200000
+#ifndef __ARM_ARCH_7A__
+#define ARMv5_ONLY
+//#undef CORTEX_A8_BRANCH_PREDICTION_HACK
+//#undef USE_MINI_HT
+#endif
+
#ifdef FORCE32
#define REG_SHIFT 2
#else
#ifdef FORCE32
#define REG_SHIFT 2
#else
diff --git
a/libpcsxcore/new_dynarec/emu_if.c
b/libpcsxcore/new_dynarec/emu_if.c
index
39bbf2a
..
02433f1
100644
(file)
--- a/
libpcsxcore/new_dynarec/emu_if.c
+++ b/
libpcsxcore/new_dynarec/emu_if.c
@@
-200,6
+200,9
@@
static int ari64_init()
gte_handlers[0x30] = gte_handlers_nf[0x30] = gteRTPT_neon;
gte_handlers[0x12] = gte_handlers_nf[0x12] = gteMVMVA_neon;
#endif
gte_handlers[0x30] = gte_handlers_nf[0x30] = gteRTPT_neon;
gte_handlers[0x12] = gte_handlers_nf[0x12] = gteMVMVA_neon;
#endif
+#endif
+#ifdef DRC_DBG
+ memcpy(gte_handlers_nf, gte_handlers, sizeof(gte_handlers_nf));
#endif
psxH_ptr = psxH;
#endif
psxH_ptr = psxH;
diff --git
a/libpcsxcore/new_dynarec/emu_if.h
b/libpcsxcore/new_dynarec/emu_if.h
index
88749be
..
7f625a7
100644
(file)
--- a/
libpcsxcore/new_dynarec/emu_if.h
+++ b/
libpcsxcore/new_dynarec/emu_if.h
@@
-1,10
+1,6
@@
#include "new_dynarec.h"
#include "../r3000a.h"
#include "new_dynarec.h"
#include "../r3000a.h"
-#ifndef __ARM_ARCH_7A__
-#define ARMv5_ONLY
-#endif
-
extern char invalid_code[0x100000];
/* weird stuff */
extern char invalid_code[0x100000];
/* weird stuff */
diff --git
a/libpcsxcore/new_dynarec/new_dynarec.c
b/libpcsxcore/new_dynarec/new_dynarec.c
index
716b1d4
..
cbc289e
100644
(file)
--- a/
libpcsxcore/new_dynarec/new_dynarec.c
+++ b/
libpcsxcore/new_dynarec/new_dynarec.c
@@
-8601,7
+8601,7
@@
int new_recompile_block(int addr)
case 0x04: gte_rt[i]=1ll<<gr; break; // MTC2
case 0x02: gte_rs[i]=1ll<<(gr+32); // CFC2
if(gr==31&&!gte_reads_flags) {
case 0x04: gte_rt[i]=1ll<<gr; break; // MTC2
case 0x02: gte_rs[i]=1ll<<(gr+32); // CFC2
if(gr==31&&!gte_reads_flags) {
-
printf
("gte flag read encountered @%08x\n",addr + i*4);
+
assem_debug
("gte flag read encountered @%08x\n",addr + i*4);
gte_reads_flags=1;
}
break;
gte_reads_flags=1;
}
break;