Added detection for the unsigned/signed short type

[clinton/Virtual-Jaguar-Rx.git] / src / debugger / DBGManager.cpp

diff --git a/src/debugger/DBGManager.cpp b/src/debugger/DBGManager.cpp
index e3d5956..1d024e3 100644 (file)
--- a/src/debugger/DBGManager.cpp
+++ b/src/debugger/DBGManager.cpp
@@ -11,10 +11,12 @@
 // JPM              Various efforts to set the ELF format support\r
 // JPM              Various efforts to set the DWARF format support\r
 // JPM  09/15/2018  Support the unsigned char\r
-// JPM  10/06/2018  Cosmetic changes\r
+// JPM   Oct./2018  Cosmetic changes, added source file search paths, and ELF function name\r
+// JPM  Sept./2019  Support the unsigned/signed short type\r
 //\r
 \r
 // To Do\r
+// To think about unique format to handle variations from ELF, DWARF, etc.\r
 //\r
 \r
 \r
@@ -42,24 +44,119 @@ struct Value
                bool B;\r
                double D;\r
                float F;\r
+               int16_t SS;\r
                int32_t SI;\r
                int64_t SL;\r
+               uint16_t US;\r
                uint32_t UI;\r
                uint64_t UL;\r
        };\r
 }S_Value;\r
 \r
 \r
+//\r
+void DBGManager_SourceFileSearchPathsInit(void);\r
+void DBGManager_SourceFileSearchPathsReset(void);\r
+void DBGManager_SourceFileSearchPathsClose(void);\r
+\r
+\r
 // Common debugger variables\r
 size_t DBGType;\r
 char value[1000];\r
+size_t NbSFSearchPaths;\r
+char **SourceFileSearchPaths;\r
+\r
+\r
+// Init the source file search paths\r
+void DBGManager_SourceFileSearchPathsInit(void)\r
+{\r
+       NbSFSearchPaths = 0;\r
+       SourceFileSearchPaths = NULL;\r
+}\r
+\r
+\r
+// Set the source file search paths\r
+// Create individual path for each one provided in the list (separate with ';')\r
+void DBGManager_SourceFileSearchPathsSet(char *ListPaths)\r
+{\r
+       // Check presence of a previous list\r
+       if (NbSFSearchPaths)\r
+       {\r
+               // Reset previous list\r
+               DBGManager_SourceFileSearchPathsReset();\r
+       }\r
+\r
+       // Check if there is a paths list\r
+       if (strlen(ListPaths))\r
+       {\r
+               // Get number of paths\r
+               char *Ptr = ListPaths;\r
+               while(*Ptr)\r
+               {\r
+                       while (*Ptr && (*Ptr++ != ';'));\r
+                       {\r
+                               NbSFSearchPaths++;\r
+                       }\r
+               }\r
+\r
+               // Isolate each search path\r
+               SourceFileSearchPaths = (char **)calloc(NbSFSearchPaths, sizeof(char *));\r
+               size_t i = 0;\r
+               Ptr = ListPaths;\r
+\r
+               while (*Ptr)\r
+               {\r
+                       // Search the path separator (';')\r
+                       char *Ptr1 = Ptr;\r
+                       while (*Ptr && (*Ptr++ != ';'));\r
+\r
+                       // Copy the inidividual search path\r
+                       SourceFileSearchPaths[i] = (char *)calloc(1, (Ptr - Ptr1) + 1);\r
+                       strncpy(SourceFileSearchPaths[i], Ptr1, (Ptr - Ptr1));\r
+                       if (SourceFileSearchPaths[i][strlen(SourceFileSearchPaths[i]) - 1] == ';')\r
+                       {\r
+                               SourceFileSearchPaths[i][strlen(SourceFileSearchPaths[i]) - 1] = 0;\r
+                       }\r
+                       i++;\r
+               }\r
+       }\r
+\r
+       DWARFManager_Set(NbSFSearchPaths, SourceFileSearchPaths);\r
+}\r
+\r
+\r
+// Reset the source file search paths\r
+void DBGManager_SourceFileSearchPathsReset(void)\r
+{\r
+       // Free each path\r
+       while (NbSFSearchPaths)\r
+       {\r
+               free(SourceFileSearchPaths[--NbSFSearchPaths]);\r
+       }\r
+\r
+       // Free the pointers list\r
+       free(SourceFileSearchPaths);\r
+       SourceFileSearchPaths = NULL;\r
+}\r
+\r
+\r
+// Close the source file search paths\r
+void DBGManager_SourceFileSearchPathsClose(void)\r
+{\r
+       DBGManager_SourceFileSearchPathsReset();\r
+}\r
 \r
 \r
 // Common debugger initialisation\r
 void DBGManager_Init(void)\r
 {\r
+       // DBG initialisations\r
        DBGType = DBG_NO_TYPE;\r
+       DBGManager_SourceFileSearchPathsInit();\r
+\r
+       // ELF initialisation \r
        ELFManager_Init();\r
+       // DWARF initialisation\r
        DWARFManager_Init();\r
 }\r
 \r
@@ -82,20 +179,6 @@ void DBGManager_Reset(void)
 }\r
 \r
 \r
-// Get debugger type\r
-size_t DBGManager_GetType(void)\r
-{\r
-       return DBGType;\r
-}\r
-\r
-\r
-// Common debugger set\r
-void DBGManager_SetType(size_t DBGTypeSet)\r
-{\r
-       DBGType |= DBGTypeSet;\r
-}\r
-\r
-\r
 // Common debugger close\r
 void DBGManager_Close(void)\r
 {\r
@@ -108,6 +191,23 @@ void DBGManager_Close(void)
        {\r
                ELFManager_Close();\r
        }\r
+\r
+       DBGManager_SourceFileSearchPathsClose();\r
+       DBGType = DBG_NO_TYPE;\r
+}\r
+\r
+\r
+// Common debugger set\r
+void DBGManager_SetType(size_t DBGTypeSet)\r
+{\r
+       DBGType |= DBGTypeSet;\r
+}\r
+\r
+\r
+// Get debugger type\r
+size_t DBGManager_GetType(void)\r
+{\r
+       return DBGType;\r
 }\r
 \r
 \r
@@ -406,6 +506,10 @@ char *DBGManager_GetVariableValueFromAdr(size_t Adr, size_t TypeEncoding, size_t
                case DBG_ATE_signed:\r
                        switch (TypeByteSize)\r
                        {\r
+                       case 2:\r
+                               sprintf(value, "%i", V.SS);\r
+                               break;\r
+\r
                        case 4:\r
                                sprintf(value, "%i", V.SI);\r
                                break;\r
@@ -425,6 +529,10 @@ char *DBGManager_GetVariableValueFromAdr(size_t Adr, size_t TypeEncoding, size_t
                case DBG_ATE_unsigned:\r
                        switch (TypeByteSize)\r
                        {\r
+                       case 2:\r
+                               sprintf(value, "%u", V.US);\r
+                               break;\r
+\r
                        case 4:\r
                                sprintf(value, "%u", V.UI);\r
                                break;\r
@@ -531,14 +639,19 @@ char *DBGManager_GetGlobalVariableName(size_t Index)
 // Return NULL if no function name has been found\r
 char *DBGManager_GetFunctionName(size_t Adr)\r
 {\r
+       char *Symbolname = NULL;\r
+\r
        if ((DBGType & DBG_ELFDWARF))\r
        {\r
-               return DWARFManager_GetFunctionName(Adr);\r
+               Symbolname = DWARFManager_GetFunctionName(Adr);\r
        }\r
-       else\r
+\r
+       if ((DBGType & DBG_ELF) && (Symbolname == NULL))\r
        {\r
-               return  NULL;\r
+               Symbolname = ELFManager_GetFunctionName(Adr);\r
        }\r
+\r
+       return  Symbolname;\r
 }\r
 \r
 \r