diff options
| author | wenyi,xie via groups.io <xiewenyi2=huawei.com@groups.io> | 2020-12-08 21:07:49 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-12-08 13:58:33 +0000 |
| commit | 8e4cb8fbceb84b66b3b2fc45b9e93d70f732e970 (patch) | |
| tree | e5de2caed2bbdbe11a80ca9484949d380c536f39 /ArmPkg | |
| parent | 4b69fab6e20a98f56acd3c717bd53812950fe5b5 (diff) | |
| download | edk2-8e4cb8fbceb84b66b3b2fc45b9e93d70f732e970.tar.gz edk2-8e4cb8fbceb84b66b3b2fc45b9e93d70f732e970.tar.bz2 edk2-8e4cb8fbceb84b66b3b2fc45b9e93d70f732e970.zip | |
ArmPkg/ArmDisassemblerLib: fix incorrect comparison
As shift = (OpCode >> 5) & 0x3, shift will never be larger than 0x3,
so the comparison between shift and 0x12 will always be false. The right
shift type of ASR is 0x2.
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
Diffstat (limited to 'ArmPkg')
| -rw-r--r-- | ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c index b4f0f8dbbf..d206cf4ea9 100644 --- a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c +++ b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c @@ -240,7 +240,7 @@ DisassembleArmInstruction ( if (shift_imm == 0) {
shift_imm = 32;
}
- } else if (shift == 0x12) {
+ } else if (shift == 0x2) {
Type = "ASR";
} else if (shift_imm == 0) {
AsciiSPrint (&Buf[Index], Size - Index, "[%a, #%a%a, %a, RRX]%a", gReg[Rn], SIGN (U), gReg[Rm], WRITE (W));
@@ -270,7 +270,7 @@ DisassembleArmInstruction ( if (shift_imm == 0) {
shift_imm = 32;
}
- } else if (shift == 0x12) {
+ } else if (shift == 0x2) {
Type = "ASR";
} else if (shift_imm == 0) {
AsciiSPrint (&Buf[Index], Size - Index, "[%a], #%a%a, %a, RRX", gReg[Rn], SIGN (U), gReg[Rm]);
|