Added the ELF strings to the preloaded instruction list.

5 files changed, 310 insertions, 1 deletions

diff --git a/plugins/pychrysa/arch/Makefile.am b/plugins/pychrysa/arch/Makefile.am
index 21e3856..9421e04 100644
--- a/plugins/pychrysa/arch/Makefile.am
+++ b/plugins/pychrysa/arch/Makefile.am
@@ -8,6 +8,7 @@ libpychrysaarch_la_SOURCES =			\
 	module.h module.c					\
 	operand.h operand.c					\
 	processor.h processor.c				\
+	raw.h raw.c							\
 	vmpa.h vmpa.c
 
 libpychrysaarch_la_LIBADD =				\
diff --git a/plugins/pychrysa/arch/instruction.c b/plugins/pychrysa/arch/instruction.c
index 0e10728..0efca5a 100644
--- a/plugins/pychrysa/arch/instruction.c
+++ b/plugins/pychrysa/arch/instruction.c
@@ -229,6 +229,7 @@ static PyObject *py_arch_instruction_get_range(PyObject *self, void *closure)
 
 }
 
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self    = objet Python concerné par l'appel.                 *
@@ -437,7 +438,7 @@ PyTypeObject *get_python_arch_instruction_type(void)
 
 bool register_python_arch_instruction(PyObject *module)
 {
-    PyTypeObject *py_arch_instruction_type; /* Type Python 'BinContent'    */
+    PyTypeObject *py_arch_instruction_type; /* Type Python 'ArchInstruc...'*/
     PyObject *dict;                         /* Dictionnaire du module      */
 
     py_arch_instruction_type = get_python_arch_instruction_type();
diff --git a/plugins/pychrysa/arch/module.c b/plugins/pychrysa/arch/module.c
index 68f702d..d9eabed 100644
--- a/plugins/pychrysa/arch/module.c
+++ b/plugins/pychrysa/arch/module.c
@@ -36,6 +36,7 @@
 #include "instruction.h"
 #include "operand.h"
 #include "processor.h"
+#include "raw.h"
 #include "vmpa.h"
 #include "arm/module.h"
 #include "../helpers.h"
@@ -146,6 +147,7 @@ bool add_arch_module_to_python_module(PyObject *super)
     result &= register_python_arch_operand(module);
     result &= register_python_arch_processor(module);
     result &= register_python_instr_iterator(module);
+    result &= register_python_raw_instruction(module);
     result &= register_python_vmpa(module);
     result &= register_python_mrange(module);
 
diff --git a/plugins/pychrysa/arch/raw.c b/plugins/pychrysa/arch/raw.c
new file mode 100644
index 0000000..39b5fe7
--- /dev/null
+++ b/plugins/pychrysa/arch/raw.c
@@ -0,0 +1,263 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * raw.c - équivalent Python du fichier "arch/raw.h"
+ *
+ * Copyright (C) 2017 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 "raw.h"
+
+
+#include <pygobject.h>
+
+
+#include <arch/raw.h>
+
+
+#include "instruction.h"
+#include "../helpers.h"
+
+
+
+/* Indique si le contenu de l'instruction est du bourrage. */
+static PyObject *py_arch_instruction_is_padding(PyObject *, void *);
+
+/* Marque l'instruction comme ne contenant que du bourrage. */
+static int py_arch_instruction_mark_as_padding(PyObject *, PyObject *, void *);
+
+/* Indique si le contenu de l'instruction est un texte. */
+static PyObject *py_arch_instruction_is_string(PyObject *, void *);
+
+/* Marque l'instruction comme contenant une chaîne de texte. */
+static int py_arch_instruction_mark_as_string(PyObject *, PyObject *, void *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = classe représentant une instruction.               *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Indique si le contenu de l'instruction est du bourrage.      *
+*                                                                             *
+*  Retour      : Valeur associée à la propriété consultée.                    *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_is_padding(PyObject *self, void *closure)
+{
+    PyObject *result;                       /* Conversion à retourner      */
+    GRawInstruction *instr;                 /* Version native              */
+    bool state;                             /* Etat courant à consulter    */
+
+    instr = G_RAW_INSTRUCTION(pygobject_get(self));
+
+    state = g_raw_instruction_is_padding(instr);
+
+    result = state ? Py_True : Py_False;
+    Py_INCREF(result);
+
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = objet Python concerné par l'appel.                 *
+*                value   = valeur fournie à intégrer ou prendre en compte.    *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Marque l'instruction comme ne contenant que du bourrage.     *
+*                                                                             *
+*  Retour      : Bilan de l'opération pour Python.                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static int py_arch_instruction_mark_as_padding(PyObject *self, PyObject *value, void *closure)
+{
+    bool state;                             /* Nouvel état à définir       */
+    GRawInstruction *instr;                 /* Version native              */
+
+    if (value != Py_True && value != Py_False)
+        return -1;
+
+    state = (value == Py_True);
+
+    instr = G_RAW_INSTRUCTION(pygobject_get(self));
+
+    g_raw_instruction_mark_as_padding(instr, state);
+
+    return 0;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = classe représentant une instruction.               *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Indique si le contenu de l'instruction est un texte.         *
+*                                                                             *
+*  Retour      : Valeur associée à la propriété consultée.                    *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_arch_instruction_is_string(PyObject *self, void *closure)
+{
+    PyObject *result;                       /* Conversion à retourner      */
+    GRawInstruction *instr;                 /* Version native              */
+    bool state;                             /* Etat courant à consulter    */
+
+    instr = G_RAW_INSTRUCTION(pygobject_get(self));
+
+    state = g_raw_instruction_is_string(instr);
+
+    result = state ? Py_True : Py_False;
+    Py_INCREF(result);
+
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self    = objet Python concerné par l'appel.                 *
+*                value   = valeur fournie à intégrer ou prendre en compte.    *
+*                closure = adresse non utilisée ici.                          *
+*                                                                             *
+*  Description : Marque l'instruction comme contenant une chaîne de texte.    *
+*                                                                             *
+*  Retour      : Bilan de l'opération pour Python.                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static int py_arch_instruction_mark_as_string(PyObject *self, PyObject *value, void *closure)
+{
+    bool state;                             /* Nouvel état à définir       */
+    GRawInstruction *instr;                 /* Version native              */
+
+    if (value != Py_True && value != Py_False)
+        return -1;
+
+    state = (value == Py_True);
+
+    instr = G_RAW_INSTRUCTION(pygobject_get(self));
+
+    g_raw_instruction_mark_as_string(instr, state);
+
+    return 0;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Fournit un accès à une définition de type à diffuser.        *
+*                                                                             *
+*  Retour      : Définition d'objet pour Python.                              *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyTypeObject *get_python_raw_instruction_type(void)
+{
+    static PyMethodDef py_raw_instruction_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_raw_instruction_getseters[] = {
+        {
+            "is_padding", py_arch_instruction_is_padding, py_arch_instruction_mark_as_padding,
+            "Report if the instruction is seen as padding.", NULL
+        },
+        {
+            "is_string", py_arch_instruction_is_string, py_arch_instruction_mark_as_string,
+            "Report if the instruction is seen as a string.", NULL
+        },
+        { NULL }
+    };
+
+    static PyTypeObject py_raw_instruction_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name        = "pychrysalide.arch.RawInstruction",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT,
+
+        .tp_doc         = "PyChrysalide raw instruction for a all architectures.",
+
+        .tp_methods     = py_raw_instruction_methods,
+        .tp_getset      = py_raw_instruction_getseters,
+
+    };
+
+    return &py_raw_instruction_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  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_raw_instruction(PyObject *module)
+{
+    PyTypeObject *py_raw_instruction_type;  /* Type Python 'RawInstruction'*/
+    PyObject *dict;                         /* Dictionnaire du module      */
+    PyTypeObject *base;                     /* Base parente pour héritage  */
+
+    py_raw_instruction_type = get_python_raw_instruction_type();
+
+    dict = PyModule_GetDict(module);
+
+    base = get_python_arch_instruction_type();
+
+    if (!register_class_for_pygobject(dict, G_TYPE_RAW_INSTRUCTION, py_raw_instruction_type, base))
+        return false;
+
+    return true;
+
+}
diff --git a/plugins/pychrysa/arch/raw.h b/plugins/pychrysa/arch/raw.h
new file mode 100644
index 0000000..4c1db7a
--- /dev/null
+++ b/plugins/pychrysa/arch/raw.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * raw.h - prototypes pour l'équivalent Python du fichier "arch/raw.h"
+ *
+ * Copyright (C) 2017 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_PYCHRYSA_ARCH_RAW_H
+#define _PLUGINS_PYCHRYSA_ARCH_RAW_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_raw_instruction_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.arch.RawInstruction'. */
+bool register_python_raw_instruction(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_ARCH_RAW_H */