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

FPURoundMode: revert use of enums in bit-fields 

The workaround of using fixed underlying types produces lots of warnings
in GCC because now the bit-fields are too small for the value range used
for conversion semantics.
This commit is contained in:
Tillmann Karras 2014-03-09 15:21:50 +01:00
parent 154ad838f4
commit d05e205a24
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Common/FPURoundMode.h
View File

@ -8,24 +8,29 @@
namespace FPURoundMode namespace FPURoundMode
{ {
enum RoundModes : u32 // TODO: MSVC currently produces broken code:
// https://connect.microsoft.com/VisualStudio/feedback/details/828892/vc-2013-miscompilation-with-enums-and-bit-fields
// Once that is fixed, change types in SetRoundMode(), SetSIMDMode(), and in UReg_FPSCR to 'RoundMode'.
enum RoundMode
{ {
ROUND_NEAR = 0, ROUND_NEAR = 0,
ROUND_CHOP = 1, ROUND_CHOP = 1,
ROUND_UP = 2, ROUND_UP = 2,
ROUND_DOWN = 3 ROUND_DOWN = 3
}; };
enum PrecisionModes : u32 enum PrecisionMode
{ {
PREC_24 = 0, PREC_24 = 0,
PREC_53 = 1, PREC_53 = 1,
PREC_64 = 2 PREC_64 = 2
}; };
void SetRoundMode(RoundModes mode);
void SetPrecisionMode(PrecisionModes mode); void SetRoundMode(int mode);
void SetSIMDMode(RoundModes rounding_mode, bool non_ieee_mode); void SetPrecisionMode(PrecisionMode mode);
void SetSIMDMode(int rounding_mode, bool non_ieee_mode);
/* /*
* There are two different flavors of float to int conversion: * There are two different flavors of float to int conversion:

6
Source/Core/Common/GenericFPURoundMode.cpp
View File

@ -21,13 +21,13 @@
// Generic, do nothing // Generic, do nothing
namespace FPURoundMode namespace FPURoundMode
{ {
void SetRoundMode(RoundModes mode) void SetRoundMode(int mode)
{ {
} }
void SetPrecisionMode(PrecisionModes mode) void SetPrecisionMode(PrecisionMode mode)
{ {
} }
void SetSIMDMode(RoundModes rounding_mode, bool non_ieee_mode) void SetSIMDMode(int rounding_mode, bool non_ieee_mode)
{ {
} }
void SaveSIMDState() void SaveSIMDState()

6
Source/Core/Common/x64FPURoundMode.cpp
View File

@ -18,7 +18,7 @@ namespace FPURoundMode
static u32 saved_sse_state = _mm_getcsr(); static u32 saved_sse_state = _mm_getcsr();
static const u32 default_sse_state = _mm_getcsr(); static const u32 default_sse_state = _mm_getcsr();
void SetRoundMode(RoundModes mode) void SetRoundMode(int mode)
{ {
// Set FPU rounding mode to mimic the PowerPC's // Set FPU rounding mode to mimic the PowerPC's
#ifdef _M_X86_32 #ifdef _M_X86_32
@ -49,7 +49,7 @@ namespace FPURoundMode
#endif #endif
} }
void SetPrecisionMode(PrecisionModes mode) void SetPrecisionMode(PrecisionMode mode)
{ {
#ifdef _M_X86_32 #ifdef _M_X86_32
// sets the floating-point lib to 53-bit // sets the floating-point lib to 53-bit
@ -75,7 +75,7 @@ namespace FPURoundMode
#endif #endif
} }
void SetSIMDMode(RoundModes rounding_mode, bool non_ieee_mode) void SetSIMDMode(int rounding_mode, bool non_ieee_mode)
{ {
// OR-mask for disabling FPU exceptions (bits 7-12 in the MXCSR register) // OR-mask for disabling FPU exceptions (bits 7-12 in the MXCSR register)
const u32 EXCEPTION_MASK = 0x1F80; const u32 EXCEPTION_MASK = 0x1F80;

3
Source/Core/Core/PowerPC/Gekko.h
View File

@ -8,7 +8,6 @@
#pragma once #pragma once
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/FPURoundMode.h"
// --- Gekko Instruction --- // --- Gekko Instruction ---
@ -390,7 +389,7 @@ union UReg_FPSCR
struct struct
{ {
// Rounding mode (towards: nearest, zero, +inf, -inf) // Rounding mode (towards: nearest, zero, +inf, -inf)
FPURoundMode::RoundModes RN : 2; u32 RN : 2;
// Non-IEEE mode enable (aka flush-to-zero) // Non-IEEE mode enable (aka flush-to-zero)
u32 NI : 1; u32 NI : 1;
// Inexact exception enable // Inexact exception enable

2
Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
View File

@ -49,7 +49,7 @@ static void FPSCRtoFPUSettings(UReg_FPSCR fp)
} }
// Set SSE rounding mode and denormal handling // Set SSE rounding mode and denormal handling
FPURoundMode::SetSIMDMode(FPSCR.RN, FPSCR.NI); FPURoundMode::SetSIMDMode(fp.RN, fp.NI);
} }
void Interpreter::mtfsb0x(UGeckoInstruction _inst) void Interpreter::mtfsb0x(UGeckoInstruction _inst)