ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a foopah in the LWL fix from earlier. >_< 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@602 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-02-25 18:34:25 +00:00
parent 8f0bacec20
commit d200ab382d
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcsx2/R5900OpcodeImpl.cpp
View File

@ -322,15 +322,14 @@ static const u8 LWL_SHIFT[4] = { 24, 16, 8, 0 };
static const u8 LWR_SHIFT[4] = { 0, 8, 16, 24 }; static const u8 LWR_SHIFT[4] = { 0, 8, 16, 24 };
void LWL() { void LWL() {
if (!_Rt_) return;
s32 addr = cpuRegs.GPR.r[_Rs_].UL[0] + _Imm_; s32 addr = cpuRegs.GPR.r[_Rs_].UL[0] + _Imm_;
u32 shift = addr & 3; u32 shift = addr & 3;
u32 mem; s32 mem; // ensure the compiler does correct sign extension into 64 bits by using s32
memRead32(addr & ~3, (u32*)&mem);
if (!_Rt_) return; cpuRegs.GPR.r[_Rt_].SD[0] = (cpuRegs.GPR.r[_Rt_].SL[0] & LWL_MASK[shift]) |
memRead32(addr & ~3, &mem);
// Reassignment note: ensure the compiler does sign extension into 64 bits, by using (s32).
cpuRegs.GPR.r[_Rt_].UD[0] = (s32)(cpuRegs.GPR.r[_Rt_].SL[0] & LWL_MASK[shift]) |
(mem << LWL_SHIFT[shift]); (mem << LWL_SHIFT[shift]);
/* /*
@ -346,13 +345,13 @@ void LWL() {
void LWR() { void LWR() {
s32 addr = cpuRegs.GPR.r[_Rs_].UL[0] + _Imm_;
u32 shift = addr & 3;
if (!_Rt_) return; if (!_Rt_) return;
u32 mem; s32 addr = cpuRegs.GPR.r[_Rs_].UL[0] + _Imm_;
memRead32(addr & ~3, &mem); u32 shift = addr & 3;
s32 mem; // ensure the compiler does correct sign extension into 64 bits by using s32
memRead32(addr & ~3, (u32*)&mem);
mem = (cpuRegs.GPR.r[_Rt_].SL[0] & LWR_MASK[shift]) | mem = (cpuRegs.GPR.r[_Rt_].SL[0] & LWR_MASK[shift]) |
(mem >> LWR_SHIFT[shift]); (mem >> LWR_SHIFT[shift]);
@ -360,7 +359,7 @@ void LWR() {
if( shift == 0 ) if( shift == 0 )
{ {
// This special case requires sign extension into the full 64 bit dest. // This special case requires sign extension into the full 64 bit dest.
cpuRegs.GPR.r[_Rt_].SD[0] = (s32)mem; cpuRegs.GPR.r[_Rt_].SD[0] = mem;
} }
else else
{ {