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 #513 from negativeExponent/simplity_multitap_core_option
[pcsx_rearmed.git]
/
libpcsxcore
/
r3000a.c
diff --git
a/libpcsxcore/r3000a.c
b/libpcsxcore/r3000a.c
index
82eb885
..
0a3e00b
100644
(file)
--- a/
libpcsxcore/r3000a.c
+++ b/
libpcsxcore/r3000a.c
@@
-27,12
+27,14
@@
#include "gte.h"
R3000Acpu *psxCpu = NULL;
#include "gte.h"
R3000Acpu *psxCpu = NULL;
+#ifndef NEW_DYNAREC
psxRegisters psxRegs;
psxRegisters psxRegs;
+#endif
int psxInit() {
int psxInit() {
- SysPrintf(_("Running PCSX Version %s (%s).\n"), P
ACKAGE
_VERSION, __DATE__);
+ SysPrintf(_("Running PCSX Version %s (%s).\n"), P
CSX
_VERSION, __DATE__);
-#if
def PSXREC
+#if
defined(NEW_DYNAREC) || defined(LIGHTREC)
if (Config.Cpu == CPU_INTERPRETER) {
psxCpu = &psxInt;
} else psxCpu = &psxRec;
if (Config.Cpu == CPU_INTERPRETER) {
psxCpu = &psxInt;
} else psxCpu = &psxRec;
@@
-50,7
+52,7
@@
int psxInit() {
void psxReset() {
psxMemReset();
void psxReset() {
psxMemReset();
- memset(&psxRegs, 0, sizeof(psxRegs));
+ memset(&psxRegs, 0
x00
, sizeof(psxRegs));
psxRegs.pc = 0xbfc00000; // Start in bootstrap
psxRegs.pc = 0xbfc00000; // Start in bootstrap