MdeModulePkg: Replace BSD License with BSD+Patent License

[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 52800f7fd145e62e7f1cc2d24ce5604d775434e1..7d933cae76498d3fa5dba0f4c8034c24aedb80cf 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
@@ -1,22 +1,10 @@
-/*++\r
+/** @file\r
 \r
-Copyright (c) 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
+Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-\r
-  EdbDisasm.c\r
-\r
-Abstract:\r
-\r
-\r
---*/\r
+**/\r
 \r
 #include "Edb.h"\r
 \r
@@ -117,29 +105,23 @@ EDB_DISASM_INSTRUCTION mEdbDisasmInstructionTable[] = {
   EdbDisasmMOVREL,            // opcode 0x39 MOVREL\r
 };\r
 \r
+/**\r
+\r
+  Disasm instruction - BREAK.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmBREAK (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - BREAK\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_BREAK);\r
 \r
@@ -164,29 +146,23 @@ Returns:
 \r
 extern CONST UINT8                    mJMPLen[];\r
 \r
+/**\r
+\r
+  Disasm instruction - JMP.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmJMP (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - JMP\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8   Modifiers;\r
   UINT8   Operands;\r
@@ -212,8 +188,8 @@ Returns:
 //    } 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
@@ -221,9 +197,9 @@ Returns:
     }\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
@@ -248,29 +224,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - JMP8.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmJMP8 (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - JMP8\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8   Modifiers;\r
 \r
@@ -284,8 +254,8 @@ Returns:
     *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
@@ -300,29 +270,23 @@ Returns:
   return 2;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - CALL.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmCALL (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - CALL\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8   Modifiers;\r
   UINT8   Operands;\r
@@ -352,7 +316,7 @@ Returns:
 //    } 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
@@ -360,10 +324,10 @@ Returns:
 //    }\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
@@ -372,7 +336,7 @@ Returns:
         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
@@ -385,20 +349,20 @@ Returns:
       }\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
@@ -410,29 +374,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - RET.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmRET (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - RET\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_RET);\r
 \r
@@ -454,29 +412,23 @@ Returns:
   return 2;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - CMP.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmCMP (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - CMP\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Opcode;\r
   UINT8  Modifiers;\r
@@ -495,7 +447,7 @@ Returns:
   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
@@ -537,9 +489,9 @@ Returns:
     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,29 +504,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - Unsigned Data Manipulate.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmUnsignedDataManip (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - Unsigned Data Manipulate\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Opcode;\r
@@ -600,7 +546,7 @@ Returns:
   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
@@ -661,9 +607,9 @@ Returns:
     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
@@ -676,29 +622,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - Signed Data Manipulate,\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmSignedDataManip (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - Signed Data Manipulate\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Opcode;\r
@@ -719,7 +659,7 @@ Returns:
   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
@@ -765,9 +705,9 @@ Returns:
     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
@@ -780,29 +720,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVxx.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVxx (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVxx\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8   Modifiers;\r
   UINT8   Opcode;\r
@@ -830,26 +764,26 @@ Returns:
   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
@@ -901,7 +835,7 @@ Returns:
     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
@@ -920,7 +854,7 @@ Returns:
     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
@@ -939,29 +873,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVsnw.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVsnw (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVsnw\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -973,10 +901,10 @@ Returns:
   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
@@ -991,7 +919,7 @@ Returns:
     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
@@ -1000,9 +928,9 @@ Returns:
     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
@@ -1015,29 +943,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVsnd.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVsnd (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVsnd\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1049,10 +971,10 @@ Returns:
   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
@@ -1067,7 +989,7 @@ Returns:
     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
@@ -1076,9 +998,9 @@ Returns:
     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
@@ -1091,29 +1013,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - LOADSP.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmLOADSP (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - LOADSP\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Operands;\r
 \r
@@ -1139,29 +1055,23 @@ Returns:
   return 2;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - STORESP.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmSTORESP (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - STORESP\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Operands;\r
 \r
@@ -1187,29 +1097,24 @@ Returns:
   return 2;\r
 }\r
 \r
+\r
+/**\r
+\r
+  Disasm instruction - PUSH.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmPUSH (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - PUSH\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1220,7 +1125,7 @@ Returns:
 \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
@@ -1242,9 +1147,9 @@ Returns:
     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
@@ -1257,29 +1162,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - POP.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmPOP (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - POP\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1290,7 +1189,7 @@ Returns:
 \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
@@ -1312,9 +1211,9 @@ Returns:
     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
@@ -1327,29 +1226,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - CMPI.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmCMPI (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - CMPI\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Opcode;\r
@@ -1375,10 +1268,10 @@ Returns:
   }\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
@@ -1396,7 +1289,7 @@ Returns:
 //    } 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
@@ -1422,7 +1315,7 @@ Returns:
     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
@@ -1430,7 +1323,7 @@ Returns:
 \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
@@ -1444,29 +1337,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - PUSHn.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmPUSHn (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - PUSHn\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1477,7 +1364,7 @@ Returns:
 \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
@@ -1494,9 +1381,9 @@ Returns:
     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
@@ -1509,29 +1396,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - POPn.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmPOPn (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - POPn\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1542,7 +1423,7 @@ Returns:
 \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
@@ -1559,9 +1440,9 @@ Returns:
     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
@@ -1574,29 +1455,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVI.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVI (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVI\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1610,7 +1485,7 @@ Returns:
   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
@@ -1659,7 +1534,7 @@ Returns:
     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
@@ -1688,29 +1563,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVIn.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVIn (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVIn\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8  Modifiers;\r
   UINT8  Operands;\r
@@ -1724,7 +1593,7 @@ Returns:
   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
@@ -1759,7 +1628,7 @@ Returns:
     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
@@ -1788,29 +1657,23 @@ Returns:
   return Size;\r
 }\r
 \r
+/**\r
+\r
+  Disasm instruction - MOVREL.\r
+\r
+  @param  InstructionAddress - The instruction address\r
+  @param  SystemContext      - EBC system context.\r
+  @param  DisasmString       - The instruction string\r
+\r
+  @return Instruction length\r
+\r
+**/\r
 UINTN\r
 EdbDisasmMOVREL (\r
   IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
   IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
   OUT    CHAR16                    **DisasmString\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Disasm instruction - MOVREL\r
-\r
-Arguments:\r
-\r
-  InstructionAddress - The instruction address\r
-  SystemContext      - EBC system context.\r
-  DisasmString       - The instruction string\r
-\r
-Returns:\r
-\r
-  Instruction length\r
-\r
---*/\r
 {\r
   UINT8   Modifiers;\r
   UINT8   Operands;\r
@@ -1827,7 +1690,7 @@ Returns:
   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
@@ -1864,7 +1727,7 @@ Returns:
     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