ArmPkg/ArmDisassemblerLib: Fixed logical/bitwise operator confusion

[mirror_edk2.git] / ArmPkg / Library / ArmDisassemblerLib / ThumbDisassembler.c

diff --git a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
index dfab4cc2e4701c7466dbd636bc4a74740943ce49..fbe8949d7de4738417c63e39c6d78cf7ac112f21 100644 (file)
--- a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
+++ b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
@@ -773,17 +773,17 @@ DisassembleThumbInstruction (
       case LDM_REG_INDIRECT_LSL:\r
         // <rt>, [<rn>, <rm> {, LSL #<imm2>]}\r
         Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, [%a, %a", gReg[Rt], gReg[Rn], gReg[Rm]);\r
-        if (((OpCode32 >> 4) && 3) == 0) {\r
+        if (((OpCode32 >> 4) & 3) == 0) {\r
           AsciiSPrint (&Buf[Offset], Size - Offset, "]");\r
         } else {\r
-          AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL #%d]", (OpCode32 >> 4) && 3);\r
+          AsciiSPrint (&Buf[Offset], Size - Offset, ", LSL #%d]", (OpCode32 >> 4) & 3);\r
         }\r
         return;\r
       \r
       case LDM_REG_IMM12:\r
         // <rt>, [<rn>, {, #<imm12>]}\r
         Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, [%a", gReg[Rt], gReg[Rn]);\r
-        if ((OpCode32 && 0xfff) == 0) {\r
+        if ((OpCode32 & 0xfff) == 0) {\r
           AsciiSPrint (&Buf[Offset], Size - Offset, "]");\r
         } else {\r
           AsciiSPrint (&Buf[Offset], Size - Offset, ", #0x%x]", OpCode32 & 0xfff);\r
@@ -797,7 +797,7 @@ DisassembleThumbInstruction (
         P = (OpCode32 & BIT10) == BIT10;\r
         Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, [%a", gReg[Rt], gReg[Rn]);\r
         if (P) {\r
-          if ((OpCode32 && 0xff) == 0) {\r
+          if ((OpCode32 & 0xff) == 0) {\r
             AsciiSPrint (&Buf[Offset], Size - Offset, "]%a", W?"!":"");\r
           } else {\r
             AsciiSPrint (&Buf[Offset], Size - Offset, ", #%a0x%x]%a", U?"":"-" , OpCode32 & 0xff, W?"!":"");\r
@@ -814,13 +814,13 @@ DisassembleThumbInstruction (
         W = (OpCode32 & BIT21) == BIT21;\r
         Offset += AsciiSPrint (&Buf[Offset], Size - Offset, " %a, %a, [%a", gReg[Rt], gReg[Rt2], gReg[Rn]);\r
         if (P) {\r
-          if ((OpCode32 && 0xff) == 0) {\r
+          if ((OpCode32 & 0xff) == 0) {\r
             AsciiSPrint (&Buf[Offset], Size - Offset, "]");\r
           } else {\r
             AsciiSPrint (&Buf[Offset], Size - Offset, ", #%a0x%x]%a", U?"":"-", (OpCode32 & 0xff) << 2, W?"!":"");\r
           }\r
         } else {\r
-          if ((OpCode32 && 0xff) != 0) {\r
+          if ((OpCode32 & 0xff) != 0) {\r
             AsciiSPrint (&Buf[Offset], Size - Offset, ", #%a0x%x", U?"":"-", (OpCode32 & 0xff) << 2);\r
           }\r
         }\r