Local variables window detects now if a variable is used or not by the code

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

diff --git a/src/debugger/localbrowser.cpp b/src/debugger/localbrowser.cpp
index 3b8d816..c5782da 100644 (file)
--- a/src/debugger/localbrowser.cpp
+++ b/src/debugger/localbrowser.cpp
@@ -78,21 +78,27 @@ bool LocalBrowserWindow::UpdateInfos(void)
                {\r
                        if (strcmp(FuncName, Ptr))\r
                        {\r
-                               FuncName = (char *)realloc(FuncName, strlen(Ptr) + 1);\r
-                               strcpy(FuncName, Ptr);\r
-\r
-                               LocalInfo = (WatchInfo *)realloc(LocalInfo, (sizeof(WatchInfo) * NbLocal));\r
-                               for (size_t i = 0; i < NbLocal; i++)\r
+                               if (FuncName = (char *)realloc(FuncName, strlen(Ptr) + 1))\r
                                {\r
-                                       if (LocalInfo[i].PtrVariableName = DBGManager_GetLocalVariableName(Adr, i + 1))\r
+                                       strcpy(FuncName, Ptr);\r
+\r
+                                       if (LocalInfo = (WatchInfo *)realloc(LocalInfo, (sizeof(WatchInfo) * NbLocal)))\r
                                        {\r
-                                               LocalInfo[i].Op = DBGManager_GetLocalVariableOp(Adr, i + 1);\r
-                                               LocalInfo[i].Adr = NULL;\r
-                                               LocalInfo[i].TypeTag = DBGManager_GetLocalVariableTypeTag(Adr, i + 1);\r
-                                               LocalInfo[i].PtrVariableBaseTypeName = DBGManager_GetLocalVariableTypeName(Adr, i + 1);\r
-                                               LocalInfo[i].TypeEncoding = DBGManager_GetLocalVariableTypeEncoding(Adr, i + 1);\r
-                                               LocalInfo[i].TypeByteSize = DBGManager_GetLocalVariableTypeByteSize(Adr, i + 1);\r
-                                               LocalInfo[i].Offset = DBGManager_GetLocalVariableOffset(Adr, i + 1);\r
+                                               for (size_t i = 0; i < NbLocal; i++)\r
+                                               {\r
+                                                       // Get local variable name and his information\r
+                                                       if (LocalInfo[i].PtrVariableName = DBGManager_GetLocalVariableName(Adr, i + 1))\r
+                                                       {\r
+                                                               LocalInfo[i].Op = DBGManager_GetLocalVariableOp(Adr, i + 1);\r
+                                                               LocalInfo[i].Adr = NULL;\r
+                                                               LocalInfo[i].PtrCPURegisterName = NULL;\r
+                                                               LocalInfo[i].TypeTag = DBGManager_GetLocalVariableTypeTag(Adr, i + 1);\r
+                                                               LocalInfo[i].PtrVariableBaseTypeName = DBGManager_GetLocalVariableTypeName(Adr, i + 1);\r
+                                                               LocalInfo[i].TypeEncoding = DBGManager_GetLocalVariableTypeEncoding(Adr, i + 1);\r
+                                                               LocalInfo[i].TypeByteSize = DBGManager_GetLocalVariableTypeByteSize(Adr, i + 1);\r
+                                                               LocalInfo[i].Offset = DBGManager_GetLocalVariableOffset(Adr, i + 1);\r
+                                                       }\r
+                                               }\r
                                        }\r
                                }\r
                        }\r
@@ -118,6 +124,8 @@ void LocalBrowserWindow::RefreshContents(void)
 //     size_t NbWatch, Adr;\r
 //     WatchInfo PtrLocalInfo;\r
 \r
+       const char *CPURegName[] = { "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7" };\r
+\r
        if (isVisible())\r
        {\r
                if (UpdateInfos())\r
@@ -137,10 +145,16 @@ void LocalBrowserWindow::RefreshContents(void)
                        {\r
                                if (LocalInfo[i].PtrVariableName)\r
                                {\r
-                                       if (((LocalInfo[i].Op >= DBG_OP_breg0) && (LocalInfo[i].Op <= DBG_OP_breg31)))\r
+                                       // Local or parameters variables\r
+                                       if (((LocalInfo[i].Op >= DBG_OP_breg0) && (LocalInfo[i].Op <= DBG_OP_breg31)) || (LocalInfo[i].Op == DBG_OP_fbreg))\r
                                        {\r
                                                LocalInfo[i].Adr = m68k_get_reg(NULL, M68K_REG_A6) + LocalInfo[i].Offset;\r
 \r
+                                               if ((LocalInfo[i].Op == DBG_OP_fbreg))\r
+                                               {\r
+                                                       LocalInfo[i].Adr += 8;\r
+                                               }\r
+\r
                                                if ((LocalInfo[i].Adr >= 0) && (LocalInfo[i].Adr < vjs.DRAM_size))\r
                                                {\r
                                                        PtrValue = DBGManager_GetVariableValueFromAdr(LocalInfo[i].Adr, LocalInfo[i].TypeEncoding, LocalInfo[i].TypeByteSize);\r
@@ -152,8 +166,10 @@ void LocalBrowserWindow::RefreshContents(void)
                                        }\r
                                        else\r
                                        {\r
+                                               // Value from CPU register\r
                                                if ((LocalInfo[i].Op >= DBG_OP_reg0) && (LocalInfo[i].Op <= DBG_OP_reg31))\r
                                                {\r
+                                                       LocalInfo[i].PtrCPURegisterName = (char *)CPURegName[(LocalInfo[i].Op - DBG_OP_reg0)];\r
                                                        PtrValue = itoa(m68k_get_reg(NULL, (m68k_register_t)((size_t)M68K_REG_D0 + (LocalInfo[i].Op - DBG_OP_reg0))), Value, 10);\r
                                                }\r
                                                else\r
@@ -162,19 +178,33 @@ void LocalBrowserWindow::RefreshContents(void)
                                                }\r
                                        }\r
 \r
-                                       sprintf(string, "%i : %s | %s | ", (i + 1), (LocalInfo[i].PtrVariableBaseTypeName ? LocalInfo[i].PtrVariableBaseTypeName : (char *)"<font color='#ff0000'>N/A</font>"), LocalInfo[i].PtrVariableName);\r
-                                       Local += QString(string);\r
-                                       if ((unsigned int)LocalInfo[i].Adr)\r
+                                       if (!LocalInfo[i].Op)\r
                                        {\r
-                                               sprintf(string, "0x%06X", (unsigned int)LocalInfo[i].Adr);\r
+                                               sprintf(string, "<font color='#A52A2A'>%i : %s | %s | [Not used]</font>", (i + 1), (LocalInfo[i].PtrVariableBaseTypeName ? LocalInfo[i].PtrVariableBaseTypeName : (char *)"<font color='#ff0000'>N/A</font>"), LocalInfo[i].PtrVariableName);\r
                                        }\r
                                        else\r
                                        {\r
-                                               sprintf(string, "%s", (char *)"<font color='#ff0000'>N/A</font>");\r
+                                               sprintf(string, "%i : %s | %s | ", (i + 1), (LocalInfo[i].PtrVariableBaseTypeName ? LocalInfo[i].PtrVariableBaseTypeName : (char *)"<font color='#ff0000'>N/A</font>"), LocalInfo[i].PtrVariableName);\r
+                                               Local += QString(string);\r
+                                               if ((unsigned int)LocalInfo[i].Adr)\r
+                                               {\r
+                                                       sprintf(string, "0x%06X", (unsigned int)LocalInfo[i].Adr);\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       if (LocalInfo[i].PtrCPURegisterName)\r
+                                                       {\r
+                                                               sprintf(string, "<font color='#0000FF'>%s</font>", LocalInfo[i].PtrCPURegisterName);\r
+                                                       }\r
+                                                       else\r
+                                                       {\r
+                                                               sprintf(string, "%s", (char *)"<font color='#ff0000'>N/A</font>");\r
+                                                       }\r
+                                               }\r
+                                               Local += QString(string);\r
+                                               sprintf(string, " | %s", (!PtrValue ? (char *)"<font color='#ff0000'>N/A</font>" : PtrValue));\r
                                        }\r
                                        Local += QString(string);\r
-                                       sprintf(string, " | %s", (!PtrValue ? (char *)"<font color='#ff0000'>N/A</font>" : PtrValue));\r
-                                       Local += QString(string);\r
                                        sprintf(string, "<br>");\r
                                        Local += QString(string);\r
                                }\r