Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix regression in break-on-load functionality

Browse source
This commit is contained in:
Henrik Rydgård 2024-12-06 00:40:21 +01:00
parent 9297d2fc49
commit 6adf8cabae
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Core.cpp
View file

@ -323,7 +323,7 @@ void Core_ProcessStepping(MIPSDebugInterface *cpu) {
// Free-threaded (hm, possibly except tracing).
void Core_Break(const char *reason, u32 relatedAddress) {
if (coreState != CORE_RUNNING_CPU) {
ERROR_LOG(Log::CPU, "Core_Break ony works in the CORE_RUNNING_CPU state");
ERROR_LOG(Log::CPU, "Core_Break only works in the CORE_RUNNING_CPU state");
return;
}

9
Core/PSPLoaders.cpp
View file

@ -326,7 +326,8 @@ bool Load_PSP_ISO(FileLoader *fileLoader, std::string *error_string) {
bool success = __KernelLoadExec(bootpath.c_str(), 0, &PSP_CoreParameter().errorString);
if (success && coreState == CORE_POWERUP) {
if (PSP_CoreParameter().startBreak) {
Core_Break("start-break");
coreState = CORE_STEPPING_CPU;
System_Notify(SystemNotification::DEBUG_MODE_CHANGE);
} else {
coreState = CORE_RUNNING_CPU;
}
@ -487,7 +488,8 @@ bool Load_PSP_ELF_PBP(FileLoader *fileLoader, std::string *error_string) {
bool success = __KernelLoadExec(finalName.c_str(), 0, &PSP_CoreParameter().errorString);
if (success && coreState == CORE_POWERUP) {
if (PSP_CoreParameter().startBreak) {
Core_Break("start-break");
coreState = CORE_STEPPING_CPU;
System_Notify(SystemNotification::DEBUG_MODE_CHANGE);
} else {
coreState = CORE_RUNNING_CPU;
}
@ -517,7 +519,8 @@ bool Load_PSP_GE_Dump(FileLoader *fileLoader, std::string *error_string) {
bool success = __KernelLoadGEDump("disc0:/data.ppdmp", &PSP_CoreParameter().errorString);
if (success && coreState == CORE_POWERUP) {
if (PSP_CoreParameter().startBreak) {
Core_Break("start-break");
coreState = CORE_STEPPING_CPU;
System_Notify(SystemNotification::DEBUG_MODE_CHANGE);
} else {
coreState = CORE_RUNNING_CPU;
}