thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Stop getCurrentCallOrigin from mutating stack frames

Browse source 
This fixes incorrect backtraces after a workaround failure or
other call to getCurrentCallOrigin when one or more stack frames
are calls to local procedures.
This commit is contained in:
Colin Snover 2017-02-03 09:58:57 -06:00
parent 5723f2f5fe
commit a1153661c4
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/sci/engine/state.cpp
View file

@ -390,26 +390,29 @@ SciCallOrigin EngineState::getCurrentCallOrigin() const {
const Script *localScript = _segMan->getScriptIfLoaded(xs->local_segment); const Script *localScript = _segMan->getScriptIfLoaded(xs->local_segment);
int curScriptNr = localScript->getScriptNumber(); int curScriptNr = localScript->getScriptNumber();
Selector debugSelector = xs->debugSelector;
int debugExportId = xs->debugExportId;
if (xs->debugLocalCallOffset != -1) { if (xs->debugLocalCallOffset != -1) {
// if lastcall was actually a local call search back for a real call // if lastcall was actually a local call search back for a real call
Common::List<ExecStack>::const_iterator callIterator = _executionStack.end(); Common::List<ExecStack>::const_iterator callIterator = _executionStack.end();
while (callIterator != _executionStack.begin()) { while (callIterator != _executionStack.begin()) {
callIterator--; callIterator--;
const ExecStack &loopCall = *callIterator; const ExecStack &loopCall = *callIterator;
if ((loopCall.debugSelector != -1) || (loopCall.debugExportId != -1)) { if (loopCall.debugSelector != -1 || loopCall.debugExportId != -1) {
xs->debugSelector = loopCall.debugSelector; debugSelector = loopCall.debugSelector;
xs->debugExportId = loopCall.debugExportId; debugExportId = loopCall.debugExportId;
break; break;
} }
} }
} }
if (xs->type == EXEC_STACK_TYPE_CALL) { if (xs->type == EXEC_STACK_TYPE_CALL) {
if (xs->debugSelector != -1) { if (debugSelector != -1) {
curMethodName = g_sci->getKernel()->getSelectorName(xs->debugSelector); curMethodName = g_sci->getKernel()->getSelectorName(debugSelector);
} else if (xs->debugExportId != -1) { } else if (debugExportId != -1) {
curObjectName = ""; curObjectName = "";
curMethodName = Common::String::format("export %d", xs->debugExportId); curMethodName = Common::String::format("export %d", debugExportId);
} }
} }

2
engines/sci/engine/workarounds.cpp
View file

@ -876,7 +876,7 @@ const SciWorkaroundEntry kScrollWindowAdd_workarounds[] = {
SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroundEntry *workaroundList, SciCallOrigin *trackOrigin) { SciWorkaroundSolution trackOriginAndFindWorkaround(int index, const SciWorkaroundEntry *workaroundList, SciCallOrigin *trackOrigin) {
const EngineState *state = g_sci->getEngineState(); const EngineState *state = g_sci->getEngineState();
ExecStack *lastCall = state->xs; const ExecStack *lastCall = state->xs;
const SciGameId gameId = g_sci->getGameId(); const SciGameId gameId = g_sci->getGameId();
*trackOrigin = state->getCurrentCallOrigin(); *trackOrigin = state->getCurrentCallOrigin();