Rename namespaces

ChocolArm64/Decoders/AOpCode.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 using System;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class AOpCode : IOpCode
     {

ChocolArm64/Decoders/Block.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class Block
     {

ChocolArm64/Decoders/Cond.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     enum Cond
     {

ChocolArm64/Decoders/DataOp.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     enum DataOp
     {

ChocolArm64/Decoders/Decoder.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
 using System;
@@ -6,15 +6,15 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
-    static class ADecoder
+    static class Decoder
     {
         private delegate object OpActivator(Inst inst, long position, int opCode);
 
         private static ConcurrentDictionary<Type, OpActivator> _opActivators;
 
-        static ADecoder()
+        static Decoder()
         {
             _opActivators = new ConcurrentDictionary<Type, OpActivator>();
         }
@@ -29,7 +29,7 @@ namespace ChocolArm64.Decoder
         }
 
         public static (Block[] Graph, Block Root) DecodeSubroutine(
-            TranslatorCache cache,
+            TranslatorCache  cache,
             CpuThreadState   state,
             MemoryManager    memory,
             long             start)

ChocolArm64/Decoders/DecoderHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     static class DecoderHelper
     {

ChocolArm64/Decoders/IOpCode.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCode
     {

ChocolArm64/Decoders/IOpCodeAlu.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeAlu : IOpCode
     {

ChocolArm64/Decoders/IOpCodeAluImm.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeAluImm : IOpCodeAlu
     {

ChocolArm64/Decoders/IOpCodeAluRs.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeAluRs : IOpCodeAlu
     {

ChocolArm64/Decoders/IOpCodeAluRx.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeAluRx : IOpCodeAlu
     {

ChocolArm64/Decoders/IOpCodeCond.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeCond : IOpCode
     {

ChocolArm64/Decoders/IOpCodeLit.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeLit : IOpCode
     {

ChocolArm64/Decoders/IOpCodeSimd.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     interface IOpCodeSimd : IOpCode
     {

ChocolArm64/Decoders/IntType.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     enum IntType
     {

ChocolArm64/Decoders/OpCodeAdr.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeAdr : AOpCode
     {

ChocolArm64/Decoders/OpCodeAlu.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeAlu : AOpCode, IOpCodeAlu
     {

ChocolArm64/Decoders/OpCodeAluImm.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using System;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeAluImm : OpCodeAlu, IOpCodeAluImm
     {

ChocolArm64/Decoders/OpCodeAluRs.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeAluRs : OpCodeAlu, IOpCodeAluRs
     {

ChocolArm64/Decoders/OpCodeAluRx.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeAluRx : OpCodeAlu, IOpCodeAluRx
     {

ChocolArm64/Decoders/OpCodeBImm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBImm : AOpCode
     {

ChocolArm64/Decoders/OpCodeBImmAl.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBImmAl : OpCodeBImm
     {

ChocolArm64/Decoders/OpCodeBImmCmp.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBImmCmp : OpCodeBImm
     {

ChocolArm64/Decoders/OpCodeBImmCond.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBImmCond : OpCodeBImm, IOpCodeCond
     {

ChocolArm64/Decoders/OpCodeBImmTest.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBImmTest : OpCodeBImm
     {

ChocolArm64/Decoders/OpCodeBReg.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBReg : AOpCode
     {

ChocolArm64/Decoders/OpCodeBfm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeBfm : OpCodeAlu
     {

ChocolArm64/Decoders/OpCodeCcmp.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeCcmp : OpCodeAlu, IOpCodeCond
     {

ChocolArm64/Decoders/OpCodeCcmpImm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeCcmpImm : OpCodeCcmp, IOpCodeAluImm
     {

ChocolArm64/Decoders/OpCodeCcmpReg.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeCcmpReg : OpCodeCcmp, IOpCodeAluRs
     {

ChocolArm64/Decoders/OpCodeCsel.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeCsel : OpCodeAlu, IOpCodeCond
     {

ChocolArm64/Decoders/OpCodeException.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeException : AOpCode
     {

ChocolArm64/Decoders/OpCodeMem.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMem : AOpCode
     {

ChocolArm64/Decoders/OpCodeMemEx.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMemEx : OpCodeMem
     {

ChocolArm64/Decoders/OpCodeMemImm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMemImm : OpCodeMem
     {

ChocolArm64/Decoders/OpCodeMemLit.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMemLit : AOpCode, IOpCodeLit
     {

ChocolArm64/Decoders/OpCodeMemPair.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMemPair : OpCodeMemImm
     {

ChocolArm64/Decoders/OpCodeMemReg.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMemReg : OpCodeMem
     {

ChocolArm64/Decoders/OpCodeMov.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMov : AOpCode
     {

ChocolArm64/Decoders/OpCodeMul.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeMul : OpCodeAlu
     {

ChocolArm64/Decoders/OpCodeSimd.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimd : AOpCode, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdCvt.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdCvt : OpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdExt.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdExt : OpCodeSimdReg
     {

ChocolArm64/Decoders/OpCodeSimdFcond.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdFcond : OpCodeSimdReg, IOpCodeCond
     {

ChocolArm64/Decoders/OpCodeSimdFmov.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdFmov : AOpCode, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdImm.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdImm : AOpCode, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdIns.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdIns : OpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdMemImm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemImm : OpCodeMemImm, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdMemLit.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemLit : AOpCode, IOpCodeSimd, IOpCodeLit
     {

ChocolArm64/Decoders/OpCodeSimdMemMs.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemMs : OpCodeMemReg, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdMemPair.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemPair : OpCodeMemPair, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdMemReg.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemReg : OpCodeMemReg, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdMemSs.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdMemSs : OpCodeMemReg, IOpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdReg.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdReg : OpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdRegElem.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdRegElem : OpCodeSimdReg
     {

ChocolArm64/Decoders/OpCodeSimdRegElemF.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdRegElemF : OpCodeSimdReg
     {

ChocolArm64/Decoders/OpCodeSimdShImm.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdShImm : OpCodeSimd
     {

ChocolArm64/Decoders/OpCodeSimdTbl.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSimdTbl : OpCodeSimdReg
     {

ChocolArm64/Decoders/OpCodeSystem.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     class OpCodeSystem : AOpCode
     {

ChocolArm64/Decoders/ShiftType.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Decoder
+namespace ChocolArm64.Decoders
 {
     enum ShiftType
     {

ChocolArm64/Decoders32/A32OpCode.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Decoder;
-using ChocolArm64.Instruction;
+using ChocolArm64.Decoders;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder32
+namespace ChocolArm64.Decoders32
 {
     class A32OpCode : AOpCode
     {

ChocolArm64/Decoders32/A32OpCodeBImmAl.cs

@@ -1,6 +1,6 @@
-using ChocolArm64.Instruction;
+using ChocolArm64.Instructions;
 
-namespace ChocolArm64.Decoder32
+namespace ChocolArm64.Decoders32
 {
     class A32OpCodeBImmAl : A32OpCode
     {

ChocolArm64/Instructions/CryptoHelper.cs

@@ -4,7 +4,7 @@ using System;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static class CryptoHelper
     {

ChocolArm64/Instructions/Inst.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     struct Inst
     {

ChocolArm64/Instructions/InstEmitAlu.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
@@ -6,9 +6,9 @@ using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.InstEmitAluHelper;
+using static ChocolArm64.Instructions.InstEmitAluHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitAluHelper.cs

@@ -1,9 +1,9 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static class InstEmitAluHelper
     {

ChocolArm64/Instructions/InstEmitBfm.cs

@@ -1,9 +1,9 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitCcmp.cs

@@ -1,12 +1,12 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 
-using static ChocolArm64.Instruction.InstEmitAluHelper;
+using static ChocolArm64.Instructions.InstEmitAluHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitCsel.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitException.cs

@@ -1,9 +1,9 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitFlow.cs

@@ -1,9 +1,9 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitHash.cs

@@ -1,11 +1,11 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitMemory.cs

@@ -1,10 +1,10 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-using static ChocolArm64.Instruction.InstEmitMemoryHelper;
+using static ChocolArm64.Instructions.InstEmitMemoryHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitMemoryEx.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
@@ -6,9 +6,9 @@ using System;
 using System.Reflection.Emit;
 using System.Threading;
 
-using static ChocolArm64.Instruction.InstEmitMemoryHelper;
+using static ChocolArm64.Instructions.InstEmitMemoryHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitMemoryHelper.cs

@@ -1,10 +1,10 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Memory;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static class InstEmitMemoryHelper
     {

ChocolArm64/Instructions/InstEmitMove.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitMul.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdArithmetic.cs

@@ -1,6 +1,6 @@
 // https://github.com/intel/ARM_NEON_2_x86_SSE/blob/master/NEON_2_SSE.h
 
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
@@ -9,9 +9,9 @@ using System.Reflection.Emit;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdCmp.cs

@@ -1,14 +1,14 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.InstEmitAluHelper;
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitAluHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdCrypto.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdCvt.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
@@ -6,9 +6,9 @@ using System.Reflection.Emit;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdHash.cs

@@ -1,9 +1,9 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Translation;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdHelper.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
@@ -7,9 +7,9 @@ using System.Reflection.Emit;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
-    static class AInstEmitSimdHelper
+    static class InstEmitSimdHelper
     {
         public static readonly Type[] IntTypesPerSizeLog2 = new Type[]
         {

ChocolArm64/Instructions/InstEmitSimdLogical.cs

@@ -1,13 +1,13 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdMemory.cs

@@ -1,13 +1,13 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 
-using static ChocolArm64.Instruction.InstEmitMemoryHelper;
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitMemoryHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdMove.cs

@@ -1,13 +1,13 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSimdShift.cs

@@ -1,15 +1,15 @@
 // https://github.com/intel/ARM_NEON_2_x86_SSE/blob/master/NEON_2_SSE.h
 
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection.Emit;
 using System.Runtime.Intrinsics.X86;
 
-using static ChocolArm64.Instruction.AInstEmitSimdHelper;
+using static ChocolArm64.Instructions.InstEmitSimdHelper;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitSystem.cs

@@ -1,11 +1,11 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using ChocolArm64.Translation;
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static partial class InstEmit
     {

ChocolArm64/Instructions/InstEmitter.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Translation;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     delegate void InstEmitter(ILEmitterCtx context);
 }

ChocolArm64/Instructions/InstInterpreter.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     delegate void InstInterpreter(CpuThreadState state, MemoryManager memory, AOpCode opCode);
 }

ChocolArm64/Instructions/SoftFallback.cs

@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     using static VectorHelper;
 

ChocolArm64/Instructions/SoftFloat.cs

@@ -3,7 +3,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static class SoftFloat
     {

ChocolArm64/Instructions/VectorHelper.cs

@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 
-namespace ChocolArm64.Instruction
+namespace ChocolArm64.Instructions
 {
     static class VectorHelper
     {

ChocolArm64/Instructions32/A32InstInterpretAlu.cs

@@ -1,4 +1,4 @@
-namespace ChocolArm64.Instruction32
+namespace ChocolArm64.Instructions32
 {
     static partial class A32InstInterpret
     {

ChocolArm64/Instructions32/A32InstInterpretFlow.cs

@@ -1,11 +1,11 @@
-using ChocolArm64.Decoder;
-using ChocolArm64.Decoder32;
+using ChocolArm64.Decoders;
+using ChocolArm64.Decoders32;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
 
-using static ChocolArm64.Instruction32.A32InstInterpretHelper;
+using static ChocolArm64.Instructions32.A32InstInterpretHelper;
 
-namespace ChocolArm64.Instruction32
+namespace ChocolArm64.Instructions32
 {
     static partial class A32InstInterpret
     {

ChocolArm64/Instructions32/A32InstInterpretHelper.cs

@@ -1,8 +1,8 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using System;
 
-namespace ChocolArm64.Instruction32
+namespace ChocolArm64.Instructions32
 {
     static class A32InstInterpretHelper
     {

ChocolArm64/OpCodeTable.cs

@@ -1,7 +1,7 @@
-using ChocolArm64.Decoder;
-using ChocolArm64.Decoder32;
-using ChocolArm64.Instruction;
-using ChocolArm64.Instruction32;
+using ChocolArm64.Decoders;
+using ChocolArm64.Decoders32;
+using ChocolArm64.Instructions;
+using ChocolArm64.Instructions32;
 using ChocolArm64.State;
 using System;
 using System.Collections.Generic;

ChocolArm64/Translation/ILEmitter.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.State;
 using System;
 using System.Collections.Generic;

ChocolArm64/Translation/ILEmitterCtx.cs

@@ -1,5 +1,5 @@
-using ChocolArm64.Decoder;
-using ChocolArm64.Instruction;
+using ChocolArm64.Decoders;
+using ChocolArm64.Instructions;
 using ChocolArm64.State;
 using System;
 using System.Collections.Generic;

ChocolArm64/Translator.cs

@@ -1,4 +1,4 @@
-using ChocolArm64.Decoder;
+using ChocolArm64.Decoders;
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
@@ -43,7 +43,7 @@ namespace ChocolArm64
         {
             do
             {
-                AOpCode opCode = ADecoder.DecodeOpCode(state, memory, state.R15);
+                AOpCode opCode = Decoder.DecodeOpCode(state, memory, state.R15);
 
                 opCode.Interpreter(state, memory, opCode);
             }
@@ -81,7 +81,7 @@ namespace ChocolArm64
 
         private TranslatedSub TranslateTier0(CpuThreadState state, MemoryManager memory, long position)
         {
-            Block block = ADecoder.DecodeBasicBlock(state, memory, position);
+            Block block = Decoder.DecodeBasicBlock(state, memory, position);
 
             Block[] graph = new Block[] { block };
 
@@ -108,7 +108,7 @@ namespace ChocolArm64
 
         private void TranslateTier1(CpuThreadState state, MemoryManager memory, long position)
         {
-            (Block[] graph, Block root) = ADecoder.DecodeSubroutine(_cache, state, memory, position);
+            (Block[] graph, Block root) = Decoder.DecodeSubroutine(_cache, state, memory, position);
 
             string subName = GetSubroutineName(position);