Merge branch 'hrydgard:master' into master

Author: ethanaobrien

Common/GPU/Vulkan/VulkanRenderManager.cpp

@@ -129,13 +129,15 @@ bool VKRGraphicsPipeline::Create(VulkanContext *vulkan, VkRenderPass compatibleR
 	double taken_ms_since_scheduling = (now - scheduleTime) * 1000.0;
 	double taken_ms = (now - start) * 1000.0;
 
+#ifndef _DEBUG
 	if (taken_ms < 0.1) {
 		DEBUG_LOG(Log::G3D, "Pipeline (x/%d) time on %s: %0.2f ms, %0.2f ms since scheduling (fast) rpType: %04x sampleBits: %d (%s)",
 			countToCompile, GetCurrentThreadName(), taken_ms, taken_ms_since_scheduling, (u32)rpType, (u32)sampleCount, tag_.c_str());
 	} else {
 		INFO_LOG(Log::G3D, "Pipeline (x/%d) time on %s: %0.2f ms, %0.2f ms since scheduling  rpType: %04x sampleBits: %d (%s)",
 			countToCompile, GetCurrentThreadName(), taken_ms, taken_ms_since_scheduling, (u32)rpType, (u32)sampleCount, tag_.c_str());
 	}
+#endif
 
 	bool success = true;
 	if (result == VK_INCOMPLETE) {

Common/Log.h

@@ -48,6 +48,7 @@ enum class Log {
 	HTTP,
 	Printf,
 	TexReplacement,
+	GeDebugger,
 
 	sceAudio,
 	sceCtrl,

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) {

Core/Compatibility.cpp

@@ -74,6 +74,7 @@ void Compatibility::Load(const std::string &gameID) {
 void Compatibility::Clear() {
 	memset(&flags_, 0, sizeof(flags_));
 	memset(&vrCompat_, 0, sizeof(vrCompat_));
+	activeList_.clear();
 }
 
 void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
@@ -163,18 +164,26 @@ void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, co
 		// Shortcut for debugging, sometimes useful to globally enable compat flags.
 		bool all = false;
 		iniFile.Get(option, "ALL", &all, false);
-		*flag |= all;
+		if (all) {
+			*flag |= all;
+			if (!activeList_.empty()) {
+				activeList_ += "\n";
+			}
+			activeList_ += option;
+		}
 	}
 }
 
 void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, float *flag) {
 	std::string value;
-	iniFile.Get(option, gameID.c_str(), &value, "0");
-	*flag = stof(value);
+	if (iniFile.Get(option, gameID.c_str(), &value, "0")) {
+		*flag = stof(value);
+	}
 }
 
 void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, int *flag) {
 	std::string value;
-	iniFile.Get(option, gameID.c_str(), &value, "0");
-	*flag = stof(value);
+	if (iniFile.Get(option, gameID.c_str(), &value, "0")) {
+		*flag = stof(value);
+	}
 }

Core/Compatibility.h

@@ -139,6 +139,10 @@ class Compatibility {
 
 	void Load(const std::string &gameID);
 
+	const std::string &GetActiveFlagsString() const {
+		return activeList_;
+	}
+
 private:
 	void Clear();
 	void CheckSettings(IniFile &iniFile, const std::string &gameID);
@@ -150,4 +154,5 @@ class Compatibility {
 	CompatFlags flags_{};
 	VRCompat vrCompat_{};
 	std::set<std::string> ignored_;
+	std::string activeList_;
 };

Core/Config.h

@@ -70,11 +70,13 @@ struct Config {
 	bool bFirstRun;
 	bool bGameSpecific = false;
 	bool bUpdatedInstanceCounter = false;
+	bool bBrowse;  // show a file browser on startup. TODO: Does anyone use this?
 
 	int iRunCount; // To be used to for example check for updates every 10 runs and things like that.
 
+	// Debugger
 	bool bAutoRun;  // start immediately
-	bool bBrowse; // when opening the emulator, immediately show a file browser
+	bool bBreakOnFrameTimeout;  // not saved
 
 	// General
 	bool bScreenshotsAsPNG;

Core/Core.cpp

@@ -90,7 +90,7 @@ static bool g_breakAfterFrame = false;
 static MIPSExceptionInfo g_exceptionInfo;
 
 // This is called on EmuThread before RunLoop.
-static void Core_ProcessStepping(MIPSDebugInterface *cpu);
+static bool Core_ProcessStepping(MIPSDebugInterface *cpu);
 
 void Core_SetGraphicsContext(GraphicsContext *ctx) {
 	PSP_CoreParameter().graphicsContext = ctx;
@@ -173,8 +173,10 @@ void Core_RunLoopUntil(u64 globalticks) {
 			return;
 		case CORE_STEPPING_CPU:
 		case CORE_STEPPING_GE:
-			Core_ProcessStepping(currentDebugMIPS);
-			return;
+			if (Core_ProcessStepping(currentDebugMIPS)) {
+				return;
+			}
+			break;
 		case CORE_RUNNING_CPU:
 			mipsr4k.RunLoopUntil(globalticks);
 			if (g_breakAfterFrame && coreState == CORE_NEXTFRAME) {
@@ -327,7 +329,7 @@ static void Core_PerformCPUStep(MIPSDebugInterface *cpu, CPUStepType stepType, i
 	}
 }
 
-static void Core_ProcessStepping(MIPSDebugInterface *cpu) {
+static bool Core_ProcessStepping(MIPSDebugInterface *cpu) {
 	Core_StateProcessed();
 
 	// Check if there's any pending save state actions.
@@ -336,17 +338,23 @@ static void Core_ProcessStepping(MIPSDebugInterface *cpu) {
 	switch (coreState) {
 	case CORE_STEPPING_CPU:
 	case CORE_STEPPING_GE:
+	case CORE_RUNNING_GE:
 		// All good
 		break;
 	default:
 		// Nothing to do.
-		return;
+		return true;
 	}
 
 	// Or any GPU actions.
 	// Legacy stepping code.
 	GPUStepping::ProcessStepping();
 
+	if (coreState == CORE_RUNNING_GE) {
+		// Retry, to get it done this frame.
+		return false;
+	}
+
 	// We're not inside jit now, so it's safe to clear the breakpoints.
 	static int lastSteppingCounter = -1;
 	if (lastSteppingCounter != steppingCounter) {
@@ -360,7 +368,7 @@ static void Core_ProcessStepping(MIPSDebugInterface *cpu) {
 	std::lock_guard<std::mutex> guard(g_stepMutex);
 
 	if (coreState != CORE_STEPPING_CPU || g_cpuStepCommand.empty()) {
-		return;
+		return true;
 	}
 
 	Core_ResetException();
@@ -377,6 +385,7 @@ static void Core_ProcessStepping(MIPSDebugInterface *cpu) {
 
 	// Update disasm dialog.
 	System_Notify(SystemNotification::MEM_VIEW);
+	return true;
 }
 
 // Free-threaded (hm, possibly except tracing).
@@ -415,7 +424,10 @@ void Core_Break(const char *reason, u32 relatedAddress) {
 // Free-threaded (or at least should be)
 void Core_Resume() {
 	// If the current PC is on a breakpoint, the user doesn't want to do nothing.
-	g_breakpoints.SetSkipFirst(currentMIPS->pc);
+	if (currentMIPS) {
+		g_breakpoints.SetSkipFirst(currentMIPS->pc);
+	}
+
 	// Handle resuming from GE.
 	if (coreState == CORE_STEPPING_GE) {
 		coreState = CORE_RUNNING_GE;
@@ -430,12 +442,20 @@ void Core_Resume() {
 
 // Should be called from the EmuThread.
 bool Core_NextFrame() {
+	CoreState coreState = ::coreState;
+
 	_dbg_assert_(coreState != CORE_STEPPING_GE && coreState != CORE_RUNNING_GE);
 
 	if (coreState == CORE_RUNNING_CPU) {
-		coreState = CORE_NEXTFRAME;
+		::coreState = CORE_NEXTFRAME;
+		return true;
+	} else if (coreState == CORE_STEPPING_CPU) {
+		// All good, just stepping through so no need to switch to the NextFrame coreState though, that'd
+		// just lose our stepping state.
+		INFO_LOG(Log::System, "Reached end-of-frame while stepping the CPU (this is ok)");
 		return true;
 	} else {
+		ERROR_LOG(Log::System, "Core_NextFrame called with wrong core state %s", CoreStateToString(coreState));
 		return false;
 	}
 }

Core/Core.h

@@ -26,7 +26,7 @@
 
 class GraphicsContext;
 
-// For platforms that don't call Core_Run
+// For platforms that don't call Run
 void Core_SetGraphicsContext(GraphicsContext *ctx);
 
 // Returns false when an UI exit state is detected.

Core/HLE/HLETables.cpp

@@ -97,7 +97,7 @@ const HLEFunction FakeSysCalls[] = {
 	{NID_EXTENDRETURN, __KernelReturnFromExtendStack, "__KernelReturnFromExtendStack", 'x', ""},
 	{NID_MODULERETURN, __KernelReturnFromModuleFunc, "__KernelReturnFromModuleFunc", 'x', ""},
 	{NID_IDLE, __KernelIdle, "_sceKernelIdle", 'x', ""},
-	{NID_GPUREPLAY, __KernelGPUReplay, "__KernelGPUReplay", 'x', ""},
+	{NID_GPUREPLAY, &WrapI_V<__KernelGPUReplay>, "__KernelGPUReplay", 'x', ""},
 	{NID_HLECALLRETURN, HLEReturnFromMipsCall, "HLEReturnFromMipsCall", 'x', ""},
 };
 

Core/HLE/sceKernelModule.cpp

@@ -1984,37 +1984,17 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str
 bool __KernelLoadGEDump(const std::string &base_filename, std::string *error_string) {
 	__KernelLoadReset();
 
-	mipsr4k.pc = PSP_GetUserMemoryBase();
-
-	const static u32_le runDumpCode[] = {
-		// Save the filename.
-		MIPS_MAKE_ORI(MIPS_REG_S0, MIPS_REG_A0, 0),
-		MIPS_MAKE_ORI(MIPS_REG_S1, MIPS_REG_A1, 0),
-		// Call the actual render.
-		MIPS_MAKE_SYSCALL("FakeSysCalls", "__KernelGPUReplay"),
-		// Make sure we don't get out of sync.
-		MIPS_MAKE_LUI(MIPS_REG_A0, 0),
-		MIPS_MAKE_SYSCALL("sceGe_user", "sceGeDrawSync"),
-		// Set the return address after the entry which saved the filename.
-		MIPS_MAKE_LUI(MIPS_REG_RA, mipsr4k.pc >> 16),
-		MIPS_MAKE_ADDIU(MIPS_REG_RA, MIPS_REG_RA, 8),
-		// Wait for the next vblank to render again.
-		MIPS_MAKE_JR_RA(),
-		MIPS_MAKE_SYSCALL("sceDisplay", "sceDisplayWaitVblankStart"),
-		// This never gets reached, just here to be safe.
-		MIPS_MAKE_BREAK(0),
-	};
+	const u32 codeStartAddr = PSP_GetUserMemoryBase();
+	mipsr4k.pc = codeStartAddr;
 
-	for (size_t i = 0; i < ARRAY_SIZE(runDumpCode); ++i) {
-		Memory::WriteUnchecked_U32(runDumpCode[i], mipsr4k.pc + (u32)i * sizeof(u32_le));
-	}
+	GPURecord::WriteRunDumpCode(codeStartAddr);
 
 	PSPModule *module = new PSPModule();
 	kernelObjects.Create(module);
 	loadedModules.insert(module->GetUID());
 	memset(&module->nm, 0, sizeof(module->nm));
 	module->isFake = true;
-	module->nm.entry_addr = mipsr4k.pc;
+	module->nm.entry_addr = codeStartAddr;
 	module->nm.gp_value = -1;
 
 	SceUID threadID = __KernelSetupRootThread(module->GetUID(), (int)base_filename.size(), base_filename.data(), 0x20, 0x1000, 0);
@@ -2024,17 +2004,20 @@ bool __KernelLoadGEDump(const std::string &base_filename, std::string *error_str
 	return true;
 }
 
-void __KernelGPUReplay() {
+int __KernelGPUReplay() {
 	// Special ABI: s0 and s1 are the "args".  Not null terminated.
 	const char *filenamep = Memory::GetCharPointer(currentMIPS->r[MIPS_REG_S1]);
 	if (!filenamep) {
-		ERROR_LOG(Log::G3D, "Failed to load dump filename");
+		ERROR_LOG(Log::G3D, "__KernelGPUReplay: Failed to load dump filename");
 		Core_Stop();
-		return;
+		return 0;
 	}
 
 	std::string filename(filenamep, currentMIPS->r[MIPS_REG_S0]);
-	if (!GPURecord::RunMountedReplay(filename)) {
+	GPURecord::ReplayResult result = GPURecord::RunMountedReplay(filename);
+
+	if (result == GPURecord::ReplayResult::Error) {
+		ERROR_LOG(Log::G3D, "__KernelGPUReplay: Failed running replay.");
 		Core_Stop();
 	}
 
@@ -2045,6 +2028,9 @@ void __KernelGPUReplay() {
 		System_SendDebugScreenshot(std::string((const char *)&topaddr[0], linesize * 272), 272);
 		Core_Stop();
 	}
+
+	// Return 0 for normal looping, 1 for break.
+	return result == GPURecord::ReplayResult::Break ? 1 : 0;
 }
 
 int sceKernelLoadExec(const char *filename, u32 paramPtr)