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

2 files changed, 7 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 92dba944..78d88660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+April 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * libpcsxcore/gte.c: Use u32 instead of unsigned long.
+
 April 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * libpcsxcore/gte.c: Backported the new GTE code from PCSX-Revolution project
diff --git a/libpcsxcore/gte.c b/libpcsxcore/gte.c
index 01ffb5d0..e07ca80d 100644
--- a/libpcsxcore/gte.c
+++ b/libpcsxcore/gte.c
@@ -202,7 +202,6 @@ static inline u32 Lm_E(u32 result) {
 		gteFLAG |= (1 << 31) | (1 << 17);
 		return 0x1ffff;
 	}
-
 	return result;
 }
 
@@ -229,7 +228,6 @@ static inline u32 MFC2(int reg) {
 			break;
 
 		case 28: case 30:
-//			SysPrintf("MFC2: psxRegs.CP2D.r[%d] cannot be read\n");
 			return 0;
 
 		case 29:
@@ -241,7 +239,7 @@ static inline u32 MFC2(int reg) {
 	return psxRegs.CP2D.r[reg];
 }
 
-static inline void MTC2(unsigned long value, int reg) {
+static inline void MTC2(u32 value, int reg) {
 	switch (reg) {
 		case 15:
 			gteSXY0 = gteSXY1;
@@ -250,8 +248,6 @@ static inline void MTC2(unsigned long value, int reg) {
 			gteSXYP = value;
 			break;
 
-//		case 23: SysPrintf("RES1\n"); break;
-
 		case 28:
 			gteIRGB = value;
 			gteIR1 = (value & 0x1f) << 7;
@@ -281,7 +277,6 @@ static inline void MTC2(unsigned long value, int reg) {
 			break;
 
 		case 7: case 29: case 31:
-//			SysPrintf("MTC2: psxRegs.CP2D.r[%d] cannot be write\n", reg);
 			return;
 
 		default:
@@ -289,7 +284,7 @@ static inline void MTC2(unsigned long value, int reg) {
 	}
 }
 
-static inline void setcp2cr(int reg, u32 value) {
+static inline void CTC2(u32 value, int reg) {
 	switch (reg) {
 		case 4:
 		case 12:
@@ -302,7 +297,6 @@ static inline void setcp2cr(int reg, u32 value) {
 			break;
 
 		case 31:
-//			SysPrintf("setcp2cr: reg=%d\n", reg);
 			value = value & 0x7ffff000;
 			if ((value & 0x7f87e000) != 0) {
 				value |= 0x80000000;
@@ -328,7 +322,7 @@ void gteMTC2() {
 }
 
 void gteCTC2() {
-	setcp2cr(_Rd_, psxRegs.GPR.r[_Rt_]);
+	CTC2(psxRegs.GPR.r[_Rt_], _Rd_);
 }
 
 #define _oB_ (psxRegs.GPR.r[_Rs_] + _Imm_)