* [PATCH v2] MdeModulePkg: Fix GCC build failure
@ 2016-11-25 3:32 Dandan Bi
2016-11-25 4:19 ` Yao, Jiewen
0 siblings, 1 reply; 2+ messages in thread
From: Dandan Bi @ 2016-11-25 3:32 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Pete Batard
V2: Add check for CreateEvent and CloseEvent.
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] MdeModulePkg: Fix GCC build failure
2016-11-25 3:32 [PATCH v2] MdeModulePkg: Fix GCC build failure Dandan Bi
@ 2016-11-25 4:19 ` Yao, Jiewen
0 siblings, 0 replies; 2+ messages in thread
From: Yao, Jiewen @ 2016-11-25 4:19 UTC (permalink / raw)
To: Bi, Dandan, edk2-devel@lists.01.org
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: Bi, Dandan
> Sent: Friday, November 25, 2016 11:33 AM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Pete Batard <pete@akeo.ie>
> Subject: [PATCH v2] MdeModulePkg: Fix GCC build failure
>
> V2: Add check for CreateEvent and CloseEvent.
>
> 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>
> ---
> 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].OldInstructi
> on;
> 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].OldInstructi
> on;
> 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].BreakpointA
> ddress;
> - OldInstruction =
> (UINT16)DebuggerPrivate->DebuggerBreakpointContext[Index].OldInstructi
> on;
> }
>
> //
> // 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-25 4:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-25 3:32 [PATCH v2] MdeModulePkg: Fix GCC build failure Dandan Bi
2016-11-25 4:19 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox