Added search paths in case of missing DWARF directories information
[clinton/Virtual-Jaguar-Rx.git] / src / debugger / DWARFManager.cpp
index bd6507b..9c497f4 100644 (file)
@@ -9,7 +9,7 @@
 // ---  ----------  ------------------------------------------------------------\r
 // JPM   Dec./2016  Created this file, and added the DWARF format support\r
 // JPM  Sept./2018  Added LEB128 decoding features, and improve the DWARF parsing information\r
-// JPM   Oct./2018  Improve the DWARF parsing information, the source file text reading, and Support the used lines source DWARF structure\r
+// JPM   Oct./2018  Improve the DWARF parsing information, and the source file text reading; support the used source lines from DWARF structure, and the search paths for the files\r
 //\r
 \r
 // To Do\r
@@ -152,6 +152,8 @@ Dwarf_Ptr errarg;
 Dwarf_Error error;\r
 Dwarf_Debug dbg;\r
 CUStruct *PtrCU;\r
+char **ListSearchPaths;\r
+size_t NbSearchPaths;\r
 \r
 \r
 //\r
@@ -161,6 +163,9 @@ void DWARFManager_CloseDMI(void);
 bool DWARFManager_ElfClose(void);\r
 char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine);\r
 void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables);\r
+void DWARFManager_SourceFileSearchPathsInit(void);\r
+void DWARFManager_SourceFileSearchPathsReset(void);\r
+void DWARFManager_SourceFileSearchPathsClose(void);\r
 \r
 \r
 //\r
@@ -170,16 +175,50 @@ Dwarf_Handler DWARFManager_ErrorHandler(Dwarf_Ptr perrarg)
 }\r
 \r
 \r
+// Dwarf manager list search paths init\r
+void DWARFManager_SourceFileSearchPathsInit(void)\r
+{\r
+       ListSearchPaths = NULL;\r
+       NbSearchPaths = 0;\r
+}\r
+\r
+\r
+// Dwarf manager list search paths reset\r
+void DWARFManager_SourceFileSearchPathsReset(void)\r
+{\r
+       ListSearchPaths = NULL;\r
+       NbSearchPaths = 0;\r
+}\r
+\r
+\r
+// Dwarf manager list search paths close\r
+void DWARFManager_SourceFileSearchPathsClose(void)\r
+{\r
+       DWARFManager_SourceFileSearchPathsReset();\r
+}\r
+\r
+\r
 // Dwarf manager init\r
 void DWARFManager_Init(void)\r
 {\r
+       DWARFManager_SourceFileSearchPathsInit();\r
        LibDwarf = DW_DLV_NO_ENTRY;\r
 }\r
 \r
 \r
+// Dwarf manager settings\r
+void DWARFManager_Set(size_t NbPathsInList, char **PtrListPaths)\r
+{\r
+       // Search paths init\r
+       ListSearchPaths = PtrListPaths;\r
+       NbSearchPaths = NbPathsInList;\r
+}\r
+\r
+\r
 // Dwarf manager Reset\r
 bool DWARFManager_Reset(void)\r
 {\r
+       DWARFManager_SourceFileSearchPathsReset();\r
        return DWARFManager_ElfClose();\r
 }\r
 \r
@@ -187,6 +226,7 @@ bool DWARFManager_Reset(void)
 // Dwarf manager Close\r
 bool DWARFManager_Close(void)\r
 {\r
+       DWARFManager_SourceFileSearchPathsClose();\r
        return(DWARFManager_Reset());\r
 }\r
 \r
@@ -394,23 +434,46 @@ void DWARFManager_InitDMI(void)
                                                                dwarf_dealloc(dbg, atlist, DW_DLA_LIST);\r
                                                        }\r
 \r
-                                                       // Check filename validity\r
+                                                       // Check filename presence\r
                                                        if (!PtrCU[NbCU].PtrSourceFilename)\r
                                                        {\r
                                                                PtrCU[NbCU].PtrSourceFilename = (char *)calloc(1, 1);\r
                                                        }\r
 \r
