1 files changed, 13 insertions, 12 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 91795117e3..40a6fd1415 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -2630,11 +2630,11 @@ bool Console::cmdViewReference(int argc, const char **argv) {
 #endif
 				default: {
 					const SegmentRef block = _engine->_gamestate->_segMan->dereference(reg);
-					uint32 size = block.maxSize;
+					uint16 size = block.maxSize;
 
 					DebugPrintf("raw data\n");
 
-					if (reg_end.getSegment() != 0 && size < reg_end.getOffset() - reg.getOffset()) {
+					if (reg_end.getSegment() != 0 && (size < reg_end.getOffset() - reg.getOffset())) {
 						DebugPrintf("Block end out of bounds (size %d). Resetting.\n", size);
 						reg_end = NULL_REG;
 					}
@@ -2913,7 +2913,8 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
 			if (jumpTarget > farthestTarget)
 				farthestTarget = jumpTarget;
 		}
-		addr = disassemble(_engine->_gamestate, addr, printBWTag, printBytecode);
+		// TODO: Use a true 32-bit reg_t for the position (addr)
+		addr = disassemble(_engine->_gamestate, make_reg32(addr.getSegment(), addr.getOffset()), printBWTag, printBytecode);
 		if (addr.isNull() && prevAddr < farthestTarget)
 			addr = prevAddr + 1; // skip past the ret
 	} while (addr.getOffset() > 0);
@@ -2936,7 +2937,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
 	uint opCount = 1;
 	bool printBWTag = false;
 	bool printBytes = false;
-	uint32 size;
+	uint16 size;
 
 	if (parse_reg_t(_engine->_gamestate, argv[1], &vpc, false)) {
 		DebugPrintf("Invalid address passed.\n");
@@ -2960,13 +2961,9 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
 		}
 	}
 
-	if (opCount < 0) {
-		DebugPrintf("Invalid op_count\n");
-		return true;
-	}
-
 	do {
-		vpc = disassemble(_engine->_gamestate, vpc, printBWTag, printBytes);
+		// TODO: Use a true 32-bit reg_t for the position (vpc)
+		vpc = disassemble(_engine->_gamestate, make_reg32(vpc.getSegment(), vpc.getOffset()), printBWTag, printBytes);
 	} while ((vpc.getOffset() > 0) && (vpc.getOffset() + 6 < size) && (--opCount));
 
 	return true;
@@ -3657,10 +3654,14 @@ static int parse_reg_t(EngineState *s, const char *str, reg_t *dest, bool mayBeV
 		relativeOffset = true;
 
 		if (!scumm_strnicmp(str + 1, "PC", 2)) {
-			*dest = s->_executionStack.back().addr.pc;
+			// TODO: Handle 32-bit PC addresses
+			reg32_t pc = s->_executionStack.back().addr.pc;
+			*dest = make_reg(pc.getSegment(), (uint16)pc.getOffset());
 			offsetStr = str + 3;
 		} else if (!scumm_strnicmp(str + 1, "P", 1)) {
-			*dest = s->_executionStack.back().addr.pc;
+			// TODO: Handle 32-bit PC addresses
+			reg32_t pc = s->_executionStack.back().addr.pc;
+			*dest = make_reg(pc.getSegment(), (uint16)pc.getOffset());
 			offsetStr = str + 2;
 		} else if (!scumm_strnicmp(str + 1, "PREV", 4)) {
 			*dest = s->r_prev;