MdeModulePkg: Apply uncrustify changes

[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 7d933cae76498d3fa5dba0f4c8034c24aedb80cf..18f16d7329826ee8c72665cd9a06bfbd9db842f6 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
@@ -44,7 +44,7 @@ EDB_DISASM_DEFINE (EdbDisasmMOVREL);
 //\r
 // Debugger Disasm Table\r
 //\r
-EDB_DISASM_INSTRUCTION mEdbDisasmInstructionTable[] = {\r
+EDB_DISASM_INSTRUCTION  mEdbDisasmInstructionTable[] = {\r
   EdbDisasmBREAK,             // opcode 0x00 BREAK\r
   EdbDisasmJMP,               // opcode 0x01 JMP\r
   EdbDisasmJMP8,              // opcode 0x02 JMP8\r
@@ -118,12 +118,12 @@ EDB_DISASM_INSTRUCTION mEdbDisasmInstructionTable[] = {
 **/\r
 UINTN\r
 EdbDisasmBREAK (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_BREAK);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_BREAK);\r
 \r
   if (*(UINT8 *)(UINTN)(InstructionAddress + 1) > 6) {\r
     return 0;\r
@@ -144,7 +144,7 @@ EdbDisasmBREAK (
   return 2;\r
 }\r
 \r
-extern CONST UINT8                    mJMPLen[];\r
+extern CONST UINT8  mJMPLen[];\r
 \r
 /**\r
 \r
@@ -159,9 +159,9 @@ extern CONST UINT8                    mJMPLen[];
 **/\r
 UINTN\r
 EdbDisasmJMP (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
   UINT8   Modifiers;\r
@@ -170,11 +170,11 @@ EdbDisasmJMP (
   UINT32  Data32;\r
   UINT64  Data64;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_JMP);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_JMP);\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Size = (UINTN)mJMPLen[(Modifiers >> 6) & 0x03];\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Size      = (UINTN)mJMPLen[(Modifiers >> 6) & 0x03];\r
 \r
   //\r
   // Construct Disasm String\r
@@ -183,11 +183,11 @@ EdbDisasmJMP (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"JMP");\r
-//    if (Modifiers & OPCODE_M_IMMDATA64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & OPCODE_M_IMMDATA64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
     if ((Modifiers & CONDITION_M_CONDITIONAL) != 0) {\r
       if ((Modifiers & JMP_M_CS) != 0) {\r
         EdbPrintInstructionName (L"cs");\r
@@ -198,20 +198,21 @@ EdbDisasmJMP (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & OPCODE_M_IMMDATA64) != 0) {\r
-      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
+      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
       if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
         EdbPrintData64 (Data64);\r
       } else {\r
         return 0;\r
       }\r
     } else {\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
       EdbPrintRegister1 (Operands);\r
 \r
       if ((Operands & OPERAND_M_INDIRECT1) == 0) {\r
         if ((Modifiers & OPCODE_M_IMMDATA) == 0) {\r
           Data32 = 0;\r
         }\r
+\r
         EdbPrintImmDatan (Data32);\r
       } else {\r
         EdbPrintRawIndexData32 (Data32);\r
@@ -237,15 +238,15 @@ EdbDisasmJMP (
 **/\r
 UINTN\r
 EdbDisasmJMP8 (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8   Modifiers;\r
+  UINT8  Modifiers;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_JMP8);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_JMP8);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
 \r
   //\r
   // Construct Disasm String\r
@@ -283,26 +284,26 @@ EdbDisasmJMP8 (
 **/\r
 UINTN\r
 EdbDisasmCALL (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8   Modifiers;\r
-  UINT8   Operands;\r
-  UINTN   Size;\r
-  UINT32  Data32;\r
-  UINT64  Data64;\r
-  UINT64  Ip;\r
-  UINTN   Result;\r
-  EFI_PHYSICAL_ADDRESS      SavedInstructionAddress;\r
-\r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_CALL);\r
+  UINT8                 Modifiers;\r
+  UINT8                 Operands;\r
+  UINTN                 Size;\r
+  UINT32                Data32;\r
+  UINT64                Data64;\r
+  UINT64                Ip;\r
+  UINTN                 Result;\r
+  EFI_PHYSICAL_ADDRESS  SavedInstructionAddress;\r
+\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_CALL);\r
   SavedInstructionAddress = InstructionAddress;\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Size = (UINTN)mJMPLen[(Modifiers >> 6) & 0x03];\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Size      = (UINTN)mJMPLen[(Modifiers >> 6) & 0x03];\r
 \r
   //\r
   // Construct Disasm String\r
@@ -311,21 +312,22 @@ EdbDisasmCALL (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"CALL");\r
-//    if (Modifiers & OPCODE_M_IMMDATA64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & OPCODE_M_IMMDATA64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
     if ((Operands & OPERAND_M_NATIVE_CALL) != 0) {\r
       EdbPrintInstructionName (L"EX");\r
     }\r
-//    if ((Operands & OPERAND_M_RELATIVE_ADDR) == 0) {\r
-//      EdbPrintInstructionName (L"a");\r
-//    }\r
+\r
+    //    if ((Operands & OPERAND_M_RELATIVE_ADDR) == 0) {\r
+    //      EdbPrintInstructionName (L"a");\r
+    //    }\r
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & OPCODE_M_IMMDATA64) != 0) {\r
-      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
+      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
       Ip = Data64;\r
       if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
         Result = EdbFindAndPrintSymbol ((UINTN)Ip);\r
@@ -337,7 +339,7 @@ EdbDisasmCALL (
       }\r
     } else {\r
       if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
-        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
       } else {\r
         Data32 = 0;\r
       }\r
@@ -354,6 +356,7 @@ EdbDisasmCALL (
         } else {\r
           Result = EdbFindAndPrintSymbol ((UINTN)Ip);\r
         }\r
+\r
         if (Result == 0) {\r
           EdbPrintRegister1 (Operands);\r
           if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
@@ -387,12 +390,12 @@ EdbDisasmCALL (
 **/\r
 UINTN\r
 EdbDisasmRET (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_RET);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_RET);\r
 \r
   if (*(UINT8 *)(UINTN)(InstructionAddress + 1) != 0) {\r
     return 0;\r
@@ -425,28 +428,28 @@ EdbDisasmRET (
 **/\r
 UINTN\r
 EdbDisasmCMP (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Opcode;\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINT16 Data16;\r
-  UINTN  Size;\r
+  UINT8   Opcode;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINT16  Data16;\r
+  UINTN   Size;\r
 \r
   ASSERT (\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPEQ)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPLTE)  ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPGTE)  ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPULTE) ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPUGTE)\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPEQ)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPLTE)  ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPGTE)  ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPULTE) ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPUGTE)\r
     );\r
 \r
