libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 02:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Remove unexpected side effect from ExecStack constructor

Browse Source 
The ExecStack constructor set argp[0] to argc before. This is now moved
to the caller, to make this action more explicit.
This commit is contained in:
Willem Jan Palenstijn 2016-04-01 23:54:00 +02:00
parent 7f12638763
commit d643cb651f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP
// Check if a breakpoint is set on this method // Check if a breakpoint is set on this method
g_sci->checkExportBreakpoint(script, pubfunct); g_sci->checkExportBreakpoint(script, pubfunct);
assert(argp[0].toUint16() == argc); // The first argument is argc
ExecStack xstack(calling_obj, calling_obj, sp, argc, argp, ExecStack xstack(calling_obj, calling_obj, sp, argc, argp,
seg, make_reg32(seg, exportAddr), -1, -1, -1, pubfunct, -1, seg, make_reg32(seg, exportAddr), -1, -1, -1, pubfunct, -1,
s->_executionStack.size() - 1, EXEC_STACK_TYPE_CALL); s->_executionStack.size() - 1, EXEC_STACK_TYPE_CALL);
@ -312,6 +313,7 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt
if (activeBreakpointTypes || DebugMan.isDebugChannelEnabled(kDebugLevelScripts)) if (activeBreakpointTypes || DebugMan.isDebugChannelEnabled(kDebugLevelScripts))
debugSelectorCall(send_obj, selector, argc, argp, varp, funcp, s->_segMan, selectorType); debugSelectorCall(send_obj, selector, argc, argp, varp, funcp, s->_segMan, selectorType);
assert(argp[0].toUint16() == argc); // The first argument is argc
ExecStack xstack(work_obj, send_obj, curSP, argc, argp, ExecStack xstack(work_obj, send_obj, curSP, argc, argp,
0xFFFF, curFP, selector, -1, -1, -1, -1, 0xFFFF, curFP, selector, -1, -1, -1, -1,
origin, stackType); origin, stackType);
@ -386,6 +388,7 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
// Call kernel function // Call kernel function
if (!kernelCall.subFunctionCount) { if (!kernelCall.subFunctionCount) {
argv[-1] = make_reg(0, argc); // The first argument is argc
addKernelCallToExecStack(s, kernelCallNr, -1, argc, argv); addKernelCallToExecStack(s, kernelCallNr, -1, argc, argv);
s->r_acc = kernelCall.function(s, argc, argv); s->r_acc = kernelCall.function(s, argc, argv);
@ -444,6 +447,7 @@ static void callKernelFunc(EngineState *s, int kernelCallNr, int argc) {
} }
if (!kernelSubCall.function) if (!kernelSubCall.function)
error("[VM] k%s: subfunction ID %d requested, but not available", kernelCall.name, subId); error("[VM] k%s: subfunction ID %d requested, but not available", kernelCall.name, subId);
argv[-1] = make_reg(0, argc); // The first argument is argc
addKernelCallToExecStack(s, kernelCallNr, subId, argc, argv); addKernelCallToExecStack(s, kernelCallNr, subId, argc, argv);
s->r_acc = kernelSubCall.function(s, argc, argv); s->r_acc = kernelSubCall.function(s, argc, argv);
@ -837,8 +841,10 @@ void run_vm(EngineState *s) {
uint32 localCallOffset = s->xs->addr.pc.getOffset() + opparams[0]; uint32 localCallOffset = s->xs->addr.pc.getOffset() + opparams[0];
int final_argc = (call_base->requireUint16()) + s->r_rest;
call_base[0] = make_reg(0, final_argc); // The first argument is argc
ExecStack xstack(s->xs->objp, s->xs->objp, s->xs->sp, ExecStack xstack(s->xs->objp, s->xs->objp, s->xs->sp,
(call_base->requireUint16()) + s->r_rest, call_base, final_argc, call_base,
s->xs->local_segment, make_reg32(s->xs->addr.pc.getSegment(), localCallOffset), s->xs->local_segment, make_reg32(s->xs->addr.pc.getSegment(), localCallOffset),
NULL_SELECTOR, -1, -1, -1, localCallOffset, s->_executionStack.size() - 1, NULL_SELECTOR, -1, -1, -1, localCallOffset, s->_executionStack.size() - 1,
EXEC_STACK_TYPE_CALL); EXEC_STACK_TYPE_CALL);

1
engines/sci/engine/vm.h
View File

@ -115,7 +115,6 @@ struct ExecStack {
fp = sp = sp_; fp = sp = sp_;
argc = argc_; argc = argc_;
variables_argp = argp_; variables_argp = argp_;
*variables_argp = make_reg(0, argc); // The first argument is argc
if (localsSegment_ != 0xFFFF) if (localsSegment_ != 0xFFFF)
local_segment = localsSegment_; local_segment = localsSegment_;
else else