4 files changed, 11 insertions, 17 deletions
diff --git a/ARMeilleure/State/FPCR.cs b/ARMeilleure/State/FPCR.cs
index 913065ea..40d56045 100644
--- a/ARMeilleure/State/FPCR.cs
+++ b/ARMeilleure/State/FPCR.cs
@@ -5,12 +5,12 @@ namespace ARMeilleure.State
     [Flags]
     public enum FPCR : uint
     {
-        Ufe = 1 << 11,
-        Fz  = 1 << 24,
-        Dn  = 1 << 25,
-        Ahp = 1 << 26,
+        Ufe = 1u << 11,
+        Fz  = 1u << 24,
+        Dn  = 1u << 25,
+        Ahp = 1u << 26,
 
-        A32Mask = 0x07ffff00
+        A32Mask = 0x07FF9F00u
     }
 
     public static class FPCRExtensions
diff --git a/ARMeilleure/State/FPSR.cs b/ARMeilleure/State/FPSR.cs
index 47323b35..800dcd10 100644
--- a/ARMeilleure/State/FPSR.cs
+++ b/ARMeilleure/State/FPSR.cs
@@ -5,9 +5,11 @@ namespace ARMeilleure.State
     [Flags]
     public enum FPSR : uint
     {
-        Ufc = 1 << 3,
-        Qc  = 1 << 27,
+        Ufc = 1u << 3,
+        Qc  = 1u << 27,
 
-        A32Mask = 0xf800000f
+        Nzcv = (1u << 31) | (1u << 30) | (1u << 29) | (1u << 28),
+
+        A32Mask = 0xF800009Fu
     }
 }
diff --git a/ARMeilleure/State/FPState.cs b/ARMeilleure/State/FPState.cs
index 2fe2a567..60c7126c 100644
--- a/ARMeilleure/State/FPState.cs
+++ b/ARMeilleure/State/FPState.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ARMeilleure.State
+namespace ARMeilleure.State
 {
-    [Flags]
     public enum FPState
     {
         VFlag = 28,
diff --git a/ARMeilleure/State/PState.cs b/ARMeilleure/State/PState.cs
index 8dbd84df..e087e702 100644
--- a/ARMeilleure/State/PState.cs
+++ b/ARMeilleure/State/PState.cs
@@ -1,8 +1,5 @@
-using System;
-
 namespace ARMeilleure.State
 {
-    [Flags]
     public enum PState
     {
         TFlag = 5,