Rewrite float Cop1::convert(uint32_t) so that it no longer breaks str…

…ict-aliasing rules
PSI-Rockin · May 3, 2019 · cb956c6 · cb956c6
1 parent 17e46b2
commit cb956c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/core/ee/cop1.cpp b/src/core/ee/cop1.cpp
@@ -1,5 +1,6 @@
 #include <cmath>
 #include <cstdio>
+#include <cstring>
 #include "cop1.hpp"
 
 #define printf(fmt, ...)(0)
@@ -10,19 +11,22 @@ Cop1::Cop1()
 }
 
 //Returns a floating point value that may be changed to accomodate the FPU's non-compliance to the IEEE 754 standard.
-float Cop1::convert(uint32_t value)
+float Cop1::convert(uint32_t value) const noexcept
 {
+    float result;
     switch(value & 0x7F800000)
     {
         case 0x0:
             value &= 0x80000000;
-            return *(float*)&value;
+            break;
         case 0x7F800000:
             value = (value & 0x80000000)|0x7F7FFFFF;
-            return *(float*)&value;
+            break;
         default:
-            return *(float*)&value;
+            break;
     }
+    memcpy(&result, &value, sizeof(float));
+    return result;
 }
 
 void Cop1::check_overflow(uint32_t& dest, bool set_flags)

diff --git a/src/core/ee/cop1.hpp b/src/core/ee/cop1.hpp
@@ -30,7 +30,7 @@ class Cop1
         COP1_REG gpr[32];
         COP1_REG accumulator;
 
-        float convert(uint32_t value);
+        float convert(uint32_t value) const noexcept;
         void check_overflow(uint32_t& dest, bool set_flags);
         void check_underflow(uint32_t& dest, bool set_flags);
     public: