xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

got rid of gzfreezel. things like gzfreezel(&int_variable) can be VERY wrong on x64!

Browse Source 
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47733 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\weimingzhi_cp 2010-05-10 02:48:37 +00:00
parent 422812bcfa
commit c8690b57b1
6 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* libpcsxcore/cdrom.c: Got rid of gzfreezel.
* libpcsxcore/mdec.c: Likewise.
* libpcsxcore/psxcommon.h: Likewise.
* libpcsxcore/sio.c: Likewise.
* libpcsxcore/psxcounters.c: Likewise.
May 10, 2010 edgbla <edgbla@yandex.ru>
* libpcsxcore/sio.h: Some code (regs,macro) was moved to the 'c' file.

2
libpcsxcore/cdrom.c
View File

@ -1136,7 +1136,7 @@ int cdrFreeze(gzFile f, int Mode) {
if (Mode == 1)
tmp = cdr.pTransfer - cdr.Transfer;
gzfreezel(&tmp);
gzfreeze(&tmp, sizeof(tmp));
if (Mode == 0)
cdr.pTransfer = cdr.Transfer + tmp;

4
libpcsxcore/mdec.c
View File

@ -558,8 +558,8 @@ void mdec1Interrupt() {
int mdecFreeze(gzFile f, int Mode) {
gzfreeze(&mdec, sizeof(mdec));
gzfreezel(iq_y);
gzfreezel(iq_uv);
gzfreeze(iq_y, sizeof(iq_y));
gzfreeze(iq_uv, sizeof(iq_uv));
return 0;
}

2
libpcsxcore/psxcommon.h
View File

@ -142,8 +142,6 @@ extern int NetOpened;
if (Mode == 1) gzwrite(f, ptr, size); \
if (Mode == 0) gzread(f, ptr, size);
#define gzfreezel(ptr) gzfreeze(ptr, sizeof(ptr))
//#define BIAS 4
#define BIAS 2
#define PSXCLK 33868800 /* 33.8688 Mhz */

4
libpcsxcore/psxcounters.c
View File

@ -465,9 +465,11 @@ void psxRcntInit()
s32 psxRcntFreeze( gzFile f, s32 Mode )
{
gzfreezel( rcnts );
gzfreeze( &rcnts, sizeof(rcnts) );
gzfreeze( &hSyncCount, sizeof(hSyncCount) );
gzfreeze( &spuSyncCount, sizeof(spuSyncCount) );
gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );
gzfreeze( &psxNextsCounter, sizeof(psxNextsCounter) );
return 0;
}

24
libpcsxcore/sio.c
View File

@ -752,18 +752,18 @@ void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
}
int sioFreeze(gzFile f, int Mode) {
gzfreezel(buf);
gzfreezel(&StatReg);
gzfreezel(&ModeReg);
gzfreezel(&CtrlReg);
gzfreezel(&BaudReg);
gzfreezel(&bufcount);
gzfreezel(&parp);
gzfreezel(&mcdst);
gzfreezel(&rdwr);
gzfreezel(&adrH);
gzfreezel(&adrL);
gzfreezel(&padst);
gzfreeze(buf, sizeof(buf));
gzfreeze(&StatReg, sizeof(StatReg));
gzfreeze(&ModeReg, sizeof(ModeReg));
gzfreeze(&CtrlReg, sizeof(CtrlReg));
gzfreeze(&BaudReg, sizeof(BaudReg));
gzfreeze(&bufcount, sizeof(bufcount));
gzfreeze(&parp, sizeof(parp));
gzfreeze(&mcdst, sizeof(mcdst));
gzfreeze(&rdwr, sizeof(rdwr));
gzfreeze(&adrH, sizeof(adrH));
gzfreeze(&adrL, sizeof(adrL));
gzfreeze(&padst, sizeof(padst));
return 0;
}