From 622c02f53780a96a7f92e4dd4fad10bafae7e8f7 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Sun, 5 May 2019 19:42:17 +0100
Subject: [PATCH] {a32,a64}_jitstate: Remove FPSCR_UFC

---
 src/backend/x64/a32_interface.cpp | 1 -
 src/backend/x64/a32_jitstate.cpp  | 3 ---
 src/backend/x64/a32_jitstate.h    | 1 -
 src/backend/x64/a64_jitstate.cpp  | 2 --
 src/backend/x64/a64_jitstate.h    | 1 -
 src/backend/x64/jitstate_info.h   | 2 --
 6 files changed, 10 deletions(-)

diff --git a/src/backend/x64/a32_interface.cpp b/src/backend/x64/a32_interface.cpp
index eb3a0136..999bb674 100644
--- a/src/backend/x64/a32_interface.cpp
+++ b/src/backend/x64/a32_interface.cpp
@@ -271,7 +271,6 @@ void TransferJitState(A32JitState& dest, const A32JitState& src, bool reset_rsb)
     dest.ExtReg = src.ExtReg;
     dest.guest_MXCSR = src.guest_MXCSR;
     dest.FPSCR_IDC = src.FPSCR_IDC;
-    dest.FPSCR_UFC = src.FPSCR_UFC;
     dest.FPSCR_mode = src.FPSCR_mode;
     dest.FPSCR_nzcv = src.FPSCR_nzcv;
     if (reset_rsb) {
diff --git a/src/backend/x64/a32_jitstate.cpp b/src/backend/x64/a32_jitstate.cpp
index f7e1b288..3ce13237 100644
--- a/src/backend/x64/a32_jitstate.cpp
+++ b/src/backend/x64/a32_jitstate.cpp
@@ -157,13 +157,11 @@ u32 A32JitState::Fpscr() const {
     ASSERT((FPSCR_mode & ~FPSCR_MODE_MASK) == 0);
     ASSERT((FPSCR_nzcv & ~FPSCR_NZCV_MASK) == 0);
     ASSERT((FPSCR_IDC & ~(1 << 7)) == 0);
-    ASSERT((FPSCR_UFC & ~(1 << 3)) == 0);
 
     u32 FPSCR = FPSCR_mode | FPSCR_nzcv;
     FPSCR |= (guest_MXCSR & 0b0000000000001);       // IOC = IE
     FPSCR |= (guest_MXCSR & 0b0000000111100) >> 1;  // IXC, UFC, OFC, DZC = PE, UE, OE, ZE
     FPSCR |= FPSCR_IDC;
-    FPSCR |= FPSCR_UFC;
     FPSCR |= fpsr_exc;
 
     return FPSCR;
@@ -184,7 +182,6 @@ void A32JitState::SetFpscr(u32 FPSCR) {
 
     // Cumulative flags IDC, IOC, IXC, UFC, OFC, DZC
     FPSCR_IDC = 0;
-    FPSCR_UFC = 0;
     fpsr_exc = FPSCR & 0x9F;
 
     if (Common::Bit<24>(FPSCR)) {
diff --git a/src/backend/x64/a32_jitstate.h b/src/backend/x64/a32_jitstate.h
index 46591af1..f057b614 100644
--- a/src/backend/x64/a32_jitstate.h
+++ b/src/backend/x64/a32_jitstate.h
@@ -70,7 +70,6 @@ struct A32JitState {
     u32 fpsr_exc = 0;
     u32 fpsr_qc = 0; // Dummy value
     u32 FPSCR_IDC = 0;
-    u32 FPSCR_UFC = 0;
     u32 FPSCR_mode = 0;
     u32 FPSCR_nzcv = 0;
     u32 old_FPSCR = 0;
diff --git a/src/backend/x64/a64_jitstate.cpp b/src/backend/x64/a64_jitstate.cpp
index b3b2b93a..bd10b46a 100644
--- a/src/backend/x64/a64_jitstate.cpp
+++ b/src/backend/x64/a64_jitstate.cpp
@@ -104,7 +104,6 @@ u32 A64JitState::GetFpsr() const {
     fpsr |= (guest_MXCSR & 0b0000000000001);       // IOC = IE
     fpsr |= (guest_MXCSR & 0b0000000111100) >> 1;  // IXC, UFC, OFC, DZC = PE, UE, OE, ZE
     fpsr |= FPSCR_IDC;
-    fpsr |= FPSCR_UFC;
     fpsr |= fpsr_exc;
     fpsr |= (fpsr_qc == 0 ? 0 : 1) << 27;
     return fpsr;
@@ -113,7 +112,6 @@ u32 A64JitState::GetFpsr() const {
 void A64JitState::SetFpsr(u32 value) {
     guest_MXCSR &= ~0x0000003D;
     FPSCR_IDC = 0;
-    FPSCR_UFC = 0;
     fpsr_qc = (value >> 27) & 1;
     fpsr_exc = value & 0x9F;
 }
diff --git a/src/backend/x64/a64_jitstate.h b/src/backend/x64/a64_jitstate.h
index 74385280..360d93b1 100644
--- a/src/backend/x64/a64_jitstate.h
+++ b/src/backend/x64/a64_jitstate.h
@@ -74,7 +74,6 @@ struct A64JitState {
     u32 fpsr_exc = 0;
     u32 fpsr_qc = 0;
     u32 FPSCR_IDC = 0;
-    u32 FPSCR_UFC = 0;
     u32 fpcr = 0;
     u32 GetFpcr() const;
     u32 GetFpsr() const;
diff --git a/src/backend/x64/jitstate_info.h b/src/backend/x64/jitstate_info.h
index 509db074..2687eeb6 100644
--- a/src/backend/x64/jitstate_info.h
+++ b/src/backend/x64/jitstate_info.h
@@ -25,7 +25,6 @@ struct JitStateInfo {
         , offsetof_rsb_codeptrs(offsetof(JitStateType, rsb_codeptrs))
         , offsetof_CPSR_nzcv(offsetof(JitStateType, CPSR_nzcv))
         , offsetof_FPSCR_IDC(offsetof(JitStateType, FPSCR_IDC))
-        , offsetof_FPSCR_UFC(offsetof(JitStateType, FPSCR_UFC))
         , offsetof_fpsr_exc(offsetof(JitStateType, fpsr_exc))
         , offsetof_fpsr_qc(offsetof(JitStateType, fpsr_qc))
     {}
@@ -40,7 +39,6 @@ struct JitStateInfo {
     const size_t offsetof_rsb_codeptrs;
     const size_t offsetof_CPSR_nzcv;
     const size_t offsetof_FPSCR_IDC;
-    const size_t offsetof_FPSCR_UFC;
     const size_t offsetof_fpsr_exc;
     const size_t offsetof_fpsr_qc;
 };