Merge pull request #19635 from hrydgard/more-debugger-stuff

ImDebugger: Add some new minor things
hrydgard · Nov 15, 2024 · b9ef2f6 · b9ef2f6
2 parents 6c64608 + 2eaffcf
commit b9ef2f6
Show file tree

Hide file tree

Showing 9 changed files with 207 additions and 64 deletions.
diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h
@@ -291,6 +291,7 @@ class Atrac : public AtracBase {
 	}
 
 	u8 *BufferStart();
+
 	void DoState(PointerWrap &p) override;
 	void WriteContextToPSPMem() override;
 

diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
@@ -162,14 +162,20 @@ void HLEShutdown() {
 	mipsCallActions.clear();
 }
 
-void RegisterModule(const char *name, int numFunctions, const HLEFunction *funcTable)
-{
+int GetNumRegisteredModules() {
+	return (int)moduleDB.size();
+}
+
+void RegisterModule(const char *name, int numFunctions, const HLEFunction *funcTable) {
 	HLEModule module = {name, numFunctions, funcTable};
 	moduleDB.push_back(module);
 }
 
-int GetModuleIndex(const char *moduleName)
-{
+const HLEModule *GetModuleByIndex(int index) {
+	return &moduleDB[index];
+}
+
+int GetModuleIndex(const char *moduleName) {
 	for (size_t i = 0; i < moduleDB.size(); i++)
 		if (strcmp(moduleName, moduleDB[i].name) == 0)
 			return (int)i;

diff --git a/Core/HLE/HLE.h b/Core/HLE/HLE.h
@@ -44,8 +44,7 @@ enum {
 	HLE_KERNEL_SYSCALL = 1 << 11,
 };
 
-struct HLEFunction
-{
+struct HLEFunction {
 	// This is the id, or nid, of the function (which is how it's linked.)
 	// Generally, the truncated least significant 32 bits of a SHA-1 hash.
 	u32 ID;
@@ -72,17 +71,15 @@ struct HLEFunction
 	u32 stackBytesToClear;
 };
 
-struct HLEModule
-{
+struct HLEModule {
 	const char *name;
 	int numFunctions;
 	const HLEFunction *funcTable;
 };
 
 typedef char SyscallModuleName[32];
 
-struct Syscall
-{
+struct Syscall {
 	SyscallModuleName moduleName;
 	u32 symAddr;
 	u32 nid;
@@ -102,6 +99,8 @@ int GetFuncIndex(int moduleIndex, u32 nib);
 int GetModuleIndex(const char *modulename);
 
 void RegisterModule(const char *name, int numFunctions, const HLEFunction *funcTable);
+int GetNumRegisteredModules();
+const HLEModule *GetModuleByIndex(int index);
 
 // Run the current thread's callbacks after the syscall finishes.
 void hleCheckCurrentCallbacks();

diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
@@ -75,13 +75,20 @@
 
 static const int atracDecodeDelay = 2300;
 
-const int PSP_NUM_ATRAC_IDS = 6;
 static bool atracInited = true;
 static AtracBase *atracContexts[PSP_NUM_ATRAC_IDS];
 static u32 atracContextTypes[PSP_NUM_ATRAC_IDS];
 static int atracLibVersion = 0;
 static u32 atracLibCrc = 0;
 
+// For debugger only.
+const AtracBase *__AtracGetCtx(int i, u32 *type) {
+	if (type) {
+		*type = atracContextTypes[i];
+	}
+	return atracContexts[i];
+}
+
 void __AtracInit() {
 	_assert_(sizeof(SceAtracContext) == 256);
 

diff --git a/Core/HLE/sceAtrac.h b/Core/HLE/sceAtrac.h
@@ -85,6 +85,12 @@ struct SceAtracContext {
     SceAtracIdInfo info;
 };
 
+const int PSP_NUM_ATRAC_IDS = 6;
+
+class AtracBase;
+
+const AtracBase *__AtracGetCtx(int i, u32 *type);
+
 // External interface used by sceSas.
 u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd);
 u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains);

diff --git a/Core/MIPS/MIPSStackWalk.cpp b/Core/MIPS/MIPSStackWalk.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "Common/Log.h"
 #include "Core/MemMap.h"
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
@@ -112,6 +113,7 @@ namespace MIPSStackWalk {
 			stop = start - LONGEST_FUNCTION;
 		}
 		for (u32 pc = start; Memory::IsValidAddress(pc) && pc >= stop; pc -= 4) {
+			_dbg_assert_(Memory::IsValidAddress(pc));
 			MIPSOpcode op = Memory::Read_Instruction(pc, true);
 
 			// Here's where they store the ra address.
@@ -161,7 +163,7 @@ namespace MIPSStackWalk {
 		}
 	}
 
-	std::vector<StackFrame> Walk(u32 pc, u32 ra, u32 sp, u32 threadEntry, u32 threadStackTop) {
+	std::vector<StackFrame> Walk(const u32 pc, u32 ra, u32 sp, const u32 threadEntry, u32 threadStackTop) {
 		std::vector<StackFrame> frames;
 
 		if (!Memory::IsValidAddress(pc) || !Memory::IsValidAddress(sp) || !Memory::IsValidAddress(ra)) {
@@ -175,7 +177,11 @@ namespace MIPSStackWalk {
 		current.stackSize = -1;
 
 		u32 prevEntry = INVALIDTARGET;
-		while (pc != threadEntry) {
+		while (current.pc != threadEntry) {
+			if (!Memory::IsValidAddress(current.pc)) {
+				break;
+			}
+
 			u32 possibleEntry = GuessEntry(current.pc);
 			if (DetermineFrameInfo(current, possibleEntry, threadEntry, ra)) {
 				frames.push_back(current);

diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
@@ -158,8 +158,8 @@ static bool Memory_TryBase(u32 flags) {
 		*view.out_ptr = (u8*)g_arena.CreateView(
 			position, view.size, base + view.virtual_address);
 		if (!*view.out_ptr) {
+			ERROR_LOG(Log::MemMap, "Failed at view %d", i);
 			goto bail;
-			DEBUG_LOG(Log::MemMap, "Failed at view %d", i);
 		}
 #else
 		if (CanIgnoreView(view)) {
@@ -169,7 +169,7 @@ static bool Memory_TryBase(u32 flags) {
 			*view.out_ptr = (u8*)g_arena.CreateView(
 				position, view.size, base + (view.virtual_address & MEMVIEW32_MASK));
 			if (!*view.out_ptr) {
-				DEBUG_LOG(Log::MemMap, "Failed at view %d", i);
+				ERROR_LOG(Log::MemMap, "Failed at view %d", i);
 				goto bail;
 			}
 		}
@@ -185,11 +185,11 @@ static bool Memory_TryBase(u32 flags) {
 		if (views[i].size == 0)
 			continue;
 		SKIP(flags, views[i].flags);
-		if (*views[j].out_ptr) {
+		if (views[j].out_ptr && *views[j].out_ptr) {
 			if (!CanIgnoreView(views[j])) {
 				g_arena.ReleaseView(0, *views[j].out_ptr, views[j].size);
 			}
-			*views[j].out_ptr = NULL;
+			*views[j].out_ptr = nullptr;
 		}
 	}
 	return false;