MdeModulePkg: Fix GCC build failure

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Pete Batard <pete@akeo.ie>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Jiewen.yao@intel.com

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
index 9e44026ab9ad077d53ceac873561de15ce1a22a5..7f7cfc0f635af36f7eda2cb8b5ece36c16488add 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
@@ -194,7 +194,6 @@ Returns:
 {\r
   UINT64   Address;\r
   UINTN    Index;\r
-  UINT16   OldInstruction;\r
   BOOLEAN  IsHitBreakpoint;\r
 \r
   //\r
@@ -209,7 +208,6 @@ Returns:
   for (Index = 0; (Index < DebuggerPrivate->DebuggerBreakpointCount) && (Index < EFI_DEBUGGER_BREAKPOINT_MAX); Index++) {\r
     if ((DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress == Address) &&\r
         (DebuggerPrivate->DebuggerBreakpointContext[Index].State)) {\r
-      OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction;\r
       IsHitBreakpoint = TRUE;\r
       break;\r
     }\r
@@ -244,7 +242,6 @@ Returns:
     for (Index = 0; (Index < DebuggerPrivate->DebuggerBreakpointCount) && (Index < EFI_DEBUGGER_BREAKPOINT_MAX); Index++) {\r
       if ((DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress == Address) &&\r
           (DebuggerPrivate->DebuggerBreakpointContext[Index].State)) {\r
-        OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction;\r
         IsHitBreakpoint = TRUE;\r
         break;\r
       }\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
index f06963f7d751fb374ce1d16de4fc7c07de9c024e..7c0122e75c5fda9f826b3d33db150df772617ecf 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
@@ -439,8 +439,6 @@ Returns:
 {\r
   UINTN      Index;\r
   EFI_STATUS Status;\r
-  UINTN      Address;\r
-  UINT16     OldInstruction;\r
 \r
   if (CommandArg == NULL) {\r
     EDBPrint (L"BreakpointClear Argument error!\n");\r
@@ -470,9 +468,6 @@ Returns:
       (Index >= DebuggerPrivate->DebuggerBreakpointCount)) {\r
     EDBPrint (L"BreakpointClear error!\n");\r
     return EFI_DEBUG_CONTINUE;\r
-  } else {\r
-    Address = (UINTN)DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress;\r
-    OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction;\r
   }\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
index 9196adb74ba3f9685525ac8c81ffc77bdf214c78..9394fb0ce5e883072501eb636a1db74506b70b74 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
@@ -457,11 +457,13 @@ Returns:
                   NULL,\r
                   &mDebuggerPrivate.BreakEvent\r
                   );\r
-  Status = gBS->SetTimer (\r
-                  mDebuggerPrivate.BreakEvent,\r
-                  TimerPeriodic,\r
-                  EFI_DEBUG_BREAK_TIMER_INTERVAL\r
-                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    Status = gBS->SetTimer (\r
+                    mDebuggerPrivate.BreakEvent,\r
+                    TimerPeriodic,\r
+                    EFI_DEBUG_BREAK_TIMER_INTERVAL\r
+                    );\r
+  }\r
 \r
   return ;\r
 }\r
@@ -493,7 +495,9 @@ Returns:
   //\r
   // Close the break event\r
   //\r
-  gBS->CloseEvent (mDebuggerPrivate.BreakEvent);\r
+  if (mDebuggerPrivate.BreakEvent != NULL) {\r
+    gBS->CloseEvent (mDebuggerPrivate.BreakEvent);\r
+  }\r
 \r
   //\r
   // Clean up the symbol\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index 22a827d35de2d38f15f8942aa6bf0c2e219f2f8f..57945023588d1b33940ca1238bd99dae79c1405e 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
@@ -193,7 +193,6 @@ Returns:
 {\r
   CHAR8                      *LineBuffer;\r
   CHAR8                      *FieldBuffer;\r
-  EFI_DEBUGGER_SYMBOL_ENTRY  *Entry;\r
   EDB_EBC_MAP_PARSE_STATE    MapParseState;\r
   EDB_EBC_SYMBOL_PARSE_STATE SymbolParseState;\r
   CHAR8                      *Name;\r
@@ -201,7 +200,6 @@ Returns:
   UINTN                      Address;\r
   EFI_DEBUGGER_SYMBOL_TYPE   Type;\r
 \r
-  Entry = Object->Entry;\r
 \r
   //\r
   // Begin to parse the Buffer\r