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

[pidgeot at users.sourceforge.net]

Revision: 52022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52022&view=rev
Author:   pidgeot
Date:     2010-08-12 00:37:09 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
DECOMPILER: Get rid of _disassemblyDone

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp
    tools/branches/gsoc2010-decompiler/decompiler/disassembler.h

Modified: tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp	2010-08-12 00:19:28 UTC (rev 52021)
+++ tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp	2010-08-12 00:37:09 UTC (rev 52022)
@@ -24,7 +24,6 @@
 
 Disassembler::Disassembler(std::vector<Instruction> &insts) : _insts(insts) {
 	_addressBase = 0;
-	_disassemblyDone = false;
 }
 
 void Disassembler::open(const char *filename) {
@@ -39,14 +38,13 @@
 }
 
 void Disassembler::disassemble() {
-	if (!_disassemblyDone)
+	if (insts.empty()) {
+		_f.seek(0, SEEK_SET);
 		doDisassemble();
-	_disassemblyDone = true;
+	}
 }
 
 void Disassembler::dumpDisassembly(std::ostream &output) {
-	if (!_disassemblyDone)
-		doDisassemble();
-	_disassemblyDone = true;
+	disassemble();
 	doDumpDisassembly(output);
 }

Modified: tools/branches/gsoc2010-decompiler/decompiler/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/disassembler.h	2010-08-12 00:19:28 UTC (rev 52021)
+++ tools/branches/gsoc2010-decompiler/decompiler/disassembler.h	2010-08-12 00:37:09 UTC (rev 52022)
@@ -34,9 +34,6 @@
  * Base class for disassemblers.
  */
 class Disassembler {
-private:
-	bool _disassemblyDone;            ///< Indicates whether or not disassembly has already been performed.
-
 protected:
 	Common::File _f;                  ///< Used to perform file I/O.
 	std::vector<Instruction> &_insts; ///< Container for disassembled instructions.


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