-  Opcode     = GET_OPCODE (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Opcode    = GET_OPCODE (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
   if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -460,27 +463,27 @@ EdbDisasmCMP (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"CMP");\r
-//    if (Modifiers & OPCODE_M_64BIT) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & OPCODE_M_64BIT) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
     switch (Opcode) {\r
-    case OPCODE_CMPEQ:\r
-      EdbPrintInstructionName (L"eq");\r
-      break;\r
-    case OPCODE_CMPLTE:\r
-      EdbPrintInstructionName (L"lte");\r
-      break;\r
-    case OPCODE_CMPGTE:\r
-      EdbPrintInstructionName (L"gte");\r
-      break;\r
-    case OPCODE_CMPULTE:\r
-      EdbPrintInstructionName (L"ulte");\r
-      break;\r
-    case OPCODE_CMPUGTE:\r
-      EdbPrintInstructionName (L"ugte");\r
-      break;\r
+      case OPCODE_CMPEQ:\r
+        EdbPrintInstructionName (L"eq");\r
+        break;\r
+      case OPCODE_CMPLTE:\r
+        EdbPrintInstructionName (L"lte");\r
+        break;\r
+      case OPCODE_CMPGTE:\r
+        EdbPrintInstructionName (L"gte");\r
+        break;\r
+      case OPCODE_CMPULTE:\r
+        EdbPrintInstructionName (L"ulte");\r
+        break;\r
+      case OPCODE_CMPUGTE:\r
+        EdbPrintInstructionName (L"ugte");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
@@ -490,7 +493,7 @@ EdbDisasmCMP (
     EdbPrintRegister2 (Operands);\r
 \r
     if ((Modifiers & OPCODE_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -517,35 +520,35 @@ EdbDisasmCMP (
 **/\r
 UINTN\r
 EdbDisasmUnsignedDataManip (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Opcode;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Opcode;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
   ASSERT (\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_NOT)    ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MULU)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_DIVU)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MODU)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_AND)    ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_OR)     ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_XOR)    ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_SHL)    ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_SHR)    ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_EXTNDB) ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_EXTNDW) ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_EXTNDD)\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_NOT)    ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MULU)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_DIVU)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MODU)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_AND)    ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_OR)     ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_XOR)    ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_SHL)    ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_SHR)    ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_EXTNDB) ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_EXTNDW) ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_EXTNDD)\r
     );\r
 \r
