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
cspace: add forgotten length decrement
[pcsx_rearmed.git]
/
libpcsxcore
/
r3000a.h
diff --git
a/libpcsxcore/r3000a.h
b/libpcsxcore/r3000a.h
index
a516645
..
b8d4d79
100644
(file)
--- a/
libpcsxcore/r3000a.h
+++ b/
libpcsxcore/r3000a.h
@@
-29,14
+29,11
@@
extern "C" {
#include "psxcounters.h"
#include "psxbios.h"
#include "psxcounters.h"
#include "psxbios.h"
-#ifdef ICACHE_EMULATION
enum {
R3000ACPU_NOTIFY_CACHE_ISOLATED = 0,
R3000ACPU_NOTIFY_CACHE_UNISOLATED = 1,
R3000ACPU_NOTIFY_DMA3_EXE_LOAD = 2
};
enum {
R3000ACPU_NOTIFY_CACHE_ISOLATED = 0,
R3000ACPU_NOTIFY_CACHE_UNISOLATED = 1,
R3000ACPU_NOTIFY_DMA3_EXE_LOAD = 2
};
-extern uint32_t *Read_ICache(uint32_t pc);
-#endif
typedef struct {
int (*Init)();
typedef struct {
int (*Init)();
@@
-44,19
+41,17
@@
typedef struct {
void (*Execute)(); /* executes up to a break */
void (*ExecuteBlock)(); /* executes up to a jump */
void (*Clear)(u32 Addr, u32 Size);
void (*Execute)(); /* executes up to a break */
void (*ExecuteBlock)(); /* executes up to a jump */
void (*Clear)(u32 Addr, u32 Size);
-#ifdef ICACHE_EMULATION
void (*Notify)(int note, void *data);
void (*Notify)(int note, void *data);
-#endif
+ void (*ApplyConfig)();
void (*Shutdown)();
} R3000Acpu;
extern R3000Acpu *psxCpu;
extern R3000Acpu psxInt;
extern R3000Acpu psxRec;
void (*Shutdown)();
} R3000Acpu;
extern R3000Acpu *psxCpu;
extern R3000Acpu psxInt;
extern R3000Acpu psxRec;
-#define PSXREC
typedef union {
typedef union {
-#if
defined(__BIGENDIAN__)
+#if
__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
struct { u8 h3, h2, h, l; } b;
struct { s8 h3, h2, h, l; } sb;
struct { u16 h, l; } w;
struct { u8 h3, h2, h, l; } b;
struct { s8 h3, h2, h, l; } sb;
struct { u16 h, l; } w;
@@
-194,6
+189,11
@@
typedef struct {
u32 cycle;
u32 interrupt;
struct { u32 sCycle, cycle; } intCycle[32];
u32 cycle;
u32 interrupt;
struct { u32 sCycle, cycle; } intCycle[32];
+ u32 gteBusyCycle;
+ u32 muldivBusyCycle;
+ // warning: changing anything in psxRegisters requires update of all
+ // asm in libpcsxcore/new_dynarec/, but this member can be replaced
+ u32 reserved[2];
} psxRegisters;
extern boolean writeok;
} psxRegisters;
extern boolean writeok;
@@
-219,7
+219,7
@@
void new_dyna_freeze(void *f, int mode);
} \
}
} \
}
-#if
defined(__BIGENDIAN__)
+#if
__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define _i32(x) *(s32 *)&x
#define _u32(x) x
#define _i32(x) *(s32 *)&x
#define _u32(x) x