**/\r
CHAR16 *\r
GetFileNameFromFullPath (\r
- IN CHAR16 *FullPath\r
+ IN CHAR16 *FullPath\r
)\r
{\r
- CHAR16 *FileName;\r
- CHAR16 *TempFileName;\r
+ CHAR16 *FileName;\r
+ CHAR16 *TempFileName;\r
\r
- FileName = FullPath;\r
+ FileName = FullPath;\r
TempFileName = StrGetNewTokenLine (FullPath, L"\\");\r
\r
while (TempFileName != NULL) {\r
- FileName = TempFileName;\r
+ FileName = TempFileName;\r
TempFileName = StrGetNextTokenLine (L"\\");\r
PatchForStrTokenBefore (TempFileName, L'\\');\r
}\r
**/\r
CHAR16 *\r
GetDirNameFromFullPath (\r
- IN CHAR16 *FullPath\r
+ IN CHAR16 *FullPath\r
)\r
{\r
- CHAR16 *FileName;\r
+ CHAR16 *FileName;\r
\r
FileName = GetFileNameFromFullPath (FullPath);\r
if (FileName != FullPath) {\r
**/\r
CHAR16 *\r
ConstructFullPath (\r
- IN CHAR16 *DirPath,\r
- IN CHAR16 *FilePath,\r
- IN UINTN Size\r
+ IN CHAR16 *DirPath,\r
+ IN CHAR16 *FilePath,\r
+ IN UINTN Size\r
)\r
{\r
- UINTN DirPathSize;\r
+ UINTN DirPathSize;\r
\r
- DirPathSize = StrLen(DirPath);\r
+ DirPathSize = StrLen (DirPath);\r
*(DirPath + DirPathSize) = L'\\';\r
StrnCatS (DirPath, DirPathSize + Size + 1, FilePath, Size);\r
\r
return DirPath;\r
}\r
\r
-CHAR16 *mSymbolTypeStr[] = {\r
+CHAR16 *mSymbolTypeStr[] = {\r
L"( F)",\r
L"(SF)",\r
L"(GV)",\r
IN EFI_DEBUGGER_SYMBOL_TYPE Type\r
)\r
{\r
- if (Type < 0 || Type >= EfiDebuggerSymbolTypeMax) {\r
+ if ((Type < 0) || (Type >= EfiDebuggerSymbolTypeMax)) {\r
return L"(?)";\r
}\r
\r
- return mSymbolTypeStr [Type];\r
+ return mSymbolTypeStr[Type];\r
}\r
\r
/**\r
EFI_DEBUG_STATUS\r
DebuggerDisplaySymbolAccrodingToAddress (\r
IN UINTN Address,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate\r
)\r
{\r
- EFI_DEBUGGER_SYMBOL_OBJECT *Object;\r
- EFI_DEBUGGER_SYMBOL_ENTRY *Entry;\r
- UINTN CandidateAddress;\r
+ EFI_DEBUGGER_SYMBOL_OBJECT *Object;\r
+ EFI_DEBUGGER_SYMBOL_ENTRY *Entry;\r
+ UINTN CandidateAddress;\r
\r
//\r
// Find the nearest symbol address\r
//\r
CandidateAddress = EbdFindSymbolAddress (Address, EdbMatchSymbolTypeNearestAddress, &Object, &Entry);\r
- if (CandidateAddress == 0 || CandidateAddress == (UINTN) -1) {\r
+ if ((CandidateAddress == 0) || (CandidateAddress == (UINTN)-1) || (Entry == NULL)) {\r
EDBPrint (L"Symbole at Address not found!\n");\r
return EFI_DEBUG_CONTINUE;\r
} else if (Address != CandidateAddress) {\r
// Display symbol\r
//\r
EDBPrint (L"Symbol File Name: %s\n", Object->Name);\r
- if (sizeof(UINTN) == sizeof(UINT64)) {\r
+ if (sizeof (UINTN) == sizeof (UINT64)) {\r
EDBPrint (L" Address Type Symbol\n");\r
EDBPrint (L" ================== ==== ========\n");\r
-// EDBPrint (L" 0xFFFFFFFF00000000 ( F) TestMain\n");\r
+ // EDBPrint (L" 0xFFFFFFFF00000000 ( F) TestMain\n");\r
EDBPrint (\r
L" 0x%016lx %s %a\n",\r
(UINT64)Entry->Rva + Object->BaseAddress,\r
} else {\r
EDBPrint (L" Address Type Symbol\n");\r
EDBPrint (L" ========== ==== ========\n");\r
-// EDBPrint (L" 0xFFFF0000 ( F) TestMain\n");\r
+ // EDBPrint (L" 0xFFFF0000 ( F) TestMain\n");\r
EDBPrint (\r
L" 0x%08x %s %a\n",\r
Entry->Rva + Object->BaseAddress,\r
DebuggerDisplaySymbolAccrodingToName (\r
IN CHAR16 *SymbolFileName,\r
IN CHAR16 *SymbolName,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate\r
)\r
{\r
- UINTN Index;\r
- UINTN SubIndex;\r
- EFI_DEBUGGER_SYMBOL_OBJECT *Object;\r
- EFI_DEBUGGER_SYMBOL_ENTRY *Entry;\r
+ UINTN Index;\r
+ UINTN SubIndex;\r
+ EFI_DEBUGGER_SYMBOL_OBJECT *Object;\r
+ EFI_DEBUGGER_SYMBOL_ENTRY *Entry;\r
\r
if (DebuggerPrivate->DebuggerSymbolContext.ObjectCount == 0) {\r
EDBPrint (L"No Symbol File!\n");\r
Object = DebuggerPrivate->DebuggerSymbolContext.Object;\r
for (Index = 0; Index < DebuggerPrivate->DebuggerSymbolContext.ObjectCount; Index++, Object++) {\r
if ((SymbolFileName != NULL) &&\r
- (StriCmp (SymbolFileName, Object->Name) != 0)) {\r
+ (StriCmp (SymbolFileName, Object->Name) != 0))\r
+ {\r
continue;\r
}\r
\r
EDBPrint (L"No Symbol!\n");\r
continue;\r
}\r
+\r
Entry = Object->Entry;\r
- if (sizeof(UINTN) == sizeof(UINT64)) {\r
+ if (sizeof (UINTN) == sizeof (UINT64)) {\r
EDBPrint (L" Address Type Symbol\n");\r
EDBPrint (L" ================== ==== ========\n");\r
-// EDBPrint (L" 0xFFFFFFFF00000000 ( F) TestMain (EbcTest.obj)\n");\r
+ // EDBPrint (L" 0xFFFFFFFF00000000 ( F) TestMain (EbcTest.obj)\n");\r
} else {\r
EDBPrint (L" Address Type Symbol\n");\r
EDBPrint (L" ========== ==== ========\n");\r
-// EDBPrint (L" 0xFFFF0000 ( F) TestMain (EbcTest.obj)\n");\r
+ // EDBPrint (L" 0xFFFF0000 ( F) TestMain (EbcTest.obj)\n");\r
}\r
\r
//\r
//\r
for (SubIndex = 0; SubIndex < Object->EntryCount; SubIndex++, Entry++) {\r
if ((SymbolName != NULL) &&\r
- (StrCmpUnicodeAndAscii (SymbolName, Entry->Name) != 0)) {\r
+ (StrCmpUnicodeAndAscii (SymbolName, Entry->Name) != 0))\r
+ {\r
continue;\r
}\r
\r
// Break symbol\r
//\r
if (((SubIndex % EFI_DEBUGGER_LINE_NUMBER_IN_PAGE) == 0) &&\r
- (SubIndex != 0)) {\r
+ (SubIndex != 0))\r
+ {\r
if (SetPageBreak ()) {\r
break;\r
}\r
}\r
\r
- if (sizeof(UINTN) == sizeof(UINT64)) {\r
+ if (sizeof (UINTN) == sizeof (UINT64)) {\r
EDBPrint (\r
L" 0x%016lx %s %a (%a)\n",\r
(UINT64)Entry->Rva + Object->BaseAddress,\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerListSymbol (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
- CHAR16 *SymbolFileName;\r
- CHAR16 *SymbolName;\r
- CHAR16 *CommandStr;\r
- UINTN Address;\r
+ CHAR16 *SymbolFileName;\r
+ CHAR16 *SymbolName;\r
+ CHAR16 *CommandStr;\r
+ UINTN Address;\r
\r
SymbolFileName = NULL;\r
- SymbolName = NULL;\r
- CommandStr = CommandArg;\r
+ SymbolName = NULL;\r
+ CommandStr = CommandArg;\r
\r
//\r
// display symbol according to address\r
//\r
if (CommandStr != NULL) {\r
if ((StriCmp (CommandStr, L"F") != 0) &&\r
- (StriCmp (CommandStr, L"S") != 0)) {\r
+ (StriCmp (CommandStr, L"S") != 0))\r
+ {\r
Address = Xtoi (CommandStr);\r
return DebuggerDisplaySymbolAccrodingToAddress (Address, DebuggerPrivate);\r
}\r
return EFI_DEBUG_CONTINUE;\r
} else {\r
SymbolFileName = CommandStr;\r
- CommandStr = StrGetNextTokenLine (L" ");\r
+ CommandStr = StrGetNextTokenLine (L" ");\r
}\r
}\r
}\r
+\r
//\r
// Get SymbolName\r
//\r
}\r
}\r
}\r
+\r
if (CommandStr != NULL) {\r
EDBPrint (L"Argument error!\n");\r
return EFI_DEBUG_CONTINUE;\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerLoadSymbol (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
- UINTN BufferSize;\r
- VOID *Buffer;\r
- EFI_STATUS Status;\r
- CHAR16 *FileName;\r
- CHAR16 *CommandArg2;\r
- BOOLEAN IsLoadCode;\r
- CHAR16 *DirName;\r
- CHAR16 CodFile[EFI_DEBUGGER_SYMBOL_NAME_MAX];\r
- CHAR16 *CodFileName;\r
- UINTN Index;\r
+ UINTN BufferSize;\r
+ VOID *Buffer;\r
+ EFI_STATUS Status;\r
+ CHAR16 *FileName;\r
+ CHAR16 *CommandArg2;\r
+ BOOLEAN IsLoadCode;\r
+ CHAR16 *DirName;\r
+ CHAR16 CodFile[EFI_DEBUGGER_SYMBOL_NAME_MAX];\r
+ CHAR16 *CodFileName;\r
+ UINTN Index;\r
\r
//\r
// Check the argument\r
EDBPrint (L"SymbolFile not found!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
- IsLoadCode = FALSE;\r
+\r
+ IsLoadCode = FALSE;\r
CommandArg2 = StrGetNextTokenLine (L" ");\r
if (CommandArg2 != NULL) {\r
if (StriCmp (CommandArg2, L"a") == 0) {\r
EDBPrint (L"SymbolFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
if (StriCmp (CommandArg + (StrLen (CommandArg) - 4), L".map") != 0) {\r
EDBPrint (L"SymbolFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
// Read MAP file to memory\r
//\r
Status = ReadFileToBuffer (DebuggerPrivate, CommandArg, &BufferSize, &Buffer, TRUE);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"SymbolFile read error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
// Load Symbol\r
//\r
Status = EdbLoadSymbol (DebuggerPrivate, FileName, BufferSize, Buffer);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"LoadSymbol error!\n");\r
gBS->FreePool (Buffer);\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
gBS->FreePool (Buffer);\r
\r
//\r
// Patch Symbol for RVA\r
//\r
Status = EdbPatchSymbolRVA (DebuggerPrivate, FileName, EdbEbcImageRvaSearchTypeLast);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"PatchSymbol RVA - %r! Using the RVA in symbol file.\n", Status);\r
} else {\r
DEBUG ((DEBUG_ERROR, "PatchSymbol RVA successfully!\n"));\r
// load each cod file\r
//\r
DirName = GetDirNameFromFullPath (CommandArg);\r
- ZeroMem (CodFile, sizeof(CodFile));\r
+ ZeroMem (CodFile, sizeof (CodFile));\r
if (StrCmp (DirName, L"") != 0) {\r
- StrCpyS (CodFile, sizeof(CodFile), DirName);\r
+ StrCpyS (CodFile, sizeof (CodFile), DirName);\r
} else {\r
DirName = L"\\";\r
}\r
//\r
// Go throuth each file under this dir\r
//\r
- Index = 0;\r
+ Index = 0;\r
CodFileName = GetFileNameUnderDir (DebuggerPrivate, DirName, L".cod", &Index);\r
while (CodFileName != NULL) {\r
- ZeroMem (CodFile, sizeof(CodFile));\r
+ ZeroMem (CodFile, sizeof (CodFile));\r
if (StrCmp (DirName, L"\\") != 0) {\r
- StrCpyS (CodFile, sizeof(CodFile), DirName);\r
+ StrCpyS (CodFile, sizeof (CodFile), DirName);\r
}\r
\r
//\r
// read cod file to memory\r
//\r
Status = ReadFileToBuffer (DebuggerPrivate, ConstructFullPath (CodFile, CodFileName, EFI_DEBUGGER_SYMBOL_NAME_MAX - StrLen (CodFile) - 2), &BufferSize, &Buffer, FALSE);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"CodeFile read error!\n");\r
CodFileName = GetFileNameUnderDir (DebuggerPrivate, DirName, L".cod", &Index);\r
continue;\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerUnloadSymbol (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR16 *FileName;\r
- CHAR16 *DirName;\r
- CHAR16 CodFile[EFI_DEBUGGER_SYMBOL_NAME_MAX];\r
- CHAR16 *CodFileName;\r
- UINTN Index;\r
- VOID *BufferPtr;\r
+ EFI_STATUS Status;\r
+ CHAR16 *FileName;\r
+ CHAR16 *DirName;\r
+ CHAR16 CodFile[EFI_DEBUGGER_SYMBOL_NAME_MAX];\r
+ CHAR16 *CodFileName;\r
+ UINTN Index;\r
+ VOID *BufferPtr;\r
\r
//\r
// Check the argument\r
// Unload Code\r
//\r
DirName = GetDirNameFromFullPath (CommandArg);\r
- ZeroMem (CodFile, sizeof(CodFile));\r
+ ZeroMem (CodFile, sizeof (CodFile));\r
if (StrCmp (DirName, L"") != 0) {\r
- StrCpyS (CodFile, sizeof(CodFile), DirName);\r
+ StrCpyS (CodFile, sizeof (CodFile), DirName);\r
} else {\r
DirName = L"\\";\r
}\r
//\r
// Go through each file under this dir\r
//\r
- Index = 0;\r
+ Index = 0;\r
CodFileName = GetFileNameUnderDir (DebuggerPrivate, DirName, L".cod", &Index);\r
while (CodFileName != NULL) {\r
- ZeroMem (CodFile, sizeof(CodFile));\r
+ ZeroMem (CodFile, sizeof (CodFile));\r
if (StrCmp (DirName, L"\\") != 0) {\r
- StrCpyS (CodFile, sizeof(CodFile), DirName);\r
+ StrCpyS (CodFile, sizeof (CodFile), DirName);\r
}\r
\r
//\r
// Unload Symbol\r
//\r
Status = EdbUnloadSymbol (DebuggerPrivate, FileName);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"UnloadSymbol error!\n");\r
}\r
\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerDisplaySymbol (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
if (CommandArg == NULL) {\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerLoadCode (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
- UINTN BufferSize;\r
- VOID *Buffer;\r
- EFI_STATUS Status;\r
- CHAR16 *CommandArg2;\r
- CHAR16 *FileName;\r
- CHAR16 *MapFileName;\r
+ UINTN BufferSize;\r
+ VOID *Buffer;\r
+ EFI_STATUS Status;\r
+ CHAR16 *CommandArg2;\r
+ CHAR16 *FileName;\r
+ CHAR16 *MapFileName;\r
\r
//\r
// Check the argument\r
EDBPrint (L"CodeFile not found!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
CommandArg2 = StrGetNextTokenLine (L" ");\r
if (CommandArg2 == NULL) {\r
EDBPrint (L"SymbolFile not found!\n");\r
EDBPrint (L"CodeFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
if (StriCmp (CommandArg + (StrLen (CommandArg) - 4), L".cod") != 0) {\r
EDBPrint (L"CodeFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
if (StrLen (CommandArg2) <= 4) {\r
EDBPrint (L"SymbolFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
if (StriCmp (CommandArg2 + (StrLen (CommandArg2) - 4), L".map") != 0) {\r
EDBPrint (L"SymbolFile name error!\n");\r
return EFI_DEBUG_CONTINUE;\r
// read cod file to memory\r
//\r
Status = ReadFileToBuffer (DebuggerPrivate, CommandArg, &BufferSize, &Buffer, TRUE);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
EDBPrint (L"CodeFile read error!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
\r
- FileName = GetFileNameFromFullPath (CommandArg);\r
+ FileName = GetFileNameFromFullPath (CommandArg);\r
MapFileName = GetFileNameFromFullPath (CommandArg2);\r
//\r
// Load Code\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerUnloadCode (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
- CHAR16 *CommandArg2;\r
- CHAR16 *FileName;\r
- CHAR16 *MapFileName;\r
- EFI_STATUS Status;\r
- VOID *BufferPtr;\r
+ CHAR16 *CommandArg2;\r
+ CHAR16 *FileName;\r
+ CHAR16 *MapFileName;\r
+ EFI_STATUS Status;\r
+ VOID *BufferPtr;\r
\r
//\r
// Check the argument\r
EDBPrint (L"CodeFile not found!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
+\r
CommandArg2 = StrGetNextTokenLine (L" ");\r
if (CommandArg2 == NULL) {\r
EDBPrint (L"SymbolFile not found!\n");\r
return EFI_DEBUG_CONTINUE;\r
}\r
\r
- FileName = GetFileNameFromFullPath (CommandArg);\r
+ FileName = GetFileNameFromFullPath (CommandArg);\r
MapFileName = GetFileNameFromFullPath (CommandArg2);\r
\r
//\r
**/\r
EFI_DEBUG_STATUS\r
DebuggerDisplayCode (\r
- IN CHAR16 *CommandArg,\r
- IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
- IN EFI_EXCEPTION_TYPE ExceptionType,\r
- IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
+ IN CHAR16 *CommandArg,\r
+ IN EFI_DEBUGGER_PRIVATE_DATA *DebuggerPrivate,\r
+ IN EFI_EXCEPTION_TYPE ExceptionType,\r
+ IN OUT EFI_SYSTEM_CONTEXT SystemContext\r
)\r
{\r
if (CommandArg == NULL) {\r
projects / mirror_edk2.git / blobdiff