[Scummvm-cvs-logs] SF.net SVN: scummvm:[52001] tools/branches/gsoc2010-decompiler
pidgeot at users.sourceforge.net
pidgeot at users.sourceforge.net
Wed Aug 11 22:47:41 CEST 2010
Revision: 52001
http://scummvm.svn.sourceforge.net/scummvm/?rev=52001&view=rev
Author: pidgeot
Date: 2010-08-11 20:47:41 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
DECOMPILER: Rename types, Kyra directory
Modified Paths:
--------------
tools/branches/gsoc2010-decompiler/Makefile.common
tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.h
tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.h
tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.h
tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h
tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h
tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h
tools/branches/gsoc2010-decompiler/decompiler/test/cfg_test.h
tools/branches/gsoc2010-decompiler/decompiler/test/codegen.h
tools/branches/gsoc2010-decompiler/decompiler/test/disassembler_test.h
Added Paths:
-----------
tools/branches/gsoc2010-decompiler/decompiler/kyra2/
Removed Paths:
-------------
tools/branches/gsoc2010-decompiler/decompiler/kyra/
Modified: tools/branches/gsoc2010-decompiler/Makefile.common
===================================================================
--- tools/branches/gsoc2010-decompiler/Makefile.common 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/Makefile.common 2010-08-11 20:47:41 UTC (rev 52001)
@@ -238,9 +238,9 @@
decompiler/scummv6/disassembler.o \
decompiler/scummv6/engine.o \
decompiler/scummv6/codegen.o \
- decompiler/kyra/disassembler.o \
- decompiler/kyra/engine.o \
- decompiler/kyra/codegen.o
+ decompiler/kyra2/disassembler.o \
+ decompiler/kyra2/engine.o \
+ decompiler/kyra2/codegen.o
decompile_LIBS := \
-lboost_program_options
Modified: tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -27,7 +27,7 @@
#include "control_flow.h"
-#include "kyra/engine.h"
+#include "kyra2/engine.h"
#include "scummv6/engine.h"
#include <fstream>
@@ -44,8 +44,8 @@
std::map<std::string, std::string> engines;
ObjectFactory<Engine> engineFactory;
- ENGINE("kyra2", "Legend of Kyrandia: Hand of Fate", Kyra::Engine);
- ENGINE("scummv6", "SCUMM v6", Scumm::v6::Engine);
+ ENGINE("kyra2", "Legend of Kyrandia: Hand of Fate", Kyra::Kyra2Engine);
+ ENGINE("scummv6", "SCUMM v6", Scumm::v6::Scummv6Engine);
po::options_description visible("Options");
visible.add_options()
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.cpp 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -23,7 +23,7 @@
#include "codegen.h"
#include "engine.h"
-std::string Kyra::CodeGenerator::constructFuncSignature(const Function &func) {
+std::string Kyra::Kyra2CodeGenerator::constructFuncSignature(const Function &func) {
std::stringstream s;
s << func._name << "(";
for (uint32 i = 0; i != func._args; ++i) {
@@ -35,7 +35,7 @@
return s.str();
}
-void Kyra::CodeGenerator::processInst(const Instruction inst) {
+void Kyra::Kyra2CodeGenerator::processInst(const Instruction inst) {
switch (inst._type) {
case kLoad:
switch (inst._opcode) {
@@ -189,7 +189,7 @@
}
}
-const Instruction &Kyra::CodeGenerator::findFirstCall() {
+const Instruction &Kyra::Kyra2CodeGenerator::findFirstCall() {
ConstInstIterator it = _curGroup->_start;
do {
if (it->_type == kCall || (it->_type == kSpecial && it->_opcode == 14))
@@ -199,7 +199,7 @@
return *_curGroup->_start;
}
-const Instruction &Kyra::CodeGenerator::findLastCall() {
+const Instruction &Kyra::Kyra2CodeGenerator::findLastCall() {
ConstInstIterator it = _curGroup->_end;
do {
if (it->_type == kCall || (it->_type == kSpecial && it->_opcode == 14))
@@ -209,7 +209,7 @@
return *_curGroup->_end;
}
-void Kyra::CodeGenerator::processSpecialMetadata(const Instruction inst, char c) {
+void Kyra::Kyra2CodeGenerator::processSpecialMetadata(const Instruction inst, char c) {
switch (c) {
case '0':
_stackOffset = 0;
@@ -222,7 +222,7 @@
EntryPtr p = _stack.peekPos(_stackOffset++);
if (p->_type == seInt) {
IntEntry *ie = (IntEntry *)p.get();
- addArg(new StringEntry(((Kyra::Engine *)_engine)->_textStrings[ie->getValue()]));
+ addArg(new StringEntry(((Kyra::Kyra2Engine *)_engine)->_textStrings[ie->getValue()]));
} else {
EntryList idxs;
idxs.push_front(p);
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.h 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/codegen.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -30,7 +30,7 @@
/**
* KYRA code generator.
*/
-class CodeGenerator : public ::CodeGenerator {
+class Kyra2CodeGenerator : public ::CodeGenerator {
private:
int _stackOffset; ///< Running count of where in the stack to look for the next argument.
@@ -53,12 +53,12 @@
const Instruction &findLastCall();
public:
/**
- * Constructor for Kyra::CodeGenerator.
+ * Constructor for Kyra2CodeGenerator.
*
* @param engine Pointer to the Engine used for the script.
* @param output The std::ostream to output the code to.
*/
- CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kLIFO, kLIFO) {}
+ Kyra2CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kLIFO, kLIFO) {}
protected:
void processInst(const Instruction inst);
virtual void processSpecialMetadata(const Instruction inst, char c);
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -31,7 +31,7 @@
_metadata = metadata;
}
-void Kyra::Disassembler::setupKyra2Funcs() {
+void Kyra::Kyra2Disassembler::setupKyra2Funcs() {
_funcCount = 176;
_funcs = new FunctionData[_funcCount];
int i = 0;
@@ -264,11 +264,11 @@
_data = NULL;
}
-Kyra::Disassembler::Disassembler(Engine *engine, std::vector<Instruction> &insts) : ::Disassembler(insts), _engine(engine) {
+Kyra::Kyra2Disassembler::Kyra2Disassembler(Kyra2Engine *engine, std::vector<Instruction> &insts) : ::Disassembler(insts), _engine(engine) {
setupKyra2Funcs();
}
-Kyra::Disassembler::~Disassembler() {
+Kyra::Kyra2Disassembler::~Kyra2Disassembler() {
if (_textChunk._data)
delete[] _textChunk._data;
if (_ordrChunk._data)
@@ -278,7 +278,7 @@
delete[] _funcs;
}
-void Kyra::Disassembler::doDisassemble() throw(UnknownOpcodeException) {
+void Kyra::Kyra2Disassembler::doDisassemble() throw(UnknownOpcodeException) {
// Load data
IFF_ID id;
id = _f.readUint32BE();
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/disassembler.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -67,18 +67,18 @@
namespace Kyra {
-class Engine;
+class Kyra2Engine;
/**
* Disassembler for KYRA.
*/
-class Disassembler : public ::Disassembler {
+class Kyra2Disassembler : public ::Disassembler {
private:
IFF_ID _formType; ///< File type as listed in the IFF formatted file.
IFFChunk _textChunk; ///< Contents of the TEXT chunk.
IFFChunk _ordrChunk; ///< Contents of the ORDR chunk.
IFFChunk _dataChunk; ///< Contents of the DATA chunk.
- Engine *_engine; ///< Pointer to the Kyra::Engine used for this script.
+ Kyra2Engine *_engine; ///< Pointer to the Kyra::Kyra2Engine used for this script.
uint32 _funcCount; ///< Number of functions in the _funcs array.
FunctionData *_funcs; ///< Array of function data.
@@ -88,13 +88,13 @@
void setupKyra2Funcs();
public:
/**
- * Constructor for Disassembler.
+ * Constructor for Kyra2Disassembler.
*
- * @param engine Pointer to the Kyra::Engine used for this script.
+ * @param engine Pointer to the Kyra::Kyra2Engine used for this script.
* @param insts Reference to the vector in which disassembled instructions should be placed.
*/
- Disassembler(Engine *engine, std::vector<Instruction> &insts);
- ~Disassembler();
+ Kyra2Disassembler(Kyra2Engine *engine, std::vector<Instruction> &insts);
+ ~Kyra2Disassembler();
void doDisassemble() throw(UnknownOpcodeException);
};
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -28,19 +28,19 @@
#include <sstream>
#include <boost/format.hpp>
-::Disassembler *Kyra::Engine::getDisassembler(std::vector<Instruction> &insts) {
- return new Disassembler(this, insts);
+::Disassembler *Kyra::Kyra2Engine::getDisassembler(std::vector<Instruction> &insts) {
+ return new Kyra2Disassembler(this, insts);
}
-uint32 Kyra::Engine::getDestAddress(ConstInstIterator it) const {
+uint32 Kyra::Kyra2Engine::getDestAddress(ConstInstIterator it) const {
return it->_params[0].getUnsigned();
}
-::CodeGenerator *Kyra::Engine::getCodeGenerator(std::ostream &output) {
- return new CodeGenerator(this, output);
+::CodeGenerator *Kyra::Kyra2Engine::getCodeGenerator(std::ostream &output) {
+ return new Kyra2CodeGenerator(this, output);
}
-void Kyra::Engine::postCFG(std::vector<Instruction> &insts, Graph g) {
+void Kyra::Kyra2Engine::postCFG(std::vector<Instruction> &insts, Graph g) {
// Add metadata to functions
for (FuncMap::iterator it = _functions.begin(); it != _functions.end(); ++it) {
std::stringstream s;
@@ -62,6 +62,6 @@
}
}
-bool Kyra::Engine::detectMoreFuncs() {
+bool Kyra::Kyra2Engine::detectMoreFuncs() {
return true;
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h 2010-08-11 12:50:18 UTC (rev 51978)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra2/engine.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -33,7 +33,7 @@
/**
* KYRA engine.
*/
-class Engine : public ::Engine {
+class Kyra2Engine : public ::Engine {
public:
::Disassembler *getDisassembler(std::vector<Instruction> &insts);
uint32 getDestAddress(ConstInstIterator it) const;
@@ -44,6 +44,6 @@
std::vector<std::string> _textStrings; ///< Container for strings from the TEXT chunk.
};
-} // End of namespace KYRA
+} // End of namespace Kyra
#endif
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -22,7 +22,7 @@
#include "codegen.h"
-EntryPtr Scumm::v6::CodeGenerator::createListEntry() {
+EntryPtr Scumm::v6::Scummv6CodeGenerator::createListEntry() {
EntryList list;
EntryPtr countEntry = _stack.pop();
std::stringstream s;
@@ -34,7 +34,7 @@
return new ListEntry(list);
}
-void Scumm::v6::CodeGenerator::processInst(const Instruction inst) {
+void Scumm::v6::Scummv6CodeGenerator::processInst(const Instruction inst) {
// This is just to keep some order in this code and have related
// opcodes near each other. It's not strictly necessary, because we
// can just look directly at the opcode, but this should be easier
@@ -389,13 +389,13 @@
NULL,
};
-const char *Scumm::v6::CodeGenerator::getVarName(uint16 varID) {
+const char *Scumm::v6::Scummv6CodeGenerator::getVarName(uint16 varID) {
if (varID >= sizeof(var_names) / sizeof(var_names[0]))
return NULL;
return var_names[varID];
}
-std::string Scumm::v6::CodeGenerator::decodeVarName(uint16 varID) {
+std::string Scumm::v6::Scummv6CodeGenerator::decodeVarName(uint16 varID) {
std::stringstream s;
if (!(varID & 0xF000)) {
uint16 var = varID & 0xFFF;
@@ -414,7 +414,7 @@
return s.str();
}
-std::string Scumm::v6::CodeGenerator::decodeArrayName(uint16 arrID) {
+std::string Scumm::v6::Scummv6CodeGenerator::decodeArrayName(uint16 arrID) {
std::stringstream s;
const char *varName;
if (!(arrID & 0xF000) && (varName = getVarName(arrID & 0xFFF)) != NULL)
@@ -423,7 +423,7 @@
return s.str();
}
-void Scumm::v6::CodeGenerator::processSpecialMetadata(const Instruction inst, char c) {
+void Scumm::v6::Scummv6CodeGenerator::processSpecialMetadata(const Instruction inst, char c) {
switch (c) {
// All of these meanings are taken from descumm.
case 'l':
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -32,7 +32,7 @@
/**
* SCUMMv6 code generator.
*/
-class CodeGenerator : public ::CodeGenerator {
+class Scummv6CodeGenerator : public ::CodeGenerator {
private:
/**
* Get the name associated with a variable ID.
@@ -71,7 +71,7 @@
* @param engine Pointer to the Engine used for the script.
* @param output The std::ostream to output the code to.
*/
- CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kFIFO, kFIFO) {}
+ Scummv6CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kFIFO, kFIFO) {}
protected:
void processInst(const Instruction inst);
virtual void processSpecialMetadata(const Instruction inst, char c);
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -27,10 +27,10 @@
#include "disassembler.h"
-Scumm::v6::Disassembler::Disassembler(std::vector<Instruction> &insts) : ::SimpleDisassembler(insts) {
+Scumm::v6::Scummv6Disassembler::Scummv6Disassembler(std::vector<Instruction> &insts) : ::SimpleDisassembler(insts) {
}
-void Scumm::v6::Disassembler::doDisassemble() throw(UnknownOpcodeException) {
+void Scumm::v6::Scummv6Disassembler::doDisassemble() throw(UnknownOpcodeException) {
std::string blockName;
for (int i = 0; i < 4; i++) {
blockName += _f.readChar();
@@ -439,7 +439,7 @@
fixStackEffect(it, (it->_stackChange >> 8) & 0xF, (it->_stackChange >> 4) & 0xF, it->_stackChange & 0xF);
}
-void Scumm::v6::Disassembler::fixStackEffect(InstIterator &it, int popBefore, int popAfter, int pushTotal) {
+void Scumm::v6::Scummv6Disassembler::fixStackEffect(InstIterator &it, int popBefore, int popAfter, int pushTotal) {
it->_stackChange = -popBefore - popAfter + pushTotal;
InstIterator it2 = it;
for (--it2; popBefore != 0; --it2)
@@ -448,7 +448,7 @@
it->_stackChange -= it2->_params[0].getSigned() + 1;
}
-void Scumm::v6::Disassembler::readParameter(Parameter *p, char type) {
+void Scumm::v6::Scummv6Disassembler::readParameter(Parameter *p, char type) {
switch (type) {
case 'c': { // Character string
byte cmd;
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -32,9 +32,9 @@
/**
* Disassembler for SCUMMv6.
*/
-class Disassembler : public SimpleDisassembler {
+class Scummv6Disassembler : public SimpleDisassembler {
public:
- Disassembler(std::vector<Instruction> &insts);
+ Scummv6Disassembler(std::vector<Instruction> &insts);
void doDisassemble() throw(UnknownOpcodeException);
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp 2010-08-11 20:47:41 UTC (rev 52001)
@@ -24,11 +24,11 @@
#include "disassembler.h"
#include "codegen.h"
-::Disassembler *Scumm::v6::Engine::getDisassembler(std::vector<Instruction> &insts) {
- return new Disassembler(insts);
+::Disassembler *Scumm::v6::Scummv6Engine::getDisassembler(std::vector<Instruction> &insts) {
+ return new Scummv6Disassembler(insts);
}
-uint32 Scumm::v6::Engine::getDestAddress(ConstInstIterator it) const {
+uint32 Scumm::v6::Scummv6Engine::getDestAddress(ConstInstIterator it) const {
switch(it->_type) {
case kJump:
case kCondJump:
@@ -41,6 +41,6 @@
}
}
-::CodeGenerator *Scumm::v6::Engine::getCodeGenerator(std::ostream &output) {
- return new CodeGenerator(this, output);
+::CodeGenerator *Scumm::v6::Scummv6Engine::getCodeGenerator(std::ostream &output) {
+ return new Scummv6CodeGenerator(this, output);
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -32,7 +32,7 @@
/**
* SCUMMv6 engine.
*/
-class Engine : public ::Engine {
+class Scummv6Engine : public ::Engine {
public:
::Disassembler *getDisassembler(std::vector<Instruction> &insts);
uint32 getDestAddress(ConstInstIterator it) const;
Modified: tools/branches/gsoc2010-decompiler/decompiler/test/cfg_test.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/test/cfg_test.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/test/cfg_test.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -34,7 +34,7 @@
public:
void testUnreachable() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/unreachable.dmp");
d->disassemble();
@@ -68,7 +68,7 @@
void testBranching() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/branches.dmp");
d->disassemble();
@@ -102,7 +102,7 @@
void testGrouping() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/branches.dmp");
d->disassemble();
@@ -136,7 +136,7 @@
void testShortCircuitDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/short-circuit.dmp");
d->disassemble();
@@ -151,7 +151,7 @@
void testWhileDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/while.dmp");
d->disassemble();
@@ -171,7 +171,7 @@
void testDoWhileDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/while.dmp");
d->disassemble();
@@ -191,7 +191,7 @@
void testBreakDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/break-while.dmp");
d->disassemble();
@@ -209,7 +209,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/break-do-while.dmp");
d->disassemble();
@@ -227,7 +227,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/break-do-while2.dmp");
d->disassemble();
@@ -247,7 +247,7 @@
void testContinueDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-while.dmp");
d->disassemble();
@@ -267,7 +267,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-do-while.dmp");
d->disassemble();
@@ -285,7 +285,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-do-while2.dmp");
d->disassemble();
@@ -305,7 +305,7 @@
void testIfDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/if.dmp");
d->disassemble();
@@ -323,7 +323,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/break-do-while.dmp");
d->disassemble();
@@ -341,7 +341,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/break-do-while2.dmp");
d->disassemble();
@@ -359,7 +359,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-do-while.dmp");
d->disassemble();
@@ -377,7 +377,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-do-while2.dmp");
d->disassemble();
@@ -397,7 +397,7 @@
void testElseDetection() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/if-else.dmp");
d->disassemble();
@@ -417,7 +417,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/if-no-else.dmp");
d->disassemble();
@@ -439,7 +439,7 @@
void testNestedLoops() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/do-while-in-while.dmp");
d->disassemble();
@@ -459,7 +459,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/nested-do-while.dmp");
d->disassemble();
@@ -479,7 +479,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/nested-while.dmp");
d->disassemble();
@@ -499,7 +499,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/nested-while2.dmp");
d->disassemble();
@@ -519,7 +519,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/while-in-do-while.dmp");
d->disassemble();
@@ -539,7 +539,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/while-in-do-while2.dmp");
d->disassemble();
@@ -563,7 +563,7 @@
// 6e48faca13e1f6df9341567608962744 *script-30.dmp
void testSamAndMaxScript30() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/script-30.dmp");
d->disassemble();
Modified: tools/branches/gsoc2010-decompiler/decompiler/test/codegen.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/test/codegen.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/test/codegen.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -73,7 +73,7 @@
public:
void testContinue() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/continue-do-while.dmp");
d->disassemble();
@@ -117,7 +117,7 @@
void testBreak() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/break-while.dmp");
d->disassemble();
@@ -161,7 +161,7 @@
void testElse() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/if-else.dmp");
d->disassemble();
@@ -207,7 +207,7 @@
// afd7dc5d377894b3b9d0504927adf1b1 *script-48.dmp
void testCoalescing() {
std::vector<Instruction> insts;
- Scumm::v6::Engine *engine = new Scumm::v6::Engine();
+ Scumm::v6::Scummv6Engine *engine = new Scumm::v6::Scummv6Engine();
Disassembler *d = engine->getDisassembler(insts);
d->open("decompiler/test/script-30.dmp");
d->disassemble();
@@ -237,7 +237,7 @@
delete engine;
insts.clear();
- engine = new Scumm::v6::Engine();
+ engine = new Scumm::v6::Scummv6Engine();
d = engine->getDisassembler(insts);
d->open("decompiler/test/script-48.dmp");
d->disassemble();
Modified: tools/branches/gsoc2010-decompiler/decompiler/test/disassembler_test.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/test/disassembler_test.h 2010-08-11 20:41:24 UTC (rev 52000)
+++ tools/branches/gsoc2010-decompiler/decompiler/test/disassembler_test.h 2010-08-11 20:47:41 UTC (rev 52001)
@@ -81,7 +81,7 @@
void testScummv6DisassemblerScript15() {
try {
std::vector<Instruction> insts;
- Scumm::v6::Disassembler s(insts);
+ Scumm::v6::Scummv6Disassembler s(insts);
s.open("decompiler/test/script-15.dmp");
s.disassemble();
TS_ASSERT(insts.size() == 11);
@@ -136,7 +136,7 @@
void testScummv6DisassemblerScript31() {
try {
std::vector<Instruction> insts;
- Scumm::v6::Disassembler s(insts);
+ Scumm::v6::Scummv6Disassembler s(insts);
s.open("decompiler/test/script-31.dmp");
s.disassemble();
TS_ASSERT(insts.size() == 5);
@@ -169,7 +169,7 @@
void testScummv6DisassemblerScript33() {
try {
std::vector<Instruction> insts;
- Scumm::v6::Disassembler s(insts);
+ Scumm::v6::Scummv6Disassembler s(insts);
s.open("decompiler/test/script-33.dmp");
s.disassemble();
TS_ASSERT(insts.size() == 10);
@@ -221,7 +221,7 @@
void testScummv6StackChangeFixRoom9202() {
try {
std::vector<Instruction> insts;
- Scumm::v6::Disassembler s(insts);
+ Scumm::v6::Scummv6Disassembler s(insts);
s.open("decompiler/test/room-9-202.dmp");
s.disassemble();
InstIterator it = insts.end();
@@ -237,7 +237,7 @@
void testScummv6StackChangeFixScript30() {
try {
std::vector<Instruction> insts;
- Scumm::v6::Disassembler s(insts);
+ Scumm::v6::Scummv6Disassembler s(insts);
s.open("decompiler/test/script-30.dmp");
s.disassemble();
InstIterator it = insts.end();
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