DIRECTOR: Lingo: Added generated script decompilation

scummvm · Aug 19, 2016 · 21d4d0a · 21d4d0a
1 parent 1abbe6b
commit 21d4d0a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
@@ -71,7 +71,7 @@ void Lingo::execute(int pc) {
 	}
 }
 
-Common::String Lingo::decodeInstruction(int pc) {
+Common::String Lingo::decodeInstruction(int pc, int *newPc) {
 	Symbol sym;
 	Common::String res;
 
@@ -118,6 +118,9 @@ Common::String Lingo::decodeInstruction(int pc) {
 		res = "<unknown>";
 	}
 
+	if (newPc)
+		*newPc = pc;
+
 	return res;
 }
 

diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
@@ -181,6 +181,14 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
 
 			parse(chunk.c_str());
 
+			if (debugChannelSet(3, kDebugLingoCompile)) {
+				int pc = 0;
+				while (pc < _currentScript->size()) {
+					Common::String instr = decodeInstruction(pc, &pc);
+					debugC(3, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str());
+				}
+			}
+
 			_currentScript->clear();
 
 			begin = end;
@@ -201,6 +209,12 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
 	if (debugChannelSet(3, kDebugLingoCompile)) {
 		if (_currentScript->size() && !_hadError)
 			Common::hexdump((byte *)&_currentScript->front(), _currentScript->size() * sizeof(inst));
+
+		int pc = 0;
+		while (pc < _currentScript->size()) {
+			Common::String instr = decodeInstruction(pc, &pc);
+			debugC(3, kDebugLingoCompile, "[%5d] %s", pc, instr.c_str());
+		}
 	}
 }
 

diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
@@ -180,7 +180,7 @@ class Lingo {
 
 	void addCode(const char *code, ScriptType type, uint16 id);
 	void executeScript(ScriptType type, uint16 id);
-	Common::String decodeInstruction(int pc);
+	Common::String decodeInstruction(int pc, int *newPC = NULL);
 
 	void processEvent(LEvent event, int entityId);