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

SCI: Improve cmdSend slightly. It's still broken, though

Browse source 
svn-id: r45097
This commit is contained in:
Willem Jan Palenstijn 2009-10-14 22:41:03 +00:00
parent 984527a479
commit e6d3bb80b4
2 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/sci/console.cpp
View file

@ -2231,6 +2231,7 @@ bool Console::cmdSend(int argc, const char **argv) {
ExecStack *xstack; ExecStack *xstack;
Object *o; Object *o;
reg_t fptr; reg_t fptr;
ObjVarRef varp;
selector_id = _vm->getKernel()->findSelector(selector_name); selector_id = _vm->getKernel()->findSelector(selector_name);
@ -2245,7 +2246,7 @@ bool Console::cmdSend(int argc, const char **argv) {
return true; return true;
} }
SelectorType selector_type = lookup_selector(_vm->_gamestate->_segMan, object, selector_id, 0, &fptr); SelectorType selector_type = lookup_selector(_vm->_gamestate->_segMan, object, selector_id, &varp, &fptr);
if (selector_type == kSelectorNone) { if (selector_type == kSelectorNone) {
DebugPrintf("Object does not support selector: \"%s\"\n", selector_name); DebugPrintf("Object does not support selector: \"%s\"\n", selector_name);
@ -2256,7 +2257,7 @@ bool Console::cmdSend(int argc, const char **argv) {
stackframe[1] = make_reg(0, argc - 3); // -object -selector name -command name stackframe[1] = make_reg(0, argc - 3); // -object -selector name -command name
for (i = 3; i < argc; i++) { for (i = 3; i < argc; i++) {
if (parse_reg_t(_vm->_gamestate, argv[i], &stackframe[i])) { if (parse_reg_t(_vm->_gamestate, argv[i], &stackframe[i-1])) {
DebugPrintf("Invalid address passed for parameter %d.\n", i); DebugPrintf("Invalid address passed for parameter %d.\n", i);
DebugPrintf("Check the \"addresses\" command on how to use addresses\n"); DebugPrintf("Check the \"addresses\" command on how to use addresses\n");
return true; return true;
@ -2264,12 +2265,18 @@ bool Console::cmdSend(int argc, const char **argv) {
} }
xstack = add_exec_stack_entry(_vm->_gamestate, fptr, xstack = add_exec_stack_entry(_vm->_gamestate, fptr,
_vm->_gamestate->_executionStack.front().sp + argc, stackframe + argc,
object, argc - 3, object, argc - 3,
_vm->_gamestate->_executionStack.front().sp - 1, 0, object, stackframe - 1, 0, object,
_vm->_gamestate->_executionStack.size()-1, SCI_XS_CALLEE_LOCALS); _vm->_gamestate->_executionStack.size()-1, SCI_XS_CALLEE_LOCALS);
xstack->selector = selector_id; xstack->selector = selector_id;
xstack->type = selector_type == kSelectorVariable ? EXEC_STACK_TYPE_VARSELECTOR : EXEC_STACK_TYPE_CALL; if (selector_type == kSelectorVariable) {
xstack->addr.varp = varp;
xstack->type = EXEC_STACK_TYPE_VARSELECTOR;
} else {
xstack->addr.pc = fptr;
xstack->type = EXEC_STACK_TYPE_CALL;
}
// Now commit the actual function: // Now commit the actual function:
xstack = send_selector(_vm->_gamestate, object, object, stackframe, argc - 3, stackframe); xstack = send_selector(_vm->_gamestate, object, object, stackframe, argc - 3, stackframe);

5
engines/sci/engine/vm.cpp
View file

@ -228,13 +228,16 @@ static void _exec_varselectors(EngineState *s) {
while (!s->_executionStack.empty() && s->_executionStack.back().type == EXEC_STACK_TYPE_VARSELECTOR) { while (!s->_executionStack.empty() && s->_executionStack.back().type == EXEC_STACK_TYPE_VARSELECTOR) {
ExecStack &xs = s->_executionStack.back(); ExecStack &xs = s->_executionStack.back();
reg_t *var = xs.getVarPointer(s->_segMan); reg_t *var = xs.getVarPointer(s->_segMan);
if (!var) {
warning("Invalid varselector exec stack entry");
} else {
// varselector access? // varselector access?
if (xs.argc) { // write? if (xs.argc) { // write?
*var = xs.variables_argp[1]; *var = xs.variables_argp[1];
} else // No, read } else // No, read
s->r_acc = *var; s->r_acc = *var;
}
s->_executionStack.pop_back(); s->_executionStack.pop_back();
} }
} }