MdeModulePkg/EbcDxe: Avoid Non-Boolean type used as Boolean

[mirror_edk2.git] / MdeModulePkg / Universal / EbcDxe / EbcDebugger / EdbDisasm.c

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
index dab53a02cf7c3b90214af8b17d75b783d09a6d48..dddf78239c5243806a22bfc3191f98f0b29e2a21 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
@@ -194,8 +194,8 @@ EdbDisasmJMP (
 //    } else {\r
 //      EdbPrintInstructionName (L"32");\r
 //    }\r
-    if (Modifiers & CONDITION_M_CONDITIONAL) {\r
-      if (Modifiers & JMP_M_CS) {\r
+    if ((Modifiers & CONDITION_M_CONDITIONAL) != 0) {\r
+      if ((Modifiers & JMP_M_CS) != 0) {\r
         EdbPrintInstructionName (L"cs");\r
       } else {\r
         EdbPrintInstructionName (L"cc");\r
@@ -203,9 +203,9 @@ EdbDisasmJMP (
     }\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & OPCODE_M_IMMDATA64) {\r
+    if ((Modifiers & OPCODE_M_IMMDATA64) != 0) {\r
       CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
-      if (Modifiers & OPCODE_M_IMMDATA) {\r
+      if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
         EdbPrintData64 (Data64);\r
       } else {\r
         return 0;\r
@@ -260,8 +260,8 @@ EdbDisasmJMP8 (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"JMP8");\r
-    if (Modifiers & CONDITION_M_CONDITIONAL) {\r
-      if (Modifiers & JMP_M_CS) {\r
+    if ((Modifiers & CONDITION_M_CONDITIONAL) != 0) {\r
+      if ((Modifiers & JMP_M_CS) != 0) {\r
         EdbPrintInstructionName (L"cs");\r
       } else {\r
         EdbPrintInstructionName (L"cc");\r
@@ -322,7 +322,7 @@ EdbDisasmCALL (
 //    } else {\r
 //      EdbPrintInstructionName (L"32");\r
 //    }\r
-    if (Operands & OPERAND_M_NATIVE_CALL) {\r
+    if ((Operands & OPERAND_M_NATIVE_CALL) != 0) {\r
       EdbPrintInstructionName (L"EX");\r
     }\r
 //    if ((Operands & OPERAND_M_RELATIVE_ADDR) == 0) {\r
@@ -330,10 +330,10 @@ EdbDisasmCALL (
 //    }\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & OPCODE_M_IMMDATA64) {\r
+    if ((Modifiers & OPCODE_M_IMMDATA64) != 0) {\r
       CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
       Ip = Data64;\r
-      if (Modifiers & OPCODE_M_IMMDATA) {\r
+      if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
         Result = EdbFindAndPrintSymbol ((UINTN)Ip);\r
         if (Result == 0) {\r
           EdbPrintData64 (Data64);\r
@@ -342,7 +342,7 @@ EdbDisasmCALL (
         return 0;\r
       }\r
     } else {\r
-      if (Modifiers & OPCODE_M_IMMDATA) {\r
+      if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
         CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
       } else {\r
         Data32 = 0;\r
@@ -355,20 +355,20 @@ EdbDisasmCALL (
       }\r
 \r
       if ((Operands & OPERAND_M_INDIRECT1) == 0) {\r
-        if (Operands & OPERAND_M_RELATIVE_ADDR) {\r
+        if ((Operands & OPERAND_M_RELATIVE_ADDR) != 0) {\r
           Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Ip + Size));\r
         } else {\r
           Result = EdbFindAndPrintSymbol ((UINTN)Ip);\r
         }\r
         if (Result == 0) {\r
           EdbPrintRegister1 (Operands);\r
-          if (Modifiers & OPCODE_M_IMMDATA) {\r
+          if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
             EdbPrintImmData32 (Data32);\r
           }\r
         }\r
       } else {\r
         EdbPrintRegister1 (Operands);\r
-        if (Modifiers & OPCODE_M_IMMDATA) {\r
+        if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
           EdbPrintRawIndexData32 (Data32);\r
         }\r
       }\r
@@ -453,7 +453,7 @@ EdbDisasmCMP (
   Opcode     = GET_OPCODE (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
-  if (Modifiers & OPCODE_M_IMMDATA) {\r
+  if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -495,9 +495,9 @@ EdbDisasmCMP (
     EdbPrintComma ();\r
     EdbPrintRegister2 (Operands);\r
 \r
-    if (Modifiers & OPCODE_M_IMMDATA) {\r
+    if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT2) {\r
+      if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -552,7 +552,7 @@ EdbDisasmUnsignedDataManip (
   Opcode     = GET_OPCODE (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & DATAMANIP_M_IMMDATA) {\r
+  if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -613,9 +613,9 @@ EdbDisasmUnsignedDataManip (
     EdbPrintRegister2 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & DATAMANIP_M_IMMDATA) {\r
+    if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT2) {\r
+      if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -665,7 +665,7 @@ EdbDisasmSignedDataManip (
   Opcode     = GET_OPCODE (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & DATAMANIP_M_IMMDATA) {\r
+  if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -711,9 +711,9 @@ EdbDisasmSignedDataManip (
     EdbPrintRegister2 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & DATAMANIP_M_IMMDATA) {\r
+    if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT2) {\r
+      if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -770,26 +770,26 @@ EdbDisasmMOVxx (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Size = 2;\r
-  if (Modifiers & (OPCODE_M_IMMED_OP1 | OPCODE_M_IMMED_OP2)) {\r
+  if ((Modifiers & (OPCODE_M_IMMED_OP1 | OPCODE_M_IMMED_OP2)) != 0) {\r
     if ((Opcode <= OPCODE_MOVQW) || (Opcode == OPCODE_MOVNW)) {\r
-      if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
         Size += 2;\r
       }\r
-      if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 2;\r
       }\r
-    } else if ((Opcode <= OPCODE_MOVQD) || (Opcode == OPCODE_MOVND)) {\r
-      if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+    } else if (((Opcode <= OPCODE_MOVQD) || (Opcode == OPCODE_MOVND)) != 0) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
         Size += 4;\r
       }\r
-      if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 4;\r
       }\r
     } else if (Opcode == OPCODE_MOVQQ) {\r
-      if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
         Size += 8;\r
       }\r
-      if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+      if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 8;\r
       }\r
     }\r
@@ -841,7 +841,7 @@ EdbDisasmMOVxx (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
       if ((Opcode <= OPCODE_MOVQW) || (Opcode == OPCODE_MOVNW)) {\r
         CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
         InstructionAddress += 2;\r
@@ -860,7 +860,7 @@ EdbDisasmMOVxx (
     EdbPrintComma ();\r
     EdbPrintRegister2 (Operands);\r
 \r
-    if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
       if ((Opcode <= OPCODE_MOVQW) || (Opcode == OPCODE_MOVNW)) {\r
         CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
         EdbPrintRawIndexData16 (Data16);\r
@@ -907,10 +907,10 @@ EdbDisasmMOVsnw (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Size = 2;\r
-  if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+  if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
     Size += 2;\r
   }\r
-  if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+  if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
     Size += 2;\r
   }\r
 \r
@@ -925,7 +925,7 @@ EdbDisasmMOVsnw (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
@@ -934,9 +934,9 @@ EdbDisasmMOVsnw (
     EdbPrintComma ();\r
     EdbPrintRegister2 (Operands);\r
 \r
-    if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT2) {\r
+      if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -977,10 +977,10 @@ EdbDisasmMOVsnd (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Size = 2;\r
-  if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+  if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
     Size += 4;\r
   }\r
-  if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+  if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
     Size += 4;\r
   }\r
 \r
@@ -995,7 +995,7 @@ EdbDisasmMOVsnd (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & OPCODE_M_IMMED_OP1) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
       CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
       InstructionAddress += 4;\r
       EdbPrintRawIndexData32 (Data32);\r
@@ -1004,9 +1004,9 @@ EdbDisasmMOVsnd (
     EdbPrintComma ();\r
     EdbPrintRegister2 (Operands);\r
 \r
-    if (Modifiers & OPCODE_M_IMMED_OP2) {\r
+    if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
       CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
-      if (Operands & OPERAND_M_INDIRECT2) {\r
+      if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData32 (Data32);\r
       } else {\r
         EdbPrintImmDatan (Data32);\r
@@ -1131,7 +1131,7 @@ EdbDisasmPUSH (
 \r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+  if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -1153,9 +1153,9 @@ EdbDisasmPUSH (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+    if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT1) {\r
+      if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -1195,7 +1195,7 @@ EdbDisasmPOP (
 \r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+  if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -1217,9 +1217,9 @@ EdbDisasmPOP (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+    if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT1) {\r
+      if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -1274,10 +1274,10 @@ EdbDisasmCMPI (
   }\r
 \r
   Size = 2;\r
-  if (Operands & OPERAND_M_CMPI_INDEX) {\r
+  if ((Operands & OPERAND_M_CMPI_INDEX) != 0) {\r
     Size += 2;\r
   }\r
-  if (Modifiers & OPCODE_M_CMPI32_DATA) {\r
+  if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
     Size += 4;\r
   } else {\r
     Size += 2;\r
@@ -1295,7 +1295,7 @@ EdbDisasmCMPI (
 //    } else {\r
 //      EdbPrintInstructionName (L"32");\r
 //    }\r
-    if (Modifiers & OPCODE_M_CMPI32_DATA) {\r
+    if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
       EdbPrintInstructionName (L"d");\r
     } else {\r
       EdbPrintInstructionName (L"w");\r
@@ -1321,7 +1321,7 @@ EdbDisasmCMPI (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Operands & OPERAND_M_CMPI_INDEX) {\r
+    if ((Operands & OPERAND_M_CMPI_INDEX) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
@@ -1329,7 +1329,7 @@ EdbDisasmCMPI (
 \r
     EdbPrintComma ();\r
 \r
-    if (Modifiers & OPCODE_M_CMPI32_DATA) {\r
+    if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
       CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
       EdbPrintDatan (Data32);\r
     } else {\r
@@ -1370,7 +1370,7 @@ EdbDisasmPUSHn (
 \r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+  if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -1387,9 +1387,9 @@ EdbDisasmPUSHn (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+    if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT1) {\r
+      if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -1429,7 +1429,7 @@ EdbDisasmPOPn (
 \r
   Operands   = GET_OPERANDS (InstructionAddress);\r
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+  if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
     Size = 2;\r
@@ -1446,9 +1446,9 @@ EdbDisasmPOPn (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Modifiers & PUSHPOP_M_IMMDATA) {\r
+    if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      if (Operands & OPERAND_M_INDIRECT1) {\r
+      if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
         EdbPrintImmDatan (Data16);\r
@@ -1491,7 +1491,7 @@ EdbDisasmMOVI (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
 \r
-  if (Operands & MOVI_M_IMMDATA) {\r
+  if ((Operands & MOVI_M_IMMDATA) != 0) {\r
     Size    = 4;\r
   } else {\r
     Size    = 2;\r
@@ -1540,7 +1540,7 @@ EdbDisasmMOVI (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Operands & MOVI_M_IMMDATA) {\r
+    if ((Operands & MOVI_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
@@ -1599,7 +1599,7 @@ EdbDisasmMOVIn (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
 \r
-  if (Operands & MOVI_M_IMMDATA) {\r
+  if ((Operands & MOVI_M_IMMDATA) != 0) {\r
     Size    = 4;\r
   } else {\r
     Size    = 2;\r
@@ -1634,7 +1634,7 @@ EdbDisasmMOVIn (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Operands & MOVI_M_IMMDATA) {\r
+    if ((Operands & MOVI_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
@@ -1696,7 +1696,7 @@ EdbDisasmMOVREL (
   Modifiers  = GET_MODIFIERS (InstructionAddress);\r
   Operands   = GET_OPERANDS (InstructionAddress);\r
 \r
-  if (Operands & MOVI_M_IMMDATA) {\r
+  if ((Operands & MOVI_M_IMMDATA) != 0) {\r
     Size    = 4;\r
   } else {\r
     Size    = 2;\r
@@ -1733,7 +1733,7 @@ EdbDisasmMOVREL (
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
-    if (Operands & MOVI_M_IMMDATA) {\r
+    if ((Operands & MOVI_M_IMMDATA) != 0) {\r
       CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r