Resolved relative addresses for routines and fixed bugs related to PyGObjects construction.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@308 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

10 files changed, 315 insertions, 78 deletions

diff --git a/plugins/pychrysa/analysis/Makefile.am b/plugins/pychrysa/analysis/Makefile.am
index f5322e8..66da864 100644
--- a/plugins/pychrysa/analysis/Makefile.am
+++ b/plugins/pychrysa/analysis/Makefile.am
@@ -6,6 +6,8 @@ libpychrysaanalysis_la_SOURCES =		\
 	module.h module.c					\
 	roptions.h roptions.c
 
+libpychrysaanalysis_la_LIBADD =			\
+	binaries/libpychrysaanalysisbinaries.la
 
 libpychrysaanalysis_la_LDFLAGS = 
 
@@ -16,3 +18,5 @@ INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_
 AM_CPPFLAGS = 
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+SUBDIRS = binaries
diff --git a/plugins/pychrysa/analysis/binaries/Makefile.am b/plugins/pychrysa/analysis/binaries/Makefile.am
new file mode 100644
index 0000000..7643acf
--- /dev/null
+++ b/plugins/pychrysa/analysis/binaries/Makefile.am
@@ -0,0 +1,16 @@
+
+noinst_LTLIBRARIES = libpychrysaanalysisbinaries.la
+
+libpychrysaanalysisbinaries_la_SOURCES =\
+	file.h file.c						\
+	module.h module.c
+
+libpychrysaanalysisbinaries_la_LDFLAGS = 
+
+
+INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I../../../../src
+
+AM_CPPFLAGS = 
+
+AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysa/analysis/binaries/file.c b/plugins/pychrysa/analysis/binaries/file.c
new file mode 100644
index 0000000..70192e9
--- /dev/null
+++ b/plugins/pychrysa/analysis/binaries/file.c
@@ -0,0 +1,142 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * file.c - prototypes pour l'équivalent Python du fichier "analysis/binaries/file.c"
+ *
+ * Copyright (C) 2012 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "file.h"
+
+
+
+#include <pygobject.h>
+
+
+#include <analysis/binaries/file.h>
+
+
+
+
+/* Crée un nouvel objet Python de type 'FileBinary'. */
+static PyObject *py_file_binary_new(PyTypeObject *, PyObject *, PyObject *);
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : type = type de l'objet à instancier.                         *
+*                args = arguments fournis à l'appel.                          *
+*                kwds = arguments de type key=val fournis.                    *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'FileBinary'.            *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_file_binary_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    char *filename;                         /* Nom du fichier à charger    */
+    int ret;                                /* Bilan de lecture des args.  */
+    GLoadedBinary *binary;                  /* Version GLib du format      */
+
+    ret = PyArg_ParseTuple(args, "s", &filename);
+    if (!ret) Py_RETURN_NONE;
+
+    binary = g_file_binary_new_from_file(filename);
+
+    result = pygobject_new(G_OBJECT(binary));
+    //g_object_unref(binary);
+
+    return result;
+
+}
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.analysis.LoadedBinary'.*
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_file_binary(PyObject *module)
+{
+    PyObject *parent_mod;                   /* Module Python-LoadedBinary  */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_file_binary_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_file_binary_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_file_binary_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.analysis.binaries.FileBinary",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide file binary",
+
+        .tp_methods     = py_file_binary_methods,
+        .tp_getset      = py_file_binary_getseters,
+        .tp_new         = (newfunc)py_file_binary_new
+
+    };
+
+    parent_mod = PyImport_ImportModule("pychrysalide.analysis");
+    if (parent_mod == NULL) return false;
+
+    py_file_binary_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "LoadedBinary");
+    Py_DECREF(parent_mod);
+
+    if (PyType_Ready(&py_file_binary_type) < 0)
+        return false;
+
+    Py_INCREF(&py_file_binary_type);
+    ret = PyModule_AddObject(module, "FileBinary", (PyObject *)&py_file_binary_type);
+
+    pygobject_register_class(module, "GFileBinary", G_TYPE_FILE_BINARY, &py_file_binary_type,
+                             Py_BuildValue("(O)", py_file_binary_type.tp_base));
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/analysis/binaries/file.h b/plugins/pychrysa/analysis/binaries/file.h
new file mode 100644
index 0000000..7cc3e26
--- /dev/null
+++ b/plugins/pychrysa/analysis/binaries/file.h
@@ -0,0 +1,39 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * file.h - prototypes pour l'équivalent Python du fichier "analysis/binaries/file.h"
+ *
+ * Copyright (C) 2012 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_FILE_H
+#define _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_FILE_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Prend en charge l'objet 'pychrysalide.analysis.binaries.FileBinary'. */
+bool register_python_file_binary(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_FILE_H */
diff --git a/plugins/pychrysa/analysis/binaries/module.c b/plugins/pychrysa/analysis/binaries/module.c
new file mode 100644
index 0000000..084e0a4
--- /dev/null
+++ b/plugins/pychrysa/analysis/binaries/module.c
@@ -0,0 +1,66 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * module.c - intégration du répertoire binaries en tant que module
+ *
+ * Copyright (C) 2012 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "module.h"
+
+
+#include "file.h"
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Ajoute le module 'binaries' au module Python.                *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool add_binaries_module_to_python_module(PyObject *super)
+{
+    bool result;
+    PyObject *module;
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_format_methods[] = {
+        { NULL }
+    };
+
+    module = Py_InitModule("pychrysalide.analysis.binaries", py_format_methods);
+    if (module == NULL) return false;
+
+    Py_INCREF(module);
+    ret = PyModule_AddObject(super, "pychrysalide.analysis.binaries", module);
+
+    result = (ret != 0);
+
+    result &= register_python_file_binary(module);
+
+    return result;
+
+}
diff --git a/plugins/pychrysa/analysis/binaries/module.h b/plugins/pychrysa/analysis/binaries/module.h
new file mode 100644
index 0000000..228f33c
--- /dev/null
+++ b/plugins/pychrysa/analysis/binaries/module.h
@@ -0,0 +1,39 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * module.h - prototypes pour l'intégration du répertoire binaries en tant que module
+ *
+ * Copyright (C) 2012 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_MODULE_H
+#define _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_MODULE_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Ajoute le module 'binaries' au module Python. */
+bool add_binaries_module_to_python_module(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_BINARIES_MODULE_H */
diff --git a/plugins/pychrysa/analysis/binary.c b/plugins/pychrysa/analysis/binary.c
index e8158a2..abbbad5 100644
--- a/plugins/pychrysa/analysis/binary.c
+++ b/plugins/pychrysa/analysis/binary.c
@@ -28,7 +28,7 @@
 #include <pygobject.h>
 
 
-#include <analysis/binaries/file.h>  /* REMME ! */
+#include <analysis/binary.h>
 
 
 #include "../quirks.h"
@@ -38,9 +38,6 @@
 
 
 
-/* Crée un nouvel objet Python de type 'LoadedBinary'. */
-static PyObject *py_loaded_binary_new(PyTypeObject *, PyObject *, PyObject *);
-
 /* Fournit le fichier correspondant à l'élément binaire. */
 static PyObject *py_loaded_binary_get_filename(PyObject *self, PyObject *args);
 
@@ -60,68 +57,6 @@ static PyObject *py_loaded_binary_get_disassembled_buffer(PyObject *, void *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
-*                args = arguments fournis à l'appel.                          *
-*                kwds = arguments de type key=val fournis.                    *
-*                                                                             *
-*  Description : Crée un nouvel objet Python de type 'LoadedBinary'.          *
-*                                                                             *
-*  Retour      : Instance Python mise en place.                               *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_loaded_binary_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    char *filename;                         /* Nom du fichier à charger    */
-    int ret;                                /* Bilan de lecture des args.  */
-    GLoadedBinary *binary;                  /* Version GLib du format      */
-
-    ret = PyArg_ParseTuple(args, "s", &filename);
-    if (!ret) return Py_None;
-
-    binary = g_file_binary_new_from_file(filename);
-
-    result = py_loaded_binary_from_c(binary);
-    g_object_unref(binary);
-
-    return (PyObject *)result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : binary = instance existante GLib.                            *
-*                                                                             *
-*  Description : Crée un nouvel objet Python de type 'LoadedBinary'.          *
-*                                                                             *
-*  Retour      : Instance Python mise en place.                               *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-PyObject *py_loaded_binary_from_c(GLoadedBinary *binary)
-{
-    PyObject *module;                       /* Module d'appartenance       */
-    PyTypeObject *type;                     /* Type Python correspondant   */
-
-    module = PyImport_ImportModule("pychrysalide.analysis");
-    type = (PyTypeObject *)PyObject_GetAttrString(module, "LoadedBinary");
-    Py_DECREF(module);
-
-    pychrysalide_set_instance_data(G_OBJECT(binary), type);
-
-    return pygobject_new(G_OBJECT(binary));
-
-}
-
-
-/******************************************************************************
-*                                                                             *
 *  Paramètres  : self = classe représentant un binaire.                       *
 *                args = arguments fournis à l'appel.                          *
 *                                                                             *
@@ -172,7 +107,7 @@ static PyObject *py_loaded_binary_get_format(PyObject *self, PyObject *args)
     binary = G_LOADED_BINARY(pygobject_get(self));
     format = g_loaded_binary_get_format(binary);
 
-    result = py_executable_format_from_c(format);
+    result = pygobject_new(G_OBJECT(format));
 
     return result;
 
@@ -202,7 +137,7 @@ static PyObject *py_loaded_binary_get_instructions(PyObject *self, PyObject *arg
 
     instr = g_loaded_binary_get_instructions(binary);
 
-    result = py_arch_instruction_from_c(instr);
+    result = pygobject_new(G_OBJECT(instr));
 
     return result;
 
@@ -234,7 +169,7 @@ static PyObject *py_loaded_binary_get_disassembled_buffer(PyObject *self, void *
     binary = G_LOADED_BINARY(pygobject_get(self));
     buffer = g_loaded_binary_get_disassembled_buffer(binary);
 
-    result = py_code_buffer_from_c(buffer);
+    result = pygobject_new(G_OBJECT(buffer));
 
     return result;
 
@@ -304,8 +239,7 @@ bool register_python_loaded_binary(PyObject *module)
         .tp_doc         = "PyChrysalide loaded binary",
 
         .tp_methods     = py_loaded_binary_methods,
-        .tp_getset      = py_loaded_binary_getseters,
-        .tp_new         = (newfunc)py_loaded_binary_new
+        .tp_getset      = py_loaded_binary_getseters
 
     };
 
diff --git a/plugins/pychrysa/analysis/binary.h b/plugins/pychrysa/analysis/binary.h
index 33ead7e..e161a5b 100644
--- a/plugins/pychrysa/analysis/binary.h
+++ b/plugins/pychrysa/analysis/binary.h
@@ -29,13 +29,8 @@
 #include <Python.h>
 #include <stdbool.h>
 
-#include <analysis/binary.h>
 
 
-
-/* Crée un nouvel objet Python de type 'LoadedBinary'. */
-PyObject *py_loaded_binary_from_c(GLoadedBinary *);
-
 /* Prend en charge l'objet 'pychrysalide.analysis.LoadedBinary'. */
 bool register_python_loaded_binary(PyObject *);
 
diff --git a/plugins/pychrysa/analysis/module.c b/plugins/pychrysa/analysis/module.c
index 42b888e..688ea12 100644
--- a/plugins/pychrysa/analysis/module.c
+++ b/plugins/pychrysa/analysis/module.c
@@ -26,6 +26,7 @@
 
 
 #include "binary.h"
+#include "binaries/module.h"
 
 
 
@@ -60,6 +61,7 @@ bool add_analysis_module_to_python_module(PyObject *super)
     result = (ret != 0);
 
     result &= register_python_loaded_binary(module);
+    result &= add_binaries_module_to_python_module(module);
 
     return result;
 
diff --git a/plugins/pychrysa/analysis/roptions.c b/plugins/pychrysa/analysis/roptions.c
index 57a4f52..a2b72e1 100644
--- a/plugins/pychrysa/analysis/roptions.c
+++ b/plugins/pychrysa/analysis/roptions.c
@@ -85,7 +85,7 @@ static PyObject *py_rendering_options_new(PyTypeObject *type, PyObject *args, Py
     GExeFormat *_executable;                /* Version GLib du format      */
 
     ret = PyArg_ParseTuple(args, "O", &executable);
-    if (!ret) return Py_None;
+    if (!ret) Py_RETURN_NONE;
 
     result = (py_rendering_options *)type->tp_alloc(type, 0);
 
@@ -199,7 +199,7 @@ static PyObject *py_rendering_options_show_code(PyObject *self, PyObject *args)
 
     printf("show code :: %d\n", state);
 
-    return Py_None;
+    Py_RETURN_NONE;
 
 }