X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/6559795198d90236d74cdba5532bfc9a350a4e80..258b1c16e9be7789c348b3aefa709f6da36805c9:/src/debugger/DWARFManager.cpp diff --git a/src/debugger/DWARFManager.cpp b/src/debugger/DWARFManager.cpp index f4711b9..fe18d00 100644 --- a/src/debugger/DWARFManager.cpp +++ b/src/debugger/DWARFManager.cpp @@ -7,8 +7,16 @@ // // WHO WHEN WHAT // --- ---------- ------------------------------------------------------------ -// JPM 12/03/2016 Created this file -// JPM 12/03/2016 DWARF format support +// 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, and the source file text reading; support the used source lines from DWARF structure, and the search paths for the files +// JPM Mar./2020 Fix a random crash when reading the source lines information +// + +// To Do +// To use pointers instead of arrays usage +// To keep sources text file intact wihtout QT/HTML transformation +// #include @@ -17,15 +25,37 @@ #include #include #include +#include "LEB128.h" -// -//#define DEBUG_NumCU 0x6 // CU number to debug or undefine it -//#define DEBUG_VariableName "argc" // Variable name to look for or undefine it +// Definitions for debugging +//#define DEBUG_NumCU 0x4d // 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 +// Definitions for the variables's typetag +#define TypeTag_structure 0x01 // structure +#define TypeTag_pointer 0x02 // pointer +#define TypeTag_subrange 0x04 // (subrange_type?) +#define TypeTag_arraytype 0x08 // array type +#define TypeTag_consttype 0x10 // const type +#define TypeTag_typedef 0x20 // typedef +#define TypeTag_enumeration_type 0x40 // enumeration +#define TypeTag_subroutine_type 0x80 // subroutine + + +// Source line CU structure +typedef struct CUStruct_LineSrc +{ + size_t StartPC; + size_t NumLineSrc; + char *PtrLineSrc; +}S_CUStruct_LineSrc; // Source line internal structure -struct DMIStruct_LineSrc +typedef struct DMIStruct_LineSrc { size_t Tag; size_t StartPC; @@ -33,27 +63,34 @@ struct DMIStruct_LineSrc char *PtrLineSrc; }S_DMIStruct_LineSrc; +// Enumeration structure +typedef struct EnumerationStruct +{ + char *PtrName; // Enumeration's name + size_t value; // Enumeration's value +}S_EnumerationStruct; + +// Structure members structure +//typedef struct StructureMembersStruct +//{ +//}S_StructureMembersStruct; + // Base type internal structure -struct BaseTypeStruct +typedef struct BaseTypeStruct { - size_t Tag; // Type's Tag - size_t Offset; // Type's offset - size_t TypeOffset; // Type's offset on another type - size_t ByteSize; // Type's Byte Size - size_t Encoding; // Type's encoding - char *PtrName; // Type's name + size_t Tag; // Type's Tag + size_t Offset; // Type's offset + size_t TypeOffset; // Type's offset on another type + size_t ByteSize; // Type's Byte Size + size_t Encoding; // Type's encoding + char *PtrName; // Type's name + size_t NbEnumeration; // Type's enumeration numbers + EnumerationStruct *PtrEnumeration; // Type's enumeration +// StructureMembersStruct *PtrStructureMembers; // Type's structure members }S_BaseTypeStruct; -// Definitions for the variables's typetag -#define TypeTag_structure 0x01 // structure -#define TypeTag_pointer 0x02 // pointer -#define TypeTag_0x04 0x04 -#define TypeTag_arraytype 0x08 // array type -#define TypeTag_consttype 0x10 // const type -#define TypeTag_typedef 0x20 // typedef - // Variables internal structure -struct VariablesStruct +typedef struct VariablesStruct { size_t Op; // Variable's DW_OP union @@ -70,7 +107,7 @@ struct VariablesStruct }S_VariablesStruct; // Sub program internal structure -struct SubProgStruct +typedef struct SubProgStruct { size_t Tag; size_t NumLineSrc; @@ -86,23 +123,27 @@ struct SubProgStruct }S_SubProgStruct; // Compilation Unit internal structure -struct CUStruct +typedef struct CUStruct { size_t Tag; - size_t LowPC, HighPC; - char *PtrProducer; // Pointer to the "Producer" information (compiler and compilation options used) + size_t LowPC, HighPC; // Memory range for the code + char *PtrProducer; // Pointer to the "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) - size_t SizeLoadSrc; // Source code size - char *PtrLoadSrc; // Pointer to loaded source code - size_t NbLinesLoadSrc; // Lines source number + size_t SizeLoadSrc; // Source code text size + char *PtrLoadSrc; // Pointer to the source code text + size_t NbLinesLoadSrc; // Total number of lines in the source code text char **PtrLinesLoadSrc; // Pointer lists to each source line put in QT html/text conformity size_t NbSubProgs; // Number of sub programs / routines - SubProgStruct *PtrSubProgs; // Pointer to the sub programs / routines information structure - size_t NbTypes; - BaseTypeStruct *PtrTypes; + SubProgStruct *PtrSubProgs; // Pointer to the sub programs / routines structure + size_t NbTypes; // Number of types + BaseTypeStruct *PtrTypes; // Pointer to types size_t NbVariables; // Variables number - VariablesStruct *PtrVariables; // Pointer to the global variables list information structure + 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 }S_CUStruct; @@ -113,6 +154,8 @@ Dwarf_Ptr errarg; Dwarf_Error error; Dwarf_Debug dbg; CUStruct *PtrCU; +char **ListSearchPaths; +size_t NbSearchPaths; // @@ -122,6 +165,9 @@ 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); // @@ -131,16 +177,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(); } @@ -148,6 +228,7 @@ bool DWARFManager_Reset(void) // Dwarf manager Close bool DWARFManager_Close(void) { + DWARFManager_SourceFileSearchPathsClose(); return(DWARFManager_Reset()); } @@ -196,6 +277,9 @@ void DWARFManager_CloseDMI(void) free(PtrCU[NbCU].PtrFullFilename); free(PtrCU[NbCU].PtrLoadSrc); free(PtrCU[NbCU].PtrProducer); + free(PtrCU[NbCU].PtrSourceFilename); + free(PtrCU[NbCU].PtrSourceFileDirectory); + free(PtrCU[NbCU].PtrLinesSrc); while (PtrCU[NbCU].NbLinesLoadSrc--) { @@ -250,12 +334,8 @@ void DWARFManager_InitDMI(void) Dwarf_Off return_offset; Dwarf_Line *linebuf; FILE *SrcFile; - size_t i, j, k; char *return_string; - char *Ptr; - char *SourceFilename = NULL; - char *SourceFileDirectory = NULL; - char *SourceFullFilename = NULL; + char *Ptr, *Ptr1; // Initialisation for the Compilation Units table NbCU = 0; @@ -326,8 +406,13 @@ void DWARFManager_InitDMI(void) case DW_AT_name: if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK) { - SourceFilename = (char *)realloc(SourceFilename, strlen(return_string) + 1); - strcpy(SourceFilename, return_string); +#ifdef DEBUG_Filename + if (strstr(return_string, DEBUG_Filename)) +#endif + { + PtrCU[NbCU].PtrSourceFilename = (char *)calloc((strlen(return_string) + 1), 1); + strcpy(PtrCU[NbCU].PtrSourceFilename, return_string); + } dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } break; @@ -336,8 +421,8 @@ void DWARFManager_InitDMI(void) case DW_AT_comp_dir: if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK) { - SourceFileDirectory = (char *)realloc(SourceFileDirectory, strlen(return_string) + 1); - strcpy(SourceFileDirectory, return_string); + PtrCU[NbCU].PtrSourceFileDirectory = (char *)calloc((strlen(return_string) + 1), 1); + strcpy(PtrCU[NbCU].PtrSourceFileDirectory, return_string); dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } break; @@ -351,12 +436,47 @@ void DWARFManager_InitDMI(void) dwarf_dealloc(dbg, atlist, DW_DLA_LIST); } - Ptr = SourceFullFilename = (char *)realloc(SourceFullFilename, strlen(SourceFilename) + strlen(SourceFileDirectory) + 2); + // Check filename presence + if (!PtrCU[NbCU].PtrSourceFilename) + { + PtrCU[NbCU].PtrSourceFilename = (char *)calloc(1, 1); + } + + // Check directory presence + if (!PtrCU[NbCU].PtrSourceFileDirectory) + { + // 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); #if defined(_WIN32) - sprintf(SourceFullFilename, "%s\\%s", SourceFileDirectory, SourceFilename); + sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename); #else - sprintf(SourceFullFilename, "%s/%s", SourceFileDirectory, SourceFilename); + sprintf(PtrCU[NbCU].PtrFullFilename, "%s/%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename); #endif + // Conform slashes and backslashes while (*Ptr) { #if defined(_WIN32) @@ -372,38 +492,76 @@ void DWARFManager_InitDMI(void) #endif Ptr++; } - PtrCU[NbCU].PtrFullFilename = (char *)calloc(strlen(SourceFullFilename) + 1, 1); - strcpy((char *)PtrCU[NbCU].PtrFullFilename, SourceFullFilename); -#ifndef __CYGWIN__ - if (!fopen_s(&SrcFile, SourceFullFilename, "rt")) + // Directory path clean-up +#if defined(_WIN32) + while ((Ptr1 = Ptr = strstr(PtrCU[NbCU].PtrFullFilename, "\\..\\"))) +#else + while ((Ptr1 = Ptr = strstr(PtrCU[NbCU].PtrFullFilename, "/../"))) +#endif + { +#if defined(_WIN32) + while (*--Ptr1 != '\\'); #else - if (!(SrcFile = fopen(SourceFullFilename, "rt"))) + while (*--Ptr1 != '/'); #endif + strcpy((Ptr1 + 1), (Ptr + 4)); + } + + // Open the source file as a binary file + if (!fopen_s(&SrcFile, PtrCU[NbCU].PtrFullFilename, "rb")) { if (!fseek(SrcFile, 0, SEEK_END)) { if ((PtrCU[NbCU].SizeLoadSrc = ftell(SrcFile)) > 0) { - if (PtrCU[NbCU].PtrLoadSrc = Ptr = (char *)calloc((PtrCU[NbCU].SizeLoadSrc + 1), 1)) + if (!fseek(SrcFile, 0, SEEK_SET)) { - rewind(SrcFile); - if (PtrCU[NbCU].SizeLoadSrc < fread(Ptr, 1, PtrCU[NbCU].SizeLoadSrc, SrcFile)) + if (PtrCU[NbCU].PtrLoadSrc = Ptr = Ptr1 = (char *)calloc(1, (PtrCU[NbCU].SizeLoadSrc + 2))) { - free(PtrCU[NbCU].PtrLoadSrc); - PtrCU[NbCU].PtrLoadSrc = NULL; - PtrCU[NbCU].SizeLoadSrc = 0; - } - else - { - do + // Read whole file + if (fread_s(PtrCU[NbCU].PtrLoadSrc, PtrCU[NbCU].SizeLoadSrc, PtrCU[NbCU].SizeLoadSrc, 1, SrcFile) != 1) + { + free(PtrCU[NbCU].PtrLoadSrc); + PtrCU[NbCU].PtrLoadSrc = NULL; + PtrCU[NbCU].SizeLoadSrc = 0; + } + else { - if (*Ptr == 0xa) + // Eliminate all carriage return code '\r' (oxd) + do { - PtrCU[NbCU].NbLinesLoadSrc++; - *Ptr = 0; + if ((*Ptr = *Ptr1) != '\r') + { + Ptr++; + } } - } while (*++Ptr); + while (*Ptr1++); + + // 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; + } + + // 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') + { + PtrCU[NbCU].NbLinesLoadSrc++; + *Ptr = 0; + } + } while (*++Ptr); + } + } } } } @@ -417,9 +575,29 @@ void DWARFManager_InitDMI(void) } } - // Get the source lines table located in the Compilation Unit + // Get the source lines table located in the CU if (dwarf_srclines(return_sib, &linebuf, &cnt, &error) == DW_DLV_OK) { + if (cnt) + { + PtrCU[NbCU].NbLinesSrc = cnt; + PtrCU[NbCU].PtrLinesSrc = (CUStruct_LineSrc *)calloc(cnt, sizeof(CUStruct_LineSrc)); + 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; + } + } + } + } + + // 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 @@ -484,8 +662,8 @@ void DWARFManager_InitDMI(void) { PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName = (char *)calloc(strlen(return_string) + 1, 1); strcpy(PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName, return_string); - dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } + dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } break; @@ -498,7 +676,22 @@ void DWARFManager_InitDMI(void) dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR); } - PtrCU[NbCU].NbVariables++; + // Check variable's name validity + if (PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName) + { + // Check variable's memory address validity + if (PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].Addr) + { + // Valid variable + PtrCU[NbCU].NbVariables++; + } + else + { + // Invalid variable + free(PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName); + PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName = NULL; + } + } dwarf_dealloc(dbg, atlist, DW_DLA_LIST); } @@ -512,8 +705,10 @@ void DWARFManager_InitDMI(void) case DW_TAG_array_type: case DW_TAG_subrange_type: case DW_TAG_subroutine_type: + case DW_TAG_enumeration_type: if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK) { + // Allocate memory for this type PtrCU[NbCU].PtrTypes = (BaseTypeStruct *)realloc(PtrCU[NbCU].PtrTypes, ((PtrCU[NbCU].NbTypes + 1) * sizeof(BaseTypeStruct))); memset(PtrCU[NbCU].PtrTypes + PtrCU[NbCU].NbTypes, 0, sizeof(BaseTypeStruct)); PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Tag = return_tagval; @@ -531,6 +726,11 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { + // + case DW_AT_sibling: + break; + + // Type's type offset case DW_AT_type: if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK) { @@ -538,6 +738,7 @@ void DWARFManager_InitDMI(void) } break; + // Type's byte size case DW_AT_byte_size: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { @@ -545,6 +746,7 @@ void DWARFManager_InitDMI(void) } break; + // Type's encoding case DW_AT_encoding: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { @@ -552,16 +754,30 @@ void DWARFManager_InitDMI(void) } break; + // Type's name case DW_AT_name: if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK) { - PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName = (char *)calloc(strlen(return_string) + 1, 1); - strcpy(PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName, return_string); +#ifdef DEBUG_TypeName + if (!strcmp(return_string, DEBUG_TypeName)) +#endif + { + PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName = (char *)calloc(strlen(return_string) + 1, 1); + strcpy(PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName, return_string); + } dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } break; - default: + // Type's file number + case DW_AT_decl_file: + break; + + // Type's line number + case DW_AT_decl_line: + break; + + default: break; } } @@ -663,21 +879,16 @@ void DWARFManager_InitDMI(void) } dwarf_dealloc(dbg, atlist, DW_DLA_LIST); - for (i = 0; i < (size_t)cnt; ++i) + // 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) + if ((PtrCU[NbCU].PtrLinesSrc[i].StartPC >= return_lowpc) && (PtrCU[NbCU].PtrLinesSrc[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].PtrLinesSrc[i].StartPC; + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].NumLineSrc = PtrCU[NbCU].PtrLinesSrc[i].NumLineSrc; + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc++; } } @@ -716,20 +927,21 @@ void DWARFManager_InitDMI(void) break; case 2: - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset = *((char *)(return_block->bl_data) + 1); - + case 3: switch (return_tagval) { case DW_TAG_variable: - PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset -= 0x80; + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset = ReadLEB128((char *)return_block->bl_data + 1); break; case DW_TAG_formal_parameter: + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset = ReadULEB128((char *)return_block->bl_data + 1); break; default: break; } + break; default: break; @@ -754,8 +966,8 @@ void DWARFManager_InitDMI(void) { PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrName = (char *)calloc(strlen(return_string) + 1, 1); strcpy(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrName, return_string); - dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } + dwarf_dealloc(dbg, return_string, DW_DLA_STRING); } break; @@ -802,13 +1014,6 @@ 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 (i = 0; i < (size_t)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 @@ -816,13 +1021,13 @@ void DWARFManager_InitDMI(void) { if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(PtrCU[NbCU].NbLinesLoadSrc, sizeof(char *))) { - for (j = 0; j < PtrCU[NbCU].NbLinesLoadSrc; j++) + for (size_t j = 0; j < PtrCU[NbCU].NbLinesLoadSrc; j++) { if (PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)calloc(10000, sizeof(char))) { if (Ptr = DWARFManager_GetLineSrcFromNumLine(PtrCU[NbCU].PtrLoadSrc, (j + 1))) { - i = 0; + size_t i = 0; while (*Ptr) { @@ -830,17 +1035,17 @@ void DWARFManager_InitDMI(void) { case 9: strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], " "); - i += strlen(" "); + i += 6; break; case '<': strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "<"); - i += strlen("<"); + i += 4; break; case '>': strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], ">"); - i += strlen(">"); + i += 4; break; #if 0 case '&': @@ -861,12 +1066,12 @@ void DWARFManager_InitDMI(void) Ptr++; } } - PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)realloc(PtrCU[NbCU].PtrLinesLoadSrc[j], i + 1); + PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)realloc(PtrCU[NbCU].PtrLinesLoadSrc[j], strlen(PtrCU[NbCU].PtrLinesLoadSrc[j]) + 1); } } - // Init lines source information based on each source code line numbers - for (j = 0; j < PtrCU[NbCU].NbSubProgs; j++) + // Init lines source information for each source code line numbers and for each subprogs + for (size_t j = 0; j < PtrCU[NbCU].NbSubProgs; j++) { // Check if the subprog / function's line exists in the source code if (PtrCU[NbCU].PtrSubProgs[j].NumLineSrc <= PtrCU[NbCU].NbLinesLoadSrc) @@ -874,7 +1079,7 @@ void DWARFManager_InitDMI(void) PtrCU[NbCU].PtrSubProgs[j].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrSubProgs[j].NumLineSrc - 1]; } - for (k = 0; k < PtrCU[NbCU].PtrSubProgs[j].NbLinesSrc; k++) + for (size_t k = 0; k < PtrCU[NbCU].PtrSubProgs[j].NbLinesSrc; k++) { if (PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc <= PtrCU[NbCU].NbLinesLoadSrc) { @@ -892,10 +1097,10 @@ void DWARFManager_InitDMI(void) // Check the presence of source lines dedicated to the sub progs if (PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc) { - i = PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc - 1].NumLineSrc; + size_t i = PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc - 1].NumLineSrc; if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(i, sizeof(char *))) { - for (j = 0; j < i; j++) + for (size_t j = 0; j < i; j++) { PtrCU[NbCU].PtrLinesLoadSrc[j] = NULL; } @@ -904,16 +1109,37 @@ void DWARFManager_InitDMI(void) } } + // Set information based on used line numbers + if (PtrCU[NbCU].PtrLinesSrc) + { + // Set the line source pointer for each used line numbers + if (PtrCU[NbCU].PtrLinesLoadSrc) + { + for (size_t i = 0; i < PtrCU[NbCU].NbLinesSrc; i++) + { + PtrCU[NbCU].PtrLinesSrc[i].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrLinesSrc[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].HighPC == ~0))) + { + PtrCU[NbCU].LowPC = PtrCU[NbCU].PtrLinesSrc[0].StartPC; + PtrCU[NbCU].HighPC = PtrCU[NbCU].PtrLinesSrc[PtrCU[NbCU].NbLinesSrc - 1].StartPC; + } + } + } + // Init global variables information based on types information - for (i = 0; i < PtrCU[NbCU].NbVariables; i++) + for (size_t i = 0; i < PtrCU[NbCU].NbVariables; i++) { DWARFManager_InitInfosVariable(PtrCU[NbCU].PtrVariables + i); } // Init local variables information based on types information - for (i = 0; i < PtrCU[NbCU].NbSubProgs; i++) + for (size_t i = 0; i < PtrCU[NbCU].NbSubProgs; i++) { - for (j = 0; j < PtrCU[NbCU].PtrSubProgs[i].NbVariables; j++) + for (size_t j = 0; j < PtrCU[NbCU].PtrSubProgs[i].NbVariables; j++) { DWARFManager_InitInfosVariable(PtrCU[NbCU].PtrSubProgs[i].PtrVariables + j); } @@ -923,10 +1149,6 @@ void DWARFManager_InitDMI(void) ++NbCU; } } - - free(SourceFilename); - free(SourceFileDirectory); - free(SourceFullFilename); } @@ -935,106 +1157,141 @@ void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables) { size_t j, TypeOffset; - PtrVariables->PtrTypeName = (char *)calloc(1000, 1); - TypeOffset = PtrVariables->TypeOffset; - - for (j = 0; j < PtrCU[NbCU].NbTypes; j++) +#ifdef DEBUG_VariableName + if (PtrVariables->PtrName && !strcmp(PtrVariables->PtrName, DEBUG_VariableName)) +#endif { - if (TypeOffset == PtrCU[NbCU].PtrTypes[j].Offset) + PtrVariables->PtrTypeName = (char *)calloc(1000, 1); + TypeOffset = PtrVariables->TypeOffset; + + for (j = 0; j < PtrCU[NbCU].NbTypes; j++) { - switch (PtrCU[NbCU].PtrTypes[j].Tag) + if (TypeOffset == PtrCU[NbCU].PtrTypes[j].Offset) { - // Structure type tag - case DW_TAG_structure_type: - PtrVariables->TypeTag |= TypeTag_structure; - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - else + switch (PtrCU[NbCU].PtrTypes[j].Tag) { - if ((PtrVariables->TypeTag & TypeTag_pointer)) + case DW_TAG_subroutine_type: + PtrVariables->TypeTag |= TypeTag_subroutine_type; + strcat(PtrVariables->PtrTypeName, " (* ) ()"); + break; + + // Structure type tag + case DW_TAG_structure_type: + PtrVariables->TypeTag |= TypeTag_structure; + if (!(PtrVariables->TypeTag & TypeTag_typedef)) { - strcat(PtrVariables->PtrTypeName, " *"); + if (PtrCU[NbCU].PtrTypes[j].PtrName) + { + strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); + } } - } - break; - - // Pointer type tag - case DW_TAG_pointer_type: - PtrVariables->TypeTag |= TypeTag_pointer; - PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; - PtrVariables->TypeEncoding = 0x10; - if (!(TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - strcat(PtrVariables->PtrTypeName, "void *"); - } - else - { - j = -1; - } - break; + if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + j = -1; + } + else + { + if ((PtrVariables->TypeTag & TypeTag_pointer)) + { + strcat(PtrVariables->PtrTypeName, " *"); + } + } + break; - // Typedef type tag - case DW_TAG_typedef: - if (!(PtrVariables->TypeTag & TypeTag_typedef)) - { - PtrVariables->TypeTag |= TypeTag_typedef; - strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); - } - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - break; + // Pointer type tag + case DW_TAG_pointer_type: + PtrVariables->TypeTag |= TypeTag_pointer; + PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; + PtrVariables->TypeEncoding = 0x10; + if (!(TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + strcat(PtrVariables->PtrTypeName, "void *"); + } + else + { + j = -1; + } + break; - // ? type tag - case DW_TAG_subrange_type: - PtrVariables->TypeTag |= TypeTag_0x04; - break; + case DW_TAG_enumeration_type: + PtrVariables->TypeTag |= TypeTag_enumeration_type; + PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; + if (!(PtrVariables->TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding)) + { + // Try to determine the possible size + switch (PtrVariables->TypeByteSize) + { + case 4: + PtrVariables->TypeEncoding = 0x7; + break; - // Array type tag - case DW_TAG_array_type: - PtrVariables->TypeTag |= TypeTag_arraytype; - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - break; + default: + break; + } + } + break; - // Const type tag - case DW_TAG_const_type: - PtrVariables->TypeTag |= TypeTag_consttype; - strcat(PtrVariables->PtrTypeName, "const "); - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - break; + // Typedef type tag + case DW_TAG_typedef: + if (!(PtrVariables->TypeTag & TypeTag_typedef)) + { + PtrVariables->TypeTag |= TypeTag_typedef; + strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); + } + if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + j = -1; + } + break; - // Base type tag - case DW_TAG_base_type: - if (!(PtrVariables->TypeTag & TypeTag_typedef)) - { - strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); - } - if ((PtrVariables->TypeTag & TypeTag_pointer)) - { - strcat(PtrVariables->PtrTypeName, " *"); - } - else - { - PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; - PtrVariables->TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding; - } - if ((PtrVariables->TypeTag & TypeTag_arraytype)) - { - strcat(PtrVariables->PtrTypeName, "[]"); - } - break; + // ? type tag + case DW_TAG_subrange_type: + PtrVariables->TypeTag |= TypeTag_subrange; + break; + + // Array type tag + case DW_TAG_array_type: + PtrVariables->TypeTag |= TypeTag_arraytype; + if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + j = -1; + } + break; + + // Const type tag + case DW_TAG_const_type: + PtrVariables->TypeTag |= TypeTag_consttype; + strcat(PtrVariables->PtrTypeName, "const "); + if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + j = -1; + } + break; + + // Base type tag + case DW_TAG_base_type: + if (!(PtrVariables->TypeTag & TypeTag_typedef)) + { + strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); + } + if ((PtrVariables->TypeTag & TypeTag_pointer)) + { + strcat(PtrVariables->PtrTypeName, " *"); + } + else + { + PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; + PtrVariables->TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding; + } + if ((PtrVariables->TypeTag & TypeTag_arraytype)) + { + strcat(PtrVariables->PtrTypeName, "[]"); + } + break; - default: - break; + default: + break; + } } } } @@ -1045,13 +1302,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)) { @@ -1070,9 +1325,7 @@ char *DWARFManager_GetSymbolnameFromAdr(size_t Adr) // Return the existence status (true or false) in Error char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, bool *Error) { - 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)) { @@ -1085,7 +1338,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) { @@ -1109,13 +1362,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)) { @@ -1129,18 +1380,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)) { @@ -1154,17 +1403,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)) { @@ -1178,16 +1425,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)) { @@ -1201,18 +1447,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)) { @@ -1226,18 +1470,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)) { @@ -1251,18 +1493,15 @@ size_t DWARFManager_GetLocalVariableTypeEncoding(size_t Adr, size_t Index) } -// Get local variable Op based on his address and index (starting by 1) -// Return 0 if not found -// May return 0 if there isn't Op linked to the variable's index +// 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)) { @@ -1276,18 +1515,15 @@ size_t DWARFManager_GetLocalVariableOp(size_t Adr, size_t Index) } -// Get local variable type name based on his index (starting by 1) -// Return NULL if not found -// May return NULL if there is not type linked to the variable's index +// 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)) { @@ -1302,12 +1538,12 @@ char *DWARFManager_GetLocalVariableTypeName(size_t Adr, size_t Index) // Get Compilation Unit / global variables numbers -// Return variables number +// 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; } @@ -1316,14 +1552,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) { @@ -1342,13 +1576,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) { @@ -1367,13 +1599,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) { @@ -1392,13 +1622,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) { @@ -1417,13 +1645,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) { @@ -1443,17 +1669,14 @@ size_t DWARFManager_GetGlobalVariableAdr(size_t Index) // Get global variable memory address based on his name -// Return 0 if not found -// Note: Return the first occurence found +// 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)) { @@ -1467,14 +1690,11 @@ size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName) } -// Get global variable name based on his index (starting by 1) -// Return name's pointer text found -// Return NULL if not found +// 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) { @@ -1494,16 +1714,16 @@ char *DWARFManager_GetGlobalVariableName(size_t Index) // Get text line from source based on address and his tag +// A tag can be either 0 or a DW_TAG_subprogram +// DW_TAG_subprogram will look for the line pointing to the function // 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)) { @@ -1513,11 +1733,18 @@ 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) && (!Tag || (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].Tag == Tag))) + if (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC <= Adr) { - return PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].PtrLineSrc; + if ((PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC == Adr) && (!Tag || (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].Tag == Tag))) + { + return PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].PtrLineSrc; + } + } + else + { + return PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k - 1].PtrLineSrc; } } } @@ -1530,17 +1757,17 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag) } -// Get line number based on the address and the tag +// Get line number based on the address and a tag +// A tag can be either 0 or a DW_TAG_subprogram +// DW_TAG_subprogram will look for the line pointing to the function name as described in the source code // 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)) { @@ -1550,7 +1777,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))) { @@ -1566,6 +1793,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].NbLinesSrc; j++) + { + if (PtrCU[i].PtrLinesSrc[j].StartPC == Adr) + { + return PtrCU[i].PtrLinesSrc[j].NumLineSrc; + } + } } } @@ -1573,17 +1809,15 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag) } -// Get function name based on address and his range -// Return NULL if no function name has been found +// Get function name based on an address +// 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)) { @@ -1597,17 +1831,15 @@ char *DWARFManager_GetFunctionName(size_t Adr) } -// Get text line from source based on address and num line (starting by 1) +// 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)) { @@ -1617,7 +1849,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) { @@ -1634,13 +1866,11 @@ char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine) } -// Get text line from source based on address and num line (starting by 1) -// Return NULL if no text line has been found +// 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)) { @@ -1658,3 +1888,17 @@ char *DWARFManager_GetLineSrcFromNumLineBaseAdr(size_t Adr, size_t NumLine) return NULL; } + +// Get number of source code filenames +size_t DWARFManager_GetNbFullSourceFilename(void) +{ + return NbCU; +} + + +// Get source code filename based on index (starting from 0) +char *DWARFManager_GetNumFullSourceFilename(size_t Index) +{ + return (PtrCU[Index].PtrFullFilename); +} +