From d14f22d0592dad854b4ec266a5acce9ecb4d791b Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 30 Aug 2014 00:26:27 +0400 Subject: [PATCH] Compilation fix 2 --- rpcs3/Emu/Cell/PPUInterpreter.h | 24 ++++++++++++------------ rpcs3/stdafx.h | 5 +++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index 4eeed301a6..e8a94377f8 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -771,10 +771,10 @@ private: { float result = CPU.VPR[vb]._f[w] * nScale; - if (result > INT_MAX) - CPU.VPR[vd]._s32[w] = (int)INT_MAX; - else if (result < INT_MIN) - CPU.VPR[vd]._s32[w] = (int)INT_MIN; + if (result > S32_MAX) + CPU.VPR[vd]._s32[w] = (int)S32_MAX; + else if (result < S32_MIN) + CPU.VPR[vd]._s32[w] = (int)S32_MIN; else // C rounding = Round towards 0 CPU.VPR[vd]._s32[w] = (int)result; } @@ -788,8 +788,8 @@ private: // C rounding = Round towards 0 s64 result = (s64)(CPU.VPR[vb]._f[w] * nScale); - if (result > UINT_MAX) - CPU.VPR[vd]._u32[w] = (u32)UINT_MAX; + if (result > U32_MAX) + CPU.VPR[vd]._u32[w] = (u32)U32_MAX; else if (result < 0) CPU.VPR[vd]._u32[w] = 0; else @@ -1061,14 +1061,14 @@ private: result += CPU.VPR[vc]._s32[w]; - if (result > INT_MAX) + if (result > S32_MAX) { - saturated = INT_MAX; + saturated = S32_MAX; CPU.VSCR.SAT = 1; } - else if (result < INT_MIN) + else if (result < S32_MIN) { - saturated = INT_MIN; + saturated = S32_MIN; CPU.VSCR.SAT = 1; } else @@ -1121,9 +1121,9 @@ private: result += CPU.VPR[vc]._u32[w]; - if (result > UINT_MAX) + if (result > U32_MAX) { - saturated = UINT_MAX; + saturated = U32_MAX; CPU.VSCR.SAT = 1; } else diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index fdac429bb2..14109af0e2 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -42,11 +42,16 @@ typedef uint16_t u16; typedef uint32_t u32; typedef uint64_t u64; +static const u32 U32_MAX = 0xffffffff; + typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +static const s32 S32_MIN = -0x80000000; +static const s32 S32_MAX = 0x7fffffff; + union u128 { struct