Introduced the flat file format.

5 files changed, 254 insertions, 3 deletions

diff --git a/plugins/pychrysalide/format/Makefile.am b/plugins/pychrysalide/format/Makefile.am
index 0dac280..f96bf81 100644
--- a/plugins/pychrysalide/format/Makefile.am
+++ b/plugins/pychrysalide/format/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libpychrysaformat.la
 
 libpychrysaformat_la_SOURCES =			\
 	executable.h executable.c			\
+	flat.h flat.c						\
 	format.h format.c					\
 	module.h module.c					\
 	symbol.h symbol.c					\
diff --git a/plugins/pychrysalide/format/executable.c b/plugins/pychrysalide/format/executable.c
index 9ae45ff..a3bcdd1 100644
--- a/plugins/pychrysalide/format/executable.c
+++ b/plugins/pychrysalide/format/executable.c
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * executable.c - équivalent Python du fichier "format/executable.h"
+ * executable.c - équivalent Python du fichier "format/executable.c"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -151,12 +151,12 @@ PyTypeObject *get_python_executable_format_type(void)
         {
             "translate_offset_into_vmpa", py_exe_format_translate_offset_into_vmpa,
             METH_VARARGS,
-            "translate_offset_into_vmpa($self, off, /)\n--\n\nTranslate a physical offset to a full location.."
+            "translate_offset_into_vmpa($self, off, /)\n--\n\nTranslate a physical offset to a full location."
         },
         {
             "translate_address_into_vmpa", py_exe_format_translate_address_into_vmpa,
             METH_VARARGS,
-            "translate_address_into_vmpa($self, addr, /)\n--\n\nTranslate a physical offset to a full location.."
+            "translate_address_into_vmpa($self, addr, /)\n--\n\nTranslate a physical offset to a full location."
         },
         { NULL }
     };
diff --git a/plugins/pychrysalide/format/flat.c b/plugins/pychrysalide/format/flat.c
new file mode 100644
index 0000000..c85ee37
--- /dev/null
+++ b/plugins/pychrysalide/format/flat.c
@@ -0,0 +1,206 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * flat.c - équivalent Python du fichier "format/flat.c"
+ *
+ * Copyright (C) 2018 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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.
+ *
+ *  Chrysalide 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 "flat.h"
+
+
+#include <pygobject.h>
+
+
+#include <format/flat.h>
+
+
+#include "executable.h"
+#include "../helpers.h"
+#include "../analysis/content.h"
+
+
+
+/* Crée un nouvel objet Python de type 'FlatFormat'. */
+static PyObject *py_flat_format_new(PyTypeObject *, PyObject *, PyObject *);
+
+/* Indique le type d'architecture visée par le format. */
+static PyObject *py_flat_format_set_target_machine(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 'FlatFormat'.            *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_flat_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    PyObject *content_obj;                  /* Objet pour le contenu       */
+    int ret;                                /* Bilan de lecture des args.  */
+    GBinContent *content;                   /* Instance GLib du contenu    */
+    GExeFormat *format;                     /* Création GLib à transmettre */
+
+    ret = PyArg_ParseTuple(args, "O!", get_python_binary_content_type(), &content_obj);
+    if (!ret) return NULL;
+
+    content = G_BIN_CONTENT(pygobject_get(content_obj));
+
+    format = g_flat_format_new(content);
+
+    if (format == NULL)
+    {
+        result = Py_None;
+        Py_INCREF(result);
+    }
+
+    else
+    {
+        result = pygobject_new(G_OBJECT(format));
+        g_object_unref(format);
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = description de l'exécutable à consulter.              *
+*                args = arguments accompagnant l'appel.                       *
+*                                                                             *
+*  Description : Indique le type d'architecture visée par le format.          *
+*                                                                             *
+*  Retour      : Rien, donc None en Python.                                   *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_flat_format_set_target_machine(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    GFlatFormat *format;                    /* Version GLib du format      */
+    const char *machine;                    /* Identifiant d'architecture  */
+    int ret;                                /* Bilan de lecture des args.  */
+
+    format = G_FLAT_FORMAT(pygobject_get(self));
+    assert(format != NULL);
+
+    ret = PyArg_ParseTuple(args, "s", &machine);
+    if (!ret) return NULL;
+
+    g_flat_format_set_target_machine(format, machine);
+
+    result = Py_None;
+    Py_INCREF(result);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Fournit un accès à une définition de type à diffuser.        *
+*                                                                             *
+*  Retour      : Définition d'objet pour Python.                              *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyTypeObject *get_python_flat_format_type(void)
+{
+    static PyMethodDef py_flat_format_methods[] = {
+        {
+            "set_machine", py_flat_format_set_target_machine,
+            METH_VARARGS,
+            "set_machine($self, machine, /)\n--\n\nSet the architecture linked to the flat format."
+        },
+        { NULL }
+    };
+
+    static PyGetSetDef py_flat_format_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_flat_format_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name        = "pychrysalide.format.FlatFormat",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide flat format",
+
+        .tp_methods     = py_flat_format_methods,
+        .tp_getset      = py_flat_format_getseters,
+        .tp_new         = (newfunc)py_flat_format_new
+
+    };
+
+    return &py_flat_format_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.format.FlatFormat'.    *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_flat_format(PyObject *module)
+{
+    PyTypeObject *py_flat_format_type;      /* Type Python 'FlatFormat'    */
+    PyObject *dict;                         /* Dictionnaire du module      */
+
+    py_flat_format_type = get_python_flat_format_type();
+
+    dict = PyModule_GetDict(module);
+
+    if (!register_class_for_pygobject(dict, G_TYPE_FLAT_FORMAT, py_flat_format_type, \
+                                      get_python_executable_format_type()))
+        return false;
+
+    return true;
+
+}
diff --git a/plugins/pychrysalide/format/flat.h b/plugins/pychrysalide/format/flat.h
new file mode 100644
index 0000000..92e5f9e
--- /dev/null
+++ b/plugins/pychrysalide/format/flat.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * flat.h - prototypes pour l'équivalent Python du fichier "format/flat.h"
+ *
+ * Copyright (C) 2018 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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.
+ *
+ *  Chrysalide 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_PYCHRYSALIDE_FORMAT_FLAT_H
+#define _PLUGINS_PYCHRYSALIDE_FORMAT_FLAT_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_flat_format_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.format.FlatFormat'. */
+bool register_python_flat_format(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSALIDE_FORMAT_FLAT_H */
diff --git a/plugins/pychrysalide/format/module.c b/plugins/pychrysalide/format/module.c
index 1daeb3f..9a88dcd 100644
--- a/plugins/pychrysalide/format/module.c
+++ b/plugins/pychrysalide/format/module.c
@@ -29,6 +29,7 @@
 
 
 #include "executable.h"
+#include "flat.h"
 #include "format.h"
 #include "symbol.h"
 #include "symiter.h"
@@ -84,6 +85,7 @@ bool add_format_module_to_python_module(PyObject *super)
 
     result &= register_python_binary_format(module);
     result &= register_python_executable_format(module);
+    result &= register_python_flat_format(module);
     result &= register_python_binary_symbol(module);
     result &= register_python_sym_iterator(module);