-                                                       // Check directory validity\r
+                                                       // Check directory presence\r
                                                        if (!PtrCU[NbCU].PtrSourceFileDirectory)\r
                                                        {\r
-                                                               PtrCU[NbCU].PtrSourceFileDirectory = (char *)calloc(2, 1);\r
-                                                               PtrCU[NbCU].PtrSourceFileDirectory[0] = '.';\r
+                                                               // Check if file exists in the search paths\r
+                                                               for (size_t i = 0; i < NbSearchPaths; i++)\r
+                                                               {\r
+                                                                       PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + strlen((const char *)ListSearchPaths[i]) + 2);\r
+#if defined(_WIN32)\r
+                                                                       sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", ListSearchPaths[i], PtrCU[NbCU].PtrSourceFilename);\r
+#else\r
+                                                                       sprintf(PtrCU[NbCU].PtrFullFilename, "%s/%s", ListSearchPaths[i], PtrCU[NbCU].PtrSourceFilename);\r
+#endif\r
+                                                                       if (!fopen_s(&SrcFile, PtrCU[NbCU].PtrFullFilename, "rb"))\r
+                                                                       {\r
+                                                                               PtrCU[NbCU].PtrSourceFileDirectory = (char *)realloc(PtrCU[NbCU].PtrSourceFileDirectory, strlen(ListSearchPaths[i]) + 1);\r
+                                                                               strcpy(PtrCU[NbCU].PtrSourceFileDirectory, ListSearchPaths[i]);\r
+                                                                       }\r
+                                                               }\r
+\r
+                                                               // File directory doesn't exits\r
+                                                               if (!PtrCU[NbCU].PtrSourceFileDirectory)\r
+                                                               {\r
+                                                                       PtrCU[NbCU].PtrSourceFileDirectory = (char *)realloc(PtrCU[NbCU].PtrSourceFileDirectory, 2);\r
+                                                                       strcpy(PtrCU[NbCU].PtrSourceFileDirectory, ".");\r
+                                                               }\r
                                                        }\r
 \r
                                                        // Create full filename\r
                                                        Ptr = PtrCU[NbCU].PtrFullFilename = (char *)realloc(PtrCU[NbCU].PtrFullFilename, strlen(PtrCU[NbCU].PtrSourceFilename) + strlen(PtrCU[NbCU].PtrSourceFileDirectory) + 2);\r
+#if defined(_WIN32)\r
                                                        sprintf(PtrCU[NbCU].PtrFullFilename, "%s\\%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename);\r
-\r
+#else\r
+                                                       sprintf(PtrCU[NbCU].PtrFullFilename, "%s/%s", PtrCU[NbCU].PtrSourceFileDirectory, PtrCU[NbCU].PtrSourceFilename);\r
+#endif\r
                                                        // Conform slashes and backslashes\r
                                                        while (*Ptr)\r
                                                        {\r
@@ -1064,14 +1127,6 @@ void DWARFManager_InitDMI(void)
                                                        PtrCU[NbCU].PtrLinesSrc[i].PtrLineSrc = PtrCU[NbCU].PtrLinesLoadSrc[PtrCU[NbCU].PtrLinesSrc[i].NumLineSrc - 1];\r
                                                }\r
                                        }\r
-\r
-                                       // Setup memory range for the code if CU doesn't have already this information\r
-                                       // It is taken from the used lines structure\r
-                                       if (!PtrCU[NbCU].LowPC && !PtrCU[NbCU].HighPC)\r
-                                       {\r
-                                               PtrCU[NbCU].LowPC = PtrCU[NbCU].PtrLinesSrc[0].StartPC;\r
-                                               PtrCU[NbCU].HighPC = PtrCU[NbCU].PtrLinesSrc[PtrCU[NbCU].NbLinesSrc - 1].StartPC;\r
-                                       }\r
                                }\r
 \r
                                // Init global variables information based on types information\r
@@ -1243,13 +1298,11 @@ void DWARFManager_InitInfosVariable(VariablesStruct *PtrVariables)
 // Return NULL if no symbol name exists\r
 char *DWARFManager_GetSymbolnameFromAdr(size_t Adr)\r
 {\r
-       size_t i, j;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((PtrCU[i].PtrSubProgs[j].StartPC == Adr))\r
                                {\r
@@ -1268,9 +1321,7 @@ char *DWARFManager_GetSymbolnameFromAdr(size_t Adr)
 // Return the existence status (true or false) in Error\r
 char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, bool *Error)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
                {\r
@@ -1283,7 +1334,7 @@ char *DWARFManager_GetFullSourceFilenameFromAdr(size_t Adr, bool *Error)
 }\r
 \r
 \r
-// Get text line source based on line number (starting by 1)\r
+// Get text line source based on line number (starting from 1)\r
 // Return NULL if no text line exists or if line number is 0\r
 char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine)\r
 {\r
@@ -1307,13 +1358,11 @@ char *DWARFManager_GetLineSrcFromNumLine(char *PtrSrcFile, size_t NumLine)
 // 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1327,18 +1376,16 @@ size_t DWARFManager_GetNbLocalVariables(size_t Adr)
 }\r
 \r
 \r
-// Get local variable name based on his index (starting by 1)\r
+// Get local variable name based on his index (starting from 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1352,17 +1399,15 @@ char *DWARFManager_GetLocalVariableName(size_t Adr, size_t Index)
 }\r
 \r
 \r
-// Get local variable's type tag based on his index (starting by 1)\r
+// Get local variable's type tag based on his index (starting from 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1376,16 +1421,15 @@ size_t DWARFManager_GetLocalVariableTypeTag(size_t Adr, size_t Index)
 }\r
 \r
 \r
-//\r
+// Get the local variable's offset based on a index (starting from 1)\r
+// Return 0 if no offset has been found\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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1399,18 +1443,16 @@ int DWARFManager_GetLocalVariableOffset(size_t Adr, size_t Index)
 }\r
 \r
 \r
-// Get local variable Type Byte Size based on his address and index (starting by 1)\r
+// Get local variable Type Byte Size based on his address and index (starting from 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1424,18 +1466,16 @@ size_t DWARFManager_GetLocalVariableTypeByteSize(size_t Adr, size_t Index)
 }\r
 \r
 \r
-// Get local variable Type Encoding based on his address and index (starting by 1)\r
+// Get local variable Type Encoding based on his address and index (starting from 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1449,17 +1489,15 @@ size_t DWARFManager_GetLocalVariableTypeEncoding(size_t Adr, size_t Index)
 }\r
 \r
 \r
-// Get local variable Op based on his address and index (starting by 1)\r
+// Get local variable Op based on his address and index (starting from 1)\r
 // Return 0 if not found, 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1473,17 +1511,15 @@ size_t DWARFManager_GetLocalVariableOp(size_t Adr, size_t Index)
 }\r
 \r
 \r
-// Get local variable type name based on his index (starting by 1) and an address\r
+// Get local variable type name based on his index (starting from 1) and an address\r
 // Return NULL if not found, may also return NULL if there is no 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
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1501,9 +1537,9 @@ char *DWARFManager_GetLocalVariableTypeName(size_t Adr, size_t Index)
 // Return number of variables\r
 size_t DWARFManager_GetNbGlobalVariables(void)\r
 {\r
-       size_t NbVariables = 0, i;\r
+       size_t NbVariables = 0;\r
 \r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                NbVariables += PtrCU[i].NbVariables;\r
        }\r
@@ -1512,14 +1548,12 @@ size_t DWARFManager_GetNbGlobalVariables(void)
 }\r
 \r
 \r
-// Get global variable type name based on his index (starting by 1)\r
+// Get global variable type name based on his index (starting from 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_GetGlobalVariableTypeName(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1538,13 +1572,11 @@ char *DWARFManager_GetGlobalVariableTypeName(size_t Index)
 }\r
 \r
 \r
-// Get global variable's type tag based on his index (starting by 1)\r
+// Get global variable's type tag based on his index (starting from 1)\r
 // Return 0 if not found\r
 size_t DWARFManager_GetGlobalVariableTypeTag(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1563,13 +1595,11 @@ size_t DWARFManager_GetGlobalVariableTypeTag(size_t Index)
 }\r
 \r
 \r
-// Get global variable byte size based on his index (starting by 1)\r
+// Get global variable byte size based on his index (starting from 1)\r
 // Return 0 if not found\r
 size_t DWARFManager_GetGlobalVariableTypeByteSize(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1588,13 +1618,11 @@ size_t DWARFManager_GetGlobalVariableTypeByteSize(size_t Index)
 }\r
 \r
 \r
-// Get global variable encoding based on his index (starting by 1)\r
+// Get global variable encoding based on his index (starting from 1)\r
 // Return 0 if not found\r
 size_t DWARFManager_GetGlobalVariableTypeEncoding(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1613,13 +1641,11 @@ size_t DWARFManager_GetGlobalVariableTypeEncoding(size_t Index)
 }\r
 \r
 \r
-// Get global variable address based on his index (starting by 1)\r
+// Get global variable memory address based on his index (starting from 1)\r
 // Return 0 if not found\r
 size_t DWARFManager_GetGlobalVariableAdr(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1642,13 +1668,11 @@ size_t DWARFManager_GetGlobalVariableAdr(size_t Index)
 // Return 0 if not found, or will return the first occurence found\r
 size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName)\r
 {\r
-       size_t i, j;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
-                       for (j = 0; j < PtrCU[i].NbVariables; j++)\r
+                       for (size_t j = 0; j < PtrCU[i].NbVariables; j++)\r
                        {\r
                                if (!strcmp(PtrCU[i].PtrVariables[j].PtrName,VariableName))\r
                                {\r
@@ -1662,13 +1686,11 @@ size_t DWARFManager_GetGlobalVariableAdrFromName(char *VariableName)
 }\r
 \r
 \r
-// Get global variable name based on his index (starting by 1)\r
+// Get global variable name based on his index (starting from 1)\r
 // Return name's pointer text found, or will return NULL if no variable can be found\r
 char *DWARFManager_GetGlobalVariableName(size_t Index)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if (PtrCU[i].NbVariables)\r
                {\r
@@ -1693,13 +1715,11 @@ char *DWARFManager_GetGlobalVariableName(size_t Index)
 // Return NULL if no text line has been found\r
 char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag)\r
 {\r
-       size_t i, j, k;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1709,7 +1729,7 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag)
                                        }\r
                                        else\r
                                        {\r
-                                               for (k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++)\r
+                                               for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++)\r
                                                {\r
                                                        if (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC <= Adr)\r
                                                        {\r
@@ -1739,13 +1759,11 @@ char *DWARFManager_GetLineSrcFromAdr(size_t Adr, size_t Tag)
 // Return 0 if no line number has been found\r
 size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag)\r
 {\r
-       size_t i, j, k;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1755,7 +1773,7 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag)
                                        }\r
                                        else\r
                                        {\r
-                                               for (k = 0; (k < PtrCU[i].PtrSubProgs[j].NbLinesSrc); k++)\r
+                                               for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++)\r
                                                {\r
                                                        if ((PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].StartPC == Adr) && (!Tag || (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].Tag == Tag)))\r
                                                        {\r
@@ -1782,13 +1800,11 @@ size_t DWARFManager_GetNumLineFromAdr(size_t Adr, size_t Tag)
 // Return NULL if no function name has been found, otherwise will return the function name in the range of the provided address\r
 char *DWARFManager_GetFunctionName(size_t Adr)\r
 {\r
-       size_t i, j;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1802,17 +1818,15 @@ char *DWARFManager_GetFunctionName(size_t Adr)
 }\r
 \r
 \r
-// Get text line from source based on address and num line (starting by 1)\r
+// Get text line from source based on address and num line (starting from 1)\r
 // Return NULL if no text line has been found\r
 char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine)\r
 {\r
-       size_t i, j, k;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t 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
+                       for (size_t j = 0; j < PtrCU[i].NbSubProgs; j++)\r
                        {\r
                                if ((Adr >= PtrCU[i].PtrSubProgs[j].LowPC) && (Adr < PtrCU[i].PtrSubProgs[j].HighPC))\r
                                {\r
@@ -1822,7 +1836,7 @@ char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine)
                                        }\r
                                        else\r
                                        {\r
-                                               for (k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++)\r
+                                               for (size_t k = 0; k < PtrCU[i].PtrSubProgs[j].NbLinesSrc; k++)\r
                                                {\r
                                                        if (PtrCU[i].PtrSubProgs[j].PtrLinesSrc[k].NumLineSrc == NumLine)\r
                                                        {\r
@@ -1839,13 +1853,11 @@ char *DWARFManager_GetLineSrcFromAdrNumLine(size_t Adr, size_t NumLine)
 }\r
 \r
 \r
-// Get text line pointer from source, based on address and line number (starting by 1)\r
+// Get text line pointer from source, based on address and line number (starting from 1)\r
 // Return NULL if no text line has been found, or if requested number line is above the source total number of lines\r
 char *DWARFManager_GetLineSrcFromNumLineBaseAdr(size_t Adr, size_t NumLine)\r
 {\r
-       size_t i;\r
-\r
-       for (i = 0; i < NbCU; i++)\r
+       for (size_t i = 0; i < NbCU; i++)\r
        {\r
                if ((Adr >= PtrCU[i].LowPC) && (Adr < PtrCU[i].HighPC))\r
                {\r