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 branch 'master' into master
[pcsx_rearmed.git]
/
libpcsxcore
/
r3000a.h
diff --git
a/libpcsxcore/r3000a.h
b/libpcsxcore/r3000a.h
index
13aaa59
..
32538e5
100644
(file)
--- a/
libpcsxcore/r3000a.h
+++ b/
libpcsxcore/r3000a.h
@@
-40,10
+40,8
@@
typedef struct {
extern R3000Acpu *psxCpu;
extern R3000Acpu psxInt;
extern R3000Acpu *psxCpu;
extern R3000Acpu psxInt;
-#if (defined(__x86_64__) || defined(__i386__) || defined(__sh__) || defined(__ppc__) || defined(__arm__)) && !defined(NOPSXREC)
extern R3000Acpu psxRec;
#define PSXREC
extern R3000Acpu psxRec;
#define PSXREC
-#endif
typedef union {
#if defined(__BIGENDIAN__)
typedef union {
#if defined(__BIGENDIAN__)
@@
-160,6
+158,7
@@
enum {
PSXINT_RCNT,
PSXINT_CDRLID,
PSXINT_CDRPLAY,
PSXINT_RCNT,
PSXINT_CDRLID,
PSXINT_CDRPLAY,
+ PSXINT_SPU_UPDATE,
PSXINT_COUNT
};
PSXINT_COUNT
};
@@
-191,9
+190,9
@@
extern psxRegisters psxRegs;
extern u32 event_cycles[PSXINT_COUNT];
extern u32 next_interupt;
extern u32 event_cycles[PSXINT_COUNT];
extern u32 next_interupt;
-void new_dyna_save(void);
+void new_dyna_
before_
save(void);
void new_dyna_after_save(void);
void new_dyna_after_save(void);
-void new_dyna_
restore(void
);
+void new_dyna_
freeze(void *f, int mode
);
#define new_dyna_set_event(e, c) { \
s32 c_ = c; \
#define new_dyna_set_event(e, c) { \
s32 c_ = c; \