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

Properly format

This commit is contained in:
np511 2017-01-29 04:34:34 -05:00
parent 936d9edc4c
commit 15d66cf337
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcsx2/IopGte.cpp
View File

@ -425,8 +425,9 @@ __inline s32 FNC_OVERFLOW4(s64 x) {
}
#define _LIMX(negv, posv, flagb) { \
if (x < (negv)) { x = (negv); gteFLAG |= (1<<(flagb)); } else \
if (x > (posv)) { x = (posv); gteFLAG |= (1<<(flagb)); } return (x); \
if (x < (negv)) { x = (negv); gteFLAG |= (1<<(flagb)); } \
else if (x > (posv)) { x = (posv); gteFLAG |= (1<<(flagb)); } \
return (x); \
}
__inline double limA1S(double x) { _LIMX(-32768.0, 32767.0, 24); }
@ -450,7 +451,9 @@ __inline double limG1(double x) {
if (x > 1023.0) { x = 1023.0; gteFLAG |= (1 << 14); }
else
if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 14); } return (x);
if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 14); }
return (x);
}
__inline double limG2(double x) {
@ -460,7 +463,9 @@ __inline double limG2(double x) {
if (x > 1023.0) { x = 1023.0; gteFLAG |= (1 << 13); }
else
if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 13); } return (x);
if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 13); }
return (x);
}
__inline s32 F12limA1S(s64 x) { _LIMX(-32768 << 12, 32767 << 12, 24); }
@ -487,12 +492,12 @@ __inline s32 FlimE(s32 x) { _LIMX(0, 65535, 12); }
__inline s32 FlimG1(s64 x) {
if (x > 2147483647) { gteFLAG |= (1 << 16); }
else
if (x < (s64)0xffffffff80000000) { gteFLAG |= (1 << 15); }
else if (x < (s64)0xffffffff80000000) { gteFLAG |= (1 << 15); }
if (x > 1023) { x = 1023; gteFLAG |= (1 << 14); }
else
if (x < -1024) { x = -1024; gteFLAG |= (1 << 14); } return (x);
else if (x < -1024) { x = -1024; gteFLAG |= (1 << 14); }
return (x);
}
__inline s32 FlimG2(s64 x) {
@ -502,7 +507,9 @@ __inline s32 FlimG2(s64 x) {
if (x > 1023) { x = 1023; gteFLAG |= (1 << 13); }
else
if (x < -1024) { x = -1024; gteFLAG |= (1 << 13); } return (x);
if (x < -1024) { x = -1024; gteFLAG |= (1 << 13); }
return (x);
}
#define MAC2IR() { \

2
pcsx2/IopMem.cpp
View File

@ -499,5 +499,5 @@ std::string iopMemReadString(u32 mem, int maxlen)
while ((c = iopMemRead8(mem++)) && maxlen--)
ret.push_back(c);
return ret;
return ret;
}

4
pcsx2/x86/ix86-32/iR5900Templates.cpp
View File

@ -426,8 +426,8 @@ void eeRecompileCodeConst0(R5900FNPTR constcode, R5900FNPTR_INFO constscode, R59
// rt = rs op imm16
void eeRecompileCodeConst1(R5900FNPTR constcode, R5900FNPTR_INFO noconstcode)
{
if ( ! _Rt_ )
return;
if ( ! _Rt_ )
return;
// for now, don't support xmm