Created an interface for jumping to addresses from operands.

5 files changed, 224 insertions, 1 deletions

diff --git a/plugins/pychrysalide/analysis/content.c b/plugins/pychrysalide/analysis/content.c
index 05f1c74..4be318d 100644
--- a/plugins/pychrysalide/analysis/content.c
+++ b/plugins/pychrysalide/analysis/content.c
@@ -454,7 +454,6 @@ PyTypeObject *get_python_binary_content_type(void)
             "data", py_binary_content_get_all_bytes, NULL,
             "Provide all the content bytes at once.", NULL
         },
-
         { NULL }
     };
 
diff --git a/plugins/pychrysalide/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index eb4b127..da66457 100644
--- a/plugins/pychrysalide/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
@@ -9,6 +9,7 @@ libpychrysaarch_la_SOURCES =			\
 	operand.h operand.c					\
 	processor.h processor.c				\
 	raw.h raw.c							\
+	targetableop.h targetableop.c		\
 	vmpa.h vmpa.c
 
 libpychrysaarch_la_LIBADD =	
diff --git a/plugins/pychrysalide/arch/module.c b/plugins/pychrysalide/arch/module.c
index 54b470c..9c10965 100644
--- a/plugins/pychrysalide/arch/module.c
+++ b/plugins/pychrysalide/arch/module.c
@@ -37,6 +37,7 @@
 #include "operand.h"
 #include "processor.h"
 #include "raw.h"
+#include "targetableop.h"
 #include "vmpa.h"
 #include "../access.h"
 #include "../helpers.h"
@@ -143,6 +144,8 @@ bool add_arch_module_to_python_module(PyObject *super)
 
     result &= py_base_define_constants(Py_TYPE(module));
 
+    result &= register_python_targetable_operand(module);
+
     result &= register_python_arch_instruction(module);
     result &= register_python_arch_operand(module);
     result &= register_python_arch_processor(module);
diff --git a/plugins/pychrysalide/arch/targetableop.c b/plugins/pychrysalide/arch/targetableop.c
new file mode 100644
index 0000000..8951492
--- /dev/null
+++ b/plugins/pychrysalide/arch/targetableop.c
@@ -0,0 +1,178 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * targetableop.c - prototypes pour l'équivalent Python du fichier "arch/targetableop.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 "targetableop.h"
+
+
+#include <assert.h>
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <arch/targetableop.h>
+
+
+#include "processor.h"
+#include "vmpa.h"
+#include "../format/format.h"
+
+
+
+/* Obtient l'adresse de la cible visée par un opérande. */
+static PyObject *py_targetable_operand_get_addr(PyObject *, PyObject *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = contenu binaire à manipuler.                          *
+*                args = non utilisé ici.                                      *
+*                                                                             *
+*  Description : Obtient l'adresse de la cible visée par un opérande.         *
+*                                                                             *
+*  Retour      : Localisation de la cible ou None.                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_targetable_operand_get_addr(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    PyObject *src_obj;                      /* Objet pour une position     */
+    PyObject *format_obj;                   /* Objet pour un format        */
+    PyObject *proc_obj;                     /* Objet pour une architecture */
+    int ret;                                /* Bilan de lecture des args.  */
+    vmpa2t *src;                            /* Version native d'adresse    */
+    GBinFormat *format;                     /* Instance GLib du format     */
+    GArchProcessor *proc;                   /* Instance GLib de l'archi.   */
+    GTargetableOperand *operand;            /* Instance à manipuler        */
+    vmpa2t addr;                            /* Localisation à cibler       */
+    bool defined;                           /* Cible définie ?             */
+
+    ret = PyArg_ParseTuple(args, "O!",
+                           get_python_vmpa_type(), &src_obj,
+                           get_python_binary_format_type(), &format_obj,
+                           get_python_arch_processor_type(), &proc_obj);
+    if (!ret) return NULL;
+
+    src = get_internal_vmpa(src_obj);
+    assert(src != NULL);
+
+    format = G_BIN_FORMAT(pygobject_get(format_obj));
+    proc = G_ARCH_PROCESSOR(pygobject_get(proc_obj));
+
+    operand = G_TARGETABLE_OPERAND(pygobject_get(self));
+    assert(operand != NULL);
+
+    defined = g_targetable_operand_get_addr(operand, src, format, proc, &addr);
+
+    if (defined)
+        result = build_from_internal_vmpa(&addr);
+    else
+    {
+        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_targetable_operand_type(void)
+{
+    static PyMethodDef py_targetable_operand_methods[] = {
+        {
+            "get_addr", py_targetable_operand_get_addr,
+            METH_VARARGS,
+            "get_addr($self, src, format, proc, /)\n--\n\nGet a target address from an operand."
+        },
+        { NULL }
+    };
+
+    static PyGetSetDef py_targetable_operand_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_targetable_operand_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name        = "pychrysalide.arch.TargetableOperand",
+        .tp_basicsize   = sizeof(PyObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide targetable operand",
+
+        .tp_methods     = py_targetable_operand_methods,
+        .tp_getset      = py_targetable_operand_getseters
+
+    };
+
+    return &py_targetable_operand_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.....TargetableOperand'.*
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_targetable_operand(PyObject *module)
+{
+    PyTypeObject *py_targetable_operand_type; /* Type 'TargetableOperand'  */
+    PyObject *dict;                         /* Dictionnaire du module      */
+
+    py_targetable_operand_type = get_python_targetable_operand_type();
+
+    dict = PyModule_GetDict(module);
+    pyg_register_interface(dict, "TargetableOperand", G_TYPE_TARGETABLE_OPERAND, py_targetable_operand_type);
+
+    return true;
+
+}
diff --git a/plugins/pychrysalide/arch/targetableop.h b/plugins/pychrysalide/arch/targetableop.h
new file mode 100644
index 0000000..d79bb87
--- /dev/null
+++ b/plugins/pychrysalide/arch/targetableop.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * targetableop.h - prototypes pour l'équivalent Python du fichier "arch/targetableop.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_ARCH_TARGETABLEOP_H
+#define _PLUGINS_PYCHRYSALIDE_ARCH_TARGETABLEOP_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_targetable_operand_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.arch.TargetableOperand'. */
+bool register_python_targetable_operand(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSALIDE_ARCH_TARGETABLEOP_H */