summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/arm/v7/fetch.c2
-rw-r--r--plugins/arm/v7/processor.c3
-rw-r--r--plugins/dalvik/context.c2
-rw-r--r--plugins/elf/strings.c2
-rw-r--r--plugins/elf/symbols.c2
-rw-r--r--plugins/fmtp/parser.c2
-rw-r--r--plugins/pychrysalide/analysis/constants.c20
-rw-r--r--plugins/pychrysalide/arch/Makefile.am1
-rw-r--r--plugins/pychrysalide/arch/constants.c43
-rw-r--r--plugins/pychrysalide/arch/constants.h3
-rw-r--r--plugins/pychrysalide/arch/instructions/Makefile.am1
-rw-r--r--plugins/pychrysalide/arch/instructions/constants.c42
-rw-r--r--plugins/pychrysalide/arch/instructions/constants.h3
-rw-r--r--plugins/pychrysalide/arch/instructions/module.c2
-rw-r--r--plugins/pychrysalide/arch/instructions/raw.c (renamed from plugins/pychrysalide/arch/raw.c)216
-rw-r--r--plugins/pychrysalide/arch/instructions/raw.h (renamed from plugins/pychrysalide/arch/raw.h)10
-rw-r--r--plugins/pychrysalide/arch/instructions/undefined.c4
-rw-r--r--plugins/pychrysalide/arch/instructions/undefined.h2
-rw-r--r--plugins/pychrysalide/arch/module.c2
-rw-r--r--plugins/readdex/ids.c2
-rw-r--r--plugins/readelf/strtab.c2
-rw-r--r--src/analysis/disass/area.c2
-rw-r--r--src/analysis/disass/block.c2
-rw-r--r--src/analysis/disass/links.c2
-rw-r--r--src/analysis/routine.c2
-rw-r--r--src/arch/Makefile.am1
-rw-r--r--src/arch/instructions/Makefile.am1
-rw-r--r--src/arch/instructions/raw.c (renamed from src/arch/raw.c)6
-rw-r--r--src/arch/instructions/raw.h (renamed from src/arch/raw.h)10
-rw-r--r--src/arch/processor.c1
-rw-r--r--src/core/processors.c2
-rw-r--r--tests/arch/raw.py32
32 files changed, 325 insertions, 102 deletions
diff --git a/plugins/arm/v7/fetch.c b/plugins/arm/v7/fetch.c
index 6a4e47e..a24f99a 100644
--- a/plugins/arm/v7/fetch.c
+++ b/plugins/arm/v7/fetch.c
@@ -30,7 +30,7 @@
#include <i18n.h>
#include <arch/processor.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <arch/operands/immediate.h>
#include <arch/operands/register.h>
#include <format/format.h>
diff --git a/plugins/arm/v7/processor.c b/plugins/arm/v7/processor.c
index e990344..61de7b5 100644
--- a/plugins/arm/v7/processor.c
+++ b/plugins/arm/v7/processor.c
@@ -27,9 +27,6 @@
#include <assert.h>
-#include <arch/raw.h>
-
-
#include "arm.h"
#include "context.h"
#include "thumb_16.h"
diff --git a/plugins/dalvik/context.c b/plugins/dalvik/context.c
index f16f90e..b08678c 100644
--- a/plugins/dalvik/context.c
+++ b/plugins/dalvik/context.c
@@ -32,7 +32,7 @@
#include <analysis/contents/restricted.h>
#include <arch/context-int.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <common/sort.h>
#include <plugins/dex/dex-int.h>
diff --git a/plugins/elf/strings.c b/plugins/elf/strings.c
index dafc25b..7a2b34a 100644
--- a/plugins/elf/strings.c
+++ b/plugins/elf/strings.c
@@ -33,7 +33,7 @@
#include <i18n.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <core/global.h>
#include <core/nproc.h>
#include <format/strsym.h>
diff --git a/plugins/elf/symbols.c b/plugins/elf/symbols.c
index 80a9143..2a164a0 100644
--- a/plugins/elf/symbols.c
+++ b/plugins/elf/symbols.c
@@ -31,7 +31,7 @@
#include <i18n.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <common/extstr.h>
#include <common/sort.h>
#include <core/global.h>
diff --git a/plugins/fmtp/parser.c b/plugins/fmtp/parser.c
index 9026fe2..3379ac2 100644
--- a/plugins/fmtp/parser.c
+++ b/plugins/fmtp/parser.c
@@ -28,7 +28,7 @@
#include <i18n.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
diff --git a/plugins/pychrysalide/analysis/constants.c b/plugins/pychrysalide/analysis/constants.c
index 2b7c3b5..d014fb7 100644
--- a/plugins/pychrysalide/analysis/constants.c
+++ b/plugins/pychrysalide/analysis/constants.c
@@ -68,16 +68,16 @@ bool define_analysis_content_constants(PyTypeObject *type)
values = PyDict_New();
result = add_const_to_group(values, "UNDEFINED", MDS_UNDEFINED);
- if (result) result = add_const_to_group(values, "4_BITS_UNSIGNED", MDS_4_BITS_UNSIGNED);
- if (result) result = add_const_to_group(values, "8_BITS_UNSIGNED", MDS_8_BITS_UNSIGNED);
- if (result) result = add_const_to_group(values, "16_BITS_UNSIGNED", MDS_16_BITS_UNSIGNED);
- if (result) result = add_const_to_group(values, "32_BITS_UNSIGNED", MDS_32_BITS_UNSIGNED);
- if (result) result = add_const_to_group(values, "64_BITS_UNSIGNED", MDS_64_BITS_UNSIGNED);
- if (result) result = add_const_to_group(values, "4_BITS_SIGNED", MDS_4_BITS_SIGNED);
- if (result) result = add_const_to_group(values, "8_BITS_SIGNED", MDS_8_BITS_SIGNED);
- if (result) result = add_const_to_group(values, "16_BITS_SIGNED", MDS_16_BITS_SIGNED);
- if (result) result = add_const_to_group(values, "32_BITS_SIGNED", MDS_32_BITS_SIGNED);
- if (result) result = add_const_to_group(values, "64_BITS_SIGNED", MDS_64_BITS_SIGNED);
+ if (result) result = add_const_to_group(values, "_4_BITS_UNSIGNED", MDS_4_BITS_UNSIGNED);
+ if (result) result = add_const_to_group(values, "_8_BITS_UNSIGNED", MDS_8_BITS_UNSIGNED);
+ if (result) result = add_const_to_group(values, "_16_BITS_UNSIGNED", MDS_16_BITS_UNSIGNED);
+ if (result) result = add_const_to_group(values, "_32_BITS_UNSIGNED", MDS_32_BITS_UNSIGNED);
+ if (result) result = add_const_to_group(values, "_64_BITS_UNSIGNED", MDS_64_BITS_UNSIGNED);
+ if (result) result = add_const_to_group(values, "_4_BITS_SIGNED", MDS_4_BITS_SIGNED);
+ if (result) result = add_const_to_group(values, "_8_BITS_SIGNED", MDS_8_BITS_SIGNED);
+ if (result) result = add_const_to_group(values, "_16_BITS_SIGNED", MDS_16_BITS_SIGNED);
+ if (result) result = add_const_to_group(values, "_32_BITS_SIGNED", MDS_32_BITS_SIGNED);
+ if (result) result = add_const_to_group(values, "_64_BITS_SIGNED", MDS_64_BITS_SIGNED);
if (!result)
{
diff --git a/plugins/pychrysalide/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index da78572..45fd567 100644
--- a/plugins/pychrysalide/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
@@ -10,7 +10,6 @@ libpychrysaarch_la_SOURCES = \
module.h module.c \
operand.h operand.c \
processor.h processor.c \
- raw.h raw.c \
register.h register.c \
vmpa.h vmpa.c
diff --git a/plugins/pychrysalide/arch/constants.c b/plugins/pychrysalide/arch/constants.c
index b6b0e62..5e9ad37 100644
--- a/plugins/pychrysalide/arch/constants.c
+++ b/plugins/pychrysalide/arch/constants.c
@@ -25,7 +25,7 @@
#include "constants.h"
-#include <arch/raw.h>
+#include <arch/instruction.h>
#include <arch/vmpa.h>
@@ -149,44 +149,3 @@ bool define_arch_vmpa_constants(PyTypeObject *type)
return result;
}
-
-
-/******************************************************************************
-* *
-* Paramètres : type = type dont le dictionnaire est à compléter. *
-* *
-* Description : Définit les constantes relatives aux instructions brutes. *
-* *
-* Retour : true en cas de succès de l'opération, false sinon. *
-* *
-* Remarques : - *
-* *
-******************************************************************************/
-
-bool define_raw_instruction_constants(PyTypeObject *type)
-{
- bool result; /* Bilan à retourner */
- PyObject *values; /* Groupe de valeurs à établir */
-
- values = PyDict_New();
-
- result = add_const_to_group(values, "PADDING", RIF_PADDING);
- if (result) result = add_const_to_group(values, "STRING", RIF_STRING);
-
- if (!result)
- {
- Py_DECREF(values);
- goto exit;
- }
-
- result = attach_constants_group_to_type(type, true, "RawInstrFlag", values,
- "Flags for some instruction properties.\n"
- "\n"
- "They can be seen as an extension of" \
- " pychrysalide.arch.ArchInstruction.ArchInstrFlag");
-
- exit:
-
- return result;
-
-}
diff --git a/plugins/pychrysalide/arch/constants.h b/plugins/pychrysalide/arch/constants.h
index 9488bc0..ecd6ce8 100644
--- a/plugins/pychrysalide/arch/constants.h
+++ b/plugins/pychrysalide/arch/constants.h
@@ -37,9 +37,6 @@ bool define_arch_instruction_constants(PyTypeObject *);
/* Définit les constantes relatives aux emplacements. */
bool define_arch_vmpa_constants(PyTypeObject *);
-/* Définit les constantes relatives aux instructions brutes. */
-bool define_raw_instruction_constants(PyTypeObject *);
-
#endif /* _PLUGINS_PYCHRYSALIDE_ARCH_CONSTANTS_H */
diff --git a/plugins/pychrysalide/arch/instructions/Makefile.am b/plugins/pychrysalide/arch/instructions/Makefile.am
index 885f96e..be7c6d7 100644
--- a/plugins/pychrysalide/arch/instructions/Makefile.am
+++ b/plugins/pychrysalide/arch/instructions/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libpychrysaarchinstructions.la
libpychrysaarchinstructions_la_SOURCES = \
constants.h constants.c \
module.h module.c \
+ raw.h raw.c \
undefined.h undefined.c
libpychrysaarchinstructions_la_LIBADD =
diff --git a/plugins/pychrysalide/arch/instructions/constants.c b/plugins/pychrysalide/arch/instructions/constants.c
index 1f6a1d2..b5e08e1 100644
--- a/plugins/pychrysalide/arch/instructions/constants.c
+++ b/plugins/pychrysalide/arch/instructions/constants.c
@@ -25,6 +25,7 @@
#include "constants.h"
+#include <arch/instructions/raw.h>
#include <arch/instructions/undefined.h>
@@ -36,6 +37,47 @@
* *
* Paramètres : type = type dont le dictionnaire est à compléter. *
* *
+* Description : Définit les constantes relatives aux instructions brutes. *
+* *
+* Retour : true en cas de succès de l'opération, false sinon. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool define_raw_instruction_constants(PyTypeObject *type)
+{
+ bool result; /* Bilan à retourner */
+ PyObject *values; /* Groupe de valeurs à établir */
+
+ values = PyDict_New();
+
+ result = add_const_to_group(values, "PADDING", RIF_PADDING);
+ if (result) result = add_const_to_group(values, "STRING", RIF_STRING);
+
+ if (!result)
+ {
+ Py_DECREF(values);
+ goto exit;
+ }
+
+ result = attach_constants_group_to_type(type, true, "RawInstrFlag", values,
+ "Flags for some instruction properties.\n"
+ "\n"
+ "They can be seen as an extension of" \
+ " pychrysalide.arch.ArchInstruction.ArchInstrFlag");
+
+ exit:
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : type = type dont le dictionnaire est à compléter. *
+* *
* Description : Définit les constantes liées aux comportements erratiques. *
* *
* Retour : true en cas de succès de l'opération, false sinon. *
diff --git a/plugins/pychrysalide/arch/instructions/constants.h b/plugins/pychrysalide/arch/instructions/constants.h
index c25f3f8..2f0c587 100644
--- a/plugins/pychrysalide/arch/instructions/constants.h
+++ b/plugins/pychrysalide/arch/instructions/constants.h
@@ -31,6 +31,9 @@
+/* Définit les constantes relatives aux instructions brutes. */
+bool define_raw_instruction_constants(PyTypeObject *);
+
/* Définit les constantes liées aux comportements erratiques. */
bool define_undefined_instruction_constants(PyTypeObject *);
diff --git a/plugins/pychrysalide/arch/instructions/module.c b/plugins/pychrysalide/arch/instructions/module.c
index 13a9c8e..5280db8 100644
--- a/plugins/pychrysalide/arch/instructions/module.c
+++ b/plugins/pychrysalide/arch/instructions/module.c
@@ -28,6 +28,7 @@
#include <assert.h>
+#include "raw.h"
#include "undefined.h"
#include "../../helpers.h"
@@ -95,6 +96,7 @@ bool populate_arch_instructions_module(void)
result = true;
+ if (result) result = ensure_python_raw_instruction_is_registered();
if (result) result = ensure_python_undefined_instruction_is_registered();
assert(result);
diff --git a/plugins/pychrysalide/arch/raw.c b/plugins/pychrysalide/arch/instructions/raw.c
index 43f2e5e..10e5c8f 100644
--- a/plugins/pychrysalide/arch/raw.c
+++ b/plugins/pychrysalide/arch/instructions/raw.c
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * raw.c - équivalent Python du fichier "arch/raw.h"
+ * raw.c - équivalent Python du fichier "arch/instructions/raw.h"
*
* Copyright (C) 2018-2020 Cyrille Bagard
*
@@ -28,20 +28,25 @@
#include <pygobject.h>
-#include <arch/raw.h>
+#include <i18n.h>
+#include <arch/instructions/raw.h>
+#include <plugins/dt.h>
#include "constants.h"
-#include "instruction.h"
-#include "../access.h"
-#include "../helpers.h"
+#include "../instruction.h"
+#include "../vmpa.h"
+#include "../../access.h"
+#include "../../helpers.h"
+#include "../../analysis/content.h"
-#define RAW_INSTRUCTION_DOC \
- "The RawInstruction object handles data which is not (yet?) disassembled" \
- " as code in a binary."
+/* Accompagne la création d'une instance dérivée en Python. */
+static PyObject *py_raw_instruction_new(PyTypeObject *, PyObject *, PyObject *);
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_raw_instruction_init(PyObject *, PyObject *, PyObject *);
/* Indique si le contenu de l'instruction est du bourrage. */
static PyObject *py_raw_instruction_get_padding(PyObject *, void *);
@@ -59,6 +64,192 @@ static int py_raw_instruction_set_string(PyObject *, PyObject *, void *);
/******************************************************************************
* *
+* Paramètres : type = type du nouvel objet à mettre en place. *
+* args = éventuelle liste d'arguments. *
+* kwds = éventuel dictionnaire de valeurs mises à disposition. *
+* *
+* Description : Accompagne la création d'une instance dérivée en Python. *
+* *
+* Retour : Nouvel objet Python mis en place ou NULL en cas d'échec. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static PyObject *py_raw_instruction_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+ PyObject *result; /* Objet à retourner */
+ PyTypeObject *base; /* Type de base à dériver */
+ bool first_time; /* Evite les multiples passages*/
+ GType gtype; /* Nouveau type de processeur */
+ bool status; /* Bilan d'un enregistrement */
+
+ /* Validations diverses */
+
+ base = get_python_raw_instruction_type();
+
+ if (type == base)
+ goto simple_way;
+
+ /* Mise en place d'un type dédié */
+
+ first_time = (g_type_from_name(type->tp_name) == 0);
+
+ gtype = build_dynamic_type(G_TYPE_RAW_INSTRUCTION, type->tp_name, NULL, NULL, NULL);
+
+ if (first_time)
+ {
+ status = register_class_for_dynamic_pygobject(gtype, type, base);
+
+ if (!status)
+ {
+ result = NULL;
+ goto exit;
+ }
+
+ }
+
+ /* On crée, et on laisse ensuite la main à PyGObject_Type.tp_init() */
+
+ simple_way:
+
+ result = PyType_GenericNew(type, args, kwds);
+
+ exit:
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : self = objet à initialiser (théoriquement). *
+* args = arguments fournis à l'appel. *
+* kwds = arguments de type key=val fournis. *
+* *
+* Description : Initialise une instance sur la base du dérivé de GObject. *
+* *
+* Retour : 0. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static int py_raw_instruction_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+ int result; /* Bilan à retourner */
+ vmpa2t *addr; /* Texte de lecture */
+ unsigned long mem_size; /* Taille de portion brute */
+ unsigned long long value; /* Valeur brute à considérer */
+ GBinContent *content; /* Contenu à lire au besoin */
+ unsigned long count; /* Nombre d'éléments à lister */
+ unsigned int endian; /* Type de boutisme impliqué */
+ int ret; /* Bilan de lecture des args. */
+ PyObject *new_args; /* Nouveaux arguments épurés */
+ PyObject *new_kwds; /* Nouveau dictionnaire épuré */
+ GArchInstruction *fake; /* Instruction à copier */
+ GArchInstruction *instr; /* Instruction à manipuler */
+ size_t op_count; /* Nombre d'opérande à copier */
+ size_t i; /* Boucle de parcours */
+ GArchOperand *op; /* Opérande à transférer */
+
+ static char *kwlist[] = { "addr", "mem_size", "value", "content", "count", "endian", NULL };
+
+#define RAW_INSTRUCTION_DOC \
+ "The RawInstruction object handles data which is not (yet?) disassembled" \
+ " as code in a binary.\n" \
+ "\n" \
+ "Raw values pointed by this kind of instruction can be immediate values" \
+ " or strings.\n" \
+ "\n" \
+ "Instances can be created using one of the following constructors:\n" \
+ "\n" \
+ " RawInstruction(addr, size, value=int)\n" \
+ " RawInstruction(addr, size, content=object, count=int, endian=int)" \
+ "\n" \
+ "Where addr is always a location defined by a pychrysalide.arch.vmpa" \
+ " object and size is a pychrysalide.analysis.BinContent.MemoryDataSize" \
+ " constant defining the size of the read immediate value(s).\n" \
+ "\n" \
+ "In the first case, value is used to build an immediate operand for the" \
+ " instruction.\n" \
+ "\n" \
+ "In the second case, content is a pychrysalide.analysis.BinContent" \
+ " instance, count states how many items belong to the array and endian" \
+ " is a pychrysalide.analysis.BinContent.SourceEndian constant defining" \
+ " the byte order used to read values."
+
+ result = -1;
+
+ /* Récupération des paramètres */
+
+ value = 0;
+ content = NULL;
+ count = 0;
+ endian = 0;
+
+ ret = PyArg_ParseTupleAndKeywords(args, kwds, "O&k|KO&kI", kwlist,
+ convert_any_to_vmpa, &addr, &mem_size,
+ &value, convert_to_binary_content, &content, &count, &endian);
+ if (!ret) return -1;
+
+ /* Initialisation d'un objet GLib */
+
+ new_args = PyTuple_New(0);
+ new_kwds = PyDict_New();
+
+ ret = PyGObject_Type.tp_init(self, new_args, new_kwds);
+
+ Py_DECREF(new_kwds);
+ Py_DECREF(new_args);
+
+ if (ret == -1) goto clean_exit;
+
+ /* Eléments de base */
+
+ if (content != NULL)
+ fake = g_raw_instruction_new_array(content, mem_size, count, addr, endian);
+ else
+ fake = g_raw_instruction_new_from_value(addr, mem_size, value);
+
+ if (fake == NULL)
+ {
+ PyErr_SetString(PyExc_ValueError, _("Unable to build the object with the given parameters."));
+ goto clean_exit;
+ }
+
+ instr = G_ARCH_INSTRUCTION(pygobject_get(self));
+
+ g_arch_instruction_lock_operands(fake);
+
+ op_count = _g_arch_instruction_count_operands(fake);
+
+ for (i = 0; i < op_count; i++)
+ {
+ op = _g_arch_instruction_get_operand(fake, i);
+ g_arch_instruction_attach_extra_operand(instr, op);
+ }
+
+ g_arch_instruction_unlock_operands(fake);
+
+ g_arch_instruction_set_range(instr, g_arch_instruction_get_range(fake));
+
+ g_object_unref(G_OBJECT(fake));
+
+ result = 0;
+
+ clean_exit:
+
+ clean_vmpa_arg(addr);
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
* Paramètres : self = classe représentant une instruction. *
* closure = adresse non utilisée ici. *
* *
@@ -227,7 +418,7 @@ PyTypeObject *get_python_raw_instruction_type(void)
PyVarObject_HEAD_INIT(NULL, 0)
- .tp_name = "pychrysalide.arch.RawInstruction",
+ .tp_name = "pychrysalide.arch.instructions.RawInstruction",
.tp_basicsize = sizeof(PyGObject),
.tp_flags = Py_TPFLAGS_DEFAULT,
@@ -237,6 +428,9 @@ PyTypeObject *get_python_raw_instruction_type(void)
.tp_methods = py_raw_instruction_methods,
.tp_getset = py_raw_instruction_getseters,
+ .tp_init = py_raw_instruction_init,
+ .tp_new = py_raw_instruction_new,
+
};
return &py_raw_instruction_type;
@@ -248,7 +442,7 @@ PyTypeObject *get_python_raw_instruction_type(void)
* *
* Paramètres : module = module dont la définition est à compléter. *
* *
-* Description : Prend en charge l'objet 'pychrysalide.arch.ArchInstruction'. *
+* Description : Prend en charge l'objet 'pychrysalide.arch...RawInstruction'.*
* *
* Retour : Bilan de l'opération. *
* *
@@ -266,7 +460,7 @@ bool ensure_python_raw_instruction_is_registered(void)
if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
{
- module = get_access_to_python_module("pychrysalide.arch");
+ module = get_access_to_python_module("pychrysalide.arch.instructions");
dict = PyModule_GetDict(module);
diff --git a/plugins/pychrysalide/arch/raw.h b/plugins/pychrysalide/arch/instructions/raw.h
index e05e773..46518b5 100644
--- a/plugins/pychrysalide/arch/raw.h
+++ b/plugins/pychrysalide/arch/instructions/raw.h
@@ -1,6 +1,6 @@
/* Chrysalide - Outil d'analyse de fichiers binaires
- * raw.h - prototypes pour l'équivalent Python du fichier "arch/raw.h"
+ * raw.h - prototypes pour l'équivalent Python du fichier "arch/instructions/raw.h"
*
* Copyright (C) 2018-2020 Cyrille Bagard
*
@@ -22,8 +22,8 @@
*/
-#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H
-#define _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H
+#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_INSTRUCTIONS_RAW_H
+#define _PLUGINS_PYCHRYSALIDE_ARCH_INSTRUCTIONS_RAW_H
#include <Python.h>
@@ -34,7 +34,7 @@
/* 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'. */
+/* Prend en charge l'objet 'pychrysalide.arch.instructions.RawInstruction'. */
bool ensure_python_raw_instruction_is_registered(void);
/* Tente de convertir en instruction brute. */
@@ -42,4 +42,4 @@ int convert_to_raw_instruction(PyObject *, void *);
-#endif /* _PLUGINS_PYCHRYSALIDE_ARCH_RAW_H */
+#endif /* _PLUGINS_PYCHRYSALIDE_ARCH_INSTRUCTIONS_RAW_H */
diff --git a/plugins/pychrysalide/arch/instructions/undefined.c b/plugins/pychrysalide/arch/instructions/undefined.c
index a2c989e..ee7dc51 100644
--- a/plugins/pychrysalide/arch/instructions/undefined.c
+++ b/plugins/pychrysalide/arch/instructions/undefined.c
@@ -269,7 +269,7 @@ PyTypeObject *get_python_undefined_instruction_type(void)
* *
* Paramètres : module = module dont la définition est à compléter. *
* *
-* Description : Prend en charge l'objet 'pychrysalide.arch.ArchInstruction'. *
+* Description : Prend en charge l'objet 'pychrysalide.....UndefInstruction'. *
* *
* Retour : Bilan de l'opération. *
* *
@@ -279,7 +279,7 @@ PyTypeObject *get_python_undefined_instruction_type(void)
bool ensure_python_undefined_instruction_is_registered(void)
{
- PyTypeObject *type; /* Type Python 'UndefinedInstruction'*/
+ PyTypeObject *type; /* Type 'UndefinedInstruction' */
PyObject *module; /* Module à recompléter */
PyObject *dict; /* Dictionnaire du module */
diff --git a/plugins/pychrysalide/arch/instructions/undefined.h b/plugins/pychrysalide/arch/instructions/undefined.h
index 4e9090c..3fa0453 100644
--- a/plugins/pychrysalide/arch/instructions/undefined.h
+++ b/plugins/pychrysalide/arch/instructions/undefined.h
@@ -34,7 +34,7 @@
/* Fournit un accès à une définition de type à diffuser. */
PyTypeObject *get_python_undefined_instruction_type(void);
-/* Prend en charge l'objet 'pychrysalide.arch.UndefinedInstruction'. */
+/* Prend en charge l'objet 'pychrysalide.arch.instructions.UndefInstruction'. */
bool ensure_python_undefined_instruction_is_registered(void);
/* Tente de convertir en instruction non définie. */
diff --git a/plugins/pychrysalide/arch/module.c b/plugins/pychrysalide/arch/module.c
index 05942a5..1fa017d 100644
--- a/plugins/pychrysalide/arch/module.c
+++ b/plugins/pychrysalide/arch/module.c
@@ -38,7 +38,6 @@
#include "instruction.h"
#include "operand.h"
#include "processor.h"
-#include "raw.h"
#include "register.h"
#include "vmpa.h"
#include "instructions/module.h"
@@ -174,7 +173,6 @@ bool populate_arch_module(void)
if (result) result = ensure_python_arch_instruction_is_registered();
if (result) result = ensure_python_arch_operand_is_registered();
if (result) result = ensure_python_arch_processor_is_registered();
- if (result) result = ensure_python_raw_instruction_is_registered();
if (result) result = ensure_python_arch_register_is_registered();
if (result) result = ensure_python_vmpa_is_registered();
if (result) result = ensure_python_mrange_is_registered();
diff --git a/plugins/readdex/ids.c b/plugins/readdex/ids.c
index 5c812a9..72c4072 100644
--- a/plugins/readdex/ids.c
+++ b/plugins/readdex/ids.c
@@ -29,7 +29,7 @@
#include <i18n.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <format/symbol.h>
#include <plugins/dex/dex_def.h>
#include <plugins/fmtp/parser.h>
diff --git a/plugins/readelf/strtab.c b/plugins/readelf/strtab.c
index 141c868..2420da6 100644
--- a/plugins/readelf/strtab.c
+++ b/plugins/readelf/strtab.c
@@ -28,7 +28,7 @@
#include <ctype.h>
-#include <arch/raw.h>
+#include <arch/instructions/raw.h>
#include <format/strsym.h>
#include <plugins/elf/section.h>
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c
index f010fa9..eaec25d 100644
--- a/src/analysis/disass/area.c
+++ b/src/analysis/disass/area.c
@@ -34,7 +34,7 @@
#include "../routine.h"
#include "../contents/restricted.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
#include "../../common/bits.h"
#include "../../common/sort.h"
#include "../../core/global.h"
diff --git a/src/analysis/disass/block.c b/src/analysis/disass/block.c
index e3f19d3..c80d464 100644
--- a/src/analysis/disass/block.c
+++ b/src/analysis/disass/block.c
@@ -32,7 +32,7 @@
#include "../block-int.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
#include "../../common/extstr.h"
#include "../../core/params.h"
#include "../../glibext/gbinarycursor.h"
diff --git a/src/analysis/disass/links.c b/src/analysis/disass/links.c
index e22fb05..c4e7076 100644
--- a/src/analysis/disass/links.c
+++ b/src/analysis/disass/links.c
@@ -28,7 +28,7 @@
#include "../../arch/instruction.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
#include "../../arch/target.h"
#include "../../arch/operands/immediate.h"
#include "../../arch/operands/targetable.h"
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index b9106d9..02bd167 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -35,7 +35,7 @@
#include "routine-int.h"
-#include "../arch/raw.h"
+#include "../arch/instructions/raw.h"
#include "../common/extstr.h"
#include "../core/params.h"
#include "../glibext/gbinarycursor.h"
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 46f78e8..af0c79a 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -18,7 +18,6 @@ libarch_la_SOURCES = \
processor-int.h \
processor.h processor.c \
proxy.h proxy.c \
- raw.h raw.c \
register-int.h \
register.h register.c \
storage.h storage.c \
diff --git a/src/arch/instructions/Makefile.am b/src/arch/instructions/Makefile.am
index c060c7e..584173f 100644
--- a/src/arch/instructions/Makefile.am
+++ b/src/arch/instructions/Makefile.am
@@ -2,6 +2,7 @@
noinst_LTLIBRARIES = libarchinstructions.la
libarchinstructions_la_SOURCES = \
+ raw.h raw.c \
undefined-int.h \
undefined.h undefined.c
diff --git a/src/arch/raw.c b/src/arch/instructions/raw.c
index 285e168..7c2535c 100644
--- a/src/arch/raw.c
+++ b/src/arch/instructions/raw.c
@@ -32,9 +32,9 @@
#include <i18n.h>
-#include "instruction-int.h"
-#include "target.h"
-#include "operands/immediate.h"
+#include "../instruction-int.h"
+#include "../target.h"
+#include "../operands/immediate.h"
diff --git a/src/arch/raw.h b/src/arch/instructions/raw.h
index c745f4a..4e92cd4 100644
--- a/src/arch/raw.h
+++ b/src/arch/instructions/raw.h
@@ -21,15 +21,15 @@
*/
-#ifndef _ARCH_RAW_H
-#define _ARCH_RAW_H
+#ifndef _ARCH_INSTRUCTIONS_RAW_H
+#define _ARCH_INSTRUCTIONS_RAW_H
#include <glib-object.h>
-#include "instruction.h"
-#include "vmpa.h"
+#include "../instruction.h"
+#include "../vmpa.h"
@@ -88,4 +88,4 @@ bool g_raw_instruction_is_string(const GRawInstruction *);
-#endif /* _ARCH_RAW_H */
+#endif /* _ARCH_INSTRUCTIONS_RAW_H */
diff --git a/src/arch/processor.c b/src/arch/processor.c
index 96007fb..777b01e 100644
--- a/src/arch/processor.c
+++ b/src/arch/processor.c
@@ -35,7 +35,6 @@
#include "instruction-int.h"
#include "processor-int.h"
-#include "raw.h"
#include "../common/sort.h"
#include "../core/logs.h"
#include "../glibext/chrysamarshal.h"
diff --git a/src/core/processors.c b/src/core/processors.c
index c03b98f..224e9f7 100644
--- a/src/core/processors.c
+++ b/src/core/processors.c
@@ -29,8 +29,8 @@
#include <string.h>
-#include "../arch/raw.h"
#include "../arch/target.h"
+#include "../arch/instructions/raw.h"
#include "../arch/instructions/undefined.h"
#include "../arch/operands/immediate.h"
#include "../arch/operands/register.h"
diff --git a/tests/arch/raw.py b/tests/arch/raw.py
new file mode 100644
index 0000000..05d7435
--- /dev/null
+++ b/tests/arch/raw.py
@@ -0,0 +1,32 @@
+#!/usr/bin/python3-dbg
+# -*- coding: utf-8 -*-
+
+
+import pychrysalide
+from chrysacase import ChrysalideTestCase
+from pychrysalide.analysis import BinContent
+from pychrysalide.analysis.contents import MemoryContent
+from pychrysalide.arch import vmpa
+from pychrysalide.arch.instructions import RawInstruction
+
+
+class TestRawInstruction(ChrysalideTestCase):
+ """TestCase for arch.instructions.RawInstruction."""
+
+ def testConstructors(self):
+ """Build some raw instructions to check their constructors."""
+
+ instr = RawInstruction(vmpa(0), BinContent.MemoryDataSize._32_BITS_UNSIGNED, value=123)
+ self.assertIsNotNone(instr)
+
+ data = b'\x01\x02\x03\x04\x05\x06\x07\x08'
+ cnt = MemoryContent(data)
+
+ instr = RawInstruction(vmpa(0), BinContent.MemoryDataSize._32_BITS_UNSIGNED,
+ content=cnt, count=2, endian=BinContent.SourceEndian.LITTLE)
+ self.assertIsNotNone(instr)
+
+ with self.assertRaisesRegex(Exception, 'Unable to build the object with the given parameters.'):
+
+ instr = RawInstruction(vmpa(0), BinContent.MemoryDataSize._32_BITS_UNSIGNED,
+ content=cnt, count=3, endian=BinContent.SourceEndian.LITTLE)