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

SCI: Fix send debugger command

Browse source 
svn-id: r45128
This commit is contained in:
Willem Jan Palenstijn 2009-10-15 19:24:50 +00:00
parent 21d397fdd2
commit e3aa37dde0
1 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

64
engines/sci/console.cpp
View file

@ -2219,75 +2219,61 @@ bool Console::cmdSend(int argc, const char **argv) {
reg_t object; reg_t object;
if (parse_reg_t(_vm->_gamestate, argv[1], &object)) { if (parse_reg_t(_vm->_gamestate, argv[1], &object)) {
DebugPrintf("Invalid address passed for parameter 1.\n"); DebugPrintf("Invalid address \"%s\" passed.\n", argv[1]);
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;
} }
const char *selector_name = argv[2]; const char *selector_name = argv[2];
StackPtr stackframe = _vm->_gamestate->_executionStack.front().sp; int selector_id = _vm->getKernel()->findSelector(selector_name);
int selector_id;
int i;
ExecStack *xstack;
Object *o;
reg_t fptr;
ObjVarRef varp;
selector_id = _vm->getKernel()->findSelector(selector_name);
if (selector_id < 0) { if (selector_id < 0) {
DebugPrintf("Unknown selector: \"%s\"\n", selector_name); DebugPrintf("Unknown selector: \"%s\"\n", selector_name);
return true; return true;
} }
o = _vm->_gamestate->_segMan->getObject(object); Object *o = _vm->_gamestate->_segMan->getObject(object);
if (o == NULL) { if (o == NULL) {
DebugPrintf("Address \"%04x:%04x\" is not an object\n", PRINT_REG(object)); DebugPrintf("Address \"%04x:%04x\" is not an object\n", PRINT_REG(object));
return true; return true;
} }
SelectorType selector_type = lookup_selector(_vm->_gamestate->_segMan, object, selector_id, &varp, &fptr); SelectorType selector_type = lookup_selector(_vm->_gamestate->_segMan, object, selector_id, 0, 0);
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);
return true; return true;
} }
stackframe[0] = make_reg(0, selector_id); // everything after the selector name is passed as an argument to the send
stackframe[1] = make_reg(0, argc - 3); // -object -selector name -command name int send_argc = argc - 3;
for (i = 3; i < argc; i++) { // Create the data block for send_selecor() at the top of the stack:
if (parse_reg_t(_vm->_gamestate, argv[i], &stackframe[i-1])) { // [selector_number][argument_counter][arguments...]
DebugPrintf("Invalid address passed for parameter %d.\n", i); StackPtr stackframe = _vm->_gamestate->_executionStack.back().sp;
stackframe[0] = make_reg(0, selector_id);
stackframe[1] = make_reg(0, send_argc);
for (int i = 0; i < send_argc; i++) {
if (parse_reg_t(_vm->_gamestate, argv[3+i], &stackframe[2+i])) {
DebugPrintf("Invalid address \"%s\" passed.\n", argv[3+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;
} }
} }
xstack = add_exec_stack_entry(_vm->_gamestate, fptr, // Now commit the actual function:
stackframe + argc, ExecStack *old_xstack, *xstack;
object, argc - 3, old_xstack = &_vm->_gamestate->_executionStack.back();
stackframe - 1, 0, object, xstack = send_selector(_vm->_gamestate, object, object,
_vm->_gamestate->_executionStack.size()-1, SCI_XS_CALLEE_LOCALS); stackframe + 2 + send_argc,
xstack->selector = selector_id; 2 + send_argc, stackframe);
if (selector_type == kSelectorVariable) {
xstack->addr.varp = varp; if (old_xstack != xstack) {
xstack->type = EXEC_STACK_TYPE_VARSELECTOR; _vm->_gamestate->_executionStackPosChanged = true;
} else { DebugPrintf("Message scheduled for execution\n");
xstack->addr.pc = fptr;
xstack->type = EXEC_STACK_TYPE_CALL;
} }
// Now commit the actual function: return true;
xstack = send_selector(_vm->_gamestate, object, object, stackframe, argc - 3, stackframe);
xstack->sp += argc;
xstack->fp += argc;
_vm->_gamestate->_executionStackPosChanged = true;
g_debugState.debugging = true;
return false;
} }
bool Console::cmdGo(int argc, const char **argv) { bool Console::cmdGo(int argc, const char **argv) {