1 files changed, 21 insertions, 34 deletions
diff --git a/src/ARMeilleure/Instructions/InstEmitSystem32.cs b/src/ARMeilleure/Instructions/InstEmitSystem32.cs
index f2732c99..82e62571 100644
--- a/src/ARMeilleure/Instructions/InstEmitSystem32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSystem32.cs
@@ -4,7 +4,6 @@ using ARMeilleure.State;
 using ARMeilleure.Translation;
 using System;
 using System.Reflection;
-
 using static ARMeilleure.Instructions.InstEmitHelper;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -34,7 +33,8 @@ namespace ARMeilleure.Instructions
                     switch (op.Opc2)
                     {
                         case 2:
-                            EmitSetTpidrEl0(context); return;
+                            EmitSetTpidrEl0(context);
+                            return;
 
                         default:
                             throw new NotImplementedException($"Unknown MRC Opc2 0x{op.Opc2:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
@@ -83,17 +83,13 @@ namespace ARMeilleure.Instructions
                         throw new NotImplementedException($"Unknown MRC CRm 0x{op.CRm:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
                     }
 
-                    switch (op.Opc2)
+                    result = op.Opc2 switch
                     {
-                        case 2:
-                            result = EmitGetTpidrEl0(context); break;
-
-                        case 3:
-                            result = EmitGetTpidrroEl0(context); break;
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRC Opc2 0x{op.Opc2:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
+                        2 => EmitGetTpidrEl0(context),
+                        3 => EmitGetTpidrroEl0(context),
+                        _ => throw new NotImplementedException(
+                            $"Unknown MRC Opc2 0x{op.Opc2:X} at 0x{op.Address:X} (0x{op.RawOpCode:X})."),
+                    };
 
                     break;
 
@@ -126,27 +122,16 @@ namespace ARMeilleure.Instructions
             }
 
             int opc = op.MrrcOp;
-
-            MethodInfo info;
-
-            switch (op.CRm)
+            MethodInfo info = op.CRm switch
             {
-                case 14: // Timer.
-                    switch (opc)
-                    {
-                        case 0:
-                            info = typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)); break;
-
-                        default:
-                            throw new NotImplementedException($"Unknown MRRC Opc1 0x{opc:X} at 0x{op.Address:X} (0x{op.RawOpCode:X}).");
-                    }
-
-                    break;
-
-                default:
-                    throw new NotImplementedException($"Unknown MRRC 0x{op.RawOpCode:X} at 0x{op.Address:X}.");
-            }
-
+                // Timer.
+                14 => opc switch
+                {
+                    0 => typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetCntpctEl0)),
+                    _ => throw new NotImplementedException($"Unknown MRRC Opc1 0x{opc:X} at 0x{op.Address:X} (0x{op.RawOpCode:X})."),
+                },
+                _ => throw new NotImplementedException($"Unknown MRRC 0x{op.RawOpCode:X} at 0x{op.Address:X}."),
+            };
             Operand result = context.Call(info);
 
             SetIntA32(context, op.Rt, context.ConvertI64ToI32(result));
@@ -235,7 +220,8 @@ namespace ARMeilleure.Instructions
                 case 0b0000: // FPSID
                     throw new NotImplementedException("Supervisor Only");
                 case 0b0001: // FPSCR
-                    EmitGetFpscr(context); return;
+                    EmitGetFpscr(context);
+                    return;
                 case 0b0101: // MVFR2
                     throw new NotImplementedException("MVFR2");
                 case 0b0110: // MVFR1
@@ -258,7 +244,8 @@ namespace ARMeilleure.Instructions
                 case 0b0000: // FPSID
                     throw new NotImplementedException("Supervisor Only");
                 case 0b0001: // FPSCR
-                    EmitSetFpscr(context); return;
+                    EmitSetFpscr(context);
+                    return;
                 case 0b0101: // MVFR2
                     throw new NotImplementedException("MVFR2");
                 case 0b0110: // MVFR1