X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fdebug%2Fcpubrowser.cpp;h=9951c648a458ae5f147350b935a9544115c21964;hb=83fce768d2c1e0e16691c092ea02d64e2b280fad;hp=067755e483ed159da7c3dc6d5fe6301d6364172b;hpb=178d7f01b40cf8367cfe5b71219e6d20f60f92d4;p=virtualjaguar

diff --git a/src/gui/debug/cpubrowser.cpp b/src/gui/debug/cpubrowser.cpp
index 067755e..9951c64 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);
@@ -47,6 +49,7 @@ void CPUBrowserWindow::RefreshContents(void)
 	char string[1024], buf[64];
 	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&nbsp;&nbsp;SR: %04X<br><br>", m68kPC, m68kSR);
@@ -77,7 +80,15 @@ 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&nbsp;&nbsp;D5: %08X&nbsp;&nbsp;D6: %08X&nbsp;&nbsp;D7: %08X", m68kD4, m68kD5, m68kD6, m68kD7);
+	sprintf(string, "D4: %08X&nbsp;&nbsp;D5: %08X&nbsp;&nbsp;D6: %08X&nbsp;&nbsp;D7: %08X<br><br>", m68kD4, m68kD5, m68kD6, m68kD7);
+	s += QString(string);
+
+	// GPU
+	sprintf(string, "GPU PC: %06X&nbsp;&nbsp;FLAGS: %08X<br><br>", GPUReadLong(0xF02010), GPUReadLong(0xF02000));
+	s += QString(string);
+
+	// DSP
+	sprintf(string, "DSP PC: %06X&nbsp;&nbsp;FLAGS: %08X<br><br>", DSPReadLong(0xF1A110), DSPReadLong(0xF1A100));
 	s += QString(string);
 
 	text->clear();
@@ -87,7 +98,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)
 	{