-  Opcode     = GET_OPCODE (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Opcode    = GET_OPCODE (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -559,48 +562,49 @@ EdbDisasmUnsignedDataManip (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     switch (Opcode) {\r
-    case OPCODE_NOT:\r
-      EdbPrintInstructionName (L"NOT");\r
-      break;\r
-    case OPCODE_MULU:\r
-      EdbPrintInstructionName (L"MULU");\r
-      break;\r
-    case OPCODE_DIVU:\r
-      EdbPrintInstructionName (L"DIVU");\r
-      break;\r
-    case OPCODE_MODU:\r
-      EdbPrintInstructionName (L"MODU");\r
-      break;\r
-    case OPCODE_AND:\r
-      EdbPrintInstructionName (L"AND");\r
-      break;\r
-    case OPCODE_OR:\r
-      EdbPrintInstructionName (L"OR");\r
-      break;\r
-    case OPCODE_XOR:\r
-      EdbPrintInstructionName (L"XOR");\r
-      break;\r
-    case OPCODE_SHL:\r
-      EdbPrintInstructionName (L"SHL");\r
-      break;\r
-    case OPCODE_SHR:\r
-      EdbPrintInstructionName (L"SHR");\r
-      break;\r
-    case OPCODE_EXTNDB:\r
-      EdbPrintInstructionName (L"EXTNDB");\r
-      break;\r
-    case OPCODE_EXTNDW:\r
-      EdbPrintInstructionName (L"EXTNDW");\r
-      break;\r
-    case OPCODE_EXTNDD:\r
-      EdbPrintInstructionName (L"EXTNDD");\r
-      break;\r
+      case OPCODE_NOT:\r
+        EdbPrintInstructionName (L"NOT");\r
+        break;\r
+      case OPCODE_MULU:\r
+        EdbPrintInstructionName (L"MULU");\r
+        break;\r
+      case OPCODE_DIVU:\r
+        EdbPrintInstructionName (L"DIVU");\r
+        break;\r
+      case OPCODE_MODU:\r
+        EdbPrintInstructionName (L"MODU");\r
+        break;\r
+      case OPCODE_AND:\r
+        EdbPrintInstructionName (L"AND");\r
+        break;\r
+      case OPCODE_OR:\r
+        EdbPrintInstructionName (L"OR");\r
+        break;\r
+      case OPCODE_XOR:\r
+        EdbPrintInstructionName (L"XOR");\r
+        break;\r
+      case OPCODE_SHL:\r
+        EdbPrintInstructionName (L"SHL");\r
+        break;\r
+      case OPCODE_SHR:\r
+        EdbPrintInstructionName (L"SHR");\r
+        break;\r
+      case OPCODE_EXTNDB:\r
+        EdbPrintInstructionName (L"EXTNDB");\r
+        break;\r
+      case OPCODE_EXTNDW:\r
+        EdbPrintInstructionName (L"EXTNDW");\r
+        break;\r
+      case OPCODE_EXTNDD:\r
+        EdbPrintInstructionName (L"EXTNDD");\r
+        break;\r
     }\r
-//    if (Modifiers & DATAMANIP_M_64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+\r
+    //    if (Modifiers & DATAMANIP_M_64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
 \r
     EdbPrintRegister1 (Operands);\r
     EdbPrintComma ();\r
@@ -608,7 +612,7 @@ EdbDisasmUnsignedDataManip (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -635,30 +639,30 @@ EdbDisasmUnsignedDataManip (
 **/\r
 UINTN\r
 EdbDisasmSignedDataManip (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Opcode;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Opcode;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
   ASSERT (\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_NEG)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_ADD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_SUB)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MUL)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_DIV)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_ASHR)\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_NEG)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_ADD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_SUB)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MUL)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_DIV)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_ASHR)\r
     );\r
 \r
