summaryrefslogtreecommitdiff
path: root/src/arch/dalvik
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2014-11-24 21:12:48 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2014-11-24 21:12:48 (GMT)
commit16f9d3b943e272112e01f5bc51e922e2ea2ddfb8 (patch)
tree293ed29545a7e097d3b70d3d95d513fc25866fd1 /src/arch/dalvik
parent532fc81565104f64b33b3ac94dfcf0762209f751 (diff)
Cleaned operands, using class functions and destructors.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@426 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/dalvik')
-rw-r--r--src/arch/dalvik/operands/args.c60
-rw-r--r--src/arch/dalvik/operands/pool.c59
-rw-r--r--src/arch/dalvik/operands/register.c58
-rw-r--r--src/arch/dalvik/operands/target.c57
4 files changed, 220 insertions, 14 deletions
diff --git a/src/arch/dalvik/operands/args.c b/src/arch/dalvik/operands/args.c
index 458a38e..2897698 100644
--- a/src/arch/dalvik/operands/args.c
+++ b/src/arch/dalvik/operands/args.c
@@ -56,6 +56,12 @@ static void g_dalvik_args_operand_class_init(GDalvikArgsOperandClass *);
/* Initialise une instance de liste d'opérandes Dalvik. */
static void g_dalvik_args_operand_init(GDalvikArgsOperand *);
+/* Supprime toutes les références externes. */
+static void g_dalvik_args_operand_dispose(GDalvikArgsOperand *);
+
+/* Procède à la libération totale de la mémoire. */
+static void g_dalvik_args_operand_finalize(GDalvikArgsOperand *);
+
/* Traduit un opérande en version humainement lisible. */
static void g_dalvik_args_operand_print(const GDalvikArgsOperand *, GBufferLine *, AsmSyntax);
@@ -79,6 +85,16 @@ G_DEFINE_TYPE(GDalvikArgsOperand, g_dalvik_args_operand, G_TYPE_ARCH_OPERAND);
static void g_dalvik_args_operand_class_init(GDalvikArgsOperandClass *klass)
{
+ GObjectClass *object; /* Autre version de la classe */
+ GArchOperandClass *operand; /* Version de classe parente */
+
+ object = G_OBJECT_CLASS(klass);
+ operand = G_ARCH_OPERAND_CLASS(klass);
+
+ object->dispose = (GObjectFinalizeFunc/* ! */)g_dalvik_args_operand_dispose;
+ object->finalize = (GObjectFinalizeFunc)g_dalvik_args_operand_finalize;
+
+ operand->print = (operand_print_fc)g_dalvik_args_operand_print;
}
@@ -97,11 +113,49 @@ static void g_dalvik_args_operand_class_init(GDalvikArgsOperandClass *klass)
static void g_dalvik_args_operand_init(GDalvikArgsOperand *operand)
{
- GArchOperand *parent; /* Instance parente */
- parent = G_ARCH_OPERAND(operand);
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : operand = instance d'objet GLib à traiter. *
+* *
+* Description : Supprime toutes les références externes. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
- parent->print = (operand_print_fc)g_dalvik_args_operand_print;
+static void g_dalvik_args_operand_dispose(GDalvikArgsOperand *operand)
+{
+ size_t i;
+
+ for (i = 0; i < operand->count; i++)
+ g_object_unref(G_OBJECT(operand->args[i]));
+
+ G_OBJECT_CLASS(g_dalvik_args_operand_parent_class)->dispose(G_OBJECT(operand));
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : operand = instance d'objet GLib à traiter. *
+* *
+* Description : Procède à la libération totale de la mémoire. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_args_operand_finalize(GDalvikArgsOperand *operand)
+{
+ G_OBJECT_CLASS(g_dalvik_args_operand_parent_class)->finalize(G_OBJECT(operand));
}
diff --git a/src/arch/dalvik/operands/pool.c b/src/arch/dalvik/operands/pool.c
index 2c1f653..a1fde2e 100644
--- a/src/arch/dalvik/operands/pool.c
+++ b/src/arch/dalvik/operands/pool.c
@@ -62,6 +62,12 @@ static void g_dalvik_pool_operand_class_init(GDalvikPoolOperandClass *);
/* Initialise une instance d'opérande de constante Dalvik. */
static void g_dalvik_pool_operand_init(GDalvikPoolOperand *);
+/* Supprime toutes les références externes. */
+static void g_dalvik_pool_operand_dispose(GDalvikPoolOperand *);
+
+/* Procède à la libération totale de la mémoire. */
+static void g_dalvik_pool_operand_finalize(GDalvikPoolOperand *);
+
/* Traduit un opérande en version humainement lisible. */
static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *, GBufferLine *, AsmSyntax);
@@ -85,6 +91,16 @@ G_DEFINE_TYPE(GDalvikPoolOperand, g_dalvik_pool_operand, G_TYPE_ARCH_OPERAND);
static void g_dalvik_pool_operand_class_init(GDalvikPoolOperandClass *klass)
{
+ GObjectClass *object; /* Autre version de la classe */
+ GArchOperandClass *operand; /* Version de classe parente */
+
+ object = G_OBJECT_CLASS(klass);
+ operand = G_ARCH_OPERAND_CLASS(klass);
+
+ object->dispose = (GObjectFinalizeFunc/* ! */)g_dalvik_pool_operand_dispose;
+ object->finalize = (GObjectFinalizeFunc)g_dalvik_pool_operand_finalize;
+
+ operand->print = (operand_print_fc)g_dalvik_pool_operand_print;
}
@@ -103,11 +119,46 @@ static void g_dalvik_pool_operand_class_init(GDalvikPoolOperandClass *klass)
static void g_dalvik_pool_operand_init(GDalvikPoolOperand *operand)
{
- GArchOperand *parent; /* Instance parente */
- parent = G_ARCH_OPERAND(operand);
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Supprime toutes les références externes. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
- parent->print = (operand_print_fc)g_dalvik_pool_operand_print;
+static void g_dalvik_pool_operand_dispose(GDalvikPoolOperand *operand)
+{
+ g_object_unref(G_OBJECT(operand->format));
+
+ G_OBJECT_CLASS(g_dalvik_pool_operand_parent_class)->dispose(G_OBJECT(operand));
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Procède à la libération totale de la mémoire. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_pool_operand_finalize(GDalvikPoolOperand *operand)
+{
+ G_OBJECT_CLASS(g_dalvik_pool_operand_parent_class)->finalize(G_OBJECT(operand));
}
@@ -155,6 +206,8 @@ GArchOperand *g_dalvik_pool_operand_new(const GDexFormat *format, DalvikPoolType
result = g_object_new(G_TYPE_DALVIK_POOL_OPERAND, NULL);
+ g_object_ref(G_OBJECT(format));
+
result->format = format;
result->type = type;
result->index = (size == MDS_8_BITS ? index8 : index16);
diff --git a/src/arch/dalvik/operands/register.c b/src/arch/dalvik/operands/register.c
index 00d5699..2ae9224 100644
--- a/src/arch/dalvik/operands/register.c
+++ b/src/arch/dalvik/operands/register.c
@@ -53,6 +53,12 @@ static void g_dalvik_register_operand_class_init(GDalvikRegisterOperandClass *);
/* Initialise une instance d'opérande de registre Dalvik. */
static void g_dalvik_register_operand_init(GDalvikRegisterOperand *);
+/* Supprime toutes les références externes. */
+static void g_dalvik_register_operand_dispose(GDalvikRegisterOperand *);
+
+/* Procède à la libération totale de la mémoire. */
+static void g_dalvik_register_operand_finalize(GDalvikRegisterOperand *);
+
/* Compare un opérande avec un autre. */
static bool g_dalvik_register_operand_compare(const GDalvikRegisterOperand *, const GDalvikRegisterOperand *);
@@ -79,6 +85,17 @@ G_DEFINE_TYPE(GDalvikRegisterOperand, g_dalvik_register_operand, G_TYPE_ARCH_OPE
static void g_dalvik_register_operand_class_init(GDalvikRegisterOperandClass *klass)
{
+ GObjectClass *object; /* Autre version de la classe */
+ GArchOperandClass *operand; /* Version de classe parente */
+
+ object = G_OBJECT_CLASS(klass);
+ operand = G_ARCH_OPERAND_CLASS(klass);
+
+ object->dispose = (GObjectFinalizeFunc/* ! */)g_dalvik_register_operand_dispose;
+ object->finalize = (GObjectFinalizeFunc)g_dalvik_register_operand_finalize;
+
+ operand->compare = (operand_compare_fc)g_dalvik_register_operand_compare;
+ operand->print = (operand_print_fc)g_dalvik_register_operand_print;
}
@@ -97,14 +114,45 @@ static void g_dalvik_register_operand_class_init(GDalvikRegisterOperandClass *kl
static void g_dalvik_register_operand_init(GDalvikRegisterOperand *operand)
{
- GArchOperand *parent; /* Instance parente */
+ operand->is_written = false;
- parent = G_ARCH_OPERAND(operand);
+}
- parent->compare = (operand_compare_fc)g_dalvik_register_operand_compare;
- parent->print = (operand_print_fc)g_dalvik_register_operand_print;
- operand->is_written = false;
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Supprime toutes les références externes. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_register_operand_dispose(GDalvikRegisterOperand *operand)
+{
+ G_OBJECT_CLASS(g_dalvik_register_operand_parent_class)->dispose(G_OBJECT(operand));
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Procède à la libération totale de la mémoire. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_register_operand_finalize(GDalvikRegisterOperand *operand)
+{
+ G_OBJECT_CLASS(g_dalvik_register_operand_parent_class)->finalize(G_OBJECT(operand));
}
diff --git a/src/arch/dalvik/operands/target.c b/src/arch/dalvik/operands/target.c
index f53bb7b..147aaae 100644
--- a/src/arch/dalvik/operands/target.c
+++ b/src/arch/dalvik/operands/target.c
@@ -52,6 +52,12 @@ static void g_dalvik_target_operand_class_init(GDalvikTargetOperandClass *);
/* Initialise une instance d'opérande de ciblage de code Dalvik. */
static void g_dalvik_target_operand_init(GDalvikTargetOperand *);
+/* Supprime toutes les références externes. */
+static void g_dalvik_target_operand_dispose(GDalvikTargetOperand *);
+
+/* Procède à la libération totale de la mémoire. */
+static void g_dalvik_target_operand_finalize(GDalvikTargetOperand *);
+
/* Traduit un opérande en version humainement lisible. */
static void g_dalvik_target_operand_print(const GDalvikTargetOperand *, GBufferLine *, AsmSyntax);
@@ -75,6 +81,16 @@ G_DEFINE_TYPE(GDalvikTargetOperand, g_dalvik_target_operand, G_TYPE_ARCH_OPERAND
static void g_dalvik_target_operand_class_init(GDalvikTargetOperandClass *klass)
{
+ GObjectClass *object; /* Autre version de la classe */
+ GArchOperandClass *operand; /* Version de classe parente */
+
+ object = G_OBJECT_CLASS(klass);
+ operand = G_ARCH_OPERAND_CLASS(klass);
+
+ object->dispose = (GObjectFinalizeFunc/* ! */)g_dalvik_target_operand_dispose;
+ object->finalize = (GObjectFinalizeFunc)g_dalvik_target_operand_finalize;
+
+ operand->print = (operand_print_fc)g_dalvik_target_operand_print;
}
@@ -93,11 +109,46 @@ static void g_dalvik_target_operand_class_init(GDalvikTargetOperandClass *klass)
static void g_dalvik_target_operand_init(GDalvikTargetOperand *operand)
{
- GArchOperand *parent; /* Instance parente */
- parent = G_ARCH_OPERAND(operand);
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Supprime toutes les références externes. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_target_operand_dispose(GDalvikTargetOperand *operand)
+{
+ g_object_unref(G_OBJECT(operand->immediate));
+
+ G_OBJECT_CLASS(g_dalvik_target_operand_parent_class)->dispose(G_OBJECT(operand));
+
+}
- parent->print = (operand_print_fc)g_dalvik_target_operand_print;
+
+/******************************************************************************
+* *
+* Paramètres : binary = instance d'objet GLib à traiter. *
+* *
+* Description : Procède à la libération totale de la mémoire. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_target_operand_finalize(GDalvikTargetOperand *operand)
+{
+ G_OBJECT_CLASS(g_dalvik_target_operand_parent_class)->finalize(G_OBJECT(operand));
}