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

Linux: Revert to using the old masking code in iVif at all times, until we can figure out why the other masking code frequently crashes under Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1977 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-10-07 21:54:19 +00:00
parent d30673c5ca
commit 47e49ded07
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/x86/iVif.cpp
View File

@ -69,13 +69,17 @@ void __fastcall SetNewMask(u32* vif1masks, u32* hasmask, u32 mask, u32 oldmask)
if ((mask&0xff) != (oldmask&0xff)) if ((mask&0xff) != (oldmask&0xff))
#ifdef __LINUX__ #ifdef __LINUX__
if (mask == 0) // Temporary workaround for a bug causing a segfault. // This seems to now be hitting several games, and not just in that spot,
// so until we can work out something better, I'm reverting to using the
// old Linux mask code all the time. --arcum42
//if (mask == 0) // Temporary workaround for a bug causing a segfault.
UseOldMaskCode(vif1masks, mask); UseOldMaskCode(vif1masks, mask);
else //else
#endif #else
{ {
__m128i r0, r1, r2, r3; __m128i r0, r1, r2, r3;
r0 = _mm_load_si128((__m128i*)&s_maskarr[mask&15][0]); r0 = _mm_load_si128((__m128i*)&s_maskarr[mask&15][0]); // Tends to crash Linux,
r2 = _mm_unpackhi_epi16(r0, r0); r2 = _mm_unpackhi_epi16(r0, r0);
r0 = _mm_unpacklo_epi16(r0, r0); r0 = _mm_unpacklo_epi16(r0, r0);
@ -93,6 +97,7 @@ void __fastcall SetNewMask(u32* vif1masks, u32* hasmask, u32 mask, u32 oldmask)
_mm_storeh_pi((__m64*)&vif1masks[12], *(__m128*)&r2); _mm_storeh_pi((__m64*)&vif1masks[12], *(__m128*)&r2);
_mm_storeh_pi((__m64*)&vif1masks[14], *(__m128*)&r3); _mm_storeh_pi((__m64*)&vif1masks[14], *(__m128*)&r3);
} }
#endif
} }
FreezeXMMRegs(0); FreezeXMMRegs(0);
} }