iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revert these

Browse Source
This commit is contained in:
SimoneN64
2024-01-10 20:59:51 +01:00
parent 6b84ca576d
commit dcf223c150
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/core/registers/Cop1.hpp
View File

@@ -107,9 +107,9 @@ struct Cop1 {
void SetCauseDivisionByZero(); void SetCauseDivisionByZero();
void SetCauseOverflow(); void SetCauseOverflow();
void SetCauseInvalid(); void SetCauseInvalid();
int fp_class=0;
private: private:
template <typename T> auto FGR(Cop0Status&, u32) -> T&; template <typename T>
auto FGR(Cop0Status&, u32) -> T&;
void decodeInterp(Interpreter&, u32); void decodeInterp(Interpreter&, u32);
void decodeJIT(JIT&, u32); void decodeJIT(JIT&, u32);
void absd(Registers&, u32 instr); void absd(Registers&, u32 instr);

20
src/backend/core/registers/cop/cop1instructions.cpp
View File

@@ -138,8 +138,7 @@ void Cop1::SetCauseInvalid() {
template <typename T> template <typename T>
FORCE_INLINE void SetCauseByArgWCVT(Registers& regs, T f) { FORCE_INLINE void SetCauseByArgWCVT(Registers& regs, T f) {
regs.cop1.fp_class = std::fpclassify(f); switch (std::fpclassify(f)) {
switch (regs.cop1.fp_class) {
case FP_NAN: case FP_NAN:
case FP_INFINITE: case FP_INFINITE:
case FP_SUBNORMAL: case FP_SUBNORMAL:
@@ -162,8 +161,7 @@ FORCE_INLINE void SetCauseByArgWCVT(Registers& regs, T f) {
template <typename T> template <typename T>
FORCE_INLINE void SetCauseByArgLCVT(Registers& regs, T f) { FORCE_INLINE void SetCauseByArgLCVT(Registers& regs, T f) {
regs.cop1.fp_class = std::fpclassify(f); switch (std::fpclassify(f)) {
switch (regs.cop1.fp_class) {
case FP_NAN: case FP_NAN:
case FP_INFINITE: case FP_INFINITE:
case FP_SUBNORMAL: case FP_SUBNORMAL:
@@ -192,7 +190,7 @@ FORCE_INLINE void SetFPUCauseRaised(Registers& regs, int raised) {
return; return;
} }
if (((raised & FE_UNDERFLOW) != 0) || regs.cop1.fp_class == FP_SUBNORMAL) { if (raised & FE_UNDERFLOW) {
if (!regs.cop1.fcr31.fs || regs.cop1.fcr31.enable_underflow || regs.cop1.fcr31.enable_inexact_operation) { if (!regs.cop1.fcr31.fs || regs.cop1.fcr31.enable_underflow || regs.cop1.fcr31.enable_inexact_operation) {
regs.cop1.SetCauseUnimplemented(); regs.cop1.SetCauseUnimplemented();
return; return;
@@ -247,8 +245,8 @@ FORCE_INLINE bool isqnan(T f) {
template <typename T> template <typename T>
FORCE_INLINE void SetCauseByArg(Registers& regs, T f) { FORCE_INLINE void SetCauseByArg(Registers& regs, T f) {
regs.cop1.fp_class = std::fpclassify(f); auto fp_class = std::fpclassify(f);
switch(regs.cop1.fp_class) { switch(fp_class) {
case FP_NAN: case FP_NAN:
if(isqnan(f)) { if(isqnan(f)) {
regs.cop1.SetCauseInvalid(); regs.cop1.SetCauseInvalid();
@@ -267,7 +265,7 @@ FORCE_INLINE void SetCauseByArg(Registers& regs, T f) {
case FP_NORMAL: case FP_NORMAL:
break; // No-op, these are fine. break; // No-op, these are fine.
default: default:
Util::panic("Unknown floating point classification: {}", regs.cop1.fp_class); Util::panic("Unknown floating point classification: {}", fp_class);
} }
} }
@@ -276,7 +274,7 @@ FORCE_INLINE void SetCauseByArg(Registers& regs, T f) {
template <typename T> template <typename T>
FORCE_INLINE void SetCauseOnResult(Registers& regs, T& d) { FORCE_INLINE void SetCauseOnResult(Registers& regs, T& d) {
Cop1& cop1 = regs.cop1; Cop1& cop1 = regs.cop1;
regs.cop1.fp_class = std::fpclassify(d); auto fp_class = std::fpclassify(d);
T magic, min; T magic, min;
if constexpr(std::is_same_v<T, float>) { if constexpr(std::is_same_v<T, float>) {
u32 c = 0x7FBFFFFF; u32 c = 0x7FBFFFFF;
@@ -287,7 +285,7 @@ FORCE_INLINE void SetCauseOnResult(Registers& regs, T& d) {
magic = U64_TO_D(c); magic = U64_TO_D(c);
min = DBL_MIN; min = DBL_MIN;
} }
switch (regs.cop1.fp_class) { switch (fp_class) {
case FP_NAN: case FP_NAN:
d = magic; // set result to sNAN d = magic; // set result to sNAN
break; break;
@@ -326,7 +324,7 @@ FORCE_INLINE void SetCauseOnResult(Registers& regs, T& d) {
case FP_NORMAL: case FP_NORMAL:
break; // No-op, these are fine. break; // No-op, these are fine.
default: default:
Util::panic("Unknown FP classification: {}", regs.cop1.fp_class); Util::panic("Unknown FP classification: {}", fp_class);
} }
} }