diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2017-07-12 13:07:55 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2017-07-12 13:08:42 (GMT) |
commit | a331ff258895865049bf79bc1629dbc744b7faf5 (patch) | |
tree | c4f649ba21afcacf974cc6536f03aa97663a9acd /src/arch/arm/v7/operands/maccess.c | |
parent | 9b018cede5af54594c0a20847239233153b04ce1 (diff) |
Removed the too complex memory share system.
Diffstat (limited to 'src/arch/arm/v7/operands/maccess.c')
-rw-r--r-- | src/arch/arm/v7/operands/maccess.c | 188 |
1 files changed, 7 insertions, 181 deletions
diff --git a/src/arch/arm/v7/operands/maccess.c b/src/arch/arm/v7/operands/maccess.c index 71d55e0..6daf821 100644 --- a/src/arch/arm/v7/operands/maccess.c +++ b/src/arch/arm/v7/operands/maccess.c @@ -25,14 +25,10 @@ #include "../../../operand-int.h" -#include "../../../sharing/manager.h" #include "../../../../common/sort.h" -/* --------------------- MANIPULATION D'OPERANDES INDIVIDUELLES --------------------- */ - - /* Définition d'un opérande offrant un accès à la mémoire depuis une base (instance) */ struct _GArmV7MAccessOperand { @@ -67,12 +63,6 @@ static void g_armv7_maccess_operand_dispose(GArmV7MAccessOperand *); /* Procède à la libération totale de la mémoire. */ static void g_armv7_maccess_operand_finalize(GArmV7MAccessOperand *); -/* Initialise un nouvel objet partagé avec des informations. */ -static bool g_armv7_maccess_operand_apply_template(GArmV7MAccessOperand *, const GArmV7MAccessOperand *); - -/* Réalise une copie minimale d'un contenu partagé. */ -static void g_armv7_maccess_operand_define_template(const GArmV7MAccessOperand *, GArmV7MAccessOperand *); - /* Compare un opérande avec un autre. */ static int g_armv7_maccess_operand_compare(const GArmV7MAccessOperand *, const GArmV7MAccessOperand *); @@ -81,23 +71,6 @@ static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *, GBufferL -/* -------------------------- PARTAGES DE CONTENUS UNIQUES -------------------------- */ - - -/* Gestionnaire des partages d'instances */ -static GShareManager *_armv7_maccess_operand_manager = NULL; - - -/* Fournit le gestionnaire de partages attribué à un type. */ -static GShareManager *get_armv7_maccess_operand_share_manager(void); - - - -/* ---------------------------------------------------------------------------------- */ -/* MANIPULATION D'OPERANDES INDIVIDUELLES */ -/* ---------------------------------------------------------------------------------- */ - - /* Indique le type défini par la GLib pour un accès à la mémoire depuis une base. */ G_DEFINE_TYPE(GArmV7MAccessOperand, g_armv7_maccess_operand, G_TYPE_ARCH_OPERAND); @@ -125,12 +98,6 @@ static void g_armv7_maccess_operand_class_init(GArmV7MAccessOperandClass *klass) object->dispose = (GObjectFinalizeFunc/* ! */)g_armv7_maccess_operand_dispose; object->finalize = (GObjectFinalizeFunc)g_armv7_maccess_operand_finalize; - operand->get_manager = (get_operand_manager_fc)get_armv7_maccess_operand_share_manager; - - operand->apply_template = (apply_operand_template_fc)g_armv7_maccess_operand_apply_template; - operand->define_template = (define_operand_template_fc)g_armv7_maccess_operand_define_template; - operand->free_template = (free_operand_template_fc)NULL; - operand->compare = (operand_compare_fc)g_armv7_maccess_operand_compare; operand->print = (operand_print_fc)g_armv7_maccess_operand_print; @@ -203,61 +170,6 @@ static void g_armv7_maccess_operand_finalize(GArmV7MAccessOperand *operand) /****************************************************************************** * * -* Paramètres : operand = objet partagé à initialiser. * -* template = information à utiliser pour la mise en place. * -* * -* Description : Initialise un nouvel objet partagé avec des informations. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static bool g_armv7_maccess_operand_apply_template(GArmV7MAccessOperand *operand, const GArmV7MAccessOperand *template) -{ - g_armv7_maccess_operand_define_template(template, operand); - - g_object_ref(G_OBJECT(operand->base)); - - if (operand->offset != NULL) - g_object_ref(G_OBJECT(operand->offset)); - - if (operand->shift != NULL) - g_object_ref(G_OBJECT(operand->shift)); - - return true; - -} - - -/****************************************************************************** -* * -* Paramètres : operand = objet partagé à consulter. * -* template = informations à retrouver intégralement. * -* * -* Description : Réalise une copie minimale d'un contenu partagé. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -static void g_armv7_maccess_operand_define_template(const GArmV7MAccessOperand *operand, GArmV7MAccessOperand *template) -{ - template->base = operand->base; - template->offset = operand->offset; - template->shift = operand->shift; - - template->not_post_indexed = operand->not_post_indexed; - template->write_back = operand->write_back; - -} - - -/****************************************************************************** -* * * Paramètres : a = premier opérande à consulter. * * b = second opérande à consulter. * * * @@ -362,17 +274,16 @@ static void g_armv7_maccess_operand_print(const GArmV7MAccessOperand *operand, G GArchOperand *g_armv7_maccess_operand_new(GArchOperand *base, GArchOperand *offset, GArchOperand *shift, bool indexed, bool wback) { - GSharedInstance *result; /* Structure à retourner */ - GArmV7MAccessOperand template; /* Transport d'informations */ + GArmV7MAccessOperand *result; /* Structure à retourner */ - template.base = base; - template.offset = offset; - template.shift = shift; + result = g_object_new(G_TYPE_ARMV7_MACCESS_OPERAND, NULL); - template.not_post_indexed = indexed; - template.write_back = wback; + result->base = base; + result->offset = offset; + result->shift = shift; - result = g_share_manager_build(_armv7_maccess_operand_manager, (GSharedInstance *)&template); + result->not_post_indexed = indexed; + result->write_back = wback; return G_ARCH_OPERAND(result); @@ -472,88 +383,3 @@ bool g_armv7_maccess_operand_has_to_write_back(const GArmV7MAccessOperand *opera return operand->write_back; } - - - -/* ---------------------------------------------------------------------------------- */ -/* PARTAGES DE CONTENUS UNIQUES */ -/* ---------------------------------------------------------------------------------- */ - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Fournit le gestionnaire de partages attribué à un type. * -* * -* Retour : Gestionnaire de partages en place. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static GShareManager *get_armv7_maccess_operand_share_manager(void) -{ - return _armv7_maccess_operand_manager; - -} - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Met en place les mécanismes de partage des accès mémmoire. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool init_armv7_maccess_operand_sharing(void) -{ - _armv7_maccess_operand_manager = g_share_manager_new(G_TYPE_ARMV7_MACCESS_OPERAND); - - return true; - -} - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Imprime des statistiques quant aux partages dans l'archi. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ -#ifdef DEBUG_DUMP_STATS -void dump_armv7_maccess_operand_share_stats(void) -{ - g_share_manager_dump_stats(_armv7_maccess_operand_manager); - -} -#endif - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Supprime les mécanismes de partage des accès mémoire. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -void exit_armv7_maccess_operand_sharing(void) -{ - g_object_unref(G_OBJECT(_armv7_maccess_operand_manager)); - -} |