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

Removed the bugged part of hle.func.scan + new comments

Browse source
This commit is contained in:
Nemoumbra 2022-10-15 16:01:12 +03:00
parent a772e87072
commit 4a967966ef
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Core/Debugger/WebSocket/HLESubscriber.cpp
View file

@ -362,9 +362,10 @@ void WebSocketHLEFuncRemove(DebuggerRequest &req) {
json.writeUint("size", funcSize);
}
// This function removes function symbols that intersect or lie inside the range
// (Note: this makes no checks whether the range is valid)
// Returns the number of removed functions
static u32 RemoveFuncSymbolsInRange(u32 addr, u32 size) {
// Note: this makes no checks whether the range is valid
u32 func_address = g_symbolMap->GetFunctionStart(addr);
if (func_address == SymbolMap::INVALID_ADDRESS) {
func_address = g_symbolMap->GetNextSymbolAddress(addr, SymbolType::ST_FUNCTION);
@ -476,7 +477,7 @@ void WebSocketHLEFuncRename(DebuggerRequest &req) {
// Parameters:
// - address: unsigned integer address for the start of the range.
// - size: unsigned integer size in bytes for scan.
// - recreate: optional bool indicating whether functions that lie inside the range must be removed before scanning
// - recreate: optional bool indicating whether functions that intersect or inside lie inside the range must be removed before scanning
//
// Response (same event name) with no extra data.
void WebSocketHLEFuncScan(DebuggerRequest &req) {
@ -504,23 +505,27 @@ void WebSocketHLEFuncScan(DebuggerRequest &req) {
return req.Fail("Address or size outside valid memory");
if (recreate) {
// let's see if the last function is partially inside our range
// The following code doesn't do what I wanted it to do AND it's debatable whether it's needed at all
// In short, I wanted to shift the start and the end of the range before removal
u32 last_func_start = g_symbolMap->GetFunctionStart(addr + size - 1);
if (last_func_start != SymbolMap::INVALID_ADDRESS) {
// there is a function
// u32 end = last_func_start + g_symbolMap->GetFunctionSize(last_func_start);
if (last_func_start + g_symbolMap->GetFunctionSize(last_func_start) != addr + size) {
size = last_func_start - addr; // decrease the size parameter
}
}
// let's see if the first function is partially inside our range
u32 start = g_symbolMap->GetFunctionStart(addr);
//// let's see if the last function is partially inside our range
//u32 last_func_start = g_symbolMap->GetFunctionStart(addr + size - 1);
//if (last_func_start != SymbolMap::INVALID_ADDRESS) {
// // there is a function
// // u32 end = last_func_start + g_symbolMap->GetFunctionSize(last_func_start);
// if (last_func_start + g_symbolMap->GetFunctionSize(last_func_start) != addr + size) {
// size = last_func_start - addr; // decrease the size parameter
// }
//}
//// let's see if the first function is partially inside our range
//u32 start = g_symbolMap->GetFunctionStart(addr);
//if (start != SymbolMap::INVALID_ADDRESS && start != addr) {
// // skip to a byte after end
// addr = start + g_symbolMap->GetFunctionSize(start);
//}
if (start != SymbolMap::INVALID_ADDRESS && start != addr) {
// skip to a byte after end
addr = start + g_symbolMap->GetFunctionSize(start);
}
RemoveFuncSymbolsInRange(addr, size);
}