[Scummvm-cvs-logs] SF.net SVN: scummvm:[51562] tools/branches/gsoc2010-decompiler/decompiler

[pidgeot at users.sourceforge.net]

Revision: 51562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51562&view=rev
Author:   pidgeot
Date:     2010-08-01 01:59:22 +0000 (Sun, 01 Aug 2010)

Log Message:
-----------
Codegen improvements

Improve extra output detection
Don't output pop() comments in SCUMMv6 codegen

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp
    tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp

Modified: tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp	2010-08-01 01:00:30 UTC (rev 51561)
+++ tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp	2010-08-01 01:59:22 UTC (rev 51562)
@@ -187,7 +187,7 @@
 	for (InEdgeIterator ie = ier.first; ie != ier.second; ++ie) {
 		GraphVertex in = boost::source(*ie, _g);
 		GroupPtr inGroup = GET(in);
-		if (inGroup == _curGroup->_prev)
+		if (!boost::get(boost::edge_attribute, _g, *ie)._isJump)
 			continue;
 		switch (inGroup->_type) {
 		case kDoWhileCond:

Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp	2010-08-01 01:00:30 UTC (rev 51561)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp	2010-08-01 01:59:22 UTC (rev 51562)
@@ -115,7 +115,7 @@
 	case kStack:
 		// Only two opcodes in SCUMMv6, 0x1A and 0xA7: both are single item pop
 		_stack.pop();
-		addOutputLine("// pop();");
+		//addOutputLine("// pop();");
 		break;
 	case kCondJumpRel:
 		switch (_curGroup->_type) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.