Fixed the typedef's name display in Local and Watch variables window
[clinton/Virtual-Jaguar-Rx.git] / src / debugger / DWARFManager.cpp
index 0a3012c..3817763 100644 (file)
 // JPM  12/03/2016  DWARF format support\r
 \r
 \r
-#include       <stdlib.h>\r
-#include       <stdio.h>\r
-#include       <stdint.h>\r
-#include       <string.h>\r
-#include       <libdwarf.h>\r
-#include       <dwarf.h>\r
+#include <stdlib.h>\r
+#include <stdio.h>\r
+#include <stdint.h>\r
+#include <string.h>\r
+#include <libdwarf.h>\r
+#include <dwarf.h>\r
+\r
+\r
+//\r
+//#define DEBUG_NumCU 0x6                                              // CU number to debug or undefine it\r
+//#define DEBUG_VariableName "argc"                            // Variable name to look for or undefine it\r
 \r
 \r
 // Source line internal structure\r
@@ -39,10 +44,23 @@ struct BaseTypeStruct
        char *PtrName;                                                  // Type's name\r
 }S_BaseTypeStruct;\r
 \r
+// Definitions for the variables's typetag\r
+#define        TypeTag_structure       0x01                    // structure\r
+#define        TypeTag_pointer         0x02                    // pointer\r
+#define        TypeTag_0x04            0x04\r
+#define        TypeTag_arraytype       0x08                    // array type\r
+#define        TypeTag_consttype       0x10                    // const type\r
+#define        TypeTag_typedef         0x20                    // typedef\r
+\r
 // Variables internal structure\r
 struct VariablesStruct\r
 {\r
-       size_t Addr;                                                    // Variable memory address\r
+       size_t Op;                                                              // Variable's DW_OP\r
+       union\r
+       {\r
+               size_t Addr;                                            // Variable memory address\r
+               int Offset;                                                     // Variable stack offset (signed)\r
+       };\r
        char *PtrName;                                                  // Variable's name\r
        size_t TypeOffset;                                              // Offset pointing on the Variable's Type\r
        size_t TypeByteSize;                                    // Variable's Type byte size\r
@@ -58,10 +76,13 @@ struct SubProgStruct
        size_t NumLineSrc;\r
        size_t StartPC;\r
        size_t LowPC, HighPC;\r
+       size_t FrameBase;\r
        char *PtrLineSrc;\r
-       char *PtrSubprogramName;\r
-       size_t NbLinesSrc;\r
-       DMIStruct_LineSrc *PtrLinesSrc;\r
+       char *PtrSubprogramName;                                                // Sub program name\r
+       size_t NbLinesSrc;                                                              // Number of lines source used by the sub program\r
+       DMIStruct_LineSrc *PtrLinesSrc;                                 // Pointer of the lines source for the sub program\r
+       size_t NbVariables;                                                             // Variables number\r
+       VariablesStruct *PtrVariables;                                  // Pointer to the local variables list information structure\r
 }S_SubProgStruct;\r
 \r
 // Compilation Unit internal structure\r
@@ -80,7 +101,7 @@ struct CUStruct
        size_t NbTypes;\r
        BaseTypeStruct *PtrTypes;\r
        size_t NbVariables;                                                             // Variables number\r
-       VariablesStruct *PtrVariables;                                  // Pointer to the variables list information structure\r
+       VariablesStruct *PtrVariables;                                  // Pointer to the global variables list information structure\r
 }S_CUStruct;\r
 \r
 \r
@@ -99,6 +120,7 @@ void DWARFManager_InitDMI(void);
 void DWARFManager_CloseDMI(void);\r
 bool DWARFManager_ElfClose(void);\r
 char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine);\r
+void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables);\r
 \r
 \r
 //\r
@@ -182,6 +204,13 @@ void DWARFManager_CloseDMI(void)
 \r
                while (PtrCU[NbCU].NbSubProgs--)\r
                {\r
+                       while (PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables--)\r
+                       {\r
+                               free(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrName);\r
+                               free(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrTypeName);\r
+                       }\r
+                       free(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables);\r
+\r
                        free(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc);\r
                        free(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrSubprogramName);\r
                }\r
@@ -216,11 +245,11 @@ void DWARFManager_InitDMI(void)
        Dwarf_Addr return_lowpc, return_highpc, return_lineaddr;\r
        Dwarf_Block *return_block;\r
        Dwarf_Signed atcnt, cnt;\r
-       Dwarf_Die return_sib, return_die;\r
+       Dwarf_Die return_sib, return_die, return_sub, return_subdie;\r
        Dwarf_Off return_offset;\r
        Dwarf_Line *linebuf;\r
        FILE *SrcFile;\r
-       size_t i, j, k, TypeOffset;\r
+       size_t i, j, k;\r
        char *return_string;\r
        char *Ptr;\r
        char *SourceFilename = NULL;\r
@@ -241,551 +270,709 @@ void DWARFManager_InitDMI(void)
                        PtrCU = (CUStruct *)Ptr;\r
                        memset(PtrCU + NbCU, 0, sizeof(CUStruct));\r
 \r
