From 362408132c44291238eacd367a876797b2b890fa Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 30 Oct 2018 15:11:10 -0500 Subject: [PATCH] Rename namespaces --- ChocolArm64/{Decoder => Decoders}/AOpCode.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/Block.cs | 2 +- ChocolArm64/{Decoder => Decoders}/Cond.cs | 2 +- ChocolArm64/{Decoder => Decoders}/DataOp.cs | 2 +- .../{Decoder/ADecoder.cs => Decoders/Decoder.cs} | 10 +++++----- ChocolArm64/{Decoder => Decoders}/DecoderHelper.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCode.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/IOpCodeAlu.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeAluImm.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeAluRs.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeAluRx.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeCond.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeLit.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IOpCodeSimd.cs | 2 +- ChocolArm64/{Decoder => Decoders}/IntType.cs | 2 +- ChocolArm64/{Decoder => Decoders}/OpCodeAdr.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeAlu.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeAluImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeAluRs.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeAluRx.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBImmAl.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBImmCmp.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBImmCond.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBImmTest.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBReg.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeBfm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeCcmp.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeCcmpImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeCcmpReg.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeCsel.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeException.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMem.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMemEx.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMemImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMemLit.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMemPair.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMemReg.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMov.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeMul.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimd.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdCvt.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdExt.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdFcond.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdFmov.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdIns.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemLit.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemMs.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemPair.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemReg.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemSs.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdReg.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdRegElem.cs | 4 ++-- .../{Decoder => Decoders}/OpCodeSimdRegElemF.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdShImm.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSimdTbl.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/OpCodeSystem.cs | 4 ++-- ChocolArm64/{Decoder => Decoders}/ShiftType.cs | 2 +- ChocolArm64/{Decoder32 => Decoders32}/A32OpCode.cs | 6 +++--- .../{Decoder32 => Decoders32}/A32OpCodeBImmAl.cs | 4 ++-- .../{Instruction => Instructions}/CryptoHelper.cs | 2 +- ChocolArm64/{Instruction => Instructions}/Inst.cs | 2 +- .../{Instruction => Instructions}/InstEmitAlu.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitAluHelper.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitBfm.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitCcmp.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitCsel.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitException.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitFlow.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitHash.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitMemory.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitMemoryEx.cs | 6 +++--- .../InstEmitMemoryHelper.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitMove.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitMul.cs | 4 ++-- .../InstEmitSimdArithmetic.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitSimdCmp.cs | 8 ++++---- .../InstEmitSimdCrypto.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitSimdCvt.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitSimdHash.cs | 6 +++--- .../InstEmitSimdHelper.cs | 6 +++--- .../InstEmitSimdLogical.cs | 6 +++--- .../InstEmitSimdMemory.cs | 8 ++++---- .../{Instruction => Instructions}/InstEmitSimdMove.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitSimdShift.cs | 6 +++--- .../{Instruction => Instructions}/InstEmitSystem.cs | 4 ++-- .../{Instruction => Instructions}/InstEmitter.cs | 2 +- .../{Instruction => Instructions}/InstInterpreter.cs | 4 ++-- .../{Instruction => Instructions}/SoftFallback.cs | 2 +- ChocolArm64/{Instruction => Instructions}/SoftFloat.cs | 2 +- .../{Instruction => Instructions}/VectorHelper.cs | 2 +- .../A32InstInterpretAlu.cs | 2 +- .../A32InstInterpretFlow.cs | 8 ++++---- .../A32InstInterpretHelper.cs | 4 ++-- ChocolArm64/OpCodeTable.cs | 8 ++++---- ChocolArm64/Translation/ILEmitter.cs | 2 +- ChocolArm64/Translation/ILEmitterCtx.cs | 4 ++-- ChocolArm64/Translator.cs | 8 ++++---- 100 files changed, 204 insertions(+), 204 deletions(-) rename ChocolArm64/{Decoder => Decoders}/AOpCode.cs (94%) rename ChocolArm64/{Decoder => Decoders}/Block.cs (95%) rename ChocolArm64/{Decoder => Decoders}/Cond.cs (91%) rename ChocolArm64/{Decoder => Decoders}/DataOp.cs (80%) rename ChocolArm64/{Decoder/ADecoder.cs => Decoders/Decoder.cs} (98%) rename ChocolArm64/{Decoder => Decoders}/DecoderHelper.cs (98%) rename ChocolArm64/{Decoder => Decoders}/IOpCode.cs (74%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeAlu.cs (80%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeAluImm.cs (72%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeAluRs.cs (82%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeAluRx.cs (82%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeCond.cs (71%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeLit.cs (86%) rename ChocolArm64/{Decoder => Decoders}/IOpCodeSimd.cs (71%) rename ChocolArm64/{Decoder => Decoders}/IntType.cs (86%) rename ChocolArm64/{Decoder => Decoders}/OpCodeAdr.cs (86%) rename ChocolArm64/{Decoder => Decoders}/OpCodeAlu.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeAluImm.cs (93%) rename ChocolArm64/{Decoder => Decoders}/OpCodeAluRs.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeAluRx.cs (88%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBImm.cs (75%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBImmAl.cs (78%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBImmCmp.cs (88%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBImmCond.cs (88%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBImmTest.cs (87%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBReg.cs (88%) rename ChocolArm64/{Decoder => Decoders}/OpCodeBfm.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeCcmp.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeCcmpImm.cs (76%) rename ChocolArm64/{Decoder => Decoders}/OpCodeCcmpReg.cs (82%) rename ChocolArm64/{Decoder => Decoders}/OpCodeCsel.cs (85%) rename ChocolArm64/{Decoder => Decoders}/OpCodeException.cs (80%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMem.cs (88%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMemEx.cs (84%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMemImm.cs (96%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMemLit.cs (93%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMemPair.cs (90%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMemReg.cs (89%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMov.cs (93%) rename ChocolArm64/{Decoder => Decoders}/OpCodeMul.cs (84%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimd.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdCvt.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdExt.cs (80%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdFcond.cs (85%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdFmov.cs (92%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdImm.cs (98%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdIns.cs (92%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemImm.cs (85%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemLit.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemMs.cs (95%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemPair.cs (82%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemReg.cs (80%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdMemSs.cs (97%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdReg.cs (87%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdRegElem.cs (91%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdRegElemF.cs (92%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdShImm.cs (83%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSimdTbl.cs (77%) rename ChocolArm64/{Decoder => Decoders}/OpCodeSystem.cs (91%) rename ChocolArm64/{Decoder => Decoders}/ShiftType.cs (73%) rename ChocolArm64/{Decoder32 => Decoders32}/A32OpCode.cs (73%) rename ChocolArm64/{Decoder32 => Decoders32}/A32OpCodeBImmAl.cs (82%) rename ChocolArm64/{Instruction => Instructions}/CryptoHelper.cs (99%) rename ChocolArm64/{Instruction => Instructions}/Inst.cs (93%) rename ChocolArm64/{Instruction => Instructions}/InstEmitAlu.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitAluHelper.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitBfm.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitCcmp.cs (94%) rename ChocolArm64/{Instruction => Instructions}/InstEmitCsel.cs (96%) rename ChocolArm64/{Instruction => Instructions}/InstEmitException.cs (97%) rename ChocolArm64/{Instruction => Instructions}/InstEmitFlow.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitHash.cs (97%) rename ChocolArm64/{Instruction => Instructions}/InstEmitMemory.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitMemoryEx.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitMemoryHelper.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitMove.cs (93%) rename ChocolArm64/{Instruction => Instructions}/InstEmitMul.cs (97%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdArithmetic.cs (99%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdCmp.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdCrypto.cs (95%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdCvt.cs (99%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdHash.cs (96%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdHelper.cs (99%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdLogical.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdMemory.cs (96%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdMove.cs (99%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSimdShift.cs (99%) rename ChocolArm64/{Instruction => Instructions}/InstEmitSystem.cs (98%) rename ChocolArm64/{Instruction => Instructions}/InstEmitter.cs (71%) rename ChocolArm64/{Instruction => Instructions}/InstInterpreter.cs (70%) rename ChocolArm64/{Instruction => Instructions}/SoftFallback.cs (99%) rename ChocolArm64/{Instruction => Instructions}/SoftFloat.cs (99%) rename ChocolArm64/{Instruction => Instructions}/VectorHelper.cs (99%) rename ChocolArm64/{Instruction32 => Instructions32}/A32InstInterpretAlu.cs (61%) rename ChocolArm64/{Instruction32 => Instructions32}/A32InstInterpretFlow.cs (91%) rename ChocolArm64/{Instruction32 => Instructions32}/A32InstInterpretHelper.cs (97%) diff --git a/ChocolArm64/Decoder/AOpCode.cs b/ChocolArm64/Decoders/AOpCode.cs similarity index 94% rename from ChocolArm64/Decoder/AOpCode.cs rename to ChocolArm64/Decoders/AOpCode.cs index e990cdc087..4d082ebb48 100644 --- a/ChocolArm64/Decoder/AOpCode.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/Block.cs b/ChocolArm64/Decoders/Block.cs similarity index 95% rename from ChocolArm64/Decoder/Block.cs rename to ChocolArm64/Decoders/Block.cs index 28b7c20fff..c0b3246153 100644 --- a/ChocolArm64/Decoder/Block.cs +++ b/ChocolArm64/Decoders/Block.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class Block { diff --git a/ChocolArm64/Decoder/Cond.cs b/ChocolArm64/Decoders/Cond.cs similarity index 91% rename from ChocolArm64/Decoder/Cond.cs rename to ChocolArm64/Decoders/Cond.cs index fe8c573e8e..57e12cd609 100644 --- a/ChocolArm64/Decoder/Cond.cs +++ b/ChocolArm64/Decoders/Cond.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { enum Cond { diff --git a/ChocolArm64/Decoder/DataOp.cs b/ChocolArm64/Decoders/DataOp.cs similarity index 80% rename from ChocolArm64/Decoder/DataOp.cs rename to ChocolArm64/Decoders/DataOp.cs index b34798cb71..b7768bb4d0 100644 --- a/ChocolArm64/Decoder/DataOp.cs +++ b/ChocolArm64/Decoders/DataOp.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { enum DataOp { diff --git a/ChocolArm64/Decoder/ADecoder.cs b/ChocolArm64/Decoders/Decoder.cs similarity index 98% rename from ChocolArm64/Decoder/ADecoder.cs rename to ChocolArm64/Decoders/Decoder.cs index daf057bd4e..4f00b7e49e 100644 --- a/ChocolArm64/Decoder/ADecoder.cs +++ b/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 _opActivators; - static ADecoder() + static Decoder() { _opActivators = new ConcurrentDictionary(); } @@ -29,7 +29,7 @@ namespace ChocolArm64.Decoder } public static (Block[] Graph, Block Root) DecodeSubroutine( - TranslatorCache cache, + TranslatorCache cache, CpuThreadState state, MemoryManager memory, long start) diff --git a/ChocolArm64/Decoder/DecoderHelper.cs b/ChocolArm64/Decoders/DecoderHelper.cs similarity index 98% rename from ChocolArm64/Decoder/DecoderHelper.cs rename to ChocolArm64/Decoders/DecoderHelper.cs index 8be984a945..6ee279d7d6 100644 --- a/ChocolArm64/Decoder/DecoderHelper.cs +++ b/ChocolArm64/Decoders/DecoderHelper.cs @@ -1,6 +1,6 @@ using System; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { static class DecoderHelper { diff --git a/ChocolArm64/Decoder/IOpCode.cs b/ChocolArm64/Decoders/IOpCode.cs similarity index 74% rename from ChocolArm64/Decoder/IOpCode.cs rename to ChocolArm64/Decoders/IOpCode.cs index 66361c3241..a381b7217c 100644 --- a/ChocolArm64/Decoder/IOpCode.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/IOpCodeAlu.cs b/ChocolArm64/Decoders/IOpCodeAlu.cs similarity index 80% rename from ChocolArm64/Decoder/IOpCodeAlu.cs rename to ChocolArm64/Decoders/IOpCodeAlu.cs index 34b9460095..5724edd5c2 100644 --- a/ChocolArm64/Decoder/IOpCodeAlu.cs +++ b/ChocolArm64/Decoders/IOpCodeAlu.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeAlu : IOpCode { diff --git a/ChocolArm64/Decoder/IOpCodeAluImm.cs b/ChocolArm64/Decoders/IOpCodeAluImm.cs similarity index 72% rename from ChocolArm64/Decoder/IOpCodeAluImm.cs rename to ChocolArm64/Decoders/IOpCodeAluImm.cs index 9e57a896c2..203b9ae0e0 100644 --- a/ChocolArm64/Decoder/IOpCodeAluImm.cs +++ b/ChocolArm64/Decoders/IOpCodeAluImm.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeAluImm : IOpCodeAlu { diff --git a/ChocolArm64/Decoder/IOpCodeAluRs.cs b/ChocolArm64/Decoders/IOpCodeAluRs.cs similarity index 82% rename from ChocolArm64/Decoder/IOpCodeAluRs.cs rename to ChocolArm64/Decoders/IOpCodeAluRs.cs index 52a74ad9a6..cd171313e5 100644 --- a/ChocolArm64/Decoder/IOpCodeAluRs.cs +++ b/ChocolArm64/Decoders/IOpCodeAluRs.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeAluRs : IOpCodeAlu { diff --git a/ChocolArm64/Decoder/IOpCodeAluRx.cs b/ChocolArm64/Decoders/IOpCodeAluRx.cs similarity index 82% rename from ChocolArm64/Decoder/IOpCodeAluRx.cs rename to ChocolArm64/Decoders/IOpCodeAluRx.cs index 9c6219a25a..76d13a837f 100644 --- a/ChocolArm64/Decoder/IOpCodeAluRx.cs +++ b/ChocolArm64/Decoders/IOpCodeAluRx.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeAluRx : IOpCodeAlu { diff --git a/ChocolArm64/Decoder/IOpCodeCond.cs b/ChocolArm64/Decoders/IOpCodeCond.cs similarity index 71% rename from ChocolArm64/Decoder/IOpCodeCond.cs rename to ChocolArm64/Decoders/IOpCodeCond.cs index 65fe9f419f..e6ee137907 100644 --- a/ChocolArm64/Decoder/IOpCodeCond.cs +++ b/ChocolArm64/Decoders/IOpCodeCond.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeCond : IOpCode { diff --git a/ChocolArm64/Decoder/IOpCodeLit.cs b/ChocolArm64/Decoders/IOpCodeLit.cs similarity index 86% rename from ChocolArm64/Decoder/IOpCodeLit.cs rename to ChocolArm64/Decoders/IOpCodeLit.cs index ec99512997..bc5609e903 100644 --- a/ChocolArm64/Decoder/IOpCodeLit.cs +++ b/ChocolArm64/Decoders/IOpCodeLit.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeLit : IOpCode { diff --git a/ChocolArm64/Decoder/IOpCodeSimd.cs b/ChocolArm64/Decoders/IOpCodeSimd.cs similarity index 71% rename from ChocolArm64/Decoder/IOpCodeSimd.cs rename to ChocolArm64/Decoders/IOpCodeSimd.cs index 1148314a58..1c8ba1d92e 100644 --- a/ChocolArm64/Decoder/IOpCodeSimd.cs +++ b/ChocolArm64/Decoders/IOpCodeSimd.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { interface IOpCodeSimd : IOpCode { diff --git a/ChocolArm64/Decoder/IntType.cs b/ChocolArm64/Decoders/IntType.cs similarity index 86% rename from ChocolArm64/Decoder/IntType.cs rename to ChocolArm64/Decoders/IntType.cs index f8cccaab95..70f833ec56 100644 --- a/ChocolArm64/Decoder/IntType.cs +++ b/ChocolArm64/Decoders/IntType.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { enum IntType { diff --git a/ChocolArm64/Decoder/OpCodeAdr.cs b/ChocolArm64/Decoders/OpCodeAdr.cs similarity index 86% rename from ChocolArm64/Decoder/OpCodeAdr.cs rename to ChocolArm64/Decoders/OpCodeAdr.cs index 3f38e25158..713a112ac1 100644 --- a/ChocolArm64/Decoder/OpCodeAdr.cs +++ b/ChocolArm64/Decoders/OpCodeAdr.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeAdr : AOpCode { diff --git a/ChocolArm64/Decoder/OpCodeAlu.cs b/ChocolArm64/Decoders/OpCodeAlu.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeAlu.cs rename to ChocolArm64/Decoders/OpCodeAlu.cs index 4b3362b7b8..c5f1f62bcd 100644 --- a/ChocolArm64/Decoder/OpCodeAlu.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeAluImm.cs b/ChocolArm64/Decoders/OpCodeAluImm.cs similarity index 93% rename from ChocolArm64/Decoder/OpCodeAluImm.cs rename to ChocolArm64/Decoders/OpCodeAluImm.cs index 2265f9e5d2..2ee08b7132 100644 --- a/ChocolArm64/Decoder/OpCodeAluImm.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeAluRs.cs b/ChocolArm64/Decoders/OpCodeAluRs.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeAluRs.cs rename to ChocolArm64/Decoders/OpCodeAluRs.cs index 21b92c725c..c32d1a99f8 100644 --- a/ChocolArm64/Decoder/OpCodeAluRs.cs +++ b/ChocolArm64/Decoders/OpCodeAluRs.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeAluRs : OpCodeAlu, IOpCodeAluRs { diff --git a/ChocolArm64/Decoder/OpCodeAluRx.cs b/ChocolArm64/Decoders/OpCodeAluRx.cs similarity index 88% rename from ChocolArm64/Decoder/OpCodeAluRx.cs rename to ChocolArm64/Decoders/OpCodeAluRx.cs index 3235da0fef..3b4860dcbe 100644 --- a/ChocolArm64/Decoder/OpCodeAluRx.cs +++ b/ChocolArm64/Decoders/OpCodeAluRx.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeAluRx : OpCodeAlu, IOpCodeAluRx { diff --git a/ChocolArm64/Decoder/OpCodeBImm.cs b/ChocolArm64/Decoders/OpCodeBImm.cs similarity index 75% rename from ChocolArm64/Decoder/OpCodeBImm.cs rename to ChocolArm64/Decoders/OpCodeBImm.cs index 1cfedfabb8..0fc20e2773 100644 --- a/ChocolArm64/Decoder/OpCodeBImm.cs +++ b/ChocolArm64/Decoders/OpCodeBImm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBImm : AOpCode { diff --git a/ChocolArm64/Decoder/OpCodeBImmAl.cs b/ChocolArm64/Decoders/OpCodeBImmAl.cs similarity index 78% rename from ChocolArm64/Decoder/OpCodeBImmAl.cs rename to ChocolArm64/Decoders/OpCodeBImmAl.cs index 52df0ffcac..f87877f992 100644 --- a/ChocolArm64/Decoder/OpCodeBImmAl.cs +++ b/ChocolArm64/Decoders/OpCodeBImmAl.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBImmAl : OpCodeBImm { diff --git a/ChocolArm64/Decoder/OpCodeBImmCmp.cs b/ChocolArm64/Decoders/OpCodeBImmCmp.cs similarity index 88% rename from ChocolArm64/Decoder/OpCodeBImmCmp.cs rename to ChocolArm64/Decoders/OpCodeBImmCmp.cs index 0f1c6dc8cb..589db284fa 100644 --- a/ChocolArm64/Decoder/OpCodeBImmCmp.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeBImmCond.cs b/ChocolArm64/Decoders/OpCodeBImmCond.cs similarity index 88% rename from ChocolArm64/Decoder/OpCodeBImmCond.cs rename to ChocolArm64/Decoders/OpCodeBImmCond.cs index c5a727c3a9..35dd2f0dec 100644 --- a/ChocolArm64/Decoder/OpCodeBImmCond.cs +++ b/ChocolArm64/Decoders/OpCodeBImmCond.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBImmCond : OpCodeBImm, IOpCodeCond { diff --git a/ChocolArm64/Decoder/OpCodeBImmTest.cs b/ChocolArm64/Decoders/OpCodeBImmTest.cs similarity index 87% rename from ChocolArm64/Decoder/OpCodeBImmTest.cs rename to ChocolArm64/Decoders/OpCodeBImmTest.cs index 6525679404..de2f82495b 100644 --- a/ChocolArm64/Decoder/OpCodeBImmTest.cs +++ b/ChocolArm64/Decoders/OpCodeBImmTest.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBImmTest : OpCodeBImm { diff --git a/ChocolArm64/Decoder/OpCodeBReg.cs b/ChocolArm64/Decoders/OpCodeBReg.cs similarity index 88% rename from ChocolArm64/Decoder/OpCodeBReg.cs rename to ChocolArm64/Decoders/OpCodeBReg.cs index 3bd2dfd2bd..b42b64f2ad 100644 --- a/ChocolArm64/Decoder/OpCodeBReg.cs +++ b/ChocolArm64/Decoders/OpCodeBReg.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBReg : AOpCode { diff --git a/ChocolArm64/Decoder/OpCodeBfm.cs b/ChocolArm64/Decoders/OpCodeBfm.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeBfm.cs rename to ChocolArm64/Decoders/OpCodeBfm.cs index e73bcdc28b..caf354cda5 100644 --- a/ChocolArm64/Decoder/OpCodeBfm.cs +++ b/ChocolArm64/Decoders/OpCodeBfm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeBfm : OpCodeAlu { diff --git a/ChocolArm64/Decoder/OpCodeCcmp.cs b/ChocolArm64/Decoders/OpCodeCcmp.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeCcmp.cs rename to ChocolArm64/Decoders/OpCodeCcmp.cs index 87c0607ded..a4e5bd1267 100644 --- a/ChocolArm64/Decoder/OpCodeCcmp.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeCcmpImm.cs b/ChocolArm64/Decoders/OpCodeCcmpImm.cs similarity index 76% rename from ChocolArm64/Decoder/OpCodeCcmpImm.cs rename to ChocolArm64/Decoders/OpCodeCcmpImm.cs index 3223953f93..c875c9bb08 100644 --- a/ChocolArm64/Decoder/OpCodeCcmpImm.cs +++ b/ChocolArm64/Decoders/OpCodeCcmpImm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeCcmpImm : OpCodeCcmp, IOpCodeAluImm { diff --git a/ChocolArm64/Decoder/OpCodeCcmpReg.cs b/ChocolArm64/Decoders/OpCodeCcmpReg.cs similarity index 82% rename from ChocolArm64/Decoder/OpCodeCcmpReg.cs rename to ChocolArm64/Decoders/OpCodeCcmpReg.cs index f99be6640d..277870de67 100644 --- a/ChocolArm64/Decoder/OpCodeCcmpReg.cs +++ b/ChocolArm64/Decoders/OpCodeCcmpReg.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeCcmpReg : OpCodeCcmp, IOpCodeAluRs { diff --git a/ChocolArm64/Decoder/OpCodeCsel.cs b/ChocolArm64/Decoders/OpCodeCsel.cs similarity index 85% rename from ChocolArm64/Decoder/OpCodeCsel.cs rename to ChocolArm64/Decoders/OpCodeCsel.cs index 36cf09d266..bb7b2bc236 100644 --- a/ChocolArm64/Decoder/OpCodeCsel.cs +++ b/ChocolArm64/Decoders/OpCodeCsel.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeCsel : OpCodeAlu, IOpCodeCond { diff --git a/ChocolArm64/Decoder/OpCodeException.cs b/ChocolArm64/Decoders/OpCodeException.cs similarity index 80% rename from ChocolArm64/Decoder/OpCodeException.cs rename to ChocolArm64/Decoders/OpCodeException.cs index b55d2b5971..a2d1ee3dbf 100644 --- a/ChocolArm64/Decoder/OpCodeException.cs +++ b/ChocolArm64/Decoders/OpCodeException.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeException : AOpCode { diff --git a/ChocolArm64/Decoder/OpCodeMem.cs b/ChocolArm64/Decoders/OpCodeMem.cs similarity index 88% rename from ChocolArm64/Decoder/OpCodeMem.cs rename to ChocolArm64/Decoders/OpCodeMem.cs index 91f43c3de7..a8b0878d7e 100644 --- a/ChocolArm64/Decoder/OpCodeMem.cs +++ b/ChocolArm64/Decoders/OpCodeMem.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMem : AOpCode { diff --git a/ChocolArm64/Decoder/OpCodeMemEx.cs b/ChocolArm64/Decoders/OpCodeMemEx.cs similarity index 84% rename from ChocolArm64/Decoder/OpCodeMemEx.cs rename to ChocolArm64/Decoders/OpCodeMemEx.cs index 52a6a023d3..a7e0f61085 100644 --- a/ChocolArm64/Decoder/OpCodeMemEx.cs +++ b/ChocolArm64/Decoders/OpCodeMemEx.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMemEx : OpCodeMem { diff --git a/ChocolArm64/Decoder/OpCodeMemImm.cs b/ChocolArm64/Decoders/OpCodeMemImm.cs similarity index 96% rename from ChocolArm64/Decoder/OpCodeMemImm.cs rename to ChocolArm64/Decoders/OpCodeMemImm.cs index a3e65a367d..1ce9691306 100644 --- a/ChocolArm64/Decoder/OpCodeMemImm.cs +++ b/ChocolArm64/Decoders/OpCodeMemImm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMemImm : OpCodeMem { diff --git a/ChocolArm64/Decoder/OpCodeMemLit.cs b/ChocolArm64/Decoders/OpCodeMemLit.cs similarity index 93% rename from ChocolArm64/Decoder/OpCodeMemLit.cs rename to ChocolArm64/Decoders/OpCodeMemLit.cs index 650b7cfeda..5d8c63d9e4 100644 --- a/ChocolArm64/Decoder/OpCodeMemLit.cs +++ b/ChocolArm64/Decoders/OpCodeMemLit.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMemLit : AOpCode, IOpCodeLit { diff --git a/ChocolArm64/Decoder/OpCodeMemPair.cs b/ChocolArm64/Decoders/OpCodeMemPair.cs similarity index 90% rename from ChocolArm64/Decoder/OpCodeMemPair.cs rename to ChocolArm64/Decoders/OpCodeMemPair.cs index 209c9502c8..0e5fa826f5 100644 --- a/ChocolArm64/Decoder/OpCodeMemPair.cs +++ b/ChocolArm64/Decoders/OpCodeMemPair.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMemPair : OpCodeMemImm { diff --git a/ChocolArm64/Decoder/OpCodeMemReg.cs b/ChocolArm64/Decoders/OpCodeMemReg.cs similarity index 89% rename from ChocolArm64/Decoder/OpCodeMemReg.cs rename to ChocolArm64/Decoders/OpCodeMemReg.cs index 815664fd75..7dabfe585f 100644 --- a/ChocolArm64/Decoder/OpCodeMemReg.cs +++ b/ChocolArm64/Decoders/OpCodeMemReg.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMemReg : OpCodeMem { diff --git a/ChocolArm64/Decoder/OpCodeMov.cs b/ChocolArm64/Decoders/OpCodeMov.cs similarity index 93% rename from ChocolArm64/Decoder/OpCodeMov.cs rename to ChocolArm64/Decoders/OpCodeMov.cs index b45933b17d..20c224223c 100644 --- a/ChocolArm64/Decoder/OpCodeMov.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeMul.cs b/ChocolArm64/Decoders/OpCodeMul.cs similarity index 84% rename from ChocolArm64/Decoder/OpCodeMul.cs rename to ChocolArm64/Decoders/OpCodeMul.cs index d49be2bfde..7ee7dbe61d 100644 --- a/ChocolArm64/Decoder/OpCodeMul.cs +++ b/ChocolArm64/Decoders/OpCodeMul.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeMul : OpCodeAlu { diff --git a/ChocolArm64/Decoder/OpCodeSimd.cs b/ChocolArm64/Decoders/OpCodeSimd.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeSimd.cs rename to ChocolArm64/Decoders/OpCodeSimd.cs index b8c0cd807c..1d3a13fd1f 100644 --- a/ChocolArm64/Decoder/OpCodeSimd.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdCvt.cs b/ChocolArm64/Decoders/OpCodeSimdCvt.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeSimdCvt.cs rename to ChocolArm64/Decoders/OpCodeSimdCvt.cs index 98a70deca6..c01aa8fcc4 100644 --- a/ChocolArm64/Decoder/OpCodeSimdCvt.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdExt.cs b/ChocolArm64/Decoders/OpCodeSimdExt.cs similarity index 80% rename from ChocolArm64/Decoder/OpCodeSimdExt.cs rename to ChocolArm64/Decoders/OpCodeSimdExt.cs index 861168d1a9..56d119136c 100644 --- a/ChocolArm64/Decoder/OpCodeSimdExt.cs +++ b/ChocolArm64/Decoders/OpCodeSimdExt.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdExt : OpCodeSimdReg { diff --git a/ChocolArm64/Decoder/OpCodeSimdFcond.cs b/ChocolArm64/Decoders/OpCodeSimdFcond.cs similarity index 85% rename from ChocolArm64/Decoder/OpCodeSimdFcond.cs rename to ChocolArm64/Decoders/OpCodeSimdFcond.cs index 319c5553bd..2d9ae09e6c 100644 --- a/ChocolArm64/Decoder/OpCodeSimdFcond.cs +++ b/ChocolArm64/Decoders/OpCodeSimdFcond.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdFcond : OpCodeSimdReg, IOpCodeCond { diff --git a/ChocolArm64/Decoder/OpCodeSimdFmov.cs b/ChocolArm64/Decoders/OpCodeSimdFmov.cs similarity index 92% rename from ChocolArm64/Decoder/OpCodeSimdFmov.cs rename to ChocolArm64/Decoders/OpCodeSimdFmov.cs index 64847c6b91..2d8add94bd 100644 --- a/ChocolArm64/Decoder/OpCodeSimdFmov.cs +++ b/ChocolArm64/Decoders/OpCodeSimdFmov.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdFmov : AOpCode, IOpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdImm.cs b/ChocolArm64/Decoders/OpCodeSimdImm.cs similarity index 98% rename from ChocolArm64/Decoder/OpCodeSimdImm.cs rename to ChocolArm64/Decoders/OpCodeSimdImm.cs index 3f8ab62c7e..28b7b5bcef 100644 --- a/ChocolArm64/Decoder/OpCodeSimdImm.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdIns.cs b/ChocolArm64/Decoders/OpCodeSimdIns.cs similarity index 92% rename from ChocolArm64/Decoder/OpCodeSimdIns.cs rename to ChocolArm64/Decoders/OpCodeSimdIns.cs index 1f9e719278..4c39939516 100644 --- a/ChocolArm64/Decoder/OpCodeSimdIns.cs +++ b/ChocolArm64/Decoders/OpCodeSimdIns.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdIns : OpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemImm.cs b/ChocolArm64/Decoders/OpCodeSimdMemImm.cs similarity index 85% rename from ChocolArm64/Decoder/OpCodeSimdMemImm.cs rename to ChocolArm64/Decoders/OpCodeSimdMemImm.cs index 624f588040..671867b1b1 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemImm.cs +++ b/ChocolArm64/Decoders/OpCodeSimdMemImm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdMemImm : OpCodeMemImm, IOpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemLit.cs b/ChocolArm64/Decoders/OpCodeSimdMemLit.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeSimdMemLit.cs rename to ChocolArm64/Decoders/OpCodeSimdMemLit.cs index e76b7101f7..e44ac910d3 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemLit.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemMs.cs b/ChocolArm64/Decoders/OpCodeSimdMemMs.cs similarity index 95% rename from ChocolArm64/Decoder/OpCodeSimdMemMs.cs rename to ChocolArm64/Decoders/OpCodeSimdMemMs.cs index 02c8d62c88..4feded7dc4 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemMs.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemPair.cs b/ChocolArm64/Decoders/OpCodeSimdMemPair.cs similarity index 82% rename from ChocolArm64/Decoder/OpCodeSimdMemPair.cs rename to ChocolArm64/Decoders/OpCodeSimdMemPair.cs index 94f0869c2f..fdb75d693f 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemPair.cs +++ b/ChocolArm64/Decoders/OpCodeSimdMemPair.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdMemPair : OpCodeMemPair, IOpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemReg.cs b/ChocolArm64/Decoders/OpCodeSimdMemReg.cs similarity index 80% rename from ChocolArm64/Decoder/OpCodeSimdMemReg.cs rename to ChocolArm64/Decoders/OpCodeSimdMemReg.cs index 70fca565fd..4f1ecad8ab 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemReg.cs +++ b/ChocolArm64/Decoders/OpCodeSimdMemReg.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdMemReg : OpCodeMemReg, IOpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdMemSs.cs b/ChocolArm64/Decoders/OpCodeSimdMemSs.cs similarity index 97% rename from ChocolArm64/Decoder/OpCodeSimdMemSs.cs rename to ChocolArm64/Decoders/OpCodeSimdMemSs.cs index 7c95ef33cc..fffad254de 100644 --- a/ChocolArm64/Decoder/OpCodeSimdMemSs.cs +++ b/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 { diff --git a/ChocolArm64/Decoder/OpCodeSimdReg.cs b/ChocolArm64/Decoders/OpCodeSimdReg.cs similarity index 87% rename from ChocolArm64/Decoder/OpCodeSimdReg.cs rename to ChocolArm64/Decoders/OpCodeSimdReg.cs index 84401b93f8..cdcb457912 100644 --- a/ChocolArm64/Decoder/OpCodeSimdReg.cs +++ b/ChocolArm64/Decoders/OpCodeSimdReg.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdReg : OpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdRegElem.cs b/ChocolArm64/Decoders/OpCodeSimdRegElem.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeSimdRegElem.cs rename to ChocolArm64/Decoders/OpCodeSimdRegElem.cs index 5aad359dd1..5e5394a731 100644 --- a/ChocolArm64/Decoder/OpCodeSimdRegElem.cs +++ b/ChocolArm64/Decoders/OpCodeSimdRegElem.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdRegElem : OpCodeSimdReg { diff --git a/ChocolArm64/Decoder/OpCodeSimdRegElemF.cs b/ChocolArm64/Decoders/OpCodeSimdRegElemF.cs similarity index 92% rename from ChocolArm64/Decoder/OpCodeSimdRegElemF.cs rename to ChocolArm64/Decoders/OpCodeSimdRegElemF.cs index b1c6fbc49e..3c6142ea4b 100644 --- a/ChocolArm64/Decoder/OpCodeSimdRegElemF.cs +++ b/ChocolArm64/Decoders/OpCodeSimdRegElemF.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdRegElemF : OpCodeSimdReg { diff --git a/ChocolArm64/Decoder/OpCodeSimdShImm.cs b/ChocolArm64/Decoders/OpCodeSimdShImm.cs similarity index 83% rename from ChocolArm64/Decoder/OpCodeSimdShImm.cs rename to ChocolArm64/Decoders/OpCodeSimdShImm.cs index a0c2160f65..3d6017dd53 100644 --- a/ChocolArm64/Decoder/OpCodeSimdShImm.cs +++ b/ChocolArm64/Decoders/OpCodeSimdShImm.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdShImm : OpCodeSimd { diff --git a/ChocolArm64/Decoder/OpCodeSimdTbl.cs b/ChocolArm64/Decoders/OpCodeSimdTbl.cs similarity index 77% rename from ChocolArm64/Decoder/OpCodeSimdTbl.cs rename to ChocolArm64/Decoders/OpCodeSimdTbl.cs index 604be22e7b..37003b8707 100644 --- a/ChocolArm64/Decoder/OpCodeSimdTbl.cs +++ b/ChocolArm64/Decoders/OpCodeSimdTbl.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSimdTbl : OpCodeSimdReg { diff --git a/ChocolArm64/Decoder/OpCodeSystem.cs b/ChocolArm64/Decoders/OpCodeSystem.cs similarity index 91% rename from ChocolArm64/Decoder/OpCodeSystem.cs rename to ChocolArm64/Decoders/OpCodeSystem.cs index aca16026e6..c979f544fc 100644 --- a/ChocolArm64/Decoder/OpCodeSystem.cs +++ b/ChocolArm64/Decoders/OpCodeSystem.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { class OpCodeSystem : AOpCode { diff --git a/ChocolArm64/Decoder/ShiftType.cs b/ChocolArm64/Decoders/ShiftType.cs similarity index 73% rename from ChocolArm64/Decoder/ShiftType.cs rename to ChocolArm64/Decoders/ShiftType.cs index 0fd8631b19..5f6a7a4ca8 100644 --- a/ChocolArm64/Decoder/ShiftType.cs +++ b/ChocolArm64/Decoders/ShiftType.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Decoder +namespace ChocolArm64.Decoders { enum ShiftType { diff --git a/ChocolArm64/Decoder32/A32OpCode.cs b/ChocolArm64/Decoders32/A32OpCode.cs similarity index 73% rename from ChocolArm64/Decoder32/A32OpCode.cs rename to ChocolArm64/Decoders32/A32OpCode.cs index aa92f45b80..8c9de0adbc 100644 --- a/ChocolArm64/Decoder32/A32OpCode.cs +++ b/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 { diff --git a/ChocolArm64/Decoder32/A32OpCodeBImmAl.cs b/ChocolArm64/Decoders32/A32OpCodeBImmAl.cs similarity index 82% rename from ChocolArm64/Decoder32/A32OpCodeBImmAl.cs rename to ChocolArm64/Decoders32/A32OpCodeBImmAl.cs index 8ff81e0c90..c4a196b63e 100644 --- a/ChocolArm64/Decoder32/A32OpCodeBImmAl.cs +++ b/ChocolArm64/Decoders32/A32OpCodeBImmAl.cs @@ -1,6 +1,6 @@ -using ChocolArm64.Instruction; +using ChocolArm64.Instructions; -namespace ChocolArm64.Decoder32 +namespace ChocolArm64.Decoders32 { class A32OpCodeBImmAl : A32OpCode { diff --git a/ChocolArm64/Instruction/CryptoHelper.cs b/ChocolArm64/Instructions/CryptoHelper.cs similarity index 99% rename from ChocolArm64/Instruction/CryptoHelper.cs rename to ChocolArm64/Instructions/CryptoHelper.cs index f2604b7abe..bb9a22a3e6 100644 --- a/ChocolArm64/Instruction/CryptoHelper.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/Inst.cs b/ChocolArm64/Instructions/Inst.cs similarity index 93% rename from ChocolArm64/Instruction/Inst.cs rename to ChocolArm64/Instructions/Inst.cs index 7e67d791a4..5f6740caec 100644 --- a/ChocolArm64/Instruction/Inst.cs +++ b/ChocolArm64/Instructions/Inst.cs @@ -1,6 +1,6 @@ using System; -namespace ChocolArm64.Instruction +namespace ChocolArm64.Instructions { struct Inst { diff --git a/ChocolArm64/Instruction/InstEmitAlu.cs b/ChocolArm64/Instructions/InstEmitAlu.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitAlu.cs rename to ChocolArm64/Instructions/InstEmitAlu.cs index 24ff08132b..39d027dc68 100644 --- a/ChocolArm64/Instruction/InstEmitAlu.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitAluHelper.cs b/ChocolArm64/Instructions/InstEmitAluHelper.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitAluHelper.cs rename to ChocolArm64/Instructions/InstEmitAluHelper.cs index db005bc820..79ee7a1a13 100644 --- a/ChocolArm64/Instruction/InstEmitAluHelper.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitBfm.cs b/ChocolArm64/Instructions/InstEmitBfm.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitBfm.cs rename to ChocolArm64/Instructions/InstEmitBfm.cs index db0a8c23d2..f1e1303b15 100644 --- a/ChocolArm64/Instruction/InstEmitBfm.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitCcmp.cs b/ChocolArm64/Instructions/InstEmitCcmp.cs similarity index 94% rename from ChocolArm64/Instruction/InstEmitCcmp.cs rename to ChocolArm64/Instructions/InstEmitCcmp.cs index f616c9b210..e5819183a4 100644 --- a/ChocolArm64/Instruction/InstEmitCcmp.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitCsel.cs b/ChocolArm64/Instructions/InstEmitCsel.cs similarity index 96% rename from ChocolArm64/Instruction/InstEmitCsel.cs rename to ChocolArm64/Instructions/InstEmitCsel.cs index 30158f0acd..5543e7cd08 100644 --- a/ChocolArm64/Instruction/InstEmitCsel.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitException.cs b/ChocolArm64/Instructions/InstEmitException.cs similarity index 97% rename from ChocolArm64/Instruction/InstEmitException.cs rename to ChocolArm64/Instructions/InstEmitException.cs index 4cf7e9c8a5..e9f0c4a1ab 100644 --- a/ChocolArm64/Instruction/InstEmitException.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitFlow.cs b/ChocolArm64/Instructions/InstEmitFlow.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitFlow.cs rename to ChocolArm64/Instructions/InstEmitFlow.cs index adc4adf5eb..5d36a02c0c 100644 --- a/ChocolArm64/Instruction/InstEmitFlow.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitHash.cs b/ChocolArm64/Instructions/InstEmitHash.cs similarity index 97% rename from ChocolArm64/Instruction/InstEmitHash.cs rename to ChocolArm64/Instructions/InstEmitHash.cs index 8b632cc450..abc1076bec 100644 --- a/ChocolArm64/Instruction/InstEmitHash.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitMemory.cs b/ChocolArm64/Instructions/InstEmitMemory.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitMemory.cs rename to ChocolArm64/Instructions/InstEmitMemory.cs index 240d807250..4089e2b79e 100644 --- a/ChocolArm64/Instruction/InstEmitMemory.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitMemoryEx.cs b/ChocolArm64/Instructions/InstEmitMemoryEx.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitMemoryEx.cs rename to ChocolArm64/Instructions/InstEmitMemoryEx.cs index 445ba0d1cb..95eb35c3b5 100644 --- a/ChocolArm64/Instruction/InstEmitMemoryEx.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitMemoryHelper.cs b/ChocolArm64/Instructions/InstEmitMemoryHelper.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitMemoryHelper.cs rename to ChocolArm64/Instructions/InstEmitMemoryHelper.cs index 5ef60764d5..5a74bbd6d0 100644 --- a/ChocolArm64/Instruction/InstEmitMemoryHelper.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitMove.cs b/ChocolArm64/Instructions/InstEmitMove.cs similarity index 93% rename from ChocolArm64/Instruction/InstEmitMove.cs rename to ChocolArm64/Instructions/InstEmitMove.cs index 1fe70f2a7b..e02e1f37ba 100644 --- a/ChocolArm64/Instruction/InstEmitMove.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitMul.cs b/ChocolArm64/Instructions/InstEmitMul.cs similarity index 97% rename from ChocolArm64/Instruction/InstEmitMul.cs rename to ChocolArm64/Instructions/InstEmitMul.cs index cfbb53f2a8..f7991844db 100644 --- a/ChocolArm64/Instruction/InstEmitMul.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdArithmetic.cs b/ChocolArm64/Instructions/InstEmitSimdArithmetic.cs similarity index 99% rename from ChocolArm64/Instruction/InstEmitSimdArithmetic.cs rename to ChocolArm64/Instructions/InstEmitSimdArithmetic.cs index e2af283436..eef7005858 100644 --- a/ChocolArm64/Instruction/InstEmitSimdArithmetic.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdCmp.cs b/ChocolArm64/Instructions/InstEmitSimdCmp.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitSimdCmp.cs rename to ChocolArm64/Instructions/InstEmitSimdCmp.cs index d29ba83cef..533eebcd5c 100644 --- a/ChocolArm64/Instruction/InstEmitSimdCmp.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdCrypto.cs b/ChocolArm64/Instructions/InstEmitSimdCrypto.cs similarity index 95% rename from ChocolArm64/Instruction/InstEmitSimdCrypto.cs rename to ChocolArm64/Instructions/InstEmitSimdCrypto.cs index f711e8ddb2..179edfadcc 100644 --- a/ChocolArm64/Instruction/InstEmitSimdCrypto.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdCvt.cs b/ChocolArm64/Instructions/InstEmitSimdCvt.cs similarity index 99% rename from ChocolArm64/Instruction/InstEmitSimdCvt.cs rename to ChocolArm64/Instructions/InstEmitSimdCvt.cs index e95c117f96..0bc9428872 100644 --- a/ChocolArm64/Instruction/InstEmitSimdCvt.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdHash.cs b/ChocolArm64/Instructions/InstEmitSimdHash.cs similarity index 96% rename from ChocolArm64/Instruction/InstEmitSimdHash.cs rename to ChocolArm64/Instructions/InstEmitSimdHash.cs index 65c37d792a..8e9a63a82d 100644 --- a/ChocolArm64/Instruction/InstEmitSimdHash.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdHelper.cs b/ChocolArm64/Instructions/InstEmitSimdHelper.cs similarity index 99% rename from ChocolArm64/Instruction/InstEmitSimdHelper.cs rename to ChocolArm64/Instructions/InstEmitSimdHelper.cs index 10cff858d5..5ba55aeead 100644 --- a/ChocolArm64/Instruction/InstEmitSimdHelper.cs +++ b/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[] { diff --git a/ChocolArm64/Instruction/InstEmitSimdLogical.cs b/ChocolArm64/Instructions/InstEmitSimdLogical.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitSimdLogical.cs rename to ChocolArm64/Instructions/InstEmitSimdLogical.cs index 9b0e3b97c3..97c4d87252 100644 --- a/ChocolArm64/Instruction/InstEmitSimdLogical.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdMemory.cs b/ChocolArm64/Instructions/InstEmitSimdMemory.cs similarity index 96% rename from ChocolArm64/Instruction/InstEmitSimdMemory.cs rename to ChocolArm64/Instructions/InstEmitSimdMemory.cs index c37250314d..a2c2784d7c 100644 --- a/ChocolArm64/Instruction/InstEmitSimdMemory.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdMove.cs b/ChocolArm64/Instructions/InstEmitSimdMove.cs similarity index 99% rename from ChocolArm64/Instruction/InstEmitSimdMove.cs rename to ChocolArm64/Instructions/InstEmitSimdMove.cs index a0bb2f2b2c..9f19c96775 100644 --- a/ChocolArm64/Instruction/InstEmitSimdMove.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSimdShift.cs b/ChocolArm64/Instructions/InstEmitSimdShift.cs similarity index 99% rename from ChocolArm64/Instruction/InstEmitSimdShift.cs rename to ChocolArm64/Instructions/InstEmitSimdShift.cs index 46c5fa303b..b9fe538e46 100644 --- a/ChocolArm64/Instruction/InstEmitSimdShift.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitSystem.cs b/ChocolArm64/Instructions/InstEmitSystem.cs similarity index 98% rename from ChocolArm64/Instruction/InstEmitSystem.cs rename to ChocolArm64/Instructions/InstEmitSystem.cs index c1addebfc1..1a966fe43c 100644 --- a/ChocolArm64/Instruction/InstEmitSystem.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/InstEmitter.cs b/ChocolArm64/Instructions/InstEmitter.cs similarity index 71% rename from ChocolArm64/Instruction/InstEmitter.cs rename to ChocolArm64/Instructions/InstEmitter.cs index 135e4e1335..db6e8604f8 100644 --- a/ChocolArm64/Instruction/InstEmitter.cs +++ b/ChocolArm64/Instructions/InstEmitter.cs @@ -1,6 +1,6 @@ using ChocolArm64.Translation; -namespace ChocolArm64.Instruction +namespace ChocolArm64.Instructions { delegate void InstEmitter(ILEmitterCtx context); } \ No newline at end of file diff --git a/ChocolArm64/Instruction/InstInterpreter.cs b/ChocolArm64/Instructions/InstInterpreter.cs similarity index 70% rename from ChocolArm64/Instruction/InstInterpreter.cs rename to ChocolArm64/Instructions/InstInterpreter.cs index 2736d13cfc..9610bd9c15 100644 --- a/ChocolArm64/Instruction/InstInterpreter.cs +++ b/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); } \ No newline at end of file diff --git a/ChocolArm64/Instruction/SoftFallback.cs b/ChocolArm64/Instructions/SoftFallback.cs similarity index 99% rename from ChocolArm64/Instruction/SoftFallback.cs rename to ChocolArm64/Instructions/SoftFallback.cs index 3b647817b7..a31aa34c50 100644 --- a/ChocolArm64/Instruction/SoftFallback.cs +++ b/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; diff --git a/ChocolArm64/Instruction/SoftFloat.cs b/ChocolArm64/Instructions/SoftFloat.cs similarity index 99% rename from ChocolArm64/Instruction/SoftFloat.cs rename to ChocolArm64/Instructions/SoftFloat.cs index a2ee72463c..c62d5b2341 100644 --- a/ChocolArm64/Instruction/SoftFloat.cs +++ b/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 { diff --git a/ChocolArm64/Instruction/VectorHelper.cs b/ChocolArm64/Instructions/VectorHelper.cs similarity index 99% rename from ChocolArm64/Instruction/VectorHelper.cs rename to ChocolArm64/Instructions/VectorHelper.cs index b10981297f..8ef15818ce 100644 --- a/ChocolArm64/Instruction/VectorHelper.cs +++ b/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 { diff --git a/ChocolArm64/Instruction32/A32InstInterpretAlu.cs b/ChocolArm64/Instructions32/A32InstInterpretAlu.cs similarity index 61% rename from ChocolArm64/Instruction32/A32InstInterpretAlu.cs rename to ChocolArm64/Instructions32/A32InstInterpretAlu.cs index 41b9d22aeb..f3be823ffc 100644 --- a/ChocolArm64/Instruction32/A32InstInterpretAlu.cs +++ b/ChocolArm64/Instructions32/A32InstInterpretAlu.cs @@ -1,4 +1,4 @@ -namespace ChocolArm64.Instruction32 +namespace ChocolArm64.Instructions32 { static partial class A32InstInterpret { diff --git a/ChocolArm64/Instruction32/A32InstInterpretFlow.cs b/ChocolArm64/Instructions32/A32InstInterpretFlow.cs similarity index 91% rename from ChocolArm64/Instruction32/A32InstInterpretFlow.cs rename to ChocolArm64/Instructions32/A32InstInterpretFlow.cs index 102457e764..f095d22cab 100644 --- a/ChocolArm64/Instruction32/A32InstInterpretFlow.cs +++ b/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 { diff --git a/ChocolArm64/Instruction32/A32InstInterpretHelper.cs b/ChocolArm64/Instructions32/A32InstInterpretHelper.cs similarity index 97% rename from ChocolArm64/Instruction32/A32InstInterpretHelper.cs rename to ChocolArm64/Instructions32/A32InstInterpretHelper.cs index 38f03a4b98..b08e12984a 100644 --- a/ChocolArm64/Instruction32/A32InstInterpretHelper.cs +++ b/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 { diff --git a/ChocolArm64/OpCodeTable.cs b/ChocolArm64/OpCodeTable.cs index 724a3891e7..1acaaa094e 100644 --- a/ChocolArm64/OpCodeTable.cs +++ b/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; diff --git a/ChocolArm64/Translation/ILEmitter.cs b/ChocolArm64/Translation/ILEmitter.cs index 916e15da76..543528d716 100644 --- a/ChocolArm64/Translation/ILEmitter.cs +++ b/ChocolArm64/Translation/ILEmitter.cs @@ -1,4 +1,4 @@ -using ChocolArm64.Decoder; +using ChocolArm64.Decoders; using ChocolArm64.State; using System; using System.Collections.Generic; diff --git a/ChocolArm64/Translation/ILEmitterCtx.cs b/ChocolArm64/Translation/ILEmitterCtx.cs index 09f6be7836..a2bd0c172a 100644 --- a/ChocolArm64/Translation/ILEmitterCtx.cs +++ b/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; diff --git a/ChocolArm64/Translator.cs b/ChocolArm64/Translator.cs index 4e89d71c7d..177874c47e 100644 --- a/ChocolArm64/Translator.cs +++ b/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);