Merge pull request hrydgard#19716 from hrydgard/more-debugger-work

More debugger code cleanup
KatyushaScarlet · Dec 10, 2024 · 2e39a88 · 2e39a88
2 parents 5f68f81 + e114848
commit 2e39a88
Show file tree

Hide file tree

Showing 16 changed files with 554 additions and 537 deletions.
diff --git a/Common/Log.h b/Common/Log.h
@@ -48,6 +48,7 @@ enum class Log {
 	HTTP,
 	Printf,
 	TexReplacement,
+	GeDebugger,
 
 	sceAudio,
 	sceCtrl,

diff --git a/Common/Log/LogManager.cpp b/Common/Log/LogManager.cpp
@@ -89,21 +89,21 @@ static const char * const g_logTypeNames[] = {
 	"HTTP",
 	"PRINTF",
 	"TEXREPLACE",
-
-		"SCEAUDIO",
-		"SCECTRL",
-		"SCEDISP",
-		"SCEFONT",
-		"SCEGE",
-		"SCEINTC",
-		"SCEIO",
-		"SCEKERNEL",
-		"SCEMODULE",
-		"SCENET",
-		"SCERTC",
-		"SCESAS",
-		"SCEUTIL",
-		"SCEMISC",
+	"DEBUGGER",
+	"SCEAUDIO",
+	"SCECTRL",
+	"SCEDISP",
+	"SCEFONT",
+	"SCEGE",
+	"SCEINTC",
+	"SCEIO",
+	"SCEKERNEL",
+	"SCEMODULE",
+	"SCENET",
+	"SCERTC",
+	"SCESAS",
+	"SCEUTIL",
+	"SCEMISC",
 };
 
 void LogManager::Init(bool *enabledSetting, bool headless) {

diff --git a/GPU/Common/GPUDebugInterface.cpp b/GPU/Common/GPUDebugInterface.cpp
@@ -533,7 +533,7 @@ bool GEExpressionFunctions::parseReference(char *str, uint32_t &referenceIndex)
 	// For now, let's just support the register bits directly.
 	GECmdInfo info;
 	if (GECmdInfoByName(str, info)) {
-		referenceIndex = info.reg;
+		referenceIndex = info.cmd;
 		return true;
 	}
 
@@ -599,8 +599,8 @@ bool GEExpressionFunctions::parseFieldReference(const char *ref, const char *fie
 	}
 
 	for (const auto &entry : fieldNames) {
-		if (entry.fmt == info.fmt && strcasecmp(field, entry.name) == 0) {
-			referenceIndex = (info.reg << 12) | (uint32_t)entry.field;
+		if (entry.fmt == info.cmdFmt && strcasecmp(field, entry.name) == 0) {
+			referenceIndex = (info.cmd << 12) | (uint32_t)entry.field;
 			return true;
 		}
 	}
@@ -624,7 +624,7 @@ bool GEExpressionFunctions::parseSymbol(char *str, uint32_t &symbolValue) {
 uint32_t GEExpressionFunctions::getReferenceValue(uint32_t referenceIndex) {
 	GPUgstate state = gpu_->GetGState();
 	if (referenceIndex < 0x100) {
-		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex)).fmt;
+		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex)).cmdFmt;
 		uint32_t value = state.cmdmem[referenceIndex];
 		if (fmt == GECmdFormat::FLOAT)
 			return value << 8;
@@ -633,7 +633,7 @@ uint32_t GEExpressionFunctions::getReferenceValue(uint32_t referenceIndex) {
 
 	if (referenceIndex >= (uint32_t)GEReferenceIndex::FIELD_START && referenceIndex <= (uint32_t)GEReferenceIndex::FIELD_END) {
 		uint32_t value = state.cmdmem[referenceIndex >> 12] & 0x00FFFFFF;
-		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex >> 12)).fmt;
+		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex >> 12)).cmdFmt;
 		return getFieldValue(fmt, GECmdField(referenceIndex & 0xFF), value);
 	}
 
@@ -898,14 +898,14 @@ uint32_t GEExpressionFunctions::getFieldValue(GECmdFormat fmt, GECmdField field,
 
 ExpressionType GEExpressionFunctions::getReferenceType(uint32_t referenceIndex) {
 	if (referenceIndex < 0x100) {
-		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex)).fmt;
+		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex)).cmdFmt;
 		if (fmt == GECmdFormat::FLOAT)
 			return EXPR_TYPE_FLOAT;
 		return EXPR_TYPE_UINT;
 	}
 
 	if (referenceIndex >= (uint32_t)GEReferenceIndex::FIELD_START && referenceIndex <= (uint32_t)GEReferenceIndex::FIELD_END) {
-		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex >> 12)).fmt;
+		GECmdFormat fmt = GECmdInfoByCmd(GECommand(referenceIndex >> 12)).cmdFmt;
 		return getFieldType(fmt, GECmdField(referenceIndex & 0xFF));
 	}
 

diff --git a/GPU/Debugger/Breakpoints.h b/GPU/Debugger/Breakpoints.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <string>
 #include "Common/CommonTypes.h"
 
 namespace GPUBreakpoints {

diff --git a/GPU/Debugger/Debugger.cpp b/GPU/Debugger/Debugger.cpp
@@ -163,7 +163,7 @@ NotifyResult NotifyCommand(u32 pc) {
 	}
 
 	if (isBreakpoint && pc == g_skipPcOnce) {
-		INFO_LOG(Log::G3D, "Skipping break at %08x (last break was here)", g_skipPcOnce);
+		INFO_LOG(Log::GeDebugger, "Skipping GE break at %08x (last break was here)", g_skipPcOnce);
 		g_skipPcOnce = 0;
 		return process ? NotifyResult::Execute : NotifyResult::Skip;
 	}
@@ -179,10 +179,10 @@ NotifyResult NotifyCommand(u32 pc) {
 
 		auto info = gpuDebug->DisassembleOp(pc);
 		if (lastStepTime >= 0.0) {
-			NOTICE_LOG(Log::G3D, "Waiting at %08x, %s (%fms)", pc, info.desc.c_str(), (time_now_d() - lastStepTime) * 1000.0);
+			NOTICE_LOG(Log::GeDebugger, "Waiting at %08x, %s (%fms)", pc, info.desc.c_str(), (time_now_d() - lastStepTime) * 1000.0);
 			lastStepTime = -1.0;
 		} else {
-			NOTICE_LOG(Log::G3D, "Waiting at %08x, %s", pc, info.desc.c_str());
+			NOTICE_LOG(Log::GeDebugger, "Waiting at %08x, %s", pc, info.desc.c_str());
 		}
 
 		g_skipPcOnce = pc;
@@ -199,10 +199,10 @@ void NotifyDraw() {
 		return;
 	if (breakNext == BreakNext::DRAW && !GPUStepping::IsStepping()) {
 		if (lastStepTime >= 0.0) {
-			NOTICE_LOG(Log::G3D, "Waiting at a draw (%fms)", (time_now_d() - lastStepTime) * 1000.0);
+			NOTICE_LOG(Log::GeDebugger, "Waiting at a draw (%fms)", (time_now_d() - lastStepTime) * 1000.0);
 			lastStepTime = -1.0;
 		} else {
-			NOTICE_LOG(Log::G3D, "Waiting at a draw");
+			NOTICE_LOG(Log::GeDebugger, "Waiting at a draw");
 		}
 		g_drawNotified = true;
 	}