X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/47b6ecae8f96f86ae72d0a76ada94c943bad54b3..fe3b257de12df90c1d99ea00ef9d22c7ccc52876:/src/debugger/DWARFManager.cpp diff --git a/src/debugger/DWARFManager.cpp b/src/debugger/DWARFManager.cpp index b6c149e..e522e4f 100644 --- a/src/debugger/DWARFManager.cpp +++ b/src/debugger/DWARFManager.cpp @@ -9,6 +9,13 @@ // --- ---------- ------------------------------------------------------------ // JPM 12/03/2016 Created this file // JPM 12/03/2016 DWARF format support +// JPM Sept./2018 Added LEB128 decoding features, and improve the DWARF parsing information +// JPM 10/06/2018 Improve the DWARF parsing information, and the source file text reading +// + +// To Do +// To use pointers instead of arrays usage +// #include @@ -17,15 +24,19 @@ #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 +// Debug definitions +//#define DEBUG_NumCU 0x9 // 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 // Source line internal structure -struct DMIStruct_LineSrc +typedef struct DMIStruct_LineSrc { size_t Tag; size_t StartPC; @@ -33,27 +44,44 @@ 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 +#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 // Variables internal structure -struct VariablesStruct +typedef struct VariablesStruct { size_t Op; // Variable's DW_OP union @@ -70,7 +98,7 @@ struct VariablesStruct }S_VariablesStruct; // Sub program internal structure -struct SubProgStruct +typedef struct SubProgStruct { size_t Tag; size_t NumLineSrc; @@ -86,11 +114,13 @@ 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) + 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 @@ -98,10 +128,11 @@ struct CUStruct 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; + 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 + size_t NbFrames; // Frames number }S_CUStruct; @@ -195,6 +226,8 @@ void DWARFManager_CloseDMI(void) free(PtrCU[NbCU].PtrFullFilename); free(PtrCU[NbCU].PtrLoadSrc); free(PtrCU[NbCU].PtrProducer); + free(PtrCU[NbCU].PtrSourceFilename); + free(PtrCU[NbCU].PtrSourceFileDirectory); while (PtrCU[NbCU].NbLinesLoadSrc--) { @@ -249,12 +282,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; @@ -286,7 +315,7 @@ void DWARFManager_InitDMI(void) // Die type detection switch (return_tagval) { - case DW_TAG_compile_unit: + case DW_TAG_compile_unit: if (dwarf_attrlist(return_sib, &atlist, &atcnt, &error) == DW_DLV_OK) { for (Dwarf_Signed i = 0; i < atcnt; ++i) @@ -295,21 +324,24 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { - case DW_AT_low_pc: + // Start address + case DW_AT_low_pc: if (dwarf_lowpc(return_sib, &return_lowpc, &error) == DW_DLV_OK) { PtrCU[NbCU].LowPC = return_lowpc; } break; - case DW_AT_high_pc: + // End address + case DW_AT_high_pc: if (dwarf_highpc(return_sib, &return_highpc, &error) == DW_DLV_OK) { PtrCU[NbCU].HighPC = return_highpc; } break; - case DW_AT_producer: + // compilation information + case DW_AT_producer: if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrProducer = (char *)calloc(strlen(return_string) + 1, 1); @@ -318,20 +350,27 @@ void DWARFManager_InitDMI(void) } break; - case DW_AT_name: + // Filename + 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; - case DW_AT_comp_dir: + // Directory name + 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; @@ -345,48 +384,109 @@ void DWARFManager_InitDMI(void) dwarf_dealloc(dbg, atlist, DW_DLA_LIST); } - Ptr = SourceFullFilename = (char *)realloc(SourceFullFilename, strlen(SourceFilename) + strlen(SourceFileDirectory) + 2); - sprintf(SourceFullFilename, "%s\\%s", SourceFileDirectory, SourceFilename); + // Check filename validity + if (!PtrCU[NbCU].PtrSourceFilename) + { + PtrCU[NbCU].PtrSourceFilename = (char *)calloc(1, 1); + } + + // Check directory validity + if (!PtrCU[NbCU].PtrSourceFileDirectory) + { + PtrCU[NbCU].PtrSourceFileDirectory = (char *)calloc(2, 1); + PtrCU[NbCU].PtrSourceFileDirectory[0] = '.'; + } + + // 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 and backslashes while (*Ptr) { +#if defined(_WIN32) if (*Ptr == '/') { *Ptr = '\\'; } +#else + if (*Ptr == '\\') + { + *Ptr = '/'; + } +#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 - if (!(SrcFile = fopen(SourceFullFilename, "rt"))) + while ((Ptr1 = Ptr = strstr(PtrCU[NbCU].PtrFullFilename, "/../"))) #endif { +#if defined(_WIN32) + while (*--Ptr1 != '\\'); +#else + 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) { - if (*Ptr == 0xa) + free(PtrCU[NbCU].PtrLoadSrc); + PtrCU[NbCU].PtrLoadSrc = NULL; + PtrCU[NbCU].SizeLoadSrc = 0; + } + else + { + // Eliminate all carriage return code '\r' (oxd) + do { - PtrCU[NbCU].NbLinesLoadSrc++; - *Ptr = 0; + if ((*Ptr = *Ptr1) != '\r') + { + 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); } - } while (*++Ptr); + } } } } @@ -400,7 +500,7 @@ 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) { } @@ -415,10 +515,10 @@ void DWARFManager_InitDMI(void) { switch (return_tagval) { - case DW_TAG_lexical_block: + case DW_TAG_lexical_block: break; - case DW_TAG_variable: + case DW_TAG_variable: if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrVariables = (VariablesStruct *)realloc(PtrCU[NbCU].PtrVariables, ((PtrCU[NbCU].NbVariables + 1) * sizeof(VariablesStruct))); @@ -432,7 +532,7 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { - case DW_AT_location: + case DW_AT_location: if (dwarf_formblock(return_attr1, &return_block, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].Op = (*((unsigned char *)(return_block->bl_data))); @@ -450,14 +550,15 @@ void DWARFManager_InitDMI(void) } break; - case DW_AT_type: + case DW_AT_type: if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].TypeOffset = return_offset; } break; - case DW_AT_name: + // Variable name + case DW_AT_name: if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK) { #ifdef DEBUG_VariableName @@ -466,12 +567,12 @@ 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; - default: + default: break; } } @@ -480,22 +581,39 @@ 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); } break; - case DW_TAG_base_type: - case DW_TAG_typedef: - case DW_TAG_structure_type: - case DW_TAG_pointer_type: - case DW_TAG_const_type: - case DW_TAG_array_type: - case DW_TAG_subrange_type: - case DW_TAG_subroutine_type: + case DW_TAG_base_type: + case DW_TAG_typedef: + case DW_TAG_structure_type: + case DW_TAG_pointer_type: + case DW_TAG_const_type: + 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; @@ -513,36 +631,57 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { - case DW_AT_type: + // + 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) { PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].TypeOffset = return_offset; } break; - case DW_AT_byte_size: + // Type's byte size + case DW_AT_byte_size: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].ByteSize = return_uvalue; } break; - case DW_AT_encoding: + // Type's encoding + case DW_AT_encoding: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Encoding = return_uvalue; } break; - case DW_AT_name: + // 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; + // Type's file number + case DW_AT_decl_file: + break; + + // Type's line number + case DW_AT_decl_line: + break; + default: break; } @@ -558,7 +697,7 @@ void DWARFManager_InitDMI(void) } break; - case DW_TAG_subprogram: + case DW_TAG_subprogram: if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrSubProgs = (SubProgStruct *)realloc(PtrCU[NbCU].PtrSubProgs, ((PtrCU[NbCU].NbSubProgs + 1) * sizeof(SubProgStruct))); @@ -573,6 +712,7 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { + // start address case DW_AT_low_pc: if (dwarf_lowpc(return_die, &return_lowpc, &error) == DW_DLV_OK) { @@ -581,6 +721,7 @@ void DWARFManager_InitDMI(void) } break; + // end address case DW_AT_high_pc: if (dwarf_highpc(return_die, &return_highpc, &error) == DW_DLV_OK) { @@ -588,6 +729,7 @@ void DWARFManager_InitDMI(void) } break; + // Line number case DW_AT_decl_line: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { @@ -595,13 +737,16 @@ void DWARFManager_InitDMI(void) } break; + // Frame case DW_AT_frame_base: if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].FrameBase = return_uvalue; + PtrCU[NbCU].NbFrames++; } break; + // function name case DW_AT_name: if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK) { @@ -611,6 +756,25 @@ void DWARFManager_InitDMI(void) } break; + case DW_AT_sibling: + break; + + case DW_AT_GNU_all_tail_call_sites: + break; + + case DW_AT_type: + break; + + case DW_AT_prototyped: + break; + + // File number + case DW_AT_decl_file: + break; + + case DW_AT_external: + break; + default: break; } @@ -620,7 +784,8 @@ 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) { @@ -662,7 +827,7 @@ void DWARFManager_InitDMI(void) { switch (return_attr) { - case DW_AT_location: + case DW_AT_location: if (dwarf_formblock(return_attr1, &return_block, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Op = *((unsigned char *)(return_block->bl_data)); @@ -673,20 +838,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; + case DW_TAG_variable: + 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: + 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; @@ -695,14 +861,14 @@ void DWARFManager_InitDMI(void) } break; - case DW_AT_type: + case DW_AT_type: if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK) { PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].TypeOffset = return_offset; } break; - case DW_AT_name: + case DW_AT_name: if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK) { #ifdef DEBUG_VariableName @@ -711,15 +877,15 @@ 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; - case DW_AT_decl_file: + case DW_AT_decl_file: break; - case DW_AT_decl_line: + case DW_AT_decl_line: break; default: @@ -761,7 +927,7 @@ void DWARFManager_InitDMI(void) } // Release the memory used by the source lines - for (i = 0; i < (size_t)cnt; ++i) + for (Dwarf_Signed i = 0; i < cnt; ++i) { dwarf_dealloc(dbg, linebuf[i], DW_DLA_LINE); } @@ -773,13 +939,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) { @@ -787,17 +953,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 '&': @@ -818,12 +984,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++) + 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) @@ -831,7 +997,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) { @@ -849,10 +1015,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; } @@ -862,15 +1028,15 @@ void DWARFManager_InitDMI(void) } // 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); } @@ -880,111 +1046,146 @@ void DWARFManager_InitDMI(void) ++NbCU; } } - - free(SourceFilename); - free(SourceFileDirectory); - free(SourceFullFilename); } -// +// Variables information initialisation 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) { - case DW_TAG_structure_type: - PtrVariables->TypeTag |= 0x1; - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + switch (PtrCU[NbCU].PtrTypes[j].Tag) { - j = -1; - } - else - { - if ((PtrVariables->TypeTag & 0x2)) + 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, " *"); + strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); } - } - break; + if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) + { + j = -1; + } + else + { + if ((PtrVariables->TypeTag & TypeTag_pointer)) + { + strcat(PtrVariables->PtrTypeName, " *"); + } + } + break; - case DW_TAG_pointer_type: - PtrVariables->TypeTag |= 0x2; - 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; + // 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; - case DW_TAG_typedef: - if (!(PtrVariables->TypeTag & 0x20)) - { - PtrVariables->TypeTag |= 0x20; - strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); - } - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - 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; - case DW_TAG_subrange_type: - PtrVariables->TypeTag |= 0x4; - break; + default: + break; + } + } + break; - case DW_TAG_array_type: - PtrVariables->TypeTag |= 0x8; - 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; - case DW_TAG_const_type: - PtrVariables->TypeTag |= 0x10; - strcat(PtrVariables->PtrTypeName, "const "); - if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset)) - { - j = -1; - } - break; + // ? type tag + case DW_TAG_subrange_type: + PtrVariables->TypeTag |= TypeTag_subrange; + break; - case DW_TAG_base_type: - if (!(PtrVariables->TypeTag & 0x20)) - { - strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName); - } - if ((PtrVariables->TypeTag & 0x2)) - { - strcat(PtrVariables->PtrTypeName, " *"); - } - else - { - PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize; - PtrVariables->TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding; - } - if ((PtrVariables->TypeTag & 0x8)) - { - strcat(PtrVariables->PtrTypeName, "[]"); - } - 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; - default: - 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; + } } } } @@ -1465,9 +1666,16 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag) { for (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; } } } @@ -1584,8 +1792,8 @@ 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 by 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; @@ -1608,3 +1816,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 +char *DWARFManager_GetNumFullSourceFilename(size_t Index) +{ + return (PtrCU[Index].PtrFullFilename); +} +