From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3FC9E81ED4 for ; Thu, 24 Nov 2016 19:32:42 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 24 Nov 2016 19:32:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,693,1473145200"; d="scan'208";a="9128522" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by orsmga002.jf.intel.com with ESMTP; 24 Nov 2016 19:32:40 -0800 From: Dandan Bi To: edk2-devel@lists.01.org Cc: Jiewen Yao , Pete Batard Date: Fri, 25 Nov 2016 11:32:35 +0800 Message-Id: <1480044755-6512-1-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [PATCH v2] MdeModulePkg: Fix GCC build failure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2016 03:32:42 -0000 V2: Add check for CreateEvent and CloseEvent. Cc: Jiewen Yao Cc: Pete Batard Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi --- MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c | 3 --- .../Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c | 5 ----- MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c | 16 ++++++++++------ MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c | 2 -- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c index e0b85c7..adc1c50 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c @@ -192,11 +192,10 @@ Returns: --*/ { UINT64 Address; UINTN Index; - UINT16 OldInstruction; BOOLEAN IsHitBreakpoint; // // Roll back IP for breakpoint instruction (BREAK(3) : 0x0300) // @@ -207,11 +206,10 @@ Returns: // IsHitBreakpoint = FALSE; for (Index = 0; (Index < DebuggerPrivate->DebuggerBreakpointCount) && (Index < EFI_DEBUGGER_BREAKPOINT_MAX); Index++) { if ((DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress == Address) && (DebuggerPrivate->DebuggerBreakpointContext[Index].State)) { - OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction; IsHitBreakpoint = TRUE; break; } } @@ -242,11 +240,10 @@ Returns: // IsHitBreakpoint = FALSE; for (Index = 0; (Index < DebuggerPrivate->DebuggerBreakpointCount) && (Index < EFI_DEBUGGER_BREAKPOINT_MAX); Index++) { if ((DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress == Address) && (DebuggerPrivate->DebuggerBreakpointContext[Index].State)) { - OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction; IsHitBreakpoint = TRUE; break; } } diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c index 4be6dd4..a137ea9 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c @@ -437,12 +437,10 @@ Returns: --*/ { UINTN Index; EFI_STATUS Status; - UINTN Address; - UINT16 OldInstruction; if (CommandArg == NULL) { EDBPrint (L"BreakpointClear Argument error!\n"); return EFI_DEBUG_CONTINUE; } @@ -464,13 +462,10 @@ Returns: if ((Index >= EFI_DEBUGGER_BREAKPOINT_MAX) || (Index >= DebuggerPrivate->DebuggerBreakpointCount)) { EDBPrint (L"BreakpointClear error!\n"); return EFI_DEBUG_CONTINUE; - } else { - Address = (UINTN)DebuggerPrivate->DebuggerBreakpointContext[Index].BreakpointAddress; - OldInstruction = (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstruction; } // // Delete breakpoint // diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c index 9196adb..9394fb0 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c @@ -455,15 +455,17 @@ Returns: TPL_CALLBACK, EbcDebuggerBreakEventFunc, NULL, &mDebuggerPrivate.BreakEvent ); - Status = gBS->SetTimer ( - mDebuggerPrivate.BreakEvent, - TimerPeriodic, - EFI_DEBUG_BREAK_TIMER_INTERVAL - ); + if (!EFI_ERROR (Status)) { + Status = gBS->SetTimer ( + mDebuggerPrivate.BreakEvent, + TimerPeriodic, + EFI_DEBUG_BREAK_TIMER_INTERVAL + ); + } return ; } VOID @@ -491,11 +493,13 @@ Returns: EFI_DEBUGGER_SYMBOL_OBJECT *Object; // // Close the break event // - gBS->CloseEvent (mDebuggerPrivate.BreakEvent); + if (mDebuggerPrivate.BreakEvent != NULL) { + gBS->CloseEvent (mDebuggerPrivate.BreakEvent); + } // // Clean up the symbol // Object = mDebuggerPrivate.DebuggerSymbolContext.Object; diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c index 9573c43..a1d21aa 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c @@ -191,19 +191,17 @@ Returns: --*/ { CHAR8 *LineBuffer; CHAR8 *FieldBuffer; - EFI_DEBUGGER_SYMBOL_ENTRY *Entry; EDB_EBC_MAP_PARSE_STATE MapParseState; EDB_EBC_SYMBOL_PARSE_STATE SymbolParseState; CHAR8 *Name; CHAR8 *ObjName; UINTN Address; EFI_DEBUGGER_SYMBOL_TYPE Type; - Entry = Object->Entry; // // Begin to parse the Buffer // LineBuffer = AsciiStrGetNewTokenLine (Buffer, "\n\r"); -- 1.9.5.msysgit.1