-                       // Get 1st Die from the Compilation Unit\r
-                       if (dwarf_siblingof(dbg, NULL, &return_sib, &error) == DW_DLV_OK)\r
+                       // Debug specific CU\r
+#ifdef DEBUG_NumCU\r
+                       if (NbCU == DEBUG_NumCU)\r
+#endif\r
                        {\r
-                               // Get Die's Tag\r
-                               if ((dwarf_tag(return_sib, &return_tagval, &error) == DW_DLV_OK))\r
+                               // Get 1st Die from the Compilation Unit\r
+                               if (dwarf_siblingof(dbg, NULL, &return_sib, &error) == DW_DLV_OK)\r
                                {\r
-                                       PtrCU[NbCU].Tag = return_tagval;\r
-\r
-                                       // Die type detection\r
-                                       switch (return_tagval)\r
+                                       // Get Die's Tag\r
+                                       if ((dwarf_tag(return_sib, &return_tagval, &error) == DW_DLV_OK))\r
                                        {\r
-                                       case    DW_TAG_compile_unit:\r
-                                               if (dwarf_attrlist(return_sib, &atlist, &atcnt, &error) == DW_DLV_OK)\r
+                                               PtrCU[NbCU].Tag = return_tagval;\r
+\r
+                                               // Die type detection\r
+                                               switch (return_tagval)\r
                                                {\r
-                                                       for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                               case    DW_TAG_compile_unit:\r
+                                                       if (dwarf_attrlist(return_sib, &atlist, &atcnt, &error) == DW_DLV_OK)\r
                                                        {\r
-                                                               if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
+                                                               for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
                                                                {\r
-                                                                       switch (return_attr)\r
+                                                                       if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
                                                                        {\r
-                                                                       case    DW_AT_low_pc:\r
-                                                                               if (dwarf_lowpc(return_sib, &return_lowpc, &error) == DW_DLV_OK)\r
+                                                                               switch (return_attr)\r
                                                                                {\r
-                                                                                       PtrCU[NbCU].LowPC = return_lowpc;\r
-                                                                               }\r
-                                                                               break;\r
+                                                                               case    DW_AT_low_pc:\r
+                                                                                       if (dwarf_lowpc(return_sib, &return_lowpc, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               PtrCU[NbCU].LowPC = return_lowpc;\r
+                                                                                       }\r
+                                                                                       break;\r
 \r
-                                                                       case    DW_AT_high_pc:\r
-                                                                               if (dwarf_highpc(return_sib, &return_highpc, &error) == DW_DLV_OK)\r
-                                                                               {\r
-                                                                                       PtrCU[NbCU].HighPC = return_highpc;\r
-                                                                               }\r
-                                                                               break;\r
+                                                                               case    DW_AT_high_pc:\r
+                                                                                       if (dwarf_highpc(return_sib, &return_highpc, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               PtrCU[NbCU].HighPC = return_highpc;\r
+                                                                                       }\r
+                                                                                       break;\r
 \r
-                                                                       case    DW_AT_producer:\r
-                                                                               if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
-                                                                               {\r
-                                                                                       PtrCU[NbCU].PtrProducer = (char *)calloc(strlen(return_string) + 1, 1);\r
-                                                                                       strcpy(PtrCU[NbCU].PtrProducer, return_string);\r
-                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
-                                                                               }\r
-                                                                               break;\r
+                                                                               case    DW_AT_producer:\r
+                                                                                       if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               PtrCU[NbCU].PtrProducer = (char *)calloc(strlen(return_string) + 1, 1);\r
+                                                                                               strcpy(PtrCU[NbCU].PtrProducer, return_string);\r
+                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                       }\r
+                                                                                       break;\r
 \r
-                                                                       case    DW_AT_name:\r
-                                                                               if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
-                                                                               {\r
-                                                                                       SourceFilename = (char *)realloc(SourceFilename, strlen(return_string) + 1);\r
-                                                                                       strcpy(SourceFilename, return_string);\r
-                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
-                                                                               }\r
-                                                                               break;\r
+                                                                               case    DW_AT_name:\r
+                                                                                       if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               SourceFilename = (char *)realloc(SourceFilename, strlen(return_string) + 1);\r
+                                                                                               strcpy(SourceFilename, return_string);\r
+                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                       }\r
+                                                                                       break;\r
 \r
-                                                                       case    DW_AT_comp_dir:\r
-                                                                               if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
-                                                                               {\r
-                                                                                       SourceFileDirectory = (char *)realloc(SourceFileDirectory, strlen(return_string) + 1);\r
-                                                                                       strcpy(SourceFileDirectory, return_string);\r
-                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
-                                                                               }\r
-                                                                               break;\r
+                                                                               case    DW_AT_comp_dir:\r
+                                                                                       if (dwarf_formstring(atlist[i], &return_string, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               SourceFileDirectory = (char *)realloc(SourceFileDirectory, strlen(return_string) + 1);\r
+                                                                                               strcpy(SourceFileDirectory, return_string);\r
+                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                       }\r
+                                                                                       break;\r
 \r
-                                                                       default:\r
-                                                                               break;\r
+                                                                               default:\r
+                                                                                       break;\r
+                                                                               }\r
                                                                        }\r
+                                                                       dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
                                                                }\r
-                                                               dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
+                                                               dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
                                                        }\r
-                                                       dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
-                                               }\r
 \r
-                                               Ptr = SourceFullFilename = (char *)realloc(SourceFullFilename, strlen(SourceFilename) + strlen(SourceFileDirectory) + 2);\r
-                                               sprintf(SourceFullFilename, "%s\\%s", SourceFileDirectory, SourceFilename);\r
-                                               while (*Ptr)\r
-                                               {\r
-                                                       if (*Ptr == '/')\r
+                                                       Ptr = SourceFullFilename = (char *)realloc(SourceFullFilename, strlen(SourceFilename) + strlen(SourceFileDirectory) + 2);\r
+                                                       sprintf(SourceFullFilename, "%s\\%s", SourceFileDirectory, SourceFilename);\r
+                                                       while (*Ptr)\r
                                                        {\r
-                                                               *Ptr = '\\';\r
+                                                               if (*Ptr == '/')\r
+                                                               {\r
+                                                                       *Ptr = '\\';\r
+                                                               }\r
+                                                               Ptr++;\r
                                                        }\r
-                                                       Ptr++;\r
-                                               }\r
-                                               PtrCU[NbCU].PtrFullFilename = (char *)calloc(strlen(SourceFullFilename) + 1, 1);\r
-                                               strcpy((char *)PtrCU[NbCU].PtrFullFilename, SourceFullFilename);\r
+                                                       PtrCU[NbCU].PtrFullFilename = (char *)calloc(strlen(SourceFullFilename) + 1, 1);\r
+                                                       strcpy((char *)PtrCU[NbCU].PtrFullFilename, SourceFullFilename);\r
 \r
 #ifndef __CYGWIN__\r
-                                               if (!fopen_s(&SrcFile, SourceFullFilename, "rt"))\r
+                                                       if (!fopen_s(&SrcFile, SourceFullFilename, "rt"))\r
 #else\r
-                                               if (!(SrcFile = fopen(SourceFullFilename, "rt")))\r
+                                                       if (!(SrcFile = fopen(SourceFullFilename, "rt")))\r
 #endif\r
-                                               {\r
-                                                       if (!fseek(SrcFile, 0, SEEK_END))\r
                                                        {\r
-                                                               if ((PtrCU[NbCU].SizeLoadSrc = ftell(SrcFile)) > 0)\r
+                                                               if (!fseek(SrcFile, 0, SEEK_END))\r
                                                                {\r
-                                                                       if (PtrCU[NbCU].PtrLoadSrc = Ptr = (char *)calloc((PtrCU[NbCU].SizeLoadSrc + 1), 1))\r
+                                                                       if ((PtrCU[NbCU].SizeLoadSrc = ftell(SrcFile)) > 0)\r
                                                                        {\r
-                                                                               rewind(SrcFile);\r
-                                                                               if (PtrCU[NbCU].SizeLoadSrc < fread(Ptr, 1, PtrCU[NbCU].SizeLoadSrc, SrcFile))\r
+                                                                               if (PtrCU[NbCU].PtrLoadSrc = Ptr = (char *)calloc((PtrCU[NbCU].SizeLoadSrc + 1), 1))\r
                                                                                {\r
-                                                                                       free(PtrCU[NbCU].PtrLoadSrc);\r
-                                                                                       PtrCU[NbCU].PtrLoadSrc = NULL;\r
-                                                                                       PtrCU[NbCU].SizeLoadSrc = 0;\r
-                                                                               }\r
-                                                                               else\r
-                                                                               {\r
-                                                                                       do\r
+                                                                                       rewind(SrcFile);\r
+                                                                                       if (PtrCU[NbCU].SizeLoadSrc < fread(Ptr, 1, PtrCU[NbCU].SizeLoadSrc, SrcFile))\r
+                                                                                       {\r
+                                                                                               free(PtrCU[NbCU].PtrLoadSrc);\r
+                                                                                               PtrCU[NbCU].PtrLoadSrc = NULL;\r
+                                                                                               PtrCU[NbCU].SizeLoadSrc = 0;\r
+                                                                                       }\r
+                                                                                       else\r
                                                                                        {\r
-                                                                                               if (*Ptr == 0xa)\r
+                                                                                               do\r
                                                                                                {\r
-                                                                                                       PtrCU[NbCU].NbLinesLoadSrc++;\r
-                                                                                                       *Ptr = 0;\r
-                                                                                               }\r
-                                                                                       } while (*++Ptr);\r
+                                                                                                       if (*Ptr == 0xa)\r
+                                                                                                       {\r
+                                                                                                               PtrCU[NbCU].NbLinesLoadSrc++;\r
+                                                                                                               *Ptr = 0;\r
+                                                                                                       }\r
+                                                                                               } while (*++Ptr);\r
+                                                                                       }\r
                                                                                }\r
                                                                        }\r
                                                                }\r
+                                                               fclose(SrcFile);\r
                                                        }\r
-                                                       fclose(SrcFile);\r
-                                               }\r
-                                               break;\r
+                                                       break;\r
 \r
-                                       default:\r
-                                               break;\r
+                                               default:\r
+                                                       break;\r
+                                               }\r
                                        }\r
-                               }\r
 \r
-                               // Get the source lines table located in the Compilation Unit\r
-                               if (dwarf_srclines(return_sib, &linebuf, &cnt, &error) == DW_DLV_OK)\r
-                               {\r
-                               }\r
+                                       // Get the source lines table located in the Compilation Unit\r
+                                       if (dwarf_srclines(return_sib, &linebuf, &cnt, &error) == DW_DLV_OK)\r
+                                       {\r
+                                       }\r
 \r
-                               if (dwarf_child(return_sib, &return_die, &error) == DW_DLV_OK)\r
-                               {\r
-                                       do\r
+                                       // Check if the CU has child\r
+                                       if (dwarf_child(return_sib, &return_die, &error) == DW_DLV_OK)\r
                                        {\r
-                                               return_sib = return_die;\r
-                                               if ((dwarf_tag(return_die, &return_tagval, &error) == DW_DLV_OK))\r
+                                               do\r
                                                {\r
-                                                       switch (return_tagval)\r
+                                                       return_sib = return_die;\r
+                                                       if ((dwarf_tag(return_die, &return_tagval, &error) == DW_DLV_OK))\r
                                                        {\r
-                                                       case    DW_TAG_lexical_block:\r
-                                                               break;\r
-\r
-                                                       case    DW_TAG_variable:\r
-                                                               if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
+                                                               switch (return_tagval)\r
                                                                {\r
-                                                                       PtrCU[NbCU].PtrVariables = (VariablesStruct *)realloc(PtrCU[NbCU].PtrVariables, ((PtrCU[NbCU].NbVariables + 1) * sizeof(VariablesStruct)));\r
-                                                                       memset(PtrCU[NbCU].PtrVariables + PtrCU[NbCU].NbVariables, 0, sizeof(VariablesStruct));\r
+                                                               case    DW_TAG_lexical_block:\r
+                                                                       break;\r
 \r
-                                                                       for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                                               case    DW_TAG_variable:\r
+                                                                       if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
                                                                        {\r
-                                                                               if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
+                                                                               PtrCU[NbCU].PtrVariables = (VariablesStruct *)realloc(PtrCU[NbCU].PtrVariables, ((PtrCU[NbCU].NbVariables + 1) * sizeof(VariablesStruct)));\r
+                                                                               memset(PtrCU[NbCU].PtrVariables + PtrCU[NbCU].NbVariables, 0, sizeof(VariablesStruct));\r
+\r
+                                                                               for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
                                                                                {\r
-                                                                                       if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
+                                                                                       if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
                                                                                        {\r
-                                                                                               switch (return_attr)\r
+                                                                                               if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
                                                                                                {\r
-                                                                                               case    DW_AT_location:\r
-                                                                                                       if (dwarf_formblock(return_attr1, &return_block, &error) == DW_DLV_OK)\r
+                                                                                                       switch (return_attr)\r
                                                                                                        {\r
-                                                                                                               if (return_block->bl_len == 5)\r
+                                                                                                       case    DW_AT_location:\r
+                                                                                                               if (dwarf_formblock(return_attr1, &return_block, &error) == DW_DLV_OK)\r
                                                                                                                {\r
-                                                                                                                       PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].Addr = (*((unsigned char *)(return_block->bl_data) + 1) << 24) + (*((unsigned char *)(return_block->bl_data) + 2) << 16) + (*((unsigned char *)(return_block->bl_data) + 3) << 8) + (*((unsigned char *)(return_block->bl_data) + 4));\r
+                                                                                                                       PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].Op = (*((unsigned char *)(return_block->bl_data)));\r
+\r
+                                                                                                                       switch (return_block->bl_len)\r
+                                                                                                                       {\r
+                                                                                                                       case 5:\r
+                                                                                                                               PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].Addr = (*((unsigned char *)(return_block->bl_data) + 1) << 24) + (*((unsigned char *)(return_block->bl_data) + 2) << 16) + (*((unsigned char *)(return_block->bl_data) + 3) << 8) + (*((unsigned char *)(return_block->bl_data) + 4));\r
+                                                                                                                               break;\r
+\r
+                                                                                                                       default:\r
+                                                                                                                               break;\r
+                                                                                                                       }\r
+                                                                                                                       dwarf_dealloc(dbg, return_block, DW_DLA_BLOCK);\r
                                                                                                                }\r
-                                                                                                               dwarf_dealloc(dbg, return_block, DW_DLA_BLOCK);\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_type:\r
-                                                                                                       if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].TypeOffset = return_offset;\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_type:\r
+                                                                                                               if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].TypeOffset = return_offset;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_name:\r
-                                                                                                       if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName = (char *)calloc(strlen(return_string) + 1, 1);\r
-                                                                                                               strcpy(PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName, return_string);\r
-                                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_name:\r
+                                                                                                               if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+#ifdef DEBUG_VariableName\r
+                                                                                                                       if (!strcmp(return_string, DEBUG_VariableName))\r
+#endif\r
+                                                                                                                       {\r
+                                                                                                                               PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName = (char *)calloc(strlen(return_string) + 1, 1);\r
+                                                                                                                               strcpy(PtrCU[NbCU].PtrVariables[PtrCU[NbCU].NbVariables].PtrName, return_string);\r
+                                                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                                                       }\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               default:\r
-                                                                                                       break;\r
+                                                                                                       default:\r
+                                                                                                               break;\r
+                                                                                                       }\r
                                                                                                }\r
                                                                                        }\r
-                                                                               }\r
 \r
-                                                                               dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
-                                                                       }\r
+                                                                                       dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
+                                                                               }\r
 \r
-                                                                       PtrCU[NbCU].NbVariables++;\r
+                                                                               PtrCU[NbCU].NbVariables++;\r
 \r
-                                                                       dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
-                                                               }\r
-                                                               break;\r
-\r
-                                                       case    DW_TAG_base_type:\r
-                                                       case    DW_TAG_typedef:\r
-                                                       case    DW_TAG_structure_type:\r
-                                                       case    DW_TAG_pointer_type:\r
-                                                       case    DW_TAG_const_type:\r
-                                                       case    DW_TAG_array_type:\r
-                                                       case    DW_TAG_subrange_type:\r
-                                                       case    DW_TAG_subroutine_type:\r
-                                                               if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
-                                                               {\r
-                                                                       PtrCU[NbCU].PtrTypes = (BaseTypeStruct *)realloc(PtrCU[NbCU].PtrTypes, ((PtrCU[NbCU].NbTypes + 1) * sizeof(BaseTypeStruct)));\r
-                                                                       memset(PtrCU[NbCU].PtrTypes + PtrCU[NbCU].NbTypes, 0, sizeof(BaseTypeStruct));\r
-                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Tag = return_tagval;\r
-\r
-                                                                       if (dwarf_dieoffset(return_die, &return_offset, &error) == DW_DLV_OK)\r
-                                                                       {\r
-                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Offset = return_offset;\r
+                                                                               dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
                                                                        }\r
-\r
-                                                                       for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                                                       break;\r
+\r
+                                                               case    DW_TAG_base_type:\r
+                                                               case    DW_TAG_typedef:\r
+                                                               case    DW_TAG_structure_type:\r
+                                                               case    DW_TAG_pointer_type:\r
+                                                               case    DW_TAG_const_type:\r
+                                                               case    DW_TAG_array_type:\r
+                                                               case    DW_TAG_subrange_type:\r
+                                                               case    DW_TAG_subroutine_type:\r
+                                                                       if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
                                                                        {\r
-                                                                               if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
+                                                                               PtrCU[NbCU].PtrTypes = (BaseTypeStruct *)realloc(PtrCU[NbCU].PtrTypes, ((PtrCU[NbCU].NbTypes + 1) * sizeof(BaseTypeStruct)));\r
+                                                                               memset(PtrCU[NbCU].PtrTypes + PtrCU[NbCU].NbTypes, 0, sizeof(BaseTypeStruct));\r
+                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Tag = return_tagval;\r
+\r
+                                                                               if (dwarf_dieoffset(return_die, &return_offset, &error) == DW_DLV_OK)\r
                                                                                {\r
-                                                                                       if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
+                                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Offset = return_offset;\r
+                                                                               }\r
+\r
+                                                                               for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                                                               {\r
+                                                                                       if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
                                                                                        {\r
-                                                                                               switch (return_attr)\r
+                                                                                               if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
                                                                                                {\r
-                                                                                               case    DW_AT_type:\r
-                                                                                                       if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK)\r
+                                                                                                       switch (return_attr)\r
                                                                                                        {\r
-                                                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].TypeOffset = return_offset;\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_type:\r
+                                                                                                               if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].TypeOffset = return_offset;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_byte_size:\r
-                                                                                                       if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].ByteSize = return_uvalue;\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_byte_size:\r
+                                                                                                               if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].ByteSize = return_uvalue;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_encoding:\r
-                                                                                                       if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Encoding = return_uvalue;\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_encoding:\r
+                                                                                                               if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].Encoding = return_uvalue;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_name:\r
-                                                                                                       if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName = (char *)calloc(strlen(return_string) + 1, 1);\r
-                                                                                                               strcpy(PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName, return_string);\r
-                                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case    DW_AT_name:\r
+                                                                                                               if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName = (char *)calloc(strlen(return_string) + 1, 1);\r
+                                                                                                                       strcpy(PtrCU[NbCU].PtrTypes[PtrCU[NbCU].NbTypes].PtrName, return_string);\r
+                                                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               default:\r
-                                                                                                       break;\r
+                                                                                                       default:\r
+                                                                                                               break;\r
+                                                                                                       }\r
                                                                                                }\r
                                                                                        }\r
-                                                                               }\r
 \r
-                                                                               dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
-                                                                       }\r
+                                                                                       dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
+                                                                               }\r
 \r
-                                                                       PtrCU[NbCU].NbTypes++;\r
+                                                                               PtrCU[NbCU].NbTypes++;\r
 \r
-                                                                       dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
-                                                               }\r
-                                                               break;\r
-\r
-                                                       case    DW_TAG_subprogram:\r
-                                                               if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
-                                                               {\r
-                                                                       PtrCU[NbCU].PtrSubProgs = (SubProgStruct *)realloc(PtrCU[NbCU].PtrSubProgs, ((PtrCU[NbCU].NbSubProgs + 1) * sizeof(SubProgStruct)));\r
-                                                                       memset((void *)(PtrCU[NbCU].PtrSubProgs + PtrCU[NbCU].NbSubProgs), 0, sizeof(SubProgStruct));\r
-                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].Tag = return_tagval;\r
+                                                                               dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
+                                                                       }\r
+                                                                       break;\r
 \r
-                                                                       for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                                               case    DW_TAG_subprogram:\r
+                                                                       if (dwarf_attrlist(return_die, &atlist, &atcnt, &error) == DW_DLV_OK)\r
                                                                        {\r
-                                                                               if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
+                                                                               PtrCU[NbCU].PtrSubProgs = (SubProgStruct *)realloc(PtrCU[NbCU].PtrSubProgs, ((PtrCU[NbCU].NbSubProgs + 1) * sizeof(SubProgStruct)));\r
+                                                                               memset((void *)(PtrCU[NbCU].PtrSubProgs + PtrCU[NbCU].NbSubProgs), 0, sizeof(SubProgStruct));\r
+                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].Tag = return_tagval;\r
+\r
+                                                                               for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
                                                                                {\r
-                                                                                       if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
+                                                                                       if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
                                                                                        {\r
-                                                                                               switch (return_attr)\r
+                                                                                               if (dwarf_attr(return_die, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
                                                                                                {\r
-                                                                                               case    DW_AT_low_pc:\r
-                                                                                                       if (dwarf_lowpc(return_die, &return_lowpc, &error) == DW_DLV_OK)\r
+                                                                                                       switch (return_attr)\r
                                                                                                        {\r
-                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].StartPC = return_lowpc;\r
-                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].LowPC = return_lowpc;\r
-                                                                                                       }\r
-                                                                                                       break;\r
+                                                                                                       case DW_AT_low_pc:\r
+                                                                                                               if (dwarf_lowpc(return_die, &return_lowpc, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].StartPC = return_lowpc;\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].LowPC = return_lowpc;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_high_pc:\r
-                                                                                                       if (dwarf_highpc(return_die, &return_highpc, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].HighPC = return_highpc;\r
-                                                                                                       }\r
-                                                                                               break;\r
+                                                                                                       case DW_AT_high_pc:\r
+                                                                                                               if (dwarf_highpc(return_die, &return_highpc, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].HighPC = return_highpc;\r
+                                                                                                               }\r
+                                                                                                               break;\r
 \r
-                                                                                               case    DW_AT_decl_line:\r
-                                                                                                       if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
-                                                                                                       {\r
-                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NumLineSrc = return_uvalue;\r
+                                                                                                       case DW_AT_decl_line:\r
+                                                                                                               if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NumLineSrc = return_uvalue;\r
+                                                                                                               }\r
+                                                                                                               break;\r
+\r
+                                                                                                       case DW_AT_frame_base:\r
+                                                                                                               if (dwarf_formudata(return_attr1, &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].FrameBase = return_uvalue;\r
+                                                                                                               }\r
+                                                                                                               break;\r
+\r
+                                                                                                       case DW_AT_name:\r
+                                                                                                               if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrSubprogramName = (char *)calloc(strlen(return_string) + 1, 1);\r
+                                                                                                                       strcpy(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrSubprogramName, return_string);\r
+                                                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                                               }\r
+                                                                                                               break;\r
+\r
+                                                                                                       default:\r
+                                                                                                               break;\r
                                                                                                        }\r
-                                                                                               break;\r
+                                                                                               }\r
+                                                                                       }\r
+                                                                                       dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
+                                                                               }\r
+                                                                               dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
 \r
-                                                                                               case    DW_AT_name:\r
-                                                                                                       if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
+                                                                               for (i = 0; i < (size_t)cnt; ++i)\r
+                                                                               {\r
+                                                                                       if (dwarf_lineaddr(linebuf[i], &return_lineaddr, &error) == DW_DLV_OK)\r
+                                                                                       {\r
+                                                                                               if (dwarf_lineno(linebuf[i], &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                               {\r
+                                                                                                       if ((return_lineaddr >= return_lowpc) && (return_lineaddr <= return_highpc))\r
                                                                                                        {\r
-                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrSubprogramName = (char *)calloc(strlen(return_string) + 1, 1);\r
-                                                                                                               strcpy(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrSubprogramName, return_string);\r
-                                                                                                               dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                                               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));\r
+                                                                                                               memset((void *)(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc), 0, sizeof(DMIStruct_LineSrc));\r
+                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].StartPC = return_lineaddr;\r
+                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].NumLineSrc = return_uvalue;\r
+                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc++;\r
                                                                                                        }\r
-                                                                                                       break;\r
-\r
-                                                                                               default:\r
-                                                                                                       break;\r
                                                                                                }\r
                                                                                        }\r
                                                                                }\r
-                                                                               dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
-                                                                       }\r
-                                                                       dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
 \r
-                                                                       for (i = 0; i < (size_t)cnt; ++i)\r
-                                                                       {\r
-                                                                               if (dwarf_lineaddr(linebuf[i], &return_lineaddr, &error) == DW_DLV_OK)\r
+                                                                               if (dwarf_child(return_die, &return_subdie, &error) == DW_DLV_OK)\r
                                                                                {\r
-                                                                                       if (dwarf_lineno(linebuf[i], &return_uvalue, &error) == DW_DLV_OK)\r
+                                                                                       do\r
                                                                                        {\r
-                                                                                               if ((return_lineaddr >= return_lowpc) && (return_lineaddr <= return_highpc))\r
+                                                                                               return_sub = return_subdie;\r
+                                                                                               if ((dwarf_tag(return_subdie, &return_tagval, &error) == DW_DLV_OK))\r
                                                                                                {\r
-                                                                                                       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));\r
-                                                                                                       memset((void *)(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc), 0, sizeof(DMIStruct_LineSrc));\r
-                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].StartPC = return_lineaddr;\r
-                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc].NumLineSrc = return_uvalue;\r
-                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbLinesSrc++;\r
+                                                                                                       switch (return_tagval)\r
+                                                                                                       {\r
+                                                                                                       case DW_TAG_formal_parameter:\r
+                                                                                                       case DW_TAG_variable:\r
+                                                                                                               if (dwarf_attrlist(return_subdie, &atlist, &atcnt, &error) == DW_DLV_OK)\r
+                                                                                                               {\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables = (VariablesStruct *)realloc(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables, ((PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables + 1) * sizeof(VariablesStruct)));\r
+                                                                                                                       memset(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables + PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables, 0, sizeof(VariablesStruct));\r
+\r
+                                                                                                                       for (Dwarf_Signed i = 0; i < atcnt; ++i)\r
+                                                                                                                       {\r
+                                                                                                                               if (dwarf_whatattr(atlist[i], &return_attr, &error) == DW_DLV_OK)\r
+                                                                                                                               {\r
+                                                                                                                                       if (dwarf_attr(return_subdie, return_attr, &return_attr1, &error) == DW_DLV_OK)\r
+                                                                                                                                       {\r
+                                                                                                                                               switch (return_attr)\r
+                                                                                                                                               {\r
+                                                                                                                                               case    DW_AT_location:\r
+                                                                                                                                                       if (dwarf_formblock(return_attr1, &return_block, &error) == DW_DLV_OK)\r
+                                                                                                                                                       {\r
+                                                                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Op = *((unsigned char *)(return_block->bl_data));\r
+\r
+                                                                                                                                                               switch (return_block->bl_len)\r
+                                                                                                                                                               {\r
+                                                                                                                                                               case 1:\r
+                                                                                                                                                                       break;\r
+\r
+                                                                                                                                                               case 2:\r
+                                                                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset = *((char *)(return_block->bl_data) + 1);\r
+\r
+                                                                                                                                                                       if (return_tagval == DW_TAG_variable)\r
+                                                                                                                                                                       {\r
+                                                                                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].Offset -= 0x80;\r
+                                                                                                                                                                       }\r
+                                                                                                                                                                       break;\r
+\r
+                                                                                                                                                               default:\r
+                                                                                                                                                                       break;\r
+                                                                                                                                                               }\r
+                                                                                                                                                               dwarf_dealloc(dbg, return_block, DW_DLA_BLOCK);\r
+                                                                                                                                                       }\r
+                                                                                                                                                       break;\r
+\r
+                                                                                                                                               case    DW_AT_type:\r
+                                                                                                                                                       if (dwarf_global_formref(return_attr1, &return_offset, &error) == DW_DLV_OK)\r
+                                                                                                                                                       {\r
+                                                                                                                                                               PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].TypeOffset = return_offset;\r
+                                                                                                                                                       }\r
+                                                                                                                                                       break;\r
+\r
+                                                                                                                                               case    DW_AT_name:\r
+                                                                                                                                                       if (dwarf_formstring(return_attr1, &return_string, &error) == DW_DLV_OK)\r
+                                                                                                                                                       {\r
+#ifdef DEBUG_VariableName\r
+                                                                                                                                                               if (!strcmp(return_string, DEBUG_VariableName))\r
+#endif\r
+                                                                                                                                                               {\r
+                                                                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrName = (char *)calloc(strlen(return_string) + 1, 1);\r
+                                                                                                                                                                       strcpy(PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].PtrVariables[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables].PtrName, return_string);\r
+                                                                                                                                                                       dwarf_dealloc(dbg, return_string, DW_DLA_STRING);\r
+                                                                                                                                                               }\r
+                                                                                                                                                       }\r
+                                                                                                                                                       break;\r
+\r
+                                                                                                                                               default:\r
+                                                                                                                                                       break;\r
+                                                                                                                                               }\r
+                                                                                                                                       }\r
+                                                                                                                               }\r
+\r
+                                                                                                                               dwarf_dealloc(dbg, atlist[i], DW_DLA_ATTR);\r
+                                                                                                                       }\r
+\r
+                                                                                                                       PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs].NbVariables++;\r
+\r
+                                                                                                                       dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
+                                                                                                               }\r
+                                                                                                               break;\r
+\r
+                                                                                                       case DW_TAG_label:\r
+                                                                                                               break;\r
+\r
+                                                                                                       default:\r
+                                                                                                               break;\r
+                                                                                                       }\r
                                                                                                }\r
                                                                                        }\r
-                                                                               }                                                               \r
+                                                                                       while (dwarf_siblingof(dbg, return_sub, &return_subdie, &error) == DW_DLV_OK);\r
+                                                                               }\r
+\r
+                                                                               PtrCU[NbCU].NbSubProgs++;\r
                                                                        }\r
-                                                                                               \r
-                                                                       PtrCU[NbCU].NbSubProgs++;\r
-                                                               }\r
-                                                               break;\r
+                                                                       break;\r
 \r
-                                                       default:\r
-                                                               break;\r
+                                                               default:\r
+                                                                       break;\r
+                                                               }\r
                                                        }\r
                                                }\r
+                                               while (dwarf_siblingof(dbg, return_sib, &return_die, &error) == DW_DLV_OK);\r
                                        }\r
-                                       while (dwarf_siblingof(dbg, return_sib, &return_die, &error) == DW_DLV_OK);\r
-                               }\r
 \r
-                               // Release the memory used by the source lines\r
-                               for (i = 0; i < (size_t)cnt; ++i)\r
-                                       dwarf_dealloc(dbg, linebuf[i], DW_DLA_LINE);\r
-                               dwarf_dealloc(dbg, linebuf, DW_DLA_LIST);\r
-                       }\r
+                                       // Release the memory used by the source lines\r
+                                       for (i = 0; i < (size_t)cnt; ++i)\r
+                                               dwarf_dealloc(dbg, linebuf[i], DW_DLA_LINE);\r
+                                       dwarf_dealloc(dbg, linebuf, DW_DLA_LIST);\r
+                               }\r
 \r
-                       // Set the source code lines for QT html/text conformity\r
-                       if (PtrCU[NbCU].NbLinesLoadSrc)\r
-                       {\r
-                               if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(PtrCU[NbCU].NbLinesLoadSrc, sizeof(char *)))\r
+                               // Set the source code lines for QT html/text conformity\r
+                               if (PtrCU[NbCU].NbLinesLoadSrc)\r
                                {\r
-                                       for (j = 0; j < PtrCU[NbCU].NbLinesLoadSrc; j++)\r
+                                       if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(PtrCU[NbCU].NbLinesLoadSrc, sizeof(char *)))\r
                                        {\r
-                                               if (PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)calloc(10000, sizeof(char)))\r
+                                               for (j = 0; j < PtrCU[NbCU].NbLinesLoadSrc; j++)\r
                                                {\r
-                                                       if (Ptr = DWARFManager_GetLineSrcFromNumLine(PtrCU[NbCU].PtrLoadSrc, (j + 1)))\r
+                                                       if (PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)calloc(10000, sizeof(char)))\r
                                                        {\r
-                                                               i = 0;\r
-\r
-                                                               while (*Ptr)\r
+                                                               if (Ptr = DWARFManager_GetLineSrcFromNumLine(PtrCU[NbCU].PtrLoadSrc, (j + 1)))\r
                                                                {\r
-                                                                       switch (*Ptr)\r
+                                                                       i = 0;\r
+\r
+                                                                       while (*Ptr)\r
                                                                        {\r
-                                                                       case 9:\r
-                                                                               strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&nbsp;");\r
-                                                                               i += strlen("&nbsp;");\r
-                                                                               break;\r
-\r
-                                                                       case '<':\r
-                                                                               strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&lt;");\r
-                                                                               i += strlen("&lt;");\r
-                                                                               break;\r
-\r
-                                                                       case '>':\r
-                                                                               strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&gt;");\r
-                                                                               i += strlen("&gt;");\r
-                                                                               break;\r
+                                                                               switch (*Ptr)\r
+                                                                               {\r
+                                                                               case 9:\r
+                                                                                       strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&nbsp;");\r
+                                                                                       i += strlen("&nbsp;");\r
+                                                                                       break;\r
+\r
+                                                                               case '<':\r
+                                                                                       strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&lt;");\r
+                                                                                       i += strlen("&lt;");\r
+                                                                                       break;\r
+\r
+                                                                               case '>':\r
+                                                                                       strcat(PtrCU[NbCU].PtrLinesLoadSrc[j], "&gt;");\r
+                                                                                       i += strlen("&gt;");\r
+                                                                                       break;\r
 #if 0\r
-                                                                       case '&':\r
-                                                                               strcpy(PtrCU[NbCU].PtrLinesLoadSrc[j], "&amp;");\r
-                                                                               i += strlen("&amp;");\r
-                                                                               break;\r
+                                                                               case '&':\r
+                                                                                       strcpy(PtrCU[NbCU].PtrLinesLoadSrc[j], "&amp;");\r
+                                                                                       i += strlen("&amp;");\r
+                                                                                       break;\r
 #endif\r
 #if 0\r
-                                                                       case '"':\r
-                                                                               strcpy(PtrCU[NbCU].PtrLinesLoadSrc[j], "&quot;");\r
-                                                                               i += strlen("&quot;");\r
-                                                                               break;\r
+                                                                               case '"':\r
+                                                                                       strcpy(PtrCU[NbCU].PtrLinesLoadSrc[j], "&quot;");\r
+                                                                                       i += strlen("&quot;");\r
+                                                                                       break;\r
 #endif\r
-                                                                       default:\r
-                                                                               PtrCU[NbCU].PtrLinesLoadSrc[j][i++] = *Ptr;\r
-                                                                               break;\r
+                                                                               default:\r
+                                                                                       PtrCU[NbCU].PtrLinesLoadSrc[j][i++] = *Ptr;\r
+                                                                                       break;\r
+                                                                               }\r
+                                                                               Ptr++;\r
                                                                        }\r
-                                                                       Ptr++;\r
+                                                               }\r
+                                                               PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)realloc(PtrCU[NbCU].PtrLinesLoadSrc[j], i + 1);\r
+                                                       }\r
+                                               }\r
+\r
+                                               // Init lines source information based on each source code line numbers\r
+                                               for (j = 0; j < PtrCU[NbCU].NbSubProgs; j++)\r
+                                               {\r
+                                                       // Check if the subprog / function's line exists in the source code\r
+                                                       if (PtrCU[NbCU].PtrSubProgs[j].NumLineSrc <= PtrCU[NbCU].NbLinesLoadSrc)\r
+                                                       {\r
+                                                               PtrCU[NbCU].PtrSubProgs[j].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrSubProgs[j].NumLineSrc - 1];\r
+                                                       }\r
+\r
+                                                       for (k = 0; k < PtrCU[NbCU].PtrSubProgs[j].NbLinesSrc; k++)\r
+                                                       {\r
+                                                               if (PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc <= PtrCU[NbCU].NbLinesLoadSrc)\r
+                                                               {\r
+                                                                       PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc - 1];\r
                                                                }\r
                                                        }\r
-                                                       PtrCU[NbCU].PtrLinesLoadSrc[j] = (char *)realloc(PtrCU[NbCU].PtrLinesLoadSrc[j], i + 1);\r
                                                }\r
                                        }\r
                                }\r
-                       }\r
-                       else\r
-                       {\r
-                               // Set each source lines pointer to NULL\r
-                               if (PtrCU[NbCU].NbSubProgs)\r
+                               else\r
                                {\r
-                                       i = PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc - 1].NumLineSrc;\r
-                                       if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(i, sizeof(char *)))\r
+                                       // Set each source lines pointer to NULL\r
+                                       if (PtrCU[NbCU].NbSubProgs)\r
                                        {\r
-                                               for (j = 0; j < i; j++)\r
+                                               // Check the presence of source lines dedicated to the sub progs\r
+                                               if (PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc)\r
                                                {\r
-                                                       PtrCU[NbCU].PtrLinesLoadSrc[j] = NULL;\r
+                                                       i = PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].PtrLinesSrc[PtrCU[NbCU].PtrSubProgs[PtrCU[NbCU].NbSubProgs - 1].NbLinesSrc - 1].NumLineSrc;\r
+                                                       if (PtrCU[NbCU].PtrLinesLoadSrc = (char **)calloc(i, sizeof(char *)))\r
+                                                       {\r
+                                                               for (j = 0; j < i; j++)\r
+                                                               {\r
+                                                                       PtrCU[NbCU].PtrLinesLoadSrc[j] = NULL;\r
+                                                               }\r
+                                                       }\r
                                                }\r
                                        }\r
                                }\r
-                       }\r
 \r
-                       // Init lines source information based on each source code line numbers\r
-                       for (j = 0; j < PtrCU[NbCU].NbSubProgs; j++)\r
-                       {\r
-                               PtrCU[NbCU].PtrSubProgs[j].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrSubProgs[j].NumLineSrc - 1];\r
+                               // Init global variables information based on types information\r
+                               for (i = 0; i < PtrCU[NbCU].NbVariables; i++)\r
+                               {\r
+                                       DWARFManager_InitInfosVariable(PtrCU[NbCU].PtrVariables + i);\r
+                               }\r
 \r
-                               for (k = 0; k < PtrCU[NbCU].PtrSubProgs[j].NbLinesSrc; k++)\r
+                               // Init local variables information based on types information\r
+                               for (i = 0; i < PtrCU[NbCU].NbSubProgs; i++)\r
                                {\r
-                                       PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc - 1];\r
+                                       for (j = 0; j < PtrCU[NbCU].PtrSubProgs[i].NbVariables; j++)\r
+                                       {\r
+                                               DWARFManager_InitInfosVariable(PtrCU[NbCU].PtrSubProgs[i].PtrVariables + j);\r
+                                       }\r
                                }\r
                        }\r
 \r
-                       // Init variables information based on types information\r
-                       for (i = 0; i < PtrCU[NbCU].NbVariables; i++)\r
-                       {\r
-                               PtrCU[NbCU].PtrVariables[i].PtrTypeName = (char *)calloc(1000, 1);\r
-                               TypeOffset = PtrCU[NbCU].PtrVariables[i].TypeOffset;\r
+                       ++NbCU;\r
+               }\r
+       } \r
+\r
+       free(SourceFilename);\r
+       free(SourceFileDirectory);\r
+       free(SourceFullFilename);\r
+}\r
 \r
-                               for (j = 0; j < PtrCU[NbCU].NbTypes; j++)\r
+\r
+// \r
+void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables)\r
+{\r
+       size_t j, TypeOffset;\r
+\r
+       PtrVariables->PtrTypeName = (char *)calloc(1000, 1);\r
+       TypeOffset = PtrVariables->TypeOffset;\r
+\r
+       for (j = 0; j < PtrCU[NbCU].NbTypes; j++)\r
+       {\r
+               if (TypeOffset == PtrCU[NbCU].PtrTypes[j].Offset)\r
+               {\r
+                       switch (PtrCU[NbCU].PtrTypes[j].Tag)\r
+                       {\r
+                       case DW_TAG_structure_type:\r
+                               PtrVariables->TypeTag |= 0x1;\r
+                               if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
                                {\r
-                                       if (TypeOffset == PtrCU[NbCU].PtrTypes[j].Offset)\r
+                                       j = -1;\r
+                               }\r
+                               else\r
+                               {\r
+                                       if ((PtrVariables->TypeTag & 0x2))\r
                                        {\r
-                                               switch (PtrCU[NbCU].PtrTypes[j].Tag)\r
-                                               {\r
-                                               case DW_TAG_structure_type:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x1;\r
-                                                       if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
-                                                       {\r
-                                                               j = -1;\r
-                                                       }\r
-                                                       else\r
-                                                       {\r
-                                                               if ((PtrCU[NbCU].PtrVariables[i].TypeTag & 0x2))\r
-                                                               {\r
-                                                                       strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, " *");\r
-                                                               }\r
-                                                       }\r
-                                                       break;\r
-\r
-                                               case DW_TAG_pointer_type:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x2;\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize;\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeEncoding = 0x10;\r
-                                                       if (!(TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
-                                                       {\r
-                                                               strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, "void *");\r
-                                                       }\r
-                                                       else\r
-                                                       {\r
-                                                               j = -1;\r
-                                                       }\r
-                                                       break;\r
+                                               strcat(PtrVariables->PtrTypeName, " *");\r
+                                       }\r
+                               }\r
+                               break;\r
 \r
-                                               case DW_TAG_typedef:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x20;\r
-                                                       strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName);\r
-                                                       if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
-                                                       {\r
-                                                               j = -1;\r
-                                                       }\r
-                                                       break;\r
+                       case DW_TAG_pointer_type:\r
+                               PtrVariables->TypeTag |= 0x2;\r
+                               PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize;\r
+                               PtrVariables->TypeEncoding = 0x10;\r
+                               if (!(TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
+                               {\r
+                                       strcat(PtrVariables->PtrTypeName, "void *");\r
+                               }\r
+                               else\r
+                               {\r
+                                       j = -1;\r
+                               }\r
+                               break;\r
 \r
-                                               case DW_TAG_subrange_type:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x4;\r
-                                                       break;\r
+                       case DW_TAG_typedef:\r
+                               if (!(PtrVariables->TypeTag & 0x20))\r
+                               {\r
+                                       PtrVariables->TypeTag |= 0x20;\r
+                                       strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName);\r
+                               }\r
+                               if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
+                               {\r
+                                       j = -1;\r
+                               }\r
+                               break;\r
 \r
-                                               case DW_TAG_array_type:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x8;\r
-                                                       if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
-                                                       {\r
-                                                               j = -1;\r
-                                                       }\r
-                                                       break;\r
+                       case DW_TAG_subrange_type:\r
+                               PtrVariables->TypeTag |= 0x4;\r
+                               break;\r
 \r
-                                               case DW_TAG_const_type:\r
-                                                       PtrCU[NbCU].PtrVariables[i].TypeTag |= 0x10;\r
-                                                       strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, "const ");\r
-                                                       if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
-                                                       {\r
-                                                               j = -1;\r
-                                                       }\r
-                                                       break;\r
+                       case DW_TAG_array_type:\r
+                               PtrVariables->TypeTag |= 0x8;\r
+                               if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
+                               {\r
+                                       j = -1;\r
+                               }\r
+                               break;\r
 \r
-                                               case DW_TAG_base_type:\r
-                                                       strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName);\r
-                                                       if ((PtrCU[NbCU].PtrVariables[i].TypeTag & 0x2))\r
-                                                       {\r
-                                                               strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, " *");\r
-                                                       }\r
-                                                       else\r
-                                                       {\r
-                                                               PtrCU[NbCU].PtrVariables[i].TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize;\r
-                                                               PtrCU[NbCU].PtrVariables[i].TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding;\r
-                                                       }\r
-                                                       if ((PtrCU[NbCU].PtrVariables[i].TypeTag & 0x8))\r
-                                                       {\r
-                                                               strcat(PtrCU[NbCU].PtrVariables[i].PtrTypeName, "[]");\r
-                                                       }\r
-                                                       break;\r
+                       case DW_TAG_const_type:\r
+                               PtrVariables->TypeTag |= 0x10;\r
+                               strcat(PtrVariables->PtrTypeName, "const ");\r
+                               if ((TypeOffset = PtrCU[NbCU].PtrTypes[j].TypeOffset))\r
+                               {\r
+                                       j = -1;\r
+                               }\r
+                               break;\r
 \r
-                                               default:\r
-                                                       break;\r
-                                               }\r
-                                       }\r
+                       case DW_TAG_base_type:\r
+                               if (!(PtrVariables->TypeTag & 0x20))\r
+                               {\r
+                                       strcat(PtrVariables->PtrTypeName, PtrCU[NbCU].PtrTypes[j].PtrName);\r
                                }\r
-                       }\r
+                               if ((PtrVariables->TypeTag & 0x2))\r
+                               {\r
+                                       strcat(PtrVariables->PtrTypeName, " *");\r
+                               }\r
+                               else\r
+                               {\r
+                                       PtrVariables->TypeByteSize = PtrCU[NbCU].PtrTypes[j].ByteSize;\r
+                                       PtrVariables->TypeEncoding = PtrCU[NbCU].PtrTypes[j].Encoding;\r
+                               }\r
+                               if ((PtrVariables->TypeTag & 0x8))\r
+                               {\r
+                                       strcat(PtrVariables->PtrTypeName, "[]");\r
+                               }\r
+                               break;\r
 \r
-                       ++NbCU;\r
+                       default:\r
+                               break;\r
+                       }\r
                }\r
-       } \r
-\r
-       free(SourceFilename);\r
-       free(SourceFileDirectory);\r
-       free(SourceFullFilename);\r
+       }\r
 }\r
 \r
 \r
@@ -854,9 +1041,204 @@ char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine)
 }\r
 \r
 \r
-// Get Compilation Unit / External variables numbers\r
+// Get number of variables referenced by the function range address\r
+size_t DWARFManager_GetNbLocalVariables(size_t Adr)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].NbVariables;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+// Get local variable name based on his index (starting by 1)\r
+// Return name's pointer text found\r
+// Return NULL if not found\r
+char *DWARFManager_GetLocalVariableName(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].PtrName;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return NULL;\r
+}\r
+\r
+\r
+// Get local variable's type tag based on his index (starting by 1)\r
+// Return 0 if not found\r
+size_t DWARFManager_GetLocalVariableTypeTag(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].TypeTag;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+//\r
+int DWARFManager_GetLocalVariableOffset(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].Offset;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+// Get local variable Type Byte Size based on his address and index (starting by 1)\r
+// Return 0 if not found\r
+// May return 0 if there is no Type Byte Size linked to the variable's address and index\r
+size_t DWARFManager_GetLocalVariableTypeByteSize(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].TypeByteSize;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+// Get local variable Type Encoding based on his address and index (starting by 1)\r
+// Return 0 if not found\r
+// May return 0 if there is no Type Encoding linked to the variable's address and index\r
+size_t DWARFManager_GetLocalVariableTypeEncoding(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].TypeEncoding;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+// Get local variable Op based on his address and index (starting by 1)\r
+// Return 0 if not found\r
+// May return 0 if there isn't Op linked to the variable's index\r
+size_t DWARFManager_GetLocalVariableOp(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].Op;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+\r
+// Get local variable type name based on his index (starting by 1)\r
+// Return NULL if not found\r
+// May return NULL if there is not type linked to the variable's index\r
+char *DWARFManager_GetLocalVariableTypeName(size_t Adr, size_t Index)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrVariables[Index - 1].PtrTypeName;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return NULL;\r
+}\r
+\r
+\r
+// Get Compilation Unit / global variables numbers\r
 // Return variables number\r
-size_t DWARFManager_GetNbExternalVariables(void)\r
+size_t DWARFManager_GetNbGlobalVariables(void)\r
 {\r
        size_t NbVariables = 0, i;\r
 \r
@@ -869,10 +1251,10 @@ size_t DWARFManager_GetNbExternalVariables(void)
 }\r
 \r
 \r
-// Get external variable type name based on his index (starting by 1)\r
+// Get global variable type name based on his index (starting by 1)\r
 // Return NULL if not found\r
 // May return NULL if there is not type linked to the variable's index\r
-char *DWARFManager_GetExternalVariableTypeName(size_t Index)\r
+char *DWARFManager_GetGlobalVariableTypeName(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -895,9 +1277,9 @@ char *DWARFManager_GetExternalVariableTypeName(size_t Index)
 }\r
 \r
 \r
-// Get external variable's type tag based on his index (starting by 1)\r
+// Get global variable's type tag based on his index (starting by 1)\r
 // Return 0 if not found\r
-size_t DWARFManager_GetExternalVariableTypeTag(size_t Index)\r
+size_t DWARFManager_GetGlobalVariableTypeTag(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -920,9 +1302,9 @@ size_t DWARFManager_GetExternalVariableTypeTag(size_t Index)
 }\r
 \r
 \r
-// Get external variable byte size based on his index (starting by 1)\r
+// Get global variable byte size based on his index (starting by 1)\r
 // Return 0 if not found\r
-size_t DWARFManager_GetExternalVariableTypeByteSize(size_t Index)\r
+size_t DWARFManager_GetGlobalVariableTypeByteSize(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -945,9 +1327,9 @@ size_t DWARFManager_GetExternalVariableTypeByteSize(size_t Index)
 }\r
 \r
 \r
-// Get external variable encoding based on his index (starting by 1)\r
+// Get global variable encoding based on his index (starting by 1)\r
 // Return 0 if not found\r
-size_t DWARFManager_GetExternalVariableTypeEncoding(size_t Index)\r
+size_t DWARFManager_GetGlobalVariableTypeEncoding(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -970,9 +1352,9 @@ size_t DWARFManager_GetExternalVariableTypeEncoding(size_t Index)
 }\r
 \r
 \r
-// Get external variable address based on his index (starting by 1)\r
+// Get global variable address based on his index (starting by 1)\r
 // Return 0 if not found\r
-size_t DWARFManager_GetExternalVariableAdr(size_t Index)\r
+size_t DWARFManager_GetGlobalVariableAdr(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -995,10 +1377,10 @@ size_t DWARFManager_GetExternalVariableAdr(size_t Index)
 }\r
 \r
 \r
-// Get external variable memory address based on his name\r
+// Get global variable memory address based on his name\r
 // Return 0 if not found\r
 // Note: Return the first occurence found\r
-size_t DWARFManager_GetExternalVariableAdrFromName(char *VariableName)\r
+size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName)\r
 {\r
        size_t i, j;\r
 \r
@@ -1020,10 +1402,10 @@ size_t DWARFManager_GetExternalVariableAdrFromName(char *VariableName)
 }\r
 \r
 \r
-// Get external variable name based on his index (starting by 1)\r
+// Get global variable name based on his index (starting by 1)\r
 // Return name's pointer text found\r
 // Return NULL if not found\r
-char *DWARFManager_GetExternalVariableName(size_t Index)\r
+char *DWARFManager_GetGlobalVariableName(size_t Index)\r
 {\r
        size_t i;\r
 \r
@@ -1126,6 +1508,30 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag)
 }\r
 \r
 \r
+// Get function name based on address and his range\r
+// Return NULL if no function name has been found\r
+char *DWARFManager_GetFunctionName(size_t Adr)\r
+{\r
+       size_t i, j;\r
+\r
+       for (i = 0; i < NbCU; i++)\r
+       {\r
+               if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
+               {\r
+                       for (j = 0; j < PtrCU[i].NbSubProgs; j++)\r
+                       {\r
+                               if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
+                               {\r
+                                       return PtrCU[i].PtrSubProgs[j].PtrSubprogramName;\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       return NULL;\r
+}\r
+\r
+\r
 // Get text line from source based on address and num line (starting by 1)\r
 // Return NULL if no text line has been found\r
 char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine)\r
@@ -1173,7 +1579,14 @@ char *DWARFManager_GetLineSrcFromNumLineBaseAdr(size_t Adr, size_t NumLine)
        {\r
                if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
                {\r
-                       return PtrCU[i].PtrLinesLoadSrc[NumLine - 1];\r
+                       if (NumLine <= PtrCU[i].NbLinesLoadSrc)\r
+                       {\r
+                               return PtrCU[i].PtrLinesLoadSrc[NumLine - 1];\r
+                       }\r
+                       else\r
+                       {\r
+                               return NULL;\r
+                       }\r
                }\r
        }\r
 \r