X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fdebug%2Fcpubrowser.cpp;h=62d6d0a250ebe8a958806d7443069db2113a0a84;hb=8443e5b7bdc1a8284ad85e4639a39a7fc2867d9f;hp=067755e483ed159da7c3dc6d5fe6301d6364172b;hpb=178d7f01b40cf8367cfe5b71219e6d20f60f92d4;p=virtualjaguar
diff --git a/src/gui/debug/cpubrowser.cpp b/src/gui/debug/cpubrowser.cpp
index 067755e..62d6d0a 100644
--- a/src/gui/debug/cpubrowser.cpp
+++ b/src/gui/debug/cpubrowser.cpp
@@ -17,6 +17,8 @@
#include "cpubrowser.h"
//#include "memory.h"
#include "m68000/m68kinterface.h"
+#include "dsp.h"
+#include "gpu.h"
CPUBrowserWindow::CPUBrowserWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog),
@@ -30,7 +32,7 @@ CPUBrowserWindow::CPUBrowserWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt:
// Need to set the size as well...
// resize(560, 480);
- QFont fixedFont("Lucida Console", 10, QFont::Normal);
+ QFont fixedFont("Lucida Console", 8, QFont::Normal);
text->setFont(fixedFont);
//// layout->setSizeConstraint(QLayout::SetFixedSize);
setLayout(layout);
@@ -44,9 +46,10 @@ CPUBrowserWindow::CPUBrowserWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt:
void CPUBrowserWindow::RefreshContents(void)
{
- char string[1024], buf[64];
+ char string[2048];
QString s;
+ // 68K
uint32_t m68kPC = m68k_get_reg(NULL, M68K_REG_PC);
uint32_t m68kSR = m68k_get_reg(NULL, M68K_REG_SR);
sprintf(string, "PC: %06X SR: %04X
", m68kPC, m68kSR);
@@ -77,7 +80,91 @@ void CPUBrowserWindow::RefreshContents(void)
uint32_t m68kD5 = m68k_get_reg(NULL, M68K_REG_D5);
uint32_t m68kD6 = m68k_get_reg(NULL, M68K_REG_D6);
uint32_t m68kD7 = m68k_get_reg(NULL, M68K_REG_D7);
- sprintf(string, "D4: %08X D5: %08X D6: %08X D7: %08X", m68kD4, m68kD5, m68kD6, m68kD7);
+ sprintf(string, "D4: %08X D5: %08X D6: %08X D7: %08X
", m68kD4, m68kD5, m68kD6, m68kD7);
+ s += QString(string);
+
+ // GPU
+ sprintf(string, "GPU PC: %06X FLAGS: %08X
", GPUReadLong(0xF02010), GPUReadLong(0xF02000));
+ s += QString(string);
+
+ sprintf(string, "Bank 0:
"
+ "R00: %08X R01: %08X R02: %08X R03: %08X
"
+ "R04: %08X R05: %08X R06: %08X R07: %08X
"
+ "R08: %08X R09: %08X R10: %08X R11: %08X
"
+ "R12: %08X R13: %08X R14: %08X R15: %08X
"
+ "R16: %08X R17: %08X R18: %08X R19: %08X
"
+ "R20: %08X R21: %08X R22: %08X R23: %08X
"
+ "R24: %08X R25: %08X R26: %08X R27: %08X
"
+ "R28: %08X R29: %08X R30: %08X R31: %08X
",
+ gpu_reg_bank_0[0], gpu_reg_bank_0[1], gpu_reg_bank_0[2], gpu_reg_bank_0[3],
+ gpu_reg_bank_0[4], gpu_reg_bank_0[5], gpu_reg_bank_0[6], gpu_reg_bank_0[7],
+ gpu_reg_bank_0[8], gpu_reg_bank_0[9], gpu_reg_bank_0[10], gpu_reg_bank_0[11],
+ gpu_reg_bank_0[12], gpu_reg_bank_0[13], gpu_reg_bank_0[14], gpu_reg_bank_0[15],
+ gpu_reg_bank_0[16], gpu_reg_bank_0[17], gpu_reg_bank_0[18], gpu_reg_bank_0[19],
+ gpu_reg_bank_0[20], gpu_reg_bank_0[21], gpu_reg_bank_0[22], gpu_reg_bank_0[23],
+ gpu_reg_bank_0[24], gpu_reg_bank_0[25], gpu_reg_bank_0[26], gpu_reg_bank_0[27],
+ gpu_reg_bank_0[28], gpu_reg_bank_0[29], gpu_reg_bank_0[30], gpu_reg_bank_0[31]);
+ s += QString(string);
+
+ sprintf(string, "Bank 1:
"
+ "R00: %08X R01: %08X R02: %08X R03: %08X
"
+ "R04: %08X R05: %08X R06: %08X R07: %08X
"
+ "R08: %08X R09: %08X R10: %08X R11: %08X
"
+ "R12: %08X R13: %08X R14: %08X R15: %08X
"
+ "R16: %08X R17: %08X R18: %08X R19: %08X
"
+ "R20: %08X R21: %08X R22: %08X R23: %08X
"
+ "R24: %08X R25: %08X R26: %08X R27: %08X
"
+ "R28: %08X R29: %08X R30: %08X R31: %08X
",
+ gpu_reg_bank_1[0], gpu_reg_bank_1[1], gpu_reg_bank_1[2], gpu_reg_bank_1[3],
+ gpu_reg_bank_1[4], gpu_reg_bank_1[5], gpu_reg_bank_1[6], gpu_reg_bank_1[7],
+ gpu_reg_bank_1[8], gpu_reg_bank_1[9], gpu_reg_bank_1[10], gpu_reg_bank_1[11],
+ gpu_reg_bank_1[12], gpu_reg_bank_1[13], gpu_reg_bank_1[14], gpu_reg_bank_1[15],
+ gpu_reg_bank_1[16], gpu_reg_bank_1[17], gpu_reg_bank_1[18], gpu_reg_bank_1[19],
+ gpu_reg_bank_1[20], gpu_reg_bank_1[21], gpu_reg_bank_1[22], gpu_reg_bank_1[23],
+ gpu_reg_bank_1[24], gpu_reg_bank_1[25], gpu_reg_bank_1[26], gpu_reg_bank_1[27],
+ gpu_reg_bank_1[28], gpu_reg_bank_1[29], gpu_reg_bank_1[30], gpu_reg_bank_1[31]);
+ s += QString(string);
+
+ // DSP
+ sprintf(string, "DSP PC: %06X FLAGS: %08X
", DSPReadLong(0xF1A110), DSPReadLong(0xF1A100));
+ s += QString(string);
+
+ sprintf(string, "Bank 0:
"
+ "R00: %08X R01: %08X R02: %08X R03: %08X
"
+ "R04: %08X R05: %08X R06: %08X R07: %08X
"
+ "R08: %08X R09: %08X R10: %08X R11: %08X
"
+ "R12: %08X R13: %08X R14: %08X R15: %08X
"
+ "R16: %08X R17: %08X R18: %08X R19: %08X
"
+ "R20: %08X R21: %08X R22: %08X R23: %08X
"
+ "R24: %08X R25: %08X R26: %08X R27: %08X
"
+ "R28: %08X R29: %08X R30: %08X R31: %08X
",
+ dsp_reg_bank_0[0], dsp_reg_bank_0[1], dsp_reg_bank_0[2], dsp_reg_bank_0[3],
+ dsp_reg_bank_0[4], dsp_reg_bank_0[5], dsp_reg_bank_0[6], dsp_reg_bank_0[7],
+ dsp_reg_bank_0[8], dsp_reg_bank_0[9], dsp_reg_bank_0[10], dsp_reg_bank_0[11],
+ dsp_reg_bank_0[12], dsp_reg_bank_0[13], dsp_reg_bank_0[14], dsp_reg_bank_0[15],
+ dsp_reg_bank_0[16], dsp_reg_bank_0[17], dsp_reg_bank_0[18], dsp_reg_bank_0[19],
+ dsp_reg_bank_0[20], dsp_reg_bank_0[21], dsp_reg_bank_0[22], dsp_reg_bank_0[23],
+ dsp_reg_bank_0[24], dsp_reg_bank_0[25], dsp_reg_bank_0[26], dsp_reg_bank_0[27],
+ dsp_reg_bank_0[28], dsp_reg_bank_0[29], dsp_reg_bank_0[30], dsp_reg_bank_0[31]);
+ s += QString(string);
+
+ sprintf(string, "Bank 1:
"
+ "R00: %08X R01: %08X R02: %08X R03: %08X
"
+ "R04: %08X R05: %08X R06: %08X R07: %08X
"
+ "R08: %08X R09: %08X R10: %08X R11: %08X
"
+ "R12: %08X R13: %08X R14: %08X R15: %08X
"
+ "R16: %08X R17: %08X R18: %08X R19: %08X
"
+ "R20: %08X R21: %08X R22: %08X R23: %08X
"
+ "R24: %08X R25: %08X R26: %08X R27: %08X
"
+ "R28: %08X R29: %08X R30: %08X R31: %08X
",
+ dsp_reg_bank_1[0], dsp_reg_bank_1[1], dsp_reg_bank_1[2], dsp_reg_bank_1[3],
+ dsp_reg_bank_1[4], dsp_reg_bank_1[5], dsp_reg_bank_1[6], dsp_reg_bank_1[7],
+ dsp_reg_bank_1[8], dsp_reg_bank_1[9], dsp_reg_bank_1[10], dsp_reg_bank_1[11],
+ dsp_reg_bank_1[12], dsp_reg_bank_1[13], dsp_reg_bank_1[14], dsp_reg_bank_1[15],
+ dsp_reg_bank_1[16], dsp_reg_bank_1[17], dsp_reg_bank_1[18], dsp_reg_bank_1[19],
+ dsp_reg_bank_1[20], dsp_reg_bank_1[21], dsp_reg_bank_1[22], dsp_reg_bank_1[23],
+ dsp_reg_bank_1[24], dsp_reg_bank_1[25], dsp_reg_bank_1[26], dsp_reg_bank_1[27],
+ dsp_reg_bank_1[28], dsp_reg_bank_1[29], dsp_reg_bank_1[30], dsp_reg_bank_1[31]);
s += QString(string);
text->clear();
@@ -87,7 +174,7 @@ void CPUBrowserWindow::RefreshContents(void)
void CPUBrowserWindow::keyPressEvent(QKeyEvent * e)
{
- if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+ if (e->key() == Qt::Key_Escape)
hide();
else if (e->key() == Qt::Key_PageUp)
{