-  Opcode     = GET_OPCODE (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Opcode    = GET_OPCODE (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -672,33 +676,34 @@ EdbDisasmSignedDataManip (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     switch (Opcode) {\r
-    case OPCODE_NEG:\r
-      EdbPrintInstructionName (L"NEG");\r
-      break;\r
-    case OPCODE_ADD:\r
-      EdbPrintInstructionName (L"ADD");\r
-      break;\r
-    case OPCODE_SUB:\r
-      EdbPrintInstructionName (L"SUB");\r
-      break;\r
-    case OPCODE_MUL:\r
-      EdbPrintInstructionName (L"MUL");\r
-      break;\r
-    case OPCODE_DIV:\r
-      EdbPrintInstructionName (L"DIV");\r
-      break;\r
-    case OPCODE_MOD:\r
-      EdbPrintInstructionName (L"MOD");\r
-      break;\r
-    case OPCODE_ASHR:\r
-      EdbPrintInstructionName (L"ASHR");\r
-      break;\r
+      case OPCODE_NEG:\r
+        EdbPrintInstructionName (L"NEG");\r
+        break;\r
+      case OPCODE_ADD:\r
+        EdbPrintInstructionName (L"ADD");\r
+        break;\r
+      case OPCODE_SUB:\r
+        EdbPrintInstructionName (L"SUB");\r
+        break;\r
+      case OPCODE_MUL:\r
+        EdbPrintInstructionName (L"MUL");\r
+        break;\r
+      case OPCODE_DIV:\r
+        EdbPrintInstructionName (L"DIV");\r
+        break;\r
+      case OPCODE_MOD:\r
+        EdbPrintInstructionName (L"MOD");\r
+        break;\r
+      case OPCODE_ASHR:\r
+        EdbPrintInstructionName (L"ASHR");\r
+        break;\r
     }\r
-//    if (Modifiers & DATAMANIP_M_64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+\r
+    //    if (Modifiers & DATAMANIP_M_64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
 \r
     EdbPrintRegister1 (Operands);\r
     EdbPrintComma ();\r
@@ -706,7 +711,7 @@ EdbDisasmSignedDataManip (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & DATAMANIP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -733,9 +738,9 @@ EdbDisasmSignedDataManip (
 **/\r
 UINTN\r
 EdbDisasmMOVxx (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
   UINT8   Modifiers;\r
@@ -747,28 +752,29 @@ EdbDisasmMOVxx (
   UINT64  Data64;\r
 \r
   ASSERT (\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVBW)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVWW)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVDW)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVQW)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVBD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVWD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVDD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVQD)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVQQ)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVNW)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_MOVND)\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVBW)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVWW)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVDW)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVQW)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVBD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVWD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVDD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVQD)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVQQ)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVNW)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_MOVND)\r
     );\r
 \r
-  Opcode     = GET_OPCODE (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Size = 2;\r
+  Opcode    = GET_OPCODE (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Size      = 2;\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) != 0) {\r
         Size += 2;\r
       }\r
+\r
       if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 2;\r
       }\r
@@ -776,6 +782,7 @@ EdbDisasmMOVxx (
       if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
         Size += 4;\r
       }\r
+\r
       if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 4;\r
       }\r
@@ -783,6 +790,7 @@ EdbDisasmMOVxx (
       if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
         Size += 8;\r
       }\r
+\r
       if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
         Size += 8;\r
       }\r
@@ -797,39 +805,39 @@ EdbDisasmMOVxx (
 \r
     EdbPrintInstructionName (L"MOV");\r
     switch (Opcode) {\r
-    case OPCODE_MOVBW:\r
-      EdbPrintInstructionName (L"bw");\r
-      break;\r
-    case OPCODE_MOVWW:\r
-      EdbPrintInstructionName (L"ww");\r
-      break;\r
-    case OPCODE_MOVDW:\r
-      EdbPrintInstructionName (L"dw");\r
-      break;\r
-    case OPCODE_MOVQW:\r
-      EdbPrintInstructionName (L"qw");\r
-      break;\r
-    case OPCODE_MOVBD:\r
-      EdbPrintInstructionName (L"bd");\r
-      break;\r
-    case OPCODE_MOVWD:\r
-      EdbPrintInstructionName (L"wd");\r
-      break;\r
-    case OPCODE_MOVDD:\r
-      EdbPrintInstructionName (L"dd");\r
-      break;\r
-    case OPCODE_MOVQD:\r
-      EdbPrintInstructionName (L"qd");\r
-      break;\r
-    case OPCODE_MOVQQ:\r
-      EdbPrintInstructionName (L"qq");\r
-      break;\r
-    case OPCODE_MOVNW:\r
-      EdbPrintInstructionName (L"nw");\r
-      break;\r
-    case OPCODE_MOVND:\r
-      EdbPrintInstructionName (L"nd");\r
-      break;\r
+      case OPCODE_MOVBW:\r
+        EdbPrintInstructionName (L"bw");\r
+        break;\r
+      case OPCODE_MOVWW:\r
+        EdbPrintInstructionName (L"ww");\r
+        break;\r
+      case OPCODE_MOVDW:\r
+        EdbPrintInstructionName (L"dw");\r
+        break;\r
+      case OPCODE_MOVQW:\r
+        EdbPrintInstructionName (L"qw");\r
+        break;\r
+      case OPCODE_MOVBD:\r
+        EdbPrintInstructionName (L"bd");\r
+        break;\r
+      case OPCODE_MOVWD:\r
+        EdbPrintInstructionName (L"wd");\r
+        break;\r
+      case OPCODE_MOVDD:\r
+        EdbPrintInstructionName (L"dd");\r
+        break;\r
+      case OPCODE_MOVQD:\r
+        EdbPrintInstructionName (L"qd");\r
+        break;\r
+      case OPCODE_MOVQQ:\r
+        EdbPrintInstructionName (L"qq");\r
+        break;\r
+      case OPCODE_MOVNW:\r
+        EdbPrintInstructionName (L"nw");\r
+        break;\r
+      case OPCODE_MOVND:\r
+        EdbPrintInstructionName (L"nd");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
@@ -837,15 +845,15 @@ EdbDisasmMOVxx (
     InstructionAddress += 2;\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
+        CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
         InstructionAddress += 2;\r
         EdbPrintRawIndexData16 (Data16);\r
       } else if ((Opcode <= OPCODE_MOVQD) || (Opcode == OPCODE_MOVND)) {\r
-        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
         InstructionAddress += 4;\r
         EdbPrintRawIndexData32 (Data32);\r
       } else if (Opcode == OPCODE_MOVQQ) {\r
-        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
+        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
         InstructionAddress += 8;\r
         EdbPrintRawIndexData64 (Data64);\r
       }\r
@@ -856,13 +864,13 @@ EdbDisasmMOVxx (
 \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
+        CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
         EdbPrintRawIndexData16 (Data16);\r
       } else if ((Opcode <= OPCODE_MOVQD) || (Opcode == OPCODE_MOVND)) {\r
-        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
         EdbPrintRawIndexData32 (Data32);\r
       } else if (Opcode == OPCODE_MOVQQ) {\r
-        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
+        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
         EdbPrintRawIndexData64 (Data64);\r
       }\r
     }\r
@@ -886,24 +894,25 @@ EdbDisasmMOVxx (
 **/\r
 UINTN\r
 EdbDisasmMOVsnw (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_MOVSNW);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_MOVSNW);\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Size = 2;\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Size      = 2;\r
   if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
     Size += 2;\r
   }\r
+\r
   if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
     Size += 2;\r
   }\r
@@ -920,7 +929,7 @@ EdbDisasmMOVsnw (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
     }\r
@@ -929,7 +938,7 @@ EdbDisasmMOVsnw (
     EdbPrintRegister2 (Operands);\r
 \r
     if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -956,24 +965,25 @@ EdbDisasmMOVsnw (
 **/\r
 UINTN\r
 EdbDisasmMOVsnd (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT32 Data32;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT32  Data32;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_MOVSND);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_MOVSND);\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Size = 2;\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Size      = 2;\r
   if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
     Size += 4;\r
   }\r
+\r
   if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
     Size += 4;\r
   }\r
@@ -990,7 +1000,7 @@ EdbDisasmMOVsnd (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & OPCODE_M_IMMED_OP1) != 0) {\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
       InstructionAddress += 4;\r
       EdbPrintRawIndexData32 (Data32);\r
     }\r
@@ -999,7 +1009,7 @@ EdbDisasmMOVsnd (
     EdbPrintRegister2 (Operands);\r
 \r
     if ((Modifiers & OPCODE_M_IMMED_OP2) != 0) {\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
       if ((Operands & OPERAND_M_INDIRECT2) != 0) {\r
         EdbPrintRawIndexData32 (Data32);\r
       } else {\r
@@ -1026,16 +1036,16 @@ EdbDisasmMOVsnd (
 **/\r
 UINTN\r
 EdbDisasmLOADSP (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
   UINT8  Operands;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_LOADSP);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_LOADSP);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Operands = GET_OPERANDS (InstructionAddress);\r
 \r
   //\r
   // Construct Disasm String\r
@@ -1068,16 +1078,16 @@ EdbDisasmLOADSP (
 **/\r
 UINTN\r
 EdbDisasmSTORESP (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
   UINT8  Operands;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_STORESP);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_STORESP);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Operands = GET_OPERANDS (InstructionAddress);\r
 \r
   //\r
   // Construct Disasm String\r
@@ -1097,7 +1107,6 @@ EdbDisasmSTORESP (
   return 2;\r
 }\r
 \r
-\r
 /**\r
 \r
   Disasm instruction - PUSH.\r
@@ -1111,20 +1120,20 @@ EdbDisasmSTORESP (
 **/\r
 UINTN\r
 EdbDisasmPUSH (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_PUSH);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_PUSH);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -1138,17 +1147,17 @@ EdbDisasmPUSH (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"PUSH");\r
-//    if (Modifiers & PUSHPOP_M_64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & PUSHPOP_M_64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -1175,20 +1184,20 @@ EdbDisasmPUSH (
 **/\r
 UINTN\r
 EdbDisasmPOP (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_POP);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_POP);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -1202,17 +1211,17 @@ EdbDisasmPOP (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"POP");\r
-//    if (Modifiers & PUSHPOP_M_64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & PUSHPOP_M_64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -1239,29 +1248,29 @@ EdbDisasmPOP (
 **/\r
 UINTN\r
 EdbDisasmCMPI (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Opcode;\r
-  UINT8  Operands;\r
-  UINT16 Data16;\r
-  UINT32 Data32;\r
-  UINTN  Size;\r
+  UINT8   Modifiers;\r
+  UINT8   Opcode;\r
+  UINT8   Operands;\r
+  UINT16  Data16;\r
+  UINT32  Data32;\r
+  UINTN   Size;\r
 \r
   ASSERT (\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPIEQ)   ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPILTE)  ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPIGTE)  ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPIULTE) ||\r
-    (GET_OPCODE(InstructionAddress) == OPCODE_CMPIUGTE)\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPIEQ)   ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPILTE)  ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPIGTE)  ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPIULTE) ||\r
+    (GET_OPCODE (InstructionAddress) == OPCODE_CMPIUGTE)\r
     );\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Opcode     = GET_OPCODE (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Opcode    = GET_OPCODE (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
 \r
   if ((Operands & 0xE0) != 0) {\r
     return 0;\r
@@ -1271,6 +1280,7 @@ EdbDisasmCMPI (
   if ((Operands & OPERAND_M_CMPI_INDEX) != 0) {\r
     Size += 2;\r
   }\r
+\r
   if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
     Size += 4;\r
   } else {\r
@@ -1284,39 +1294,40 @@ EdbDisasmCMPI (
     *DisasmString = EdbPreInstructionString ();\r
 \r
     EdbPrintInstructionName (L"CMPI");\r
-//    if (Modifiers & OPCODE_M_CMPI64) {\r
-//      EdbPrintInstructionName (L"64");\r
-//    } else {\r
-//      EdbPrintInstructionName (L"32");\r
-//    }\r
+    //    if (Modifiers & OPCODE_M_CMPI64) {\r
+    //      EdbPrintInstructionName (L"64");\r
+    //    } else {\r
+    //      EdbPrintInstructionName (L"32");\r
+    //    }\r
     if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
       EdbPrintInstructionName (L"d");\r
     } else {\r
       EdbPrintInstructionName (L"w");\r
     }\r
+\r
     switch (Opcode) {\r
-    case OPCODE_CMPIEQ:\r
-      EdbPrintInstructionName (L"eq");\r
-      break;\r
-    case OPCODE_CMPILTE:\r
-      EdbPrintInstructionName (L"lte");\r
-      break;\r
-    case OPCODE_CMPIGTE:\r
-      EdbPrintInstructionName (L"gte");\r
-      break;\r
-    case OPCODE_CMPIULTE:\r
-      EdbPrintInstructionName (L"ulte");\r
-      break;\r
-    case OPCODE_CMPIUGTE:\r
-      EdbPrintInstructionName (L"ugte");\r
-      break;\r
+      case OPCODE_CMPIEQ:\r
+        EdbPrintInstructionName (L"eq");\r
+        break;\r
+      case OPCODE_CMPILTE:\r
+        EdbPrintInstructionName (L"lte");\r
+        break;\r
+      case OPCODE_CMPIGTE:\r
+        EdbPrintInstructionName (L"gte");\r
+        break;\r
+      case OPCODE_CMPIULTE:\r
+        EdbPrintInstructionName (L"ulte");\r
+        break;\r
+      case OPCODE_CMPIUGTE:\r
+        EdbPrintInstructionName (L"ugte");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Operands & OPERAND_M_CMPI_INDEX) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
     }\r
@@ -1324,10 +1335,10 @@ EdbDisasmCMPI (
     EdbPrintComma ();\r
 \r
     if ((Modifiers & OPCODE_M_CMPI32_DATA) != 0) {\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
+      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
       EdbPrintDatan (Data32);\r
     } else {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       EdbPrintDatan (Data16);\r
     }\r
 \r
@@ -1350,20 +1361,20 @@ EdbDisasmCMPI (
 **/\r
 UINTN\r
 EdbDisasmPUSHn (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_PUSHN);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_PUSHN);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -1382,7 +1393,7 @@ EdbDisasmPUSHn (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -1409,20 +1420,20 @@ EdbDisasmPUSHn (
 **/\r
 UINTN\r
 EdbDisasmPOPn (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_POPN);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_POPN);\r
 \r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
   if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
     Size = 4;\r
   } else {\r
@@ -1441,7 +1452,7 @@ EdbDisasmPOPn (
 \r
     InstructionAddress += 2;\r
     if ((Modifiers & PUSHPOP_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       if ((Operands & OPERAND_M_INDIRECT1) != 0) {\r
         EdbPrintRawIndexData16 (Data16);\r
       } else {\r
@@ -1468,28 +1479,29 @@ EdbDisasmPOPn (
 **/\r
 UINTN\r
 EdbDisasmMOVI (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
-  UINT32 Data32;\r
-  UINT64 Data64;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
+  UINT32  Data32;\r
+  UINT64  Data64;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_MOVI);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_MOVI);\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
 \r
   if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-    Size    = 4;\r
+    Size = 4;\r
   } else {\r
-    Size    = 2;\r
+    Size = 2;\r
   }\r
+\r
   if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH16) {\r
     Size += 2;\r
   } else if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH32) {\r
@@ -1506,36 +1518,37 @@ EdbDisasmMOVI (
 \r
     EdbPrintInstructionName (L"MOVI");\r
     switch (Operands & MOVI_M_MOVEWIDTH) {\r
-    case MOVI_MOVEWIDTH8:\r
-      EdbPrintInstructionName (L"b");\r
-      break;\r
-    case MOVI_MOVEWIDTH16:\r
-      EdbPrintInstructionName (L"w");\r
-      break;\r
-    case MOVI_MOVEWIDTH32:\r
-      EdbPrintInstructionName (L"d");\r
-      break;\r
-    case MOVI_MOVEWIDTH64:\r
-      EdbPrintInstructionName (L"q");\r
-      break;\r
+      case MOVI_MOVEWIDTH8:\r
+        EdbPrintInstructionName (L"b");\r
+        break;\r
+      case MOVI_MOVEWIDTH16:\r
+        EdbPrintInstructionName (L"w");\r
+        break;\r
+      case MOVI_MOVEWIDTH32:\r
+        EdbPrintInstructionName (L"d");\r
+        break;\r
+      case MOVI_MOVEWIDTH64:\r
+        EdbPrintInstructionName (L"q");\r
+        break;\r
     }\r
+\r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      EdbPrintInstructionName (L"w");\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      EdbPrintInstructionName (L"d");\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      EdbPrintInstructionName (L"q");\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        EdbPrintInstructionName (L"w");\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        EdbPrintInstructionName (L"d");\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        EdbPrintInstructionName (L"q");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
     }\r
@@ -1543,18 +1556,18 @@ EdbDisasmMOVI (
     EdbPrintComma ();\r
 \r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      EdbPrintDatan (Data16);\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
-      EdbPrintDatan (Data32);\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
-      EdbPrintData64n (Data64);\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
+        EdbPrintDatan (Data16);\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
+        EdbPrintDatan (Data32);\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
+        EdbPrintData64n (Data64);\r
+        break;\r
     }\r
 \r
     EdbPostInstructionString ();\r
@@ -1576,28 +1589,29 @@ EdbDisasmMOVI (
 **/\r
 UINTN\r
 EdbDisasmMOVIn (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8  Modifiers;\r
-  UINT8  Operands;\r
-  UINTN  Size;\r
-  UINT16 Data16;\r
-  UINT32 Data32;\r
-  UINT64 Data64;\r
+  UINT8   Modifiers;\r
+  UINT8   Operands;\r
+  UINTN   Size;\r
+  UINT16  Data16;\r
+  UINT32  Data32;\r
+  UINT64  Data64;\r
 \r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_MOVIN);\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_MOVIN);\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
 \r
   if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-    Size    = 4;\r
+    Size = 4;\r
   } else {\r
-    Size    = 2;\r
+    Size = 2;\r
   }\r
+\r
   if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH16) {\r
     Size += 2;\r
   } else if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH32) {\r
@@ -1614,22 +1628,22 @@ EdbDisasmMOVIn (
 \r
     EdbPrintInstructionName (L"MOVIn");\r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      EdbPrintInstructionName (L"w");\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      EdbPrintInstructionName (L"d");\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      EdbPrintInstructionName (L"q");\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        EdbPrintInstructionName (L"w");\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        EdbPrintInstructionName (L"d");\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        EdbPrintInstructionName (L"q");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
     }\r
@@ -1637,18 +1651,18 @@ EdbDisasmMOVIn (
     EdbPrintComma ();\r
 \r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      EdbPrintRawIndexData16 (Data16);\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
-      EdbPrintRawIndexData32 (Data32);\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
-      EdbPrintRawIndexData64 (Data64);\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
+        EdbPrintRawIndexData16 (Data16);\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
+        EdbPrintRawIndexData32 (Data32);\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
+        EdbPrintRawIndexData64 (Data64);\r
+        break;\r
     }\r
 \r
     EdbPostInstructionString ();\r
@@ -1670,31 +1684,32 @@ EdbDisasmMOVIn (
 **/\r
 UINTN\r
 EdbDisasmMOVREL (\r
-  IN     EFI_PHYSICAL_ADDRESS      InstructionAddress,\r
-  IN     EFI_SYSTEM_CONTEXT        SystemContext,\r
-  OUT    CHAR16                    **DisasmString\r
+  IN     EFI_PHYSICAL_ADDRESS  InstructionAddress,\r
+  IN     EFI_SYSTEM_CONTEXT    SystemContext,\r
+  OUT    CHAR16                **DisasmString\r
   )\r
 {\r
-  UINT8   Modifiers;\r
-  UINT8   Operands;\r
-  UINTN   Size;\r
-  UINT16  Data16;\r
-  UINT32  Data32;\r
-  UINT64  Data64;\r
-  UINTN   Result;\r
-  EFI_PHYSICAL_ADDRESS      SavedInstructionAddress;\r
-\r
-  ASSERT (GET_OPCODE(InstructionAddress) == OPCODE_MOVREL);\r
+  UINT8                 Modifiers;\r
+  UINT8                 Operands;\r
+  UINTN                 Size;\r
+  UINT16                Data16;\r
+  UINT32                Data32;\r
+  UINT64                Data64;\r
+  UINTN                 Result;\r
+  EFI_PHYSICAL_ADDRESS  SavedInstructionAddress;\r
+\r
+  ASSERT (GET_OPCODE (InstructionAddress) == OPCODE_MOVREL);\r
   SavedInstructionAddress = InstructionAddress;\r
 \r
-  Modifiers  = GET_MODIFIERS (InstructionAddress);\r
-  Operands   = GET_OPERANDS (InstructionAddress);\r
+  Modifiers = GET_MODIFIERS (InstructionAddress);\r
+  Operands  = GET_OPERANDS (InstructionAddress);\r
 \r
   if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-    Size    = 4;\r
+    Size = 4;\r
   } else {\r
-    Size    = 2;\r
+    Size = 2;\r
   }\r
+\r
   if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH16) {\r
     Size += 2;\r
   } else if ((Modifiers & MOVI_M_DATAWIDTH) == MOVI_DATAWIDTH32) {\r
@@ -1713,22 +1728,22 @@ EdbDisasmMOVREL (
 \r
     EdbPrintInstructionName (L"MOVrel");\r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      EdbPrintInstructionName (L"w");\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      EdbPrintInstructionName (L"d");\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      EdbPrintInstructionName (L"q");\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        EdbPrintInstructionName (L"w");\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        EdbPrintInstructionName (L"d");\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        EdbPrintInstructionName (L"q");\r
+        break;\r
     }\r
 \r
     EdbPrintRegister1 (Operands);\r
 \r
     InstructionAddress += 2;\r
     if ((Operands & MOVI_M_IMMDATA) != 0) {\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
+      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
       InstructionAddress += 2;\r
       EdbPrintRawIndexData16 (Data16);\r
     }\r
@@ -1736,31 +1751,35 @@ EdbDisasmMOVREL (
     EdbPrintComma ();\r
 \r
     switch (Modifiers & MOVI_M_DATAWIDTH) {\r
-    case MOVI_DATAWIDTH16:\r
-      CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT16));\r
-      Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT16)Data16));\r
-      if (Result == 0) {\r
-        EdbPrintData16 (Data16);\r
-      }\r
-      break;\r
-    case MOVI_DATAWIDTH32:\r
-      CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT32));\r
-      Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT32)Data32));\r
-      if (Result == 0) {\r
-        EdbPrintData32 (Data32);\r
-      }\r
-      break;\r
-    case MOVI_DATAWIDTH64:\r
-      CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof(UINT64));\r
-      if (sizeof(UINTN) == sizeof(UINT64)) {\r
-        Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT64)Data64));\r
-      } else {\r
-        Result = 0;\r
-      }\r
-      if (Result == 0) {\r
-        EdbPrintData64 (Data64);\r
-      }\r
-      break;\r
+      case MOVI_DATAWIDTH16:\r
+        CopyMem (&Data16, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT16));\r
+        Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT16)Data16));\r
+        if (Result == 0) {\r
+          EdbPrintData16 (Data16);\r
+        }\r
+\r
+        break;\r
+      case MOVI_DATAWIDTH32:\r
+        CopyMem (&Data32, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT32));\r
+        Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT32)Data32));\r
+        if (Result == 0) {\r
+          EdbPrintData32 (Data32);\r
+        }\r
+\r
+        break;\r
+      case MOVI_DATAWIDTH64:\r
+        CopyMem (&Data64, (VOID *)(UINTN)(InstructionAddress), sizeof (UINT64));\r
+        if (sizeof (UINTN) == sizeof (UINT64)) {\r
+          Result = EdbFindAndPrintSymbol ((UINTN)(SavedInstructionAddress + Size + (INT64)Data64));\r
+        } else {\r
+          Result = 0;\r
+        }\r
+\r
+        if (Result == 0) {\r
+          EdbPrintData64 (Data64);\r
+        }\r
+\r
+        break;\r
     }\r
 \r
     EdbPostInstructionString ();\r