Debugger sources code clean-up

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

diff --git a/src/debugger/m68kDasmWin.cpp b/src/debugger/m68kDasmWin.cpp
index 007c2b3..ec36938 100644 (file)
--- a/src/debugger/m68kDasmWin.cpp
+++ b/src/debugger/m68kDasmWin.cpp
@@ -17,74 +17,31 @@
 \r
 #include       <stdlib.h>\r
 #include "debugger/m68kDasmWin.h"\r
 \r
 #include       <stdlib.h>\r
 #include "debugger/m68kDasmWin.h"\r

-//#include "memory.h"\r

 #include "m68000/m68kinterface.h"\r
 #include "dsp.h"\r
 #include "gpu.h"\r
 #include "m68000/m68kinterface.h"\r
 #include "dsp.h"\r
 #include "gpu.h"\r

-//#include "jaguar.h"\r
-//#include "ELFManager.h"\r

 #include "DBGManager.h"\r
 #include "DBGManager.h"\r

-//extern       jaguarRunAddress;\r

 #include "settings.h"\r
 \r
 \r
 // \r
 m68KDasmWindow::m68KDasmWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog),\r
        layout(new QVBoxLayout), text(new QTextBrowser),\r
 #include "settings.h"\r
 \r
 \r
 // \r
 m68KDasmWindow::m68KDasmWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog),\r
        layout(new QVBoxLayout), text(new QTextBrowser),\r

-//     layout(new QTabWidget), text(new QLabel),\r
-#if 0\r
-       refresh(new QPushButton(tr("Refresh"))),\r
-       address(new QLineEdit),\r
-       go(new QPushButton(tr("Go"))),\r
-#endif\r
-//     memBase(0x4000)\r
-       //sb(new QScrollBar),\r

        memBase(0)\r
 {\r
        memBase(0)\r
 {\r

-//     m68kDasmWindow *m68kDasmWin = new m68kDasmWindow();\r
-//     setWindowTitle(tr("Jaguar Disassembly Window"));\r
-//     layout->addTab(new m68KDasmWindow(), tr("M68K Disassembly"));\r
-       //layout = new QTabWidget;\r
-       //layout->QWidget();\r
-\r
-#if 0\r
-       address->setInputMask("hhhhhh");\r
-       QHBoxLayout * hbox1 = new QHBoxLayout;\r
-       hbox1->addWidget(refresh);\r
-       hbox1->addWidget(address);\r
-       hbox1->addWidget(go);\r
-#endif\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::Monospace);   //TypeWriter\r
        fixedFont.setLetterSpacing(QFont::PercentageSpacing, 100);\r
        text->setFont(fixedFont);\r
        fixedFont.setStyleHint(QFont::Monospace);   //TypeWriter\r
        fixedFont.setLetterSpacing(QFont::PercentageSpacing, 100);\r
        text->setFont(fixedFont);\r

-//     sb = layout->text->verticalScrollBar();\r
-//     text->setStyleSheet("background-color: DeepSkyBlue;");\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
-#if 0\r
-       layout->addLayout(hbox1);\r
-#endif\r
-\r
-#if 0\r
-       connect(refresh, SIGNAL(clicked()), this, SLOT(RefreshContents()));\r
-       connect(go, SIGNAL(clicked()), this, SLOT(GoToAddress()));\r
-#endif\r

 }\r
 \r
 \r
 //\r
 void m68KDasmWindow::RefreshContents(void)\r
 {\r
 }\r
 \r
 \r
 //\r
 void m68KDasmWindow::RefreshContents(void)\r
 {\r

-       //char ;        //, buf[64];\r

        QString s;\r
        char buffer[1024], string[1024], adresse[16];\r
        size_t pc = memBase, oldpc;\r
        QString s;\r
        char buffer[1024], string[1024], adresse[16];\r
        size_t pc = memBase, oldpc;\r


@@ -97,24 +54,12 @@ void m68KDasmWindow::RefreshContents(void)
        size_t  nbr = vjs.nbrdisasmlines;\r
        char *PtrFullSource, *CurrentPtrFullSource = (char *)calloc(1, 1);\r
        size_t NumLine; // , CurrentNumLine = 0;\r
        size_t  nbr = vjs.nbrdisasmlines;\r
        char *PtrFullSource, *CurrentPtrFullSource = (char *)calloc(1, 1);\r
        size_t NumLine; // , CurrentNumLine = 0;\r

-//     size_t CurrentNumLine = DBGManager_GetNumLineFromAdr(pc, DBG_NO_TAG) - 1;\r

        size_t CurrentNumLine;\r
        char singleCharString[2] = { 0, 0 };\r
 \r
        size_t CurrentNumLine;\r
        char singleCharString[2] = { 0, 0 };\r
 \r

-       //text->clear();\r
-\r

        for (i = 0; i < nbr; i++)\r
        {\r
        for (i = 0; i < nbr; i++)\r
        {\r

-               //sb->setValue(sb->maximum());\r
-               //j = text->verticalScrollBar()->maximum();\r
-               //text->verticalScrollBar()->setValue(text->verticalScrollBar()->maximum());\r
-               //if (text->verticalScrollBar()->value())\r
-               //{\r
-               //      j = 1;\r
-               //}\r
-\r

                oldpc = pc;\r
                oldpc = pc;\r

-//             WriteLog("%06X: %s\n", oldpc, buffer);\r

                adr = constant = equal = false;\r
 \r
                // Display source filename based on the program address\r
                adr = constant = equal = false;\r
 \r
                // Display source filename based on the program address\r


@@ -124,13 +69,12 @@ void m68KDasmWindow::RefreshContents(void)
                        if (strcmp(OldPtrFullSource, PtrFullSource))\r
 #endif\r
                        {\r
                        if (strcmp(OldPtrFullSource, PtrFullSource))\r
 #endif\r
                        {\r

-#if 1\r

                                if (i)\r
                                {\r
                                        nbr++;\r
                                        s += QString("<br>");\r
                                }\r
                                if (i)\r
                                {\r
                                        nbr++;\r
                                        s += QString("<br>");\r
                                }\r

-#endif\r
+\r

                                CurrentNumLine = DBGManager_GetNumLineFromAdr(pc, DBG_NO_TAG) - 1;\r
                                nbr++;\r
                                CurrentPtrFullSource = (char *)realloc(CurrentPtrFullSource, strlen(PtrFullSource) + 1);\r
                                CurrentNumLine = DBGManager_GetNumLineFromAdr(pc, DBG_NO_TAG) - 1;\r
                                nbr++;\r
                                CurrentPtrFullSource = (char *)realloc(CurrentPtrFullSource, strlen(PtrFullSource) + 1);\r


@@ -195,7 +139,6 @@ void m68KDasmWindow::RefreshContents(void)
                                }\r
 \r
                                buffer[0] = 0;  // Clear string\r
                                }\r
 \r
                                buffer[0] = 0;  // Clear string\r

-                               //char singleCharString[2] = { 0, 0 };\r

 \r
                                for (j = 0; j < strlen(string); j++)\r
                                {\r
 \r
                                for (j = 0; j < strlen(string); j++)\r
                                {\r


@@ -256,9 +199,7 @@ void m68KDasmWindow::RefreshContents(void)
                                }\r
 \r
                                Symbol = NULL;\r
                                }\r
 \r
                                Symbol = NULL;\r

-                               //              s += QString(string);\r

                                s += QString(buffer);\r
                                s += QString(buffer);\r

-                               //              text->setStyleSheet("QLabel { background-color : red; color : blue; }");\r

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


@@ -289,54 +230,6 @@ void m68KDasmWindow::RefreshContents(void)
 }\r
 \r
 \r
 }\r
 \r
 \r

-#if 0\r
-// \r
-void m68KDasmWindow::keyPressEvent(QKeyEvent * e)\r
-{\r
-//     if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)\r
-//             hide();\r
-#if 0\r
-       else if (e->key() == Qt::Key_PageUp)\r
-       {\r
-               memBase -= 64;\r
-\r
-               if (memBase < 0)\r
-                       memBase = 0;\r
-\r
-               RefreshContents();\r
-       }\r
-       else if (e->key() == Qt::Key_PageDown)\r
-       {\r
-               memBase += 64;\r
-\r
-               if (memBase > (0xF00000 - 64))\r
-                       memBase = 0xF00000 - 64;\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 > (0xF00000 - 64))\r
-                       memBase = 0xF00000 - 64;\r
-\r
-               RefreshContents();\r
-       }\r
-#endif\r
-}\r
-#endif\r
-\r
-\r

 // Set mem base PC address using the 68K pc current address\r
 void   m68KDasmWindow::Use68KPCAddress(void)\r
 {\r
 // Set mem base PC address using the 68K pc current address\r
 void   m68KDasmWindow::Use68KPCAddress(void)\r
 {\r


@@ -348,18 +241,4 @@ void       m68KDasmWindow::Use68KPCAddress(void)
 void m68KDasmWindow::SetAddress(int address)\r
 {\r
        memBase = address;\r
 void m68KDasmWindow::SetAddress(int address)\r
 {\r
        memBase = address;\r

-//     RefreshContents();\r

 }\r
 }\r

-\r
-\r
-#if 0\r
-// Set mem base PC address based on user interaction\r
-void m68KDasmWindow::GoToAddress(void)\r
-{\r
-       bool ok;\r
-\r
-       QString newAddress = address->text();\r
-       memBase = newAddress.toUInt(&ok, 16);\r
-       RefreshContents();\r
-}\r
-#endif\r