X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/5fa7aa73305908579b14bd1dc27417352bf5acdf..009df4d72576516c0bd57440cddf6a2e7063bccd:/src/debugger/DWARFManager.cpp diff --git a/src/debugger/DWARFManager.cpp b/src/debugger/DWARFManager.cpp index bd6507b..e0e07b9 100644 --- a/src/debugger/DWARFManager.cpp +++ b/src/debugger/DWARFManager.cpp @@ -9,7 +9,10 @@ // --- ---------- ------------------------------------------------------------ // JPM Dec./2016 Created this file, and added the DWARF format support // JPM Sept./2018 Added LEB128 decoding features, and improve the DWARF parsing information -// JPM Oct./2018 Improve the DWARF parsing information, the source file text reading, and Support the used lines source DWARF structure +// JPM Oct./2018 Improve the DWARF parsing information, and the source file text reading; support the used source lines from DWARF structure, and the search paths for the files +// JPM Aug./2019 Added new functions to handle DWARF information, full filename fix +// JPM Mar./2020 Fix a random crash when reading the source lines information +// JPM Aug./2020 Added a source code file date check when reading DWARF information // // To Do @@ -21,17 +24,24 @@ #include #include #include -#include -#include +#include +#include +#include +#include "libdwarf.h" +#include "dwarf.h" #include "LEB128.h" +#include "DWARFManager.h" // Definitions for debugging -//#define DEBUG_NumCU 0x9 // CU number to debug or undefine it +//#define DEBUG_NumCU 0x3 // CU number to debug or undefine it //#define DEBUG_VariableName "sound_death" // Variable name to look for or undefine it //#define DEBUG_TypeName "Cbuf_Execute" // Type name to look for or undefine it //#define DEBUG_TypeDef DW_TAG_typedef // Type def to look for or undefine it (not supported) -//#define DEBUG_Filename "net_jag.c" // Filename to look for or undefine it +//#define DEBUG_Filename "crt0" // Filename to look for or undefine it + +// Definitions for handling data +//#define CONVERT_QT_HML // Text will be converted as HTML // Definitions for the variables's typetag #define TypeTag_structure 0x01 // structure @@ -124,8 +134,9 @@ typedef struct SubProgStruct typedef struct CUStruct { size_t Tag; + size_t Language; // Language (C, etc.) used by the source code size_t LowPC, HighPC; // Memory range for the code - char *PtrProducer; // Pointer to the "Producer" text information (mostly compiler and compilation options used) + char *PtrProducer; // "Producer" text information (mostly compiler and compilation options used) char *PtrSourceFilename; // Source file name char *PtrSourceFileDirectory; // Directory of the source file char *PtrFullFilename; // Pointer to full namefile (directory & filename) @@ -140,8 +151,13 @@ typedef struct CUStruct size_t NbVariables; // Variables number VariablesStruct *PtrVariables; // Pointer to the global variables list structure size_t NbFrames; // Frames number - size_t NbLinesSrc; // Number of used source lines - CUStruct_LineSrc *PtrLinesSrc; // Pointer to the used source lines list structure + size_t NbUsedLinesSrc; // Number of used source lines + size_t LastNumUsedLinesSrc; // Last number line used + CUStruct_LineSrc *PtrUsedLinesSrc; // Pointer to the used source lines list structure + char **PtrUsedLinesLoadSrc; // Pointer lists to each used source line referenced by the CUStruct_LineSrc structure + size_t *PtrUsedNumLines; // List of the number lines used + struct _stat _statbuf; // File information + DWARFstatus Status; // File status }S_CUStruct; @@ -152,6 +168,9 @@ Dwarf_Ptr errarg; Dwarf_Error error; Dwarf_Debug dbg; CUStruct *PtrCU; +char **ListSearchPaths; +size_t NbSearchPaths; +struct _stat FileElfExeInfo; // @@ -161,6 +180,10 @@ void DWARFManager_CloseDMI(void); bool DWARFManager_ElfClose(void); char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine); void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables); +void DWARFManager_SourceFileSearchPathsInit(void); +void DWARFManager_SourceFileSearchPathsReset(void); +void DWARFManager_SourceFileSearchPathsClose(void); +void DWARFManager_ConformSlachesBackslashes(char *Ptr); // @@ -170,16 +193,50 @@ Dwarf_Handler DWARFManager_ErrorHandler(Dwarf_Ptr perrarg) } +// Dwarf manager list search paths init +void DWARFManager_SourceFileSearchPathsInit(void) +{ + ListSearchPaths = NULL; + NbSearchPaths = 0; +} + + +// Dwarf manager list search paths reset +void DWARFManager_SourceFileSearchPathsReset(void) +{ + ListSearchPaths = NULL; + NbSearchPaths = 0; +} + + +// Dwarf manager list search paths close +void DWARFManager_SourceFileSearchPathsClose(void) +{ + DWARFManager_SourceFileSearchPathsReset(); +} + + // Dwarf manager init void DWARFManager_Init(void) { + DWARFManager_SourceFileSearchPathsInit(); LibDwarf = DW_DLV_NO_ENTRY; } +// Dwarf manager settings +void DWARFManager_Set(size_t NbPathsInList, char **PtrListPaths) +{ + // Search paths init + ListSearchPaths = PtrListPaths; + NbSearchPaths = NbPathsInList; +} + + // Dwarf manager Reset bool DWARFManager_Reset(void) { + DWARFManager_SourceFileSearchPathsReset(); return DWARFManager_ElfClose(); } @@ -187,15 +244,17 @@ bool DWARFManager_Reset(void) // Dwarf manager Close bool DWARFManager_Close(void) { + DWARFManager_SourceFileSearchPathsClose(); return(DWARFManager_Reset()); } // Dwarf manager Elf init -int DWARFManager_ElfInit(Elf *ElfPtr) +int DWARFManager_ElfInit(Elf *ElfPtr, struct _stat FileElfInfo) { if ((LibDwarf = dwarf_elf_init(ElfPtr, DW_DLC_READ, (Dwarf_Handler)DWARFManager_ErrorHandler, errarg, &dbg, &error)) == DW_DLV_OK) { + FileElfExeInfo = FileElfInfo; DWARFManager_InitDMI(); } @@ -237,7 +296,9 @@ void DWARFManager_CloseDMI(void) free(PtrCU[NbCU].PtrProducer); free(PtrCU[NbCU].PtrSourceFilename); free(PtrCU[NbCU].PtrSourceFileDirectory); - free(PtrCU[NbCU].PtrLinesSrc); + free(PtrCU[NbCU].PtrUsedLinesSrc); + free(PtrCU[NbCU].PtrUsedLinesLoadSrc); + free(PtrCU[NbCU].PtrUsedNumLines); while (PtrCU[NbCU].NbLinesLoadSrc--) { @@ -385,6 +446,14 @@ void DWARFManager_InitDMI(void) } break; + // Language + case DW_AT_language: + if (dwarf_formudata(atlist[i], &return_uvalue, &error) == DW_DLV_OK) + { + PtrCU[NbCU].Language = return_uvalue; + } + break; + default: break; } @@ -394,40 +463,62 @@ void DWARFManager_InitDMI(void) dwarf_dealloc(dbg, atlist, DW_DLA_LIST); } - // Check filename validity + // Check filename presence if (!PtrCU[NbCU].PtrSourceFilename) { PtrCU[NbCU].PtrSourceFilename = (char *)calloc(1, 1); } - // Check directory validity + // Check directory presence if (!PtrCU[NbCU].PtrSourceFileDirectory) { - PtrCU[NbCU].PtrSourceFileDirectory = (char *)calloc(2, 1); - PtrCU[NbCU].PtrSourceFileDirectory[0] = '.'; + // Check if file exists in the search paths + for (size_t i = 0; i < NbSearchPaths; i++) + { + PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + strlen((const char *)ListSearchPaths[i]) + 2); +#if defined(_WIN32) + sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", ListSearchPaths[i], PtrCU[NbCU].PtrSourceFilename); +#else + sprintf(PtrCU[NbCU].PtrFullFilename, "%s/%s", ListSearchPaths[i], PtrCU[NbCU].PtrSourceFilename); +#endif + if (!fopen_s(&SrcFile, PtrCU[NbCU].PtrFullFilename, "rb")) + { + PtrCU[NbCU].PtrSourceFileDirectory = (char *)realloc(PtrCU[NbCU].PtrSourceFileDirectory, strlen(ListSearchPaths[i]) + 1); + strcpy(PtrCU[NbCU].PtrSourceFileDirectory, ListSearchPaths[i]); + } + } + + // File directory doesn't exits + if (!PtrCU[NbCU].PtrSourceFileDirectory) + { + PtrCU[NbCU].PtrSourceFileDirectory = (char *)realloc(PtrCU[NbCU].PtrSourceFileDirectory, 2); + strcpy(PtrCU[NbCU].PtrSourceFileDirectory, "."); + } } - // Create full filename - Ptr = PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + strlen(PtrCU[NbCU].PtrSourceFileDirectory) + 2); - sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename); + // Conform slashes / backslashes for the filename + DWARFManager_ConformSlachesBackslashes(PtrCU[NbCU].PtrSourceFilename); - // Conform slashes and backslashes - while (*Ptr) + // Check if filename contains already the complete directory + if (PtrCU[NbCU].PtrSourceFilename[1] == ':') { + // Copy the filename as the full filename + PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + 1); + strcpy(PtrCU[NbCU].PtrFullFilename, PtrCU[NbCU].PtrSourceFilename); + } + else + { + // Create full filename and Conform slashes / backslashes + PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + strlen(PtrCU[NbCU].PtrSourceFileDirectory) + 2); #if defined(_WIN32) - if (*Ptr == '/') - { - *Ptr = '\\'; - } + sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename); #else - if (*Ptr == '\\') - { - *Ptr = '/'; - } + sprintf(PtrCU[NbCU].PtrFullFilename, "%s/%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename); #endif - Ptr++; } + DWARFManager_ConformSlachesBackslashes(PtrCU[NbCU].PtrFullFilename); + // Directory path clean-up #if defined(_WIN32) while ((Ptr1 = Ptr = strstr(PtrCU[NbCU].PtrFullFilename, "\\..\\"))) @@ -443,65 +534,88 @@ void DWARFManager_InitDMI(void) strcpy((Ptr1 + 1), (Ptr + 4)); } - // Open the source file as a binary file - if (!fopen_s(&SrcFile, PtrCU[NbCU].PtrFullFilename, "rb")) + // Get the source file information + if (!_stat(PtrCU[NbCU].PtrFullFilename, &PtrCU[NbCU]._statbuf)) { - if (!fseek(SrcFile, 0, SEEK_END)) + // check the time stamp with the executable + if (PtrCU[NbCU]._statbuf.st_mtime <= FileElfExeInfo.st_mtime) { - if ((PtrCU[NbCU].SizeLoadSrc = ftell(SrcFile)) > 0) + // Open the source file as a binary file + if (!fopen_s(&SrcFile, PtrCU[NbCU].PtrFullFilename, "rb")) { - if (!fseek(SrcFile, 0, SEEK_SET)) + if (!fseek(SrcFile, 0, SEEK_END)) { - if (PtrCU[NbCU].PtrLoadSrc = Ptr = Ptr1 = (char *)calloc(1, (PtrCU[NbCU].SizeLoadSrc + 2))) + if ((PtrCU[NbCU].SizeLoadSrc = ftell(SrcFile)) > 0) { - // Read whole file - if (fread_s(PtrCU[NbCU].PtrLoadSrc, PtrCU[NbCU].SizeLoadSrc, PtrCU[NbCU].SizeLoadSrc, 1, SrcFile) != 1) + if (!fseek(SrcFile, 0, SEEK_SET)) { - free(PtrCU[NbCU].PtrLoadSrc); - PtrCU[NbCU].PtrLoadSrc = NULL; - PtrCU[NbCU].SizeLoadSrc = 0; - } - else - { - // Eliminate all carriage return code '\r' (oxd) - do + if (PtrCU[NbCU].PtrLoadSrc = Ptr = Ptr1 = (char *)calloc(1, (PtrCU[NbCU].SizeLoadSrc + 2))) { - if ((*Ptr = *Ptr1) != '\r') + // Read whole file + if (fread_s(PtrCU[NbCU].PtrLoadSrc, PtrCU[NbCU].SizeLoadSrc, PtrCU[NbCU].SizeLoadSrc, 1, SrcFile) != 1) { - Ptr++; + free(PtrCU[NbCU].PtrLoadSrc); + PtrCU[NbCU].PtrLoadSrc = NULL; + PtrCU[NbCU].SizeLoadSrc = 0; } - } - while (*Ptr1++); + else + { + // Eliminate all carriage return code '\r' (oxd) + do + { + if ((*Ptr = *Ptr1) != '\r') + { + Ptr++; + } + } while (*Ptr1++); - // Get back the new text file size - PtrCU[NbCU].SizeLoadSrc = strlen(Ptr = PtrCU[NbCU].PtrLoadSrc); + // Get back the new text file size + PtrCU[NbCU].SizeLoadSrc = strlen(Ptr = PtrCU[NbCU].PtrLoadSrc); - // Make sure the text file finish with a new line code '\n' (0xa) - if (PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc - 1] != '\n') - { - PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc++] = '\n'; - PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc] = 0; - } + // Make sure the text file finish with a new line code '\n' (0xa) + if (PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc - 1] != '\n') + { + PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc++] = '\n'; + PtrCU[NbCU].PtrLoadSrc[PtrCU[NbCU].SizeLoadSrc] = 0; + } - // Reallocate text file - if (PtrCU[NbCU].PtrLoadSrc = Ptr = (char *)realloc(PtrCU[NbCU].PtrLoadSrc, (PtrCU[NbCU].SizeLoadSrc + 1))) - { - // Count line numbers, based on the new line code '\n' (0xa), and finish each line with 0 - do - { - if (*Ptr == '\n') + // Reallocate text file + if (PtrCU[NbCU].PtrLoadSrc = Ptr = (char *)realloc(PtrCU[NbCU].PtrLoadSrc, (PtrCU[NbCU].SizeLoadSrc + 1))) { - PtrCU[NbCU].NbLinesLoadSrc++; - *Ptr = 0; + // Count line numbers, based on the new line code '\n' (0xa), and finish each line with 0 + do + { + if (*Ptr == '\n') + { + PtrCU[NbCU].NbLinesLoadSrc++; + *Ptr = 0; + } + } while (*++Ptr); } - } while (*++Ptr); + } } } } } + + fclose(SrcFile); + } + else + { + // Source file doesn't exist + PtrCU[NbCU].Status = DWARFSTATUS_NOFILE; } } - fclose(SrcFile); + else + { + // Source file is outdated + PtrCU[NbCU].Status = DWARFSTATUS_OUTDATEDFILE; + } + } + else + { + // Source file doesn't have information + PtrCU[NbCU].Status = DWARFSTATUS_NOFILEINFO; } break; @@ -511,24 +625,32 @@ void DWARFManager_InitDMI(void) } // Get the source lines table located in the CU - if (dwarf_srclines(return_sib, &linebuf, &cnt, &error) == DW_DLV_OK) + if ((dwarf_srclines(return_sib, &linebuf, &cnt, &error) == DW_DLV_OK) && (PtrCU[NbCU].Status == DWARFSTATUS_OK)) { if (cnt) { - PtrCU[NbCU].NbLinesSrc = cnt; - PtrCU[NbCU].PtrLinesSrc = (CUStruct_LineSrc *)calloc(cnt, sizeof(CUStruct_LineSrc)); + PtrCU[NbCU].NbUsedLinesSrc = cnt; + PtrCU[NbCU].PtrUsedLinesSrc = (CUStruct_LineSrc *)calloc(cnt, sizeof(CUStruct_LineSrc)); + PtrCU[NbCU].PtrUsedLinesLoadSrc = (char **)calloc(cnt, sizeof(char *)); + PtrCU[NbCU].PtrUsedNumLines = (size_t *)calloc(cnt, sizeof(size_t)); + + // Get the addresses and their source line numbers for (Dwarf_Signed i = 0; i < cnt; i++) { if (dwarf_lineaddr(linebuf[i], &return_lineaddr, &error) == DW_DLV_OK) { + // Get the source line number if (dwarf_lineno(linebuf[i], &return_uvalue, &error) == DW_DLV_OK) { - PtrCU[NbCU].PtrLinesSrc[i].StartPC = return_lineaddr; - PtrCU[NbCU].PtrLinesSrc[i].NumLineSrc = return_uvalue; + PtrCU[NbCU].PtrUsedLinesSrc[i].StartPC = return_lineaddr; + PtrCU[NbCU].PtrUsedLinesSrc[i].NumLineSrc = return_uvalue; } } } } + + // Release the memory used by the source lines table located in the CU + dwarf_srclines_dealloc(dbg, linebuf, cnt); } // Check if the CU has child @@ -813,19 +935,14 @@ void DWARFManager_InitDMI(void) // Get source line number and associated block of address for (Dwarf_Signed i = 0; i < cnt; ++i) { - if (dwarf_lineaddr(linebuf[i], &return_lineaddr, &error) == DW_DLV_OK) + // Check the presence of the line in the memory frame + if (PtrCU[NbCU].PtrUsedLinesSrc && (PtrCU[NbCU].PtrUsedLinesSrc[i].StartPC >= return_lowpc) && (PtrCU[NbCU].PtrUsedLinesSrc[i].StartPC <= return_highpc)) { - if (dwarf_lineno(linebuf[i], &return_uvalue, &error) == DW_DLV_OK) - { - if ((return_lineaddr >= return_lowpc) && (return_lineaddr <= return_highpc)) - { - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc = (DMIStruct_LineSrc *)realloc(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc, (PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc + 1) * sizeof(DMIStruct_LineSrc)); - memset((void *)(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc), 0, sizeof(DMIStruct_LineSrc)); - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].StartPC = return_lineaddr; - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].NumLineSrc = return_uvalue; - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc++; - } - } + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc = (DMIStruct_LineSrc *)realloc(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc, (PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc + 1) * sizeof(DMIStruct_LineSrc)); + memset((void *)(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc), 0, sizeof(DMIStruct_LineSrc)); + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].StartPC = PtrCU[NbCU].PtrUsedLinesSrc[i].StartPC; + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].NumLineSrc = PtrCU[NbCU].PtrUsedLinesSrc[i].NumLineSrc; + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc++; } } @@ -951,16 +1068,9 @@ void DWARFManager_InitDMI(void) } while (dwarf_siblingof(dbg, return_sib, &return_die, &error) == DW_DLV_OK); } - - // Release the memory used by the source lines - for (Dwarf_Signed i = 0; i < cnt; ++i) - { - dwarf_dealloc(dbg, linebuf[i], DW_DLA_LINE); - } - dwarf_dealloc(dbg, linebuf, DW_DLA_LIST); } - // Set the source code lines for QT html/text conformity + // Set the source code lines if (PtrCU[NbCU].NbLinesLoadSrc) { if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(PtrCU[NbCU].NbLinesLoadSrc, sizeof(char *))) @@ -977,6 +1087,7 @@ void DWARFManager_InitDMI(void) { switch (*Ptr) { +#ifdef CONVERT_QT_HML case 9: strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], " "); i += 6; @@ -1002,6 +1113,7 @@ void DWARFManager_InitDMI(void) strcpy(PtrCU[NbCU].PtrLinesLoadSrc[j], """); i += strlen("""); break; +#endif #endif default: PtrCU[NbCU].PtrLinesLoadSrc[j][i++] = *Ptr; @@ -1053,24 +1165,29 @@ void DWARFManager_InitDMI(void) } } - // Set information based on used line numbers - if (PtrCU[NbCU].PtrLinesSrc) + // Check validity between used number lines and number lines in the source file + if (PtrCU[NbCU].LastNumUsedLinesSrc <= PtrCU[NbCU].NbLinesLoadSrc) { - // Set the line source pointer for each used line numbers - if (PtrCU[NbCU].PtrLinesLoadSrc) + // Set information based on used line numbers + if (PtrCU[NbCU].PtrUsedLinesSrc) { - for (size_t i = 0; i < PtrCU[NbCU].NbLinesSrc; i++) + // Set the line source pointers for each used line numbers + if (PtrCU[NbCU].PtrLinesLoadSrc) { - PtrCU[NbCU].PtrLinesSrc[i].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrLinesSrc[i].NumLineSrc - 1]; - } - } + for (size_t i = 0; i < PtrCU[NbCU].NbUsedLinesSrc; i++) + { + PtrCU[NbCU].PtrUsedNumLines[i] = PtrCU[NbCU].PtrUsedLinesSrc[i].NumLineSrc - 1; + PtrCU[NbCU].PtrUsedLinesLoadSrc[i] = PtrCU[NbCU].PtrUsedLinesSrc[i].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrUsedLinesSrc[i].NumLineSrc - 1]; + } - // Setup memory range for the code if CU doesn't have already this information - // It is taken from the used lines structure - if (!PtrCU[NbCU].LowPC && !PtrCU[NbCU].HighPC) - { - PtrCU[NbCU].LowPC = PtrCU[NbCU].PtrLinesSrc[0].StartPC; - PtrCU[NbCU].HighPC = PtrCU[NbCU].PtrLinesSrc[PtrCU[NbCU].NbLinesSrc - 1].StartPC; + // Setup memory range for the code if CU doesn't have already this information + // It is taken from the used lines structure + if (!PtrCU[NbCU].LowPC && (!PtrCU[NbCU].HighPC || (PtrCU[NbCU].HighPC == ~0))) + { + PtrCU[NbCU].LowPC = PtrCU[NbCU].PtrUsedLinesSrc[0].StartPC; + PtrCU[NbCU].HighPC = PtrCU[NbCU].PtrUsedLinesSrc[PtrCU[NbCU].NbUsedLinesSrc - 1].StartPC; + } + } } } @@ -1096,6 +1213,27 @@ void DWARFManager_InitDMI(void) } +// Conform slashes and backslashes +void DWARFManager_ConformSlachesBackslashes(char *Ptr) +{ + while (*Ptr) + { +#if defined(_WIN32) + if (*Ptr == '/') + { + *Ptr = '\\'; + } +#else + if (*Ptr == '\\') + { + *Ptr = '/'; + } +#endif + Ptr++; + } +} + + // Variables information initialisation void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables) { @@ -1124,7 +1262,10 @@ void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables) PtrVariables->TypeTag |= TypeTag_structure; if (!(PtrVariables->TypeTag & TypeTag_typedef)) { - strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); + if (PtrCU[NbCU].PtrTypes[j].PtrName) + { + strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); + } } if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) { @@ -1243,13 +1384,11 @@ void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables) // Return NULL if no symbol name exists char *DWARFManager_GetSymbolnameFromAdr(size_t Adr) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; (j < PtrCU[i].NbSubProgs); j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((PtrCU[i].PtrSubProgs[j].StartPC == Adr)) { @@ -1265,16 +1404,18 @@ char *DWARFManager_GetSymbolnameFromAdr(size_t Adr) // Get complete source filename based from address // Return NULL if no source filename exists -// Return the existence status (true or false) in Error -char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, bool *Error) +// Return the existence status in Status if pointer not NULL +char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, DWARFstatus *Status) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - *Error = PtrCU[i].PtrLoadSrc ? true : false; + if (Status) + { + *Status = PtrCU[i].Status; + } + return PtrCU[i].PtrFullFilename; } } @@ -1283,7 +1424,7 @@ char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, bool *Error) } -// Get text line source based on line number (starting by 1) +// Get text line source based on line number (starting from 1) // Return NULL if no text line exists or if line number is 0 char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine) { @@ -1307,13 +1448,11 @@ char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine) // Get number of variables referenced by the function range address size_t DWARFManager_GetNbLocalVariables(size_t Adr) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1327,18 +1466,16 @@ size_t DWARFManager_GetNbLocalVariables(size_t Adr) } -// Get local variable name based on his index (starting by 1) +// Get local variable name based on his index (starting from 1) // Return name's pointer text found // Return NULL if not found char *DWARFManager_GetLocalVariableName(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1352,17 +1489,15 @@ char *DWARFManager_GetLocalVariableName(size_t Adr, size_t Index) } -// Get local variable's type tag based on his index (starting by 1) +// Get local variable's type tag based on his index (starting from 1) // Return 0 if not found size_t DWARFManager_GetLocalVariableTypeTag(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1376,16 +1511,15 @@ size_t DWARFManager_GetLocalVariableTypeTag(size_t Adr, size_t Index) } -// +// Get the local variable's offset based on a index (starting from 1) +// Return 0 if no offset has been found int DWARFManager_GetLocalVariableOffset(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1399,18 +1533,16 @@ int DWARFManager_GetLocalVariableOffset(size_t Adr, size_t Index) } -// Get local variable Type Byte Size based on his address and index (starting by 1) +// Get local variable Type Byte Size based on his address and index (starting from 1) // Return 0 if not found // May return 0 if there is no Type Byte Size linked to the variable's address and index size_t DWARFManager_GetLocalVariableTypeByteSize(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1424,18 +1556,16 @@ size_t DWARFManager_GetLocalVariableTypeByteSize(size_t Adr, size_t Index) } -// Get local variable Type Encoding based on his address and index (starting by 1) +// Get local variable Type Encoding based on his address and index (starting from 1) // Return 0 if not found // May return 0 if there is no Type Encoding linked to the variable's address and index size_t DWARFManager_GetLocalVariableTypeEncoding(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1449,17 +1579,15 @@ size_t DWARFManager_GetLocalVariableTypeEncoding(size_t Adr, size_t Index) } -// Get local variable Op based on his address and index (starting by 1) +// Get local variable Op based on his address and index (starting from 1) // Return 0 if not found, may return 0 if there isn't Op linked to the variable's index size_t DWARFManager_GetLocalVariableOp(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1473,17 +1601,15 @@ size_t DWARFManager_GetLocalVariableOp(size_t Adr, size_t Index) } -// Get local variable type name based on his index (starting by 1) and an address +// Get local variable type name based on his index (starting from 1) and an address // Return NULL if not found, may also return NULL if there is no type linked to the variable's index char *DWARFManager_GetLocalVariableTypeName(size_t Adr, size_t Index) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1501,9 +1627,9 @@ char *DWARFManager_GetLocalVariableTypeName(size_t Adr, size_t Index) // Return number of variables size_t DWARFManager_GetNbGlobalVariables(void) { - size_t NbVariables = 0, i; + size_t NbVariables = 0; - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { NbVariables += PtrCU[i].NbVariables; } @@ -1512,14 +1638,12 @@ size_t DWARFManager_GetNbGlobalVariables(void) } -// Get global variable type name based on his index (starting by 1) +// Get global variable type name based on his index (starting from 1) // Return NULL if not found // May return NULL if there is not type linked to the variable's index char *DWARFManager_GetGlobalVariableTypeName(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1538,13 +1662,11 @@ char *DWARFManager_GetGlobalVariableTypeName(size_t Index) } -// Get global variable's type tag based on his index (starting by 1) +// Get global variable's type tag based on his index (starting from 1) // Return 0 if not found size_t DWARFManager_GetGlobalVariableTypeTag(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1563,13 +1685,11 @@ size_t DWARFManager_GetGlobalVariableTypeTag(size_t Index) } -// Get global variable byte size based on his index (starting by 1) +// Get global variable byte size based on his index (starting from 1) // Return 0 if not found size_t DWARFManager_GetGlobalVariableTypeByteSize(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1588,13 +1708,11 @@ size_t DWARFManager_GetGlobalVariableTypeByteSize(size_t Index) } -// Get global variable encoding based on his index (starting by 1) +// Get global variable encoding based on his index (starting from 1) // Return 0 if not found size_t DWARFManager_GetGlobalVariableTypeEncoding(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1613,13 +1731,11 @@ size_t DWARFManager_GetGlobalVariableTypeEncoding(size_t Index) } -// Get global variable address based on his index (starting by 1) +// Get global variable memory address based on his index (starting from 1) // Return 0 if not found size_t DWARFManager_GetGlobalVariableAdr(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1642,13 +1758,11 @@ size_t DWARFManager_GetGlobalVariableAdr(size_t Index) // Return 0 if not found, or will return the first occurence found size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { - for (j = 0; j < PtrCU[i].NbVariables; j++) + for (size_t j = 0; j < PtrCU[i].NbVariables; j++) { if (!strcmp(PtrCU[i].PtrVariables[j].PtrName,VariableName)) { @@ -1662,13 +1776,11 @@ size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName) } -// Get global variable name based on his index (starting by 1) +// Get global variable name based on his index (starting from 1) // Return name's pointer text found, or will return NULL if no variable can be found char *DWARFManager_GetGlobalVariableName(size_t Index) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if (PtrCU[i].NbVariables) { @@ -1693,13 +1805,11 @@ char *DWARFManager_GetGlobalVariableName(size_t Index) // Return NULL if no text line has been found char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag) { - size_t i, j, k; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1709,7 +1819,7 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag) } else { - for (k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++) + for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++) { if (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC <= Adr) { @@ -1739,13 +1849,11 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag) // Return 0 if no line number has been found size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag) { - size_t i, j, k; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; (j < PtrCU[i].NbSubProgs); j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1755,7 +1863,7 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag) } else { - for (k = 0; (k < PtrCU[i].PtrSubProgs[j].NbLinesSrc); k++) + for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++) { if ((PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC == Adr) && (!Tag || (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].Tag == Tag))) { @@ -1771,6 +1879,15 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag) #endif } } + + // Check if a used line is found with the address + for (size_t j = 0; j < PtrCU[i].NbUsedLinesSrc; j++) + { + if (PtrCU[i].PtrUsedLinesSrc[j].StartPC == Adr) + { + return PtrCU[i].PtrUsedLinesSrc[j].NumLineSrc; + } + } } } @@ -1782,13 +1899,11 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag) // Return NULL if no function name has been found, otherwise will return the function name in the range of the provided address char *DWARFManager_GetFunctionName(size_t Adr) { - size_t i, j; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1802,17 +1917,66 @@ char *DWARFManager_GetFunctionName(size_t Adr) } -// Get text line from source based on address and num line (starting by 1) +// Get number of lines of texts source list from source index +size_t DWARFManager_GetSrcNbListPtrFromIndex(size_t Index, bool Used) +{ + if (!Used) + { + return PtrCU[Index].NbLinesLoadSrc; + } + else + { + return PtrCU[Index].NbUsedLinesSrc; + } +} + + +// Get text source line number list pointer from source index +// Return NULL for the text source used list +size_t *DWARFManager_GetSrcNumLinesPtrFromIndex(size_t Index, bool Used) +{ + if (Used) + { + return PtrCU[Index].PtrUsedNumLines; + } + else + { + return NULL; + } +} + + +// Get text source list pointers from source index +// Return NULL for the text source used list +char **DWARFManager_GetSrcListPtrFromIndex(size_t Index, bool Used) +{ + if (!Used) + { + return PtrCU[Index].PtrLinesLoadSrc; + } + else + { + return PtrCU[Index].PtrUsedLinesLoadSrc; + } +} + + +// Get source language +size_t DWARFManager_GetSrcLanguageFromIndex(size_t Index) +{ + return PtrCU[Index].Language; +} + + +// Get text line from source based on address and num line (starting from 1) // Return NULL if no text line has been found char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine) { - size_t i, j, k; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { - for (j = 0; j < PtrCU[i].NbSubProgs; j++) + for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++) { if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC)) { @@ -1822,7 +1986,7 @@ char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine) } else { - for (k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++) + for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++) { if (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc == NumLine) { @@ -1839,13 +2003,11 @@ char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine) } -// Get text line pointer from source, based on address and line number (starting by 1) +// Get text line pointer from source, based on address and line number (starting from 1) // Return NULL if no text line has been found, or if requested number line is above the source total number of lines char *DWARFManager_GetLineSrcFromNumLineBaseAdr(size_t Adr, size_t NumLine) { - size_t i; - - for (i = 0; i < NbCU; i++) + for (size_t i = 0; i < NbCU; i++) { if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC)) { @@ -1865,15 +2027,22 @@ char *DWARFManager_GetLineSrcFromNumLineBaseAdr(size_t Adr, size_t NumLine) // Get number of source code filenames -size_t DWARFManager_GetNbFullSourceFilename(void) +size_t DWARFManager_GetNbSources(void) { return NbCU; } -// Get source code filename based on index (starting from 0) +// Get source code filename, including his directory, based on index (starting from 0) char *DWARFManager_GetNumFullSourceFilename(size_t Index) { return (PtrCU[Index].PtrFullFilename); } + +// Get source code filename based on index (starting from 0) +char *DWARFManager_GetNumSourceFilename(size_t Index) +{ + return (PtrCU[Index].PtrSourceFilename); +} +