Debugger sources code clean-up

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

diff --git a/src/debugger/localbrowser.cpp b/src/debugger/localbrowser.cpp
index 3b8d816..35b858d 100644 (file)
--- a/src/debugger/localbrowser.cpp
+++ b/src/debugger/localbrowser.cpp
@@ -21,39 +21,18 @@
 // \r
 LocalBrowserWindow::LocalBrowserWindow(QWidget * parent/*= 0*/) : QWidget(parent, Qt::Dialog),\r
        layout(new QVBoxLayout), text(new QTextBrowser),\r
 // \r
 LocalBrowserWindow::LocalBrowserWindow(QWidget * parent/*= 0*/) : QWidget(parent, Qt::Dialog),\r
        layout(new QVBoxLayout), text(new QTextBrowser),\r

-//     layout(new QVBoxLayout), text(new QLabel),\r
-//     refresh(new QPushButton(tr("Refresh"))),\r
-//     address(new QLineEdit),\r
-//     go(new QPushButton(tr("Go"))),\r
-//     memBase(0),\r

        NbLocal(0),\r
        FuncName((char *)calloc(1, 1)),\r
        LocalInfo(NULL)\r
 {\r
        setWindowTitle(tr("Local"));\r
 \r
        NbLocal(0),\r
        FuncName((char *)calloc(1, 1)),\r
        LocalInfo(NULL)\r
 {\r
        setWindowTitle(tr("Local"));\r
 \r

-//     address->setInputMask("hhhhhh");\r
-//     QHBoxLayout * hbox1 = new QHBoxLayout;\r
-//     hbox1->addWidget(refresh);\r
-//     hbox1->addWidget(address);\r
-//     hbox1->addWidget(go);\r
-\r
-       // Need to set the size as well...\r
-//     resize(560, 480);\r
-\r

        QFont fixedFont("Lucida Console", 8, QFont::Normal);\r
        QFont fixedFont("Lucida Console", 8, QFont::Normal);\r

-//     QFont fixedFont("", 8, QFont::Normal);\r

        fixedFont.setStyleHint(QFont::TypeWriter);\r
        text->setFont(fixedFont);\r
        fixedFont.setStyleHint(QFont::TypeWriter);\r
        text->setFont(fixedFont);\r

-////   layout->setSizeConstraint(QLayout::SetFixedSize);\r

        setLayout(layout);\r
 \r
        layout->addWidget(text);\r
        setLayout(layout);\r
 \r
        layout->addWidget(text);\r

-//     layout->addWidget(refresh);\r
-//     layout->addLayout(hbox1);\r
-\r
-//     connect(refresh, SIGNAL(clicked()), this, SLOT(RefreshContents()));\r
-//     connect(go, SIGNAL(clicked()), this, SLOT(GoToAddress()));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -62,7 +41,6 @@ LocalBrowserWindow::~LocalBrowserWindow(void)
 {\r
        free(LocalInfo);\r
        free(FuncName);\r
 {\r
        free(LocalInfo);\r
        free(FuncName);\r

-//     NbLocal = 0;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -78,21 +56,27 @@ bool LocalBrowserWindow::UpdateInfos(void)
                {\r
                        if (strcmp(FuncName, Ptr))\r
                        {\r
                {\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
                                {\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
                                        {\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
                                        }\r
                                }\r
                        }\r


@@ -111,36 +95,30 @@ bool LocalBrowserWindow::UpdateInfos(void)
 void LocalBrowserWindow::RefreshContents(void)\r
 {\r
        char string[1024];\r
 void LocalBrowserWindow::RefreshContents(void)\r
 {\r
        char string[1024];\r

-//     char buf[64];\r

        QString Local;\r
        char Value[100];\r
        char *PtrValue;\r
        QString Local;\r
        char Value[100];\r
        char *PtrValue;\r

-//     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
                {\r
 \r
        if (isVisible())\r
        {\r
                if (UpdateInfos())\r
                {\r

-//#ifdef _MSC_VER\r
-                       //#pragma message("Warning: !!! Need to check the memory desalocation for LocalInfo !!!")\r
-//#else\r
-                       //#warning "!!! Need to do the memory desalocation for LocalInfo !!!"\r
-//#endif // _MSC_VER\r
-//#ifdef _MSC_VER\r
-                       //#pragma message("Warning: !!! Need to check the memory desalocation for FuncName !!!")\r
-//#else\r
-                       //#warning "!!! Need to do the memory desalocation for FuncName !!!"\r
-//#endif // _MSC_VER\r
-\r

                        for (size_t i = 0; i < NbLocal; i++)\r
                        {\r
                                if (LocalInfo[i].PtrVariableName)\r
                                {\r
                        for (size_t i = 0; i < NbLocal; i++)\r
                        {\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
                                        {\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
                                                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 +130,10 @@ void LocalBrowserWindow::RefreshContents(void)
                                        }\r
                                        else\r
                                        {\r
                                        }\r
                                        else\r
                                        {\r

+                                               // Value from CPU register\r

                                                if ((LocalInfo[i].Op >= DBG_OP_reg0) && (LocalInfo[i].Op <= DBG_OP_reg31))\r
                                                {\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
                                                        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 +142,33 @@ void LocalBrowserWindow::RefreshContents(void)
                                                }\r
                                        }\r
 \r
                                                }\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
                                        {\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
                                        }\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
                                        }\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
                                        sprintf(string, "<br>");\r
                                        Local += QString(string);\r
                                }\r


@@ -191,58 +185,11 @@ void LocalBrowserWindow::RefreshContents(void)
 }\r
 \r
 \r
 }\r
 \r
 \r

-#if 0\r
+// \r

 void LocalBrowserWindow::keyPressEvent(QKeyEvent * e)\r
 {\r
        if (e->key() == Qt::Key_Escape)\r
 void LocalBrowserWindow::keyPressEvent(QKeyEvent * e)\r
 {\r
        if (e->key() == Qt::Key_Escape)\r

-               hide();\r
-       else if (e->key() == Qt::Key_PageUp)\r

        {\r
        {\r

-               memBase -= 480;\r
-\r
-               if (memBase < 0)\r
-                       memBase = 0;\r
-\r
-               RefreshContents();\r
-       }\r
-       else if (e->key() == Qt::Key_PageDown)\r
-       {\r
-               memBase += 480;\r
-\r
-               if (memBase > (0x200000 - 480))\r
-                       memBase = 0x200000 - 480;\r
-\r
-               RefreshContents();\r
-       }\r
-       else if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Minus)\r
-       {\r
-               memBase -= 16;\r
-\r
-               if (memBase < 0)\r
-                       memBase = 0;\r
-\r
-               RefreshContents();\r
-       }\r
-       else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Equal)\r
-       {\r
-               memBase += 16;\r
-\r
-               if (memBase > (0x200000 - 480))\r
-                       memBase = 0x200000 - 480;\r
-\r
-               RefreshContents();\r
+               hide();\r

        }\r
 }\r
        }\r
 }\r

-#endif\r
-\r
-\r
-#if 0\r
-void LocalBrowserWindow::GoToAddress(void)\r
-{\r
-       bool ok;\r
-       QString newAddress = address->text();\r
-       memBase = newAddress.toUInt(&ok, 16);\r
-       RefreshContents();\r
-}\r
-#endif\r
-\r