Saved progress toward the Android permissions display.

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

4 files changed, 483 insertions, 8 deletions

diff --git a/plugins/pychrysa/arch/Makefile.am b/plugins/pychrysa/arch/Makefile.am
index 6ab3332..fd7c862 100644
--- a/plugins/pychrysa/arch/Makefile.am
+++ b/plugins/pychrysa/arch/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libpychrysaarch.la
 
 libpychrysaarch_la_SOURCES =			\
 	archbase.h archbase.c				\
+	instruction.h instruction.c			\
 	module.h module.c					\
 	processor.h processor.c
 
@@ -10,7 +11,8 @@ libpychrysaarch_la_SOURCES =			\
 libpychrysaarch_la_LDFLAGS = 
 
 
-INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) -I../../../src
+INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I../../../src
 
 AM_CPPFLAGS = 
 
diff --git a/plugins/pychrysa/arch/instruction.c b/plugins/pychrysa/arch/instruction.c
new file mode 100644
index 0000000..80cc4ee
--- /dev/null
+++ b/plugins/pychrysa/arch/instruction.c
@@ -0,0 +1,418 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * instruction.c - équivalent Python du fichier "arch/instruction.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
+ */
+
+
+#include "instruction.h"
+
+
+#include <pygobject.h>
+#include <stdbool.h>
+#include <string.h>
+
+
+#include "../quirks.h"
+
+
+
+/* --------------------- ITERATEUR POUR BOUCLE SUR INSTRUCTIONS --------------------- */
+
+
+/* Itérateur pour les instructions */
+typedef struct _PyArchInstructionIter
+{
+    PyObject_HEAD                           /* A laisser en premier        */
+
+    GArchInstruction *head;                 /* Ancrage supposé             */
+    PyObject *current;                      /* Départ, puis parcours...    */
+    bool started;                           /* Démarrage effectué ?        */
+
+} PyArchInstructionIter;
+
+
+/* Prépare l'itérateur pour un parcours d'instructions. */
+static PyObject *py_arch_instruction_iterator_create(PyObject *);
+
+/* Libère la mémoire d'un itérateur de 'ArchInstruction'. */
+static void py_arch_instruction_iterator_dealloc(PyArchInstructionIter *);
+
+/* Fournit l'élément suivant dans un parcours d'instructions. */
+static PyObject *py_arch_instruction_iterator_next(PyArchInstructionIter *);
+
+
+
+/* --------------------- INSTRUCTIONS D'ARCHITECTURES EN PYTHON --------------------- */
+
+
+/* Crée un nouvel objet Python de type 'ArchInstruction'. */
+static PyObject *py_arch_instruction_new(PyTypeObject *, PyObject *, PyObject *);
+
+/* Prépare un parcours d'instructions. */
+static PyObject *py_arch_instruction_get_iter(PyObject *);
+
+/* Fournit la valeur associée à une propriété donnée. */
+static PyObject *py_arch_instruction_get_location(PyObject *, char *);
+
+
+
+/* ---------------------------------------------------------------------------------- */
+/*                       ITERATEUR POUR BOUCLE SUR INSTRUCTIONS                       */
+/* ---------------------------------------------------------------------------------- */
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : origin = élément à l'origine du parcours.                    *
+*                                                                             *
+*  Description : Prépare l'itérateur pour un parcours d'instructions.         *
+*                                                                             *
+*  Retour      : Instance d'itérateur prête à emploi.                         *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_iterator_create(PyObject *origin)
+{
+    PyArchInstructionIter *result;          /* Nouvelle instance à renvoyer*/
+    PyObject *module;                       /* Module d'appartenance       */
+    PyTypeObject *type;                     /* Type d'objet à créer        */
+
+    module = PyImport_ImportModule("pychrysalide.arch");
+    type = (PyTypeObject *)PyObject_GetAttrString(module, "ArchInstructionIterator");
+    Py_DECREF(module);
+
+    result = (PyArchInstructionIter *)type->tp_alloc(type, 0);
+
+    if (result != NULL)
+    {
+        result->head = G_ARCH_INSTRUCTION(pygobject_get(origin));
+        g_object_ref(G_OBJECT(result->head));
+
+        Py_INCREF(origin);
+        result->current = origin;
+    }
+
+    return (PyObject *)result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = instance d'objet à supprimer.                         *
+*                                                                             *
+*  Description : Libère la mémoire d'un itérateur de 'ArchInstruction'.       *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static void py_arch_instruction_iterator_dealloc(PyArchInstructionIter *self)
+{
+    g_object_unref(G_OBJECT(self->head));
+    Py_DECREF(self->current);
+
+#if PY_VERSION_HEX < 0x03000000
+    self->ob_type->tp_free((PyObject *)self);
+#else
+    Py_TYPE(self)->tp_free((PyObject *)self);
+#endif
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = instance manipulée à traiter.                         *
+*                                                                             *
+*  Description : Fournit l'élément suivant dans un parcours d'instructions.   *
+*                                                                             *
+*  Retour      : Point suivant du parcours ou NULL.                           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_iterator_next(PyArchInstructionIter *self)
+{
+    PyObject *result;                       /* Elément à retourner         */
+    GArchInstruction *next;                 /* Elément réel suivant        */
+
+    if (!self->started)
+    {
+        self->started = true;
+        result = self->current;
+    }
+    else
+    {
+        next = G_ARCH_INSTRUCTION(pygobject_get(self->current));
+        next = g_arch_instruction_get_next_iter(self->head, next, VMPA_MAX);
+
+        if (next != NULL)
+        {
+            result = py_arch_instruction_from_c(next);
+
+            Py_INCREF(result);
+            Py_DECREF(self->current);
+            self->current = result;
+
+        }
+        else result = NULL;
+
+    }
+
+    return (PyObject *)result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Permet une itération de 'pychrysalide.arch.ArchInstruction'. *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_arch_instruction_iterator(PyObject *module)
+{
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyTypeObject py_arch_instruction_iterator_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.arch.ArchInstructionIterator",
+        .tp_basicsize   = sizeof(PyArchInstructionIter),
+
+        .tp_dealloc     = (destructor)py_arch_instruction_iterator_dealloc,
+
+        .tp_flags       = Py_TPFLAGS_HAVE_ITER | Py_TPFLAGS_HAVE_CLASS,
+
+        .tp_doc         = "PyChrysalide architecture instruction iterator",
+
+        .tp_iter        = PyObject_SelfIter,
+        .tp_iternext    = (iternextfunc)py_arch_instruction_iterator_next
+
+    };
+
+    if (PyType_Ready(&py_arch_instruction_iterator_type) < 0)
+        return false;
+
+    Py_INCREF(&py_arch_instruction_iterator_type);
+    ret = PyModule_AddObject(module, "ArchInstructionIterator", (PyObject *)&py_arch_instruction_iterator_type);
+
+    return (ret == 0);
+
+}
+
+
+
+/* ---------------------------------------------------------------------------------- */
+/*                       INSTRUCTIONS D'ARCHITECTURES EN PYTHON                       */
+/* ---------------------------------------------------------------------------------- */
+
+
+/******************************************************************************
+*                                                                             *
+*  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 'ArchInstruction'.       *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    return Py_None;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : binary = instance existante GLib.                            *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'ArchInstruction'.       *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyObject *py_arch_instruction_from_c(GArchInstruction *instr)
+{
+    PyObject *module;                       /* Module d'appartenance       */
+    PyTypeObject *type;                     /* Type Python correspondant   */
+
+    module = PyImport_ImportModule("pychrysalide.arch");
+    type = (PyTypeObject *)PyObject_GetAttrString(module, "ArchInstruction");
+    Py_DECREF(module);
+
+    pychrysalide_set_instance_data(G_OBJECT(instr), type);
+
+    return pygobject_new(G_OBJECT(instr));
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = instance manipulée à traiter.                         *
+*                                                                             *
+*  Description : Prépare un parcours d'instructions.                          *
+*                                                                             *
+*  Retour      : Point de départ d'un parcours.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_get_iter(PyObject *self)
+{
+    return py_arch_instruction_iterator_create(self);
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe représentant une instruction.                  *
+*                name = nom de la propriété à lire.                           *
+*                                                                             *
+*  Description : Fournit la valeur associée à une propriété donnée.           *
+*                                                                             *
+*  Retour      : Valeur associée à la propriété consultée.                    *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_get_location(PyObject *self, char *name)
+{
+    PyObject *result;                       /* Trouvailles à retourner     */
+    GArchInstruction *instr;                /* Version native              */
+    off_t offset;                           /* Position dans le fichier    */
+    off_t length;                           /* Taille de l'instruction     */
+    vmpa_t address;                         /* Position en mémoire         */
+
+    instr = G_ARCH_INSTRUCTION(pygobject_get(self));
+    g_arch_instruction_get_location(instr, &offset, &length, &address);
+
+    if (strcmp(name, "offset") == 0)
+        result = PyLong_FromLong(offset);
+
+    else if (strcmp(name, "") == 0)
+        result = PyLong_FromLong(length);
+
+    else /*if (strcmp(name, "") == 0)*/
+        result = PyLong_FromLongLong(address);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.arch.ArchInstruction'. *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_arch_instruction(PyObject *module)
+{
+    PyObject *pygobj_mod;                   /* Module Python-GObject       */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_arch_instruction_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_arch_instruction_getseters[] = {
+        {
+            "offset", (getter)py_arch_instruction_get_location, (setter)NULL,
+            "Provide the location of the instruction in the binary file.", "offset"
+        },
+        {
+            "length", (getter)py_arch_instruction_get_location, (setter)NULL,
+            "Provide the length of the instruction.", "length"
+        },
+        {
+            "address", (getter)py_arch_instruction_get_location, (setter)NULL,
+            "Provide the location of the instruction in memory.", "address"
+        },
+        { NULL }
+    };
+
+    static PyTypeObject py_arch_instruction_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.arch.ArchInstruction",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide architecture instruction",
+
+        .tp_methods     = py_arch_instruction_methods,
+        .tp_getset      = py_arch_instruction_getseters,
+        .tp_new         = (newfunc)py_arch_instruction_new,
+
+        .tp_iter        = (getiterfunc)py_arch_instruction_get_iter
+
+    };
+
+    pygobj_mod = PyImport_ImportModule("gobject");
+    if (pygobj_mod == NULL) return false;
+
+    py_arch_instruction_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(pygobj_mod, "GObject");
+    Py_DECREF(pygobj_mod);
+
+    if (PyType_Ready(&py_arch_instruction_type) < 0)
+        return false;
+
+    Py_INCREF(&py_arch_instruction_type);
+    ret = PyModule_AddObject(module, "ArchInstruction", (PyObject *)&py_arch_instruction_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/arch/instruction.h b/plugins/pychrysa/arch/instruction.h
new file mode 100644
index 0000000..545d88e
--- /dev/null
+++ b/plugins/pychrysa/arch/instruction.h
@@ -0,0 +1,55 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * instruction.h - prototypes pour l'équivalent Python du fichier "arch/instruction.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_PYOIDA_ARCH_INSTRUCTION_H
+#define _PLUGINS_PYOIDA_ARCH_INSTRUCTION_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+#include <arch/instruction.h>
+
+
+
+/* --------------------- ITERATEUR POUR BOUCLE SUR INSTRUCTIONS --------------------- */
+
+
+/* Permet une itération de 'pychrysalide.arch.ArchInstruction'. */
+bool register_python_arch_instruction_iterator(PyObject *);
+
+
+
+/* --------------------- INSTRUCTIONS D'ARCHITECTURES EN PYTHON --------------------- */
+
+
+/* Crée un nouvel objet Python de type 'ArchInstruction'. */
+PyObject *py_arch_instruction_from_c(GArchInstruction *);
+
+/* Prend en charge l'objet 'pychrysalide.arch.ArchInstruction'. */
+bool register_python_arch_instruction(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYOIDA_ARCH_INSTRUCTION_H */
diff --git a/plugins/pychrysa/arch/module.c b/plugins/pychrysa/arch/module.c
index 59b0c2c..8092b6b 100644
--- a/plugins/pychrysa/arch/module.c
+++ b/plugins/pychrysa/arch/module.c
@@ -25,8 +25,7 @@
 #include "module.h"
 
 
-#include "archbase.h"
-#include "processor.h"
+#include "instruction.h"
 
 
 
@@ -54,18 +53,19 @@ bool add_arch_module_to_python_module(PyObject *super)
         { NULL }
     };
 
-    module = Py_InitModule("pyoida.arch", py_arch_methods);
+    module = Py_InitModule("pychrysalide.arch", py_arch_methods);
     if (module == NULL) return false;
 
 
     Py_INCREF(module);
-    ret = PyModule_AddObject(super, "pyoida.arch", module);
+    ret = PyModule_AddObject(super, "pychrysalide.arch", module);
 
-    if (ret != 0) /* ... */;
+    result = (ret != 0);
 
-    result = add_arch_vmpa_to_python_module(module);
-    result = add_arch_processor_to_python_module(module);
+    if (ret != 0) /* ... */;
 
+    result &= register_python_arch_instruction(module);
+    result &= register_python_arch_instruction_iterator(module);
 
     return true;