SCI: Some debugger fixes and cleanup.

svn-id: r40732

4 files changed, 58 insertions, 40 deletions

diff --git a/engines/sci/engine/sciconsole.cpp b/engines/sci/engine/sciconsole.cpp
index 2a116506c2..ac2bb8c5e6 100644
--- a/engines/sci/engine/sciconsole.cpp
+++ b/engines/sci/engine/sciconsole.cpp
@@ -328,21 +328,19 @@ int parse_reg_t(EngineState *s, const char *str, reg_t *dest) { // Returns 0 on
 				}
 
 				if (valid) {
-					char *objname = (char *)obj->base
-					                + obj->_variables[SCRIPT_NAME_SELECTOR].offset;
+					const char *objname = obj_get_name(s, objpos);
 					if (!strcmp(objname, str_objname)) {
 						// Found a match!
-						if (index < 0 ||
-						        times_found == index)
-							*dest = objpos;
-						else if (times_found < 0 && index) {
-							if (index == 1) {
+						if ((index < 0) && (times_found > 0)) {
+							if (times_found == 1) {
 								// First time we realized the ambiguity
 								sciprintf("Ambiguous:\n");
 								sciprintf("  %3x: ["PREG"] %s\n", 0, PRINT_REG(*dest), str_objname);
 							}
-							sciprintf("  %3x: ["PREG"] %s\n", index, PRINT_REG(objpos), str_objname);
+							sciprintf("  %3x: ["PREG"] %s\n", times_found, PRINT_REG(objpos), str_objname);
 						}
+						if (index < 0 || times_found == index)
+							*dest = objpos;
 						++times_found;
 					}
 				}
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 171c1435ea..3407fc5b08 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -89,11 +89,12 @@ char inputbuf[256] = "";
 		+ s->_classtable[species].class_offset)
 #endif
 
-const char *_debug_get_input_default() {
+static const char *_debug_get_input() {
 	char newinpbuf[256];
 	
 	printf("> ");
-	fgets(newinpbuf, 254, stdin);
+	if (!fgets(newinpbuf, 254, stdin))
+		return NULL;
 
 	size_t l = strlen(newinpbuf);
 	if (l > 0 && newinpbuf[0] != '\n') {
@@ -276,8 +277,6 @@ int c_sfx_01_track(EngineState *s, const Common::Array<cmd_param_t> &cmdParams)
 	return 0;
 }
 
-const char *(*_debug_get_input)(void) = _debug_get_input_default;
-
 int c_segtable(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	uint i;
 
@@ -341,8 +340,13 @@ int c_segtable(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	return 0;
 }
 
-static void print_obj_head(EngineState *s, Object *obj) {
-	sciprintf(PREG" %s : %3d vars, %3d methods\n", PRINT_REG(obj->pos), obj_get_name(s, obj->pos),
+static void print_obj_head(EngineState *s, reg_t pos) {
+	Object *obj = obj_get(s, pos);
+
+	if (!obj)
+		return;
+
+	sciprintf("["PREG"] %s : %3d vars, %3d methods\n", PRINT_REG(pos), obj_get_name(s, pos),
 				obj->_variables.size(), obj->methods_nr);
 }
 
@@ -380,7 +384,14 @@ static void print_list(EngineState *s, List *l) {
 	sciprintf("\t>\n");
 }
 
-static void _c_single_seg_info(EngineState *s, MemObject *mobj) {
+static bool _c_single_seg_info(EngineState *s, int nr) {
+	sciprintf("[%04x] ", nr);
+
+	if ((nr < 0) || ((uint)nr >= s->seg_manager->_heap.size()) || !s->seg_manager->_heap[nr])
+		return false;
+
+	MemObject *mobj = s->seg_manager->_heap[nr];
+
 	switch (mobj->getType()) {
 
 	case MEM_OBJ_SCRIPT: {
@@ -401,7 +412,7 @@ static void _c_single_seg_info(EngineState *s, MemObject *mobj) {
 		sciprintf("  Objects: %4d\n", scr->_objects.size());
 		for (uint i = 0; i < scr->_objects.size(); i++) {
 			sciprintf("    ");
-			print_obj_head(s, &scr->_objects[i]);
+			print_obj_head(s, scr->_objects[i].pos);
 		}
 	}
 	break;
@@ -439,8 +450,11 @@ static void _c_single_seg_info(EngineState *s, MemObject *mobj) {
 
 		for (uint i = 0; i < ct->_table.size(); i++)
 			if (ct->isValidEntry(i)) {
-				sciprintf("  [%04x] ", i);
-				print_obj_head(s, &(ct->_table[i]));
+				reg_t objpos;
+				objpos.offset = i;
+				objpos.segment = nr;
+				sciprintf("  [%04x] %s; copy of ", i, obj_get_name(s, objpos));
+				print_obj_head(s, ct->_table[i].pos);
 			}
 	}
 	break;
@@ -490,6 +504,9 @@ static void _c_single_seg_info(EngineState *s, MemObject *mobj) {
 		sciprintf("Invalid type %d\n", mobj->getType());
 		break;
 	}
+
+	sciprintf("\n");
+	return true;
 }
 
 static int show_node(EngineState *s, reg_t addr) {
@@ -665,21 +682,14 @@ int c_seginfo(EngineState *s, const Common::Array<cmd_param_t> &cmdParams) {
 	if (cmdParams.size()) {
 		while (i < cmdParams.size()) {
 			int nr = cmdParams[i++].val;
-			if (nr < 0 || (uint)nr >= s->seg_manager->_heap.size() || !s->seg_manager->_heap[nr]) {
+			if (!_c_single_seg_info(s, nr))
 				sciprintf("Segment %04x does not exist\n", nr);
-				return 1;
-			}
-			sciprintf("[%04x] ", nr);
-			_c_single_seg_info(s, s->seg_manager->_heap[nr]);
 		}
-	} else
+	} else {
 		for (i = 0; i < s->seg_manager->_heap.size(); i++) {
-			if (s->seg_manager->_heap[i]) {
-				sciprintf("[%04x] ", i);
-				_c_single_seg_info(s, s->seg_manager->_heap[i]);
-				sciprintf("\n");
-			}
+			_c_single_seg_info(s, i);
 		}
+	}
 
 	return 0;
 }
@@ -2526,25 +2536,31 @@ int objinfo(EngineState *s, reg_t pos) {
 	Object *var_container = obj;
 	int i;
 
-	sciprintf("["PREG"]: ", PRINT_REG(pos));
 	if (!obj) {
-		sciprintf("Not an object.");
+		sciprintf("["PREG"]: Not an object.", PRINT_REG(pos));
 		return 1;
 	}
 
-	print_obj_head(s, obj);
+	print_obj_head(s, pos);
 
 	if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS))
 		var_container = obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
 	sciprintf("  -- member variables:\n");
 	for (i = 0; (uint)i < obj->_variables.size(); i++) {
 		sciprintf("    ");
-		if (i < var_container->variable_names_nr)
+		if (i < var_container->variable_names_nr) {
 			sciprintf("[%03x] %s = ", VM_OBJECT_GET_VARSELECTOR(var_container, i), selector_name(s, VM_OBJECT_GET_VARSELECTOR(var_container, i)));
-		else
+		} else
 			sciprintf("p#%x = ", i);
 
-		sciprintf(PREG"\n", PRINT_REG(obj->_variables[i]));
+		reg_t val = obj->_variables[i];
+		sciprintf(PREG, PRINT_REG(val));
+
+		Object *ref = obj_get(s, val);
+		if (ref)
+			sciprintf(" (%s)", obj_get_name(s, val));
+
+		sciprintf("\n");
 	}
 	sciprintf("  -- methods:\n");
 	for (i = 0; i < obj->methods_nr; i++) {
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index a9fddac956..1c3917fc69 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -2075,11 +2075,18 @@ Object *obj_get(EngineState *s, reg_t offset) {
 
 const char *obj_get_name(EngineState *s, reg_t pos) {
 	Object *obj = obj_get(s, pos);
-
 	if (!obj)
 		return "<no such object>";
 
-	return (const char *)(obj->base + obj->_variables[SCRIPT_NAME_SELECTOR].offset);
+	reg_t nameReg = obj->_variables[SCRIPT_NAME_SELECTOR];
+	if (nameReg.isNull())
+		return "<no name>";
+
+	const char *name = (const char*)s->seg_manager->dereference(obj->_variables[SCRIPT_NAME_SELECTOR], NULL);
+	if (!name)
+		return "<invalid name>";
+
+	return name;
 }
 
 void quit_vm() {
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index e9737195a1..470e25cc8c 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -815,9 +815,6 @@ extern int script_gc_interval;
 extern int script_step_counter;
 
 
-/** The function used to get input for debugging */
-extern const char *(*_debug_get_input)(void);
-
 extern int _debugstate_valid;
 extern int _debug_seeking;
 extern int _debug_step_running;