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

pidgeot at users.sourceforge.net pidgeot at users.sourceforge.net
Thu Aug 5 20:36:28 CEST 2010


Revision: 51761
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51761&view=rev
Author:   pidgeot
Date:     2010-08-05 18:36:28 +0000 (Thu, 05 Aug 2010)

Log Message:
-----------
Only designate full script as single function if
CFG-based function detection not requested

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp

Modified: tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp	2010-08-05 17:33:06 UTC (rev 51760)
+++ tools/branches/gsoc2010-decompiler/decompiler/control_flow.cpp	2010-08-05 18:36:28 UTC (rev 51761)
@@ -38,7 +38,7 @@
 ControlFlow::ControlFlow(const std::vector<Instruction> &insts, Engine *engine) : _insts(insts) {
 	_engine = engine;
 
-	if (engine->_functions.empty())
+	if (engine->_functions.empty() && !_engine->detectMoreFuncs())
 		engine->_functions[insts.begin()->_address] = Function(insts.begin(), insts.end());
 
 	GroupPtr prev = NULL;


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




More information about the Scummvm-git-logs mailing list