From 9b19dfd562a92fcb1e65f4737485f907ed939eb9 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Tue, 24 Nov 2015 18:19:26 +0100 Subject: [PATCH] ee: rename ptr variable Avoid conflict with ptr[] function operator --- pcsx2/x86/ix86-32/iR5900MultDiv.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp index 778ca0f301..03bc2c847c 100644 --- a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp +++ b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp @@ -260,9 +260,9 @@ void recWritebackConstHILO(u64 res, int writed, int upper) reglo = _allocCheckGPRtoXMM(g_pCurInstInfo, XMMGPR_LO, MODE_WRITE|MODE_READ); if( reglo >= 0 ) { - u32* ptr = recGetImm64(res & 0x80000000 ? -1 : 0, (u32)res); - if( upper ) SSE_MOVHPS_M64_to_XMM(reglo, (uptr)ptr); - else SSE_MOVLPS_M64_to_XMM(reglo, (uptr)ptr); + u32* mem_ptr = recGetImm64(res & 0x80000000 ? -1 : 0, (u32)res); + if( upper ) SSE_MOVHPS_M64_to_XMM(reglo, (uptr)mem_ptr); + else SSE_MOVLPS_M64_to_XMM(reglo, (uptr)mem_ptr); } else { MOV32ItoM(loaddr, res & 0xffffffff); @@ -280,9 +280,9 @@ void recWritebackConstHILO(u64 res, int writed, int upper) reghi = _allocCheckGPRtoXMM(g_pCurInstInfo, XMMGPR_HI, MODE_WRITE|MODE_READ); if( reghi >= 0 ) { - u32* ptr = recGetImm64((res >> 63) ? -1 : 0, res >> 32); - if( upper ) SSE_MOVHPS_M64_to_XMM(reghi, (uptr)ptr); - else SSE_MOVLPS_M64_to_XMM(reghi, (uptr)ptr); + u32* mem_ptr = recGetImm64((res >> 63) ? -1 : 0, res >> 32); + if( upper ) SSE_MOVHPS_M64_to_XMM(reghi, (uptr)mem_ptr); + else SSE_MOVLPS_M64_to_XMM(reghi, (uptr)mem_ptr); } else { _deleteEEreg(XMMGPR_HI, 0);