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

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47733 e17a0e51-4ae3-4d35-97c3-1a29b211df97

6 files changed, 26 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index c676e9d6..8bcc10a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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. 
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index e1047952..75d1b5a1 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -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;
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index cd3f1031..5cba2796 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -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;
 }
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 1b89d63d..059800ef 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -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 */
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index d2bb5252..d26a3d93 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -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;
 }
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 3aa3b92f..2243243d 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -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;
 }