From f162e30958448a0c82356cb85b663fd286ddc7a5 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Fri, 30 Nov 2018 11:45:11 -0300 Subject: [PATCH] Fix some assignment alignments, remove some unused usings --- ChocolArm64/Decoders/OpCodeAlu64.cs | 5 ++--- ChocolArm64/Decoders/OpCodeAluRs64.cs | 2 +- ChocolArm64/Decoders/OpCodeAluRx64.cs | 4 ++-- ChocolArm64/Decoders/OpCodeBImmCmp64.cs | 1 - ChocolArm64/Decoders/OpCodeCcmp64.cs | 4 ++-- ChocolArm64/Decoders/OpCodeCsel64.cs | 2 +- ChocolArm64/Decoders/OpCodeMemImm64.cs | 2 +- ChocolArm64/Decoders/OpCodeMemReg64.cs | 6 +++--- ChocolArm64/Decoders/OpCodeMov64.cs | 1 - ChocolArm64/Decoders/OpCodeSimdCvt64.cs | 1 - ChocolArm64/Decoders/OpCodeSimdImm64.cs | 5 ++--- ChocolArm64/Decoders/OpCodeSimdMemMs64.cs | 1 - ChocolArm64/Decoders/OpCodeSimdMemSs64.cs | 1 - ChocolArm64/Decoders/ShiftType.cs | 8 ++++---- 14 files changed, 18 insertions(+), 25 deletions(-) diff --git a/ChocolArm64/Decoders/OpCodeAlu64.cs b/ChocolArm64/Decoders/OpCodeAlu64.cs index 5f094572ef..b46fef4f7a 100644 --- a/ChocolArm64/Decoders/OpCodeAlu64.cs +++ b/ChocolArm64/Decoders/OpCodeAlu64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { @@ -12,8 +11,8 @@ namespace ChocolArm64.Decoders public OpCodeAlu64(Inst inst, long position, int opCode) : base(inst, position, opCode) { - Rd = (opCode >> 0) & 0x1f; - Rn = (opCode >> 5) & 0x1f; + Rd = (opCode >> 0) & 0x1f; + Rn = (opCode >> 5) & 0x1f; DataOp = (DataOp)((opCode >> 24) & 0x3); RegisterSize = (opCode >> 31) != 0 diff --git a/ChocolArm64/Decoders/OpCodeAluRs64.cs b/ChocolArm64/Decoders/OpCodeAluRs64.cs index f24c7f37bd..bed840b8ea 100644 --- a/ChocolArm64/Decoders/OpCodeAluRs64.cs +++ b/ChocolArm64/Decoders/OpCodeAluRs64.cs @@ -22,7 +22,7 @@ namespace ChocolArm64.Decoders Shift = shift; - Rm = (opCode >> 16) & 0x1f; + Rm = (opCode >> 16) & 0x1f; ShiftType = (ShiftType)((opCode >> 22) & 0x3); } } diff --git a/ChocolArm64/Decoders/OpCodeAluRx64.cs b/ChocolArm64/Decoders/OpCodeAluRx64.cs index a36f94ca89..24cee056cb 100644 --- a/ChocolArm64/Decoders/OpCodeAluRx64.cs +++ b/ChocolArm64/Decoders/OpCodeAluRx64.cs @@ -11,9 +11,9 @@ namespace ChocolArm64.Decoders public OpCodeAluRx64(Inst inst, long position, int opCode) : base(inst, position, opCode) { - Shift = (opCode >> 10) & 0x7; + Shift = (opCode >> 10) & 0x7; IntType = (IntType)((opCode >> 13) & 0x7); - Rm = (opCode >> 16) & 0x1f; + Rm = (opCode >> 16) & 0x1f; } } } \ No newline at end of file diff --git a/ChocolArm64/Decoders/OpCodeBImmCmp64.cs b/ChocolArm64/Decoders/OpCodeBImmCmp64.cs index 6f43319918..2e674a54c3 100644 --- a/ChocolArm64/Decoders/OpCodeBImmCmp64.cs +++ b/ChocolArm64/Decoders/OpCodeBImmCmp64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { diff --git a/ChocolArm64/Decoders/OpCodeCcmp64.cs b/ChocolArm64/Decoders/OpCodeCcmp64.cs index e2aae96dee..8e91f15ae7 100644 --- a/ChocolArm64/Decoders/OpCodeCcmp64.cs +++ b/ChocolArm64/Decoders/OpCodeCcmp64.cs @@ -21,9 +21,9 @@ namespace ChocolArm64.Decoders return; } - Nzcv = (opCode >> 0) & 0xf; + Nzcv = (opCode >> 0) & 0xf; Cond = (Cond)((opCode >> 12) & 0xf); - RmImm = (opCode >> 16) & 0x1f; + RmImm = (opCode >> 16) & 0x1f; Rd = CpuThreadState.ZrIndex; } diff --git a/ChocolArm64/Decoders/OpCodeCsel64.cs b/ChocolArm64/Decoders/OpCodeCsel64.cs index d085a82378..d1a5a2dbee 100644 --- a/ChocolArm64/Decoders/OpCodeCsel64.cs +++ b/ChocolArm64/Decoders/OpCodeCsel64.cs @@ -10,7 +10,7 @@ namespace ChocolArm64.Decoders public OpCodeCsel64(Inst inst, long position, int opCode) : base(inst, position, opCode) { - Rm = (opCode >> 16) & 0x1f; + Rm = (opCode >> 16) & 0x1f; Cond = (Cond)((opCode >> 12) & 0xf); } } diff --git a/ChocolArm64/Decoders/OpCodeMemImm64.cs b/ChocolArm64/Decoders/OpCodeMemImm64.cs index edaa4970ae..d9f322eac2 100644 --- a/ChocolArm64/Decoders/OpCodeMemImm64.cs +++ b/ChocolArm64/Decoders/OpCodeMemImm64.cs @@ -41,7 +41,7 @@ namespace ChocolArm64.Decoders if (WBack || Unscaled) { //9-bits Signed Immediate. - Imm = (opCode << 43) >> 55; + Imm = (opCode << 11) >> 23; } else { diff --git a/ChocolArm64/Decoders/OpCodeMemReg64.cs b/ChocolArm64/Decoders/OpCodeMemReg64.cs index 3dd210fbd2..2eb734aa39 100644 --- a/ChocolArm64/Decoders/OpCodeMemReg64.cs +++ b/ChocolArm64/Decoders/OpCodeMemReg64.cs @@ -11,10 +11,10 @@ namespace ChocolArm64.Decoders public OpCodeMemReg64(Inst inst, long position, int opCode) : base(inst, position, opCode) { - Shift = ((opCode >> 12) & 0x1) != 0; + Shift = ((opCode >> 12) & 0x1) != 0; IntType = (IntType)((opCode >> 13) & 0x7); - Rm = (opCode >> 16) & 0x1f; - Extend64 = ((opCode >> 22) & 0x3) == 2; + Rm = (opCode >> 16) & 0x1f; + Extend64 = ((opCode >> 22) & 0x3) == 2; } } } \ No newline at end of file diff --git a/ChocolArm64/Decoders/OpCodeMov64.cs b/ChocolArm64/Decoders/OpCodeMov64.cs index f969785479..7dbd92472b 100644 --- a/ChocolArm64/Decoders/OpCodeMov64.cs +++ b/ChocolArm64/Decoders/OpCodeMov64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { diff --git a/ChocolArm64/Decoders/OpCodeSimdCvt64.cs b/ChocolArm64/Decoders/OpCodeSimdCvt64.cs index 6c68a3af26..eacd594099 100644 --- a/ChocolArm64/Decoders/OpCodeSimdCvt64.cs +++ b/ChocolArm64/Decoders/OpCodeSimdCvt64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { diff --git a/ChocolArm64/Decoders/OpCodeSimdImm64.cs b/ChocolArm64/Decoders/OpCodeSimdImm64.cs index 3ef6a8c6e2..37ee504d28 100644 --- a/ChocolArm64/Decoders/OpCodeSimdImm64.cs +++ b/ChocolArm64/Decoders/OpCodeSimdImm64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { @@ -61,12 +60,12 @@ namespace ChocolArm64.Decoders else if ((modeHigh & 0b110) == 0b100) { //16-bits shifted Immediate. - Size = 1; imm <<= (modeHigh & 1) << 3; + Size = 1; imm <<= (modeHigh & 1) << 3; } else if ((modeHigh & 0b100) == 0b000) { //32-bits shifted Immediate. - Size = 2; imm <<= modeHigh << 3; + Size = 2; imm <<= modeHigh << 3; } else if ((modeHigh & 0b111) == 0b110) { diff --git a/ChocolArm64/Decoders/OpCodeSimdMemMs64.cs b/ChocolArm64/Decoders/OpCodeSimdMemMs64.cs index 0748ef43f3..83297c4146 100644 --- a/ChocolArm64/Decoders/OpCodeSimdMemMs64.cs +++ b/ChocolArm64/Decoders/OpCodeSimdMemMs64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { diff --git a/ChocolArm64/Decoders/OpCodeSimdMemSs64.cs b/ChocolArm64/Decoders/OpCodeSimdMemSs64.cs index 07ec8ab730..1b0ead3311 100644 --- a/ChocolArm64/Decoders/OpCodeSimdMemSs64.cs +++ b/ChocolArm64/Decoders/OpCodeSimdMemSs64.cs @@ -1,5 +1,4 @@ using ChocolArm64.Instructions; -using ChocolArm64.State; namespace ChocolArm64.Decoders { diff --git a/ChocolArm64/Decoders/ShiftType.cs b/ChocolArm64/Decoders/ShiftType.cs index 5f6a7a4ca8..cad4310346 100644 --- a/ChocolArm64/Decoders/ShiftType.cs +++ b/ChocolArm64/Decoders/ShiftType.cs @@ -2,9 +2,9 @@ namespace ChocolArm64.Decoders { enum ShiftType { - Lsl, - Lsr, - Asr, - Ror + Lsl = 0, + Lsr = 1, + Asr = 2, + Ror = 3 } } \ No newline at end of file