libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Ensure export breakpoints always trigger on export calls

Browse Source 
Previously, export calls to non-existing functions would act like
there was never an export call, and the breakpoint would never be
triggered.
This commit is contained in:
Colin Snover 2016-10-14 13:20:04 -05:00
parent a05ae2e24a
commit c3adfc065e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sci/engine/vm.cpp
View File

@ -235,13 +235,13 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP
scr = s->_segMan->getScript(seg);
}
// Check if a breakpoint is set on this method
g_sci->checkExportBreakpoint(script, pubfunct);
uint32 exportAddr = scr->validateExportFunc(pubfunct, false);
if (!exportAddr)
return NULL;
// Check if a breakpoint is set on this method
g_sci->checkExportBreakpoint(script, pubfunct);
assert(argp[0].toUint16() == argc); // The first argument is argc
ExecStack xstack(calling_obj, calling_obj, sp, argc, argp,
seg, make_reg32(seg, exportAddr), -1, -1, -1, pubfunct, -1,