[Scummvm-cvs-logs] SF.net SVN: scummvm:[51400] scummvm/branches/gsoc2010-plugins/backends
toneman1138 at users.sourceforge.net
toneman1138 at users.sourceforge.net
Wed Jul 28 04:05:17 CEST 2010
Revision: 51400
http://scummvm.svn.sourceforge.net/scummvm/?rev=51400&view=rev
Author: toneman1138
Date: 2010-07-28 02:05:17 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
abstracted an ELF plugin provider
Modified Paths:
--------------
scummvm/branches/gsoc2010-plugins/backends/module.mk
scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp
Added Paths:
-----------
scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
Removed Paths:
-------------
scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp
scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h
scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.cpp
scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h
Modified: scummvm/branches/gsoc2010-plugins/backends/module.mk
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/module.mk 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/module.mk 2010-07-28 02:05:17 UTC (rev 51400)
@@ -30,14 +30,13 @@
midi/timidity.o \
midi/dmedia.o \
midi/windows.o \
+ plugins/elf-provider.o \
plugins/dc/dc-provider.o \
plugins/posix/posix-provider.o \
plugins/sdl/sdl-provider.o \
plugins/win32/win32-provider.o \
plugins/psp/psp-provider.o \
- plugins/ps2/ps2-provider.o \
plugins/gp2xwiz/gp2xwiz-provider.o \
- plugins/ds/ds-provider.o \
saves/savefile.o \
saves/default/default-saves.o \
saves/posix/posix-saves.o \
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp 2010-07-28 02:05:17 UTC (rev 51400)
@@ -111,7 +111,7 @@
#include "engine.h"
-#include "backends/plugins/ds/ds-provider.h"
+#include "backends/plugins/elf-provider.h"
#include "backends/fs/ds/ds-fs.h"
#include "base/version.h"
@@ -3304,7 +3304,7 @@
#endif
#ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new DSPluginProvider());
+ PluginManager::instance().addPluginProvider(new ELFPluginProvider());
#endif
while (1) {
Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp 2010-07-28 02:05:17 UTC (rev 51400)
@@ -59,7 +59,7 @@
#include "backends/platform/ps2/ps2debug.h"
#include "backends/fs/ps2/ps2-fs-factory.h"
-#include "backends/plugins/ps2/ps2-provider.h"
+#include "backends/plugins/elf-provider.h"
#include "backends/saves/default/default-saves.h"
#include "common/config-manager.h"
@@ -132,7 +132,7 @@
g_system = g_systemPs2 = new OSystem_PS2(argv[0]);
#ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new PS2PluginProvider());
+ PluginManager::instance().addPluginProvider(new ELFPluginProvider());
#endif
g_systemPs2->init();
Deleted: scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.cpp 2010-07-28 02:05:17 UTC (rev 51400)
@@ -1,108 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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$
- *
- */
-
-#if defined(DYNAMIC_MODULES) && defined(__DS__)
-
-#include "backends/plugins/ds/ds-provider.h"
-#include "backends/plugins/dynamic-plugin.h"
-#include "common/fs.h"
-
-#include "backends/plugins/elf-loader.h"
-
-
-class DSPlugin : public DynamicPlugin {
-protected:
- void *_dlHandle;
- Common::String _filename;
-
- virtual VoidFunc findSymbol(const char *symbol) {
- void *func = dlsym(_dlHandle, symbol);
- if (!func)
- warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());
-
- // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++
- // standard and POSIX: ISO C++ disallows casting between function pointers
- // and data pointers, but dlsym always returns a void pointer. For details,
- // see e.g. <http://www.trilithium.com/johan/2004/12/problem-with-dlsym/>.
- assert(sizeof(VoidFunc) == sizeof(func));
- VoidFunc tmp;
- memcpy(&tmp, &func, sizeof(VoidFunc));
- return tmp;
- }
-
-public:
- DSPlugin(const Common::String &filename)
- : _dlHandle(0), _filename(filename) {}
-
- ~DSPlugin() {
- if (_dlHandle) unloadPlugin();
- }
-
- bool loadPlugin() {
- assert(!_dlHandle);
- _dlHandle = dlopen(_filename.c_str(), RTLD_LAZY);
-
- if (!_dlHandle) {
- warning("Failed loading plugin '%s' (%s)", _filename.c_str(), dlerror());
- return false;
- }
-
- bool ret = DynamicPlugin::loadPlugin();
-
- if (ret)
- dlforgetsyms(_dlHandle);
-
- return ret;
- }
-
- void unloadPlugin() {
- DynamicPlugin::unloadPlugin();
- if (_dlHandle) {
- if (dlclose(_dlHandle) != 0)
- warning("Failed unloading plugin '%s' (%s)", _filename.c_str(), dlerror());
- _dlHandle = 0;
- }
- }
-};
-
-
-Plugin* DSPluginProvider::createPlugin(const Common::FSNode &node) const {
- return new DSPlugin(node.getPath());
-}
-
-bool DSPluginProvider::isPluginFilename(const Common::FSNode &node) const {
- // Check the plugin suffix
- Common::String filename = node.getName();
- printf("Testing name %s", filename.c_str());
- if (!filename.hasSuffix(".PLG") && !filename.hasSuffix(".plg") && !filename.hasSuffix(".PLUGIN") && !filename.hasSuffix(".plugin")) {
- printf(" fail.\n");
- return false;
- }
-
- printf(" success!\n");
- return true;
-}
-
-#endif // defined(DYNAMIC_MODULES) && defined(__DS__)
Deleted: scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h 2010-07-28 02:05:17 UTC (rev 51400)
@@ -1,43 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 BACKENDS_PLUGINS_DS_DS_PROVIDER_H
-#define BACKENDS_PLUGINS_DS_DS_PROVIDER_H
-
-#include "base/plugins.h"
-
-#if defined(DYNAMIC_MODULES) && defined(__DS__)
-
-class DSPluginProvider : public FilePluginProvider {
-protected:
- Plugin* createPlugin(const Common::FSNode &node) const;
-
- bool isPluginFilename(const Common::FSNode &node) const;
-
-};
-
-#endif // defined(DYNAMIC_MODULES) && defined(__DS__)
-
-#endif /* BACKENDS_PLUGINS_DS_DS_PROVIDER_H */
Added: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp (rev 0)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp 2010-07-28 02:05:17 UTC (rev 51400)
@@ -0,0 +1,108 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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$
+ *
+ */
+
+#if defined(DYNAMIC_MODULES) //TODO: && defined(ELF loader target)
+
+#include "backends/plugins/elf-provider.h"
+#include "backends/plugins/dynamic-plugin.h"
+#include "common/fs.h"
+
+#include "backends/plugins/elf-loader.h"
+
+
+class ELFPlugin : public DynamicPlugin {
+protected:
+ void *_dlHandle;
+ Common::String _filename;
+
+ virtual VoidFunc findSymbol(const char *symbol) {
+ void *func = dlsym(_dlHandle, symbol);
+ if (!func)
+ warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());
+
+ // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++
+ // standard and POSIX: ISO C++ disallows casting between function pointers
+ // and data pointers, but dlsym always returns a void pointer. For details,
+ // see e.g. <http://www.trilithium.com/johan/2004/12/problem-with-dlsym/>.
+ assert(sizeof(VoidFunc) == sizeof(func));
+ VoidFunc tmp;
+ memcpy(&tmp, &func, sizeof(VoidFunc));
+ return tmp;
+ }
+
+public:
+ ELFPlugin(const Common::String &filename)
+ : _dlHandle(0), _filename(filename) {}
+
+ ~ELFPlugin() {
+ if (_dlHandle) unloadPlugin();
+ }
+
+ bool loadPlugin() {
+ assert(!_dlHandle);
+ _dlHandle = dlopen(_filename.c_str(), RTLD_LAZY);
+
+ if (!_dlHandle) {
+ warning("Failed loading plugin '%s' (%s)", _filename.c_str(), dlerror());
+ return false;
+ }
+
+ bool ret = DynamicPlugin::loadPlugin();
+
+ if (ret)
+ dlforgetsyms(_dlHandle);
+
+ return ret;
+ }
+
+ void unloadPlugin() {
+ DynamicPlugin::unloadPlugin();
+ if (_dlHandle) {
+ if (dlclose(_dlHandle) != 0)
+ warning("Failed unloading plugin '%s' (%s)", _filename.c_str(), dlerror());
+ _dlHandle = 0;
+ }
+ }
+};
+
+
+Plugin* ELFPluginProvider::createPlugin(const Common::FSNode &node) const {
+ return new ELFPlugin(node.getPath());
+}
+
+bool ELFPluginProvider::isPluginFilename(const Common::FSNode &node) const {
+ // Check the plugin suffix
+ Common::String filename = node.getName();
+ printf("Testing name %s", filename.c_str());
+ if (!filename.hasSuffix(".PLG") && !filename.hasSuffix(".plg") && !filename.hasSuffix(".PLUGIN") && !filename.hasSuffix(".plugin")) {
+ printf(" fail.\n");
+ return false;
+ }
+
+ printf(" success!\n");
+ return true;
+}
+
+#endif // defined(DYNAMIC_MODULES)
Property changes on: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h (rev 0)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h 2010-07-28 02:05:17 UTC (rev 51400)
@@ -0,0 +1,43 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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 BACKENDS_PLUGINS_ELF_PROVIDER_H
+#define BACKENDS_PLUGINS_ELF_PROVIDER_H
+
+#include "base/plugins.h"
+
+#if defined(DYNAMIC_MODULES) // TODO: && defined(ELF-loader target)
+
+class ELFPluginProvider : public FilePluginProvider {
+protected:
+ Plugin* createPlugin(const Common::FSNode &node) const;
+
+ bool isPluginFilename(const Common::FSNode &node) const;
+
+};
+
+#endif // defined(DYNAMIC_MODULES)
+
+#endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */
Property changes on: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ URL Id
Added: svn:eol-style
+ native
Deleted: scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.cpp 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.cpp 2010-07-28 02:05:17 UTC (rev 51400)
@@ -1,108 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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$
- *
- */
-
-#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
-
-#include "backends/plugins/ps2/ps2-provider.h"
-#include "backends/plugins/dynamic-plugin.h"
-#include "common/fs.h"
-
-#include "backends/plugins/elf-loader.h"
-
-
-class PS2Plugin : public DynamicPlugin {
-protected:
- void *_dlHandle;
- Common::String _filename;
-
- virtual VoidFunc findSymbol(const char *symbol) {
- void *func = dlsym(_dlHandle, symbol);
- if (!func)
- warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror());
-
- // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++
- // standard and POSIX: ISO C++ disallows casting between function pointers
- // and data pointers, but dlsym always returns a void pointer. For details,
- // see e.g. <http://www.trilithium.com/johan/2004/12/problem-with-dlsym/>.
- assert(sizeof(VoidFunc) == sizeof(func));
- VoidFunc tmp;
- memcpy(&tmp, &func, sizeof(VoidFunc));
- return tmp;
- }
-
-public:
- PS2Plugin(const Common::String &filename)
- : _dlHandle(0), _filename(filename) {}
-
- ~PS2Plugin() {
- if (_dlHandle) unloadPlugin();
- }
-
- bool loadPlugin() {
- assert(!_dlHandle);
- _dlHandle = dlopen(_filename.c_str(), RTLD_LAZY);
-
- if (!_dlHandle) {
- warning("Failed loading plugin '%s' (%s)", _filename.c_str(), dlerror());
- return false;
- }
-
- bool ret = DynamicPlugin::loadPlugin();
-
- if (ret)
- dlforgetsyms(_dlHandle);
-
- return ret;
- }
-
- void unloadPlugin() {
- DynamicPlugin::unloadPlugin();
- if (_dlHandle) {
- if (dlclose(_dlHandle) != 0)
- warning("Failed unloading plugin '%s' (%s)", _filename.c_str(), dlerror());
- _dlHandle = 0;
- }
- }
-};
-
-
-Plugin* PS2PluginProvider::createPlugin(const Common::FSNode &node) const {
- return new PS2Plugin(node.getPath());
-}
-
-bool PS2PluginProvider::isPluginFilename(const Common::FSNode &node) const {
- // Check the plugin suffix
- Common::String filename = node.getName();
- fprintf(stderr, "Testing name %s", filename.c_str());
- if (!filename.hasSuffix(".PLG") && !filename.hasSuffix(".plg")) {
- fprintf(stderr," fail.\n");
- return false;
- }
-
- fprintf(stderr," success!\n");
- return true;
-}
-
-#endif // defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
Deleted: scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h 2010-07-28 01:03:17 UTC (rev 51399)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h 2010-07-28 02:05:17 UTC (rev 51400)
@@ -1,43 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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 BACKENDS_PLUGINS_PS2_PS2_PROVIDER_H
-#define BACKENDS_PLUGINS_PS2_PS2_PROVIDER_H
-
-#include "base/plugins.h"
-
-#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
-
-class PS2PluginProvider : public FilePluginProvider {
-protected:
- Plugin* createPlugin(const Common::FSNode &node) const;
-
- bool isPluginFilename(const Common::FSNode &node) const;
-
-};
-
-#endif // defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
-
-#endif /* BACKENDS_PLUGINS_PS2_PS2_PROVIDER_H */
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