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

[pidgeot at users.sourceforge.net]

Revision: 51285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51285&view=rev
Author:   pidgeot
Date:     2010-07-25 22:16:50 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
Create classes for KYRA disassembler

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/Makefile.common
    tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp

Added Paths:
-----------
    tools/branches/gsoc2010-decompiler/decompiler/kyra/
    tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
    tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h
    tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp
    tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h

Modified: tools/branches/gsoc2010-decompiler/Makefile.common
===================================================================
--- tools/branches/gsoc2010-decompiler/Makefile.common	2010-07-25 20:50:59 UTC (rev 51284)
+++ tools/branches/gsoc2010-decompiler/Makefile.common	2010-07-25 22:16:50 UTC (rev 51285)
@@ -278,7 +278,9 @@
 	decompiler/codegen.o \
 	decompiler/scummv6/disassembler.o \
 	decompiler/scummv6/engine.o \
-	decompiler/scummv6/codegen.o
+	decompiler/scummv6/codegen.o \
+	decompiler/kyra/disassembler.o \
+	decompiler/kyra/engine.o
 
 decompile_LIBS := \
 	-lboost_program_options

Modified: tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp	2010-07-25 20:50:59 UTC (rev 51284)
+++ tools/branches/gsoc2010-decompiler/decompiler/decompiler.cpp	2010-07-25 22:16:50 UTC (rev 51285)
@@ -27,6 +27,7 @@
 
 #include "control_flow.h"
 
+#include "kyra/engine.h"
 #include "scummv6/engine.h"
 
 #include <fstream>
@@ -43,6 +44,7 @@
 		std::map<std::string, std::string> engines;
 		ObjectFactory<Engine> engineFactory;
 
+		ENGINE("kyra", "Kyrandia", Kyra::Engine);
 		ENGINE("scummv6", "SCUMM v6", Scumm::v6::Engine);
 
 		po::options_description visible("Options");


Property changes on: tools/branches/gsoc2010-decompiler/decompiler/kyra
___________________________________________________________________
Added: svn:ignore
   + .deps


Added: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp	                        (rev 0)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp	2010-07-25 22:16:50 UTC (rev 51285)
@@ -0,0 +1,27 @@
+/* ScummVM Tools
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "disassembler.h"
+
+void Kyra::Disassembler::doDisassemble() throw(UnknownOpcodeException) {
+	// TODO
+}


Property changes on: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h	                        (rev 0)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h	2010-07-25 22:16:50 UTC (rev 51285)
@@ -0,0 +1,42 @@
+/* ScummVM Tools
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef DEC_KYRA_DISASM_H
+#define DEC_KYRA_DISASM_H
+
+#include "decompiler/disassembler.h"
+
+namespace Kyra {
+
+/**
+ * Disassembler for KYRA.
+ */
+class Disassembler : public ::Disassembler {
+public:
+	void doDisassemble() throw(UnknownOpcodeException);
+};
+
+} // End of namespace Kyra
+
+#endif
+
+


Property changes on: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp	                        (rev 0)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp	2010-07-25 22:16:50 UTC (rev 51285)
@@ -0,0 +1,38 @@
+/* ScummVM Tools
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "engine.h"
+#include "disassembler.h"
+
+::Disassembler *Kyra::Engine::getDisassembler() const {
+	return new Disassembler();
+}
+
+uint32 Kyra::Engine::getDestAddress(ConstInstIterator it) const {
+	// TODO
+	return 0;
+}
+
+::CodeGenerator *Kyra::Engine::getCodeGenerator(std::ostream &output) {
+	// TODO
+	return NULL;
+}


Property changes on: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h	                        (rev 0)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h	2010-07-25 22:16:50 UTC (rev 51285)
@@ -0,0 +1,42 @@
+/* ScummVM Tools
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef KYRA_ENGINE_H
+#define KYRA_ENGINE_H
+
+#include "decompiler/engine.h"
+
+namespace Kyra {
+
+/**
+ * KYRA engine.
+ */
+class Engine : public ::Engine {
+public:
+	::Disassembler *getDisassembler() const;
+	uint32 getDestAddress(ConstInstIterator it) const;
+	::CodeGenerator *getCodeGenerator(std::ostream &output);
+};
+
+} // End of namespace KYRA
+
+#endif


Property changes on: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native


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