ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Fix memory searches for relative values (fixes #2135)

This commit is contained in:
Vicki Pfau 2021-05-22 21:48:51 -07:00
parent b78f47b214
commit 3159f2ec56
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -12,6 +12,7 @@ Emulation fixes:
Other fixes: Other fixes:
- 3DS: Fix disabling "wide" mode on 2DS (fixes mgba.io/i/2167) - 3DS: Fix disabling "wide" mode on 2DS (fixes mgba.io/i/2167)
- Core: Fix memory leak in opening games from the library - Core: Fix memory leak in opening games from the library
- Core: Fix memory searches for relative values (fixes mgba.io/i/2135)
- GB Core: Fix GBC colors setting breaking default model overrides (fixes mgba.io/i/2161) - GB Core: Fix GBC colors setting breaking default model overrides (fixes mgba.io/i/2161)
- GBA: Fix out of bounds ROM accesses on patched ROMs smaller than 32 MiB - GBA: Fix out of bounds ROM accesses on patched ROMs smaller than 32 MiB
- Qt: Fix infrequent deadlock when using sync to video - Qt: Fix infrequent deadlock when using sync to video

60
src/core/mem-search.c
View File

@ -47,7 +47,7 @@ static size_t _search32(const void* mem, size_t size, const struct mCoreMemoryBl
res->segment = -1; // TODO res->segment = -1; // TODO
res->guessDivisor = 1; res->guessDivisor = 1;
res->guessMultiplier = 1; res->guessMultiplier = 1;
res->oldValue = value32; res->oldValue = mem32[i >> 2];
++found; ++found;
} }
} }
@ -70,7 +70,7 @@ static size_t _search16(const void* mem, size_t size, const struct mCoreMemoryBl
res->segment = -1; // TODO res->segment = -1; // TODO
res->guessDivisor = 1; res->guessDivisor = 1;
res->guessMultiplier = 1; res->guessMultiplier = 1;
res->oldValue = value16; res->oldValue = mem16[i >> 1];
++found; ++found;
} }
} }
@ -92,7 +92,7 @@ static size_t _search8(const void* mem, size_t size, const struct mCoreMemoryBlo
res->segment = -1; // TODO res->segment = -1; // TODO
res->guessDivisor = 1; res->guessDivisor = 1;
res->guessMultiplier = 1; res->guessMultiplier = 1;
res->oldValue = value8; res->oldValue = mem8[i];
++found; ++found;
} }
} }
@ -248,42 +248,46 @@ void mCoreMemorySearch(struct mCore* core, const struct mCoreMemorySearchParams*
} }
} }
bool _testGuess(struct mCore* core, struct mCoreMemorySearchResult* res, const struct mCoreMemorySearchParams* params) { bool _testSpecificGuess(struct mCore* core, struct mCoreMemorySearchResult* res, int64_t opValue, enum mCoreMemorySearchOp op) {
int64_t value;
int32_t offset = 0; int32_t offset = 0;
char* end; if (op >= mCORE_MEMORY_SEARCH_DELTA) {
if (params->op >= mCORE_MEMORY_SEARCH_DELTA) {
offset = res->oldValue; offset = res->oldValue;
} }
value = strtoll(params->valueStr, &end, 10); res->oldValue += opValue;
if (end) { int64_t value = core->rawRead8(core, res->address, res->segment);
res->oldValue += value; if (_op(value * res->guessDivisor / res->guessMultiplier - offset, opValue, op)) {
if (_op(core->rawRead8(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) { res->oldValue = value;
return true;
}
if (!(res->address & 1) && (res->width >= 2 || res->width == -1)) {
value = core->rawRead16(core, res->address, res->segment);
if (_op(value * res->guessDivisor / res->guessMultiplier - offset, opValue, op)) {
res->oldValue = value;
return true; return true;
} }
if (!(res->address & 1) && (res->width >= 2 || res->width == -1) && _op(core->rawRead16(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) { }
if (!(res->address & 3) && (res->width >= 4 || res->width == -1)) {
value = core->rawRead32(core, res->address, res->segment);
if (_op(value * res->guessDivisor / res->guessMultiplier - offset, opValue, op)) {
res->oldValue = value;
return true; return true;
} }
if (!(res->address & 3) && (res->width >= 4 || res->width == -1) && _op(core->rawRead32(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) { }
return true; res->oldValue -= opValue;
} return false;
res->oldValue -= value; }
bool _testGuess(struct mCore* core, struct mCoreMemorySearchResult* res, const struct mCoreMemorySearchParams* params) {
char* end;
int64_t value = strtoll(params->valueStr, &end, 10);
if (end && _testSpecificGuess(core, res, value, params->op)) {
return true;
} }
value = strtoll(params->valueStr, &end, 16); value = strtoll(params->valueStr, &end, 16);
if (end) { if (end && _testSpecificGuess(core, res, value, params->op)) {
res->oldValue += value; return true;
if (_op(core->rawRead8(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) {
return true;
}
if (!(res->address & 1) && (res->width >= 2 || res->width == -1) && _op(core->rawRead16(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) {
return true;
}
if (!(res->address & 3) && (res->width >= 4 || res->width == -1) && _op(core->rawRead32(core, res->address, res->segment) * res->guessDivisor / res->guessMultiplier - offset, value, params->op)) {
return true;
}
res->oldValue -= value;
} }
return false; return false;
} }