diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-20 04:55:02 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-20 04:55:02 +0000 |
| commit | b8b814362e39bd1abbcaf47df579cd8ad2793aa4 (patch) | |
| tree | a7d4dab6a4a78e0a501098f82229cc292fb60293 /libpcsxcore | |
| parent | e1e09a77d27270ea451e043c66bc14789a5e57a4 (diff) | |
| download | pcsxr-b8b814362e39bd1abbcaf47df579cd8ad2793aa4.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48367 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore')
| -rw-r--r-- | libpcsxcore/psxcommon.h | 10 | ||||
| -rw-r--r-- | libpcsxcore/psxinterpreter.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index 1d60c3e5..90153ec5 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -136,12 +136,16 @@ typedef struct { extern PcsxConfig Config; extern boolean NetOpened; -#define gzfreeze(ptr, size) \ +#define gzfreeze(ptr, size) { \ if (Mode == 1) gzwrite(f, ptr, size); \ - if (Mode == 0) gzread(f, ptr, size); + if (Mode == 0) gzread(f, ptr, size); \ +} +// Make the timing events trigger faster as we are currently assuming everything +// takes one cycle, which is not the case on real hardware. +// FIXME: Count the proper cycle and get rid of this #define BIAS 2 -#define PSXCLK 33868800 /* 33.8688 Mhz */ +#define PSXCLK 33868800 /* 33.8688 MHz */ enum { PSX_TYPE_NTSC = 0, diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index dabec103..7e39d2b1 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -781,7 +781,7 @@ static void intShutdown() { // interpreter execution inline void execI() { - u32 *code = (u32 *)PSXM(psxRegs.pc); + u32 *code = (u32 *)PSXM(psxRegs.pc); psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code)); debugI(); |