From cce4c81282ee5434d707458a9e061a6fcd1189d5 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 18 Dec 2023 17:41:07 -0800
Subject: Fix and cleanup some more warnings

---
 core/fpu_ctrl.h | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'core/fpu_ctrl.h')

diff --git a/core/fpu_ctrl.h b/core/fpu_ctrl.h
index 9554313a..d4f75ec3 100644
--- a/core/fpu_ctrl.h
+++ b/core/fpu_ctrl.h
@@ -2,20 +2,31 @@
 #define CORE_FPU_CTRL_H
 
 class FPUCtl {
-#if defined(HAVE_SSE_INTRINSICS) || (defined(__GNUC__) && defined(HAVE_SSE))
     unsigned int sse_state{};
-#endif
     bool in_mode{};
 
+    static unsigned int Set() noexcept;
+    static void Reset(unsigned int state) noexcept;
+
 public:
-    FPUCtl() noexcept { enter(); in_mode = true; }
-    ~FPUCtl() { if(in_mode) leave(); }
+    FPUCtl() noexcept : sse_state{Set()}, in_mode{true} { }
+    ~FPUCtl() { if(in_mode) Reset(sse_state); }
 
     FPUCtl(const FPUCtl&) = delete;
     FPUCtl& operator=(const FPUCtl&) = delete;
 
-    void enter() noexcept;
-    void leave() noexcept;
+    void enter() noexcept
+    {
+        if(!in_mode)
+            sse_state = Set();
+        in_mode = true;
+    }
+    void leave() noexcept
+    {
+        if(in_mode)
+            Reset(sse_state);
+        in_mode = false;
+    }
 };
 
 #endif /* CORE_FPU_CTRL_H */
-- 
cgit v1.2.3