diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2022-08-17 21:37:24 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2022-08-17 21:37:24 (GMT) |
commit | 429b54556283116a29c5d699af0cf891bb1c1055 (patch) | |
tree | a8f9063b9a9590d2960e9463c457bead29916445 /plugins | |
parent | dbe336e27d5bcf2d913750576f868353ca4ba041 (diff) |
Disable the extra data storage inside the GObject structure.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/arm/v7/operand.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/it.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/limitation.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/maccess.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/register.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/reglist.c | 4 | ||||
-rw-r--r-- | plugins/arm/v7/operands/shift.c | 8 | ||||
-rw-r--r-- | plugins/dalvik/operands/args.c | 12 | ||||
-rw-r--r-- | plugins/dalvik/operands/pool.c | 8 |
9 files changed, 26 insertions, 26 deletions
diff --git a/plugins/arm/v7/operand.c b/plugins/arm/v7/operand.c index 8f93e78..ad7b572 100644 --- a/plugins/arm/v7/operand.c +++ b/plugins/arm/v7/operand.c @@ -169,10 +169,10 @@ static void g_armv7_operand_finalize(GArmV7Operand *operand) static guint g_armv7_operand_hash(const GArmV7Operand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + operand_extra_data_t *extra; /* Données insérées à modifier */ GArchOperandClass *class; /* Classe parente normalisée */ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); diff --git a/plugins/arm/v7/operands/it.c b/plugins/arm/v7/operands/it.c index b2fb2f6..0286e06 100644 --- a/plugins/arm/v7/operands/it.c +++ b/plugins/arm/v7/operands/it.c @@ -61,9 +61,9 @@ struct _GArmV7ITCondOperand * Accès aux informations éventuellement déportées. */ -#if __SIZEOF_INT__ == __SIZEOF_LONG__ +#if 1 //__SIZEOF_INT__ == __SIZEOF_LONG__ -# define GET_ARMV7_ITCOND_OP_EXTRA(op) (a7itcop_extra_data_t *)&op->extra +# define GET_ARMV7_ITCOND_OP_EXTRA(op) ((a7itcop_extra_data_t *)&((GArchOperand *)op)->extra) #else diff --git a/plugins/arm/v7/operands/limitation.c b/plugins/arm/v7/operands/limitation.c index f2e8373..fe8d9fb 100644 --- a/plugins/arm/v7/operands/limitation.c +++ b/plugins/arm/v7/operands/limitation.c @@ -66,9 +66,9 @@ struct _GArmV7LimitationOperandClass * Accès aux informations éventuellement déportées. */ -#if __SIZEOF_INT__ == __SIZEOF_LONG__ +#if 1 //__SIZEOF_INT__ == __SIZEOF_LONG__ -# define GET_ARMV7_LIMITATION_OP_EXTRA(op) (a7limop_extra_data_t *)&op->extra +# define GET_ARMV7_LIMITATION_OP_EXTRA(op) ((a7limop_extra_data_t *)&((GArchOperand *)op)->extra) #else diff --git a/plugins/arm/v7/operands/maccess.c b/plugins/arm/v7/operands/maccess.c index d503b12..b67b65a 100644 --- a/plugins/arm/v7/operands/maccess.c +++ b/plugins/arm/v7/operands/maccess.c @@ -682,11 +682,11 @@ static void g_armv7_maccess_operand_update_inner_instances(GArmV7MAccessOperand static guint g_armv7_maccess_operand_hash(const GArmV7MAccessOperand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + operand_extra_data_t *extra; /* Données insérées à consulter*/ GArchOperandClass *class; /* Classe parente normalisée */ size_t count; /* Quantité d'éléments utiles */ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); diff --git a/plugins/arm/v7/operands/register.c b/plugins/arm/v7/operands/register.c index 026d0d5..21dc129 100644 --- a/plugins/arm/v7/operands/register.c +++ b/plugins/arm/v7/operands/register.c @@ -63,9 +63,9 @@ struct _GArmV7RegisterOperandClass * Accès aux informations éventuellement déportées. */ -#if __SIZEOF_INT__ == __SIZEOF_LONG__ +#if 1 //__SIZEOF_INT__ == __SIZEOF_LONG__ -# define GET_ARMV7_REGISTER_OP_EXTRA(op) (a7regop_extra_data_t *)&op->extra +# define GET_ARMV7_REGISTER_OP_EXTRA(op) ((a7regop_extra_data_t *)&((GArchOperand *)op)->extra) #else diff --git a/plugins/arm/v7/operands/reglist.c b/plugins/arm/v7/operands/reglist.c index d53a7e1..df93f77 100644 --- a/plugins/arm/v7/operands/reglist.c +++ b/plugins/arm/v7/operands/reglist.c @@ -447,11 +447,11 @@ static void g_armv7_reglist_operand_print(const GArmV7RegListOperand *operand, G static guint g_armv7_reglist_operand_hash(const GArmV7RegListOperand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + operand_extra_data_t *extra; /* Données insérées à consulter*/ GArchOperandClass *class; /* Classe parente normalisée */ size_t i; /* Boucle de parcours */ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); diff --git a/plugins/arm/v7/operands/shift.c b/plugins/arm/v7/operands/shift.c index ccdfe5c..1e1a8ab 100644 --- a/plugins/arm/v7/operands/shift.c +++ b/plugins/arm/v7/operands/shift.c @@ -72,9 +72,9 @@ struct _GArmV7ShiftOperandClass * Accès aux informations éventuellement déportées. */ -#if __SIZEOF_INT__ == __SIZEOF_LONG__ +#if 1 //__SIZEOF_INT__ == __SIZEOF_LONG__ -# define GET_ARMV7_SHIFT_OP_EXTRA(op) (a7shiftop_extra_data_t *)&op->extra +# define GET_ARMV7_SHIFT_OP_EXTRA(op) ((a7shiftop_extra_data_t *)&((GArchOperand *)op)->extra) #else @@ -561,11 +561,11 @@ static void g_armv7_shift_operand_update_inner_instances(GArmV7ShiftOperand *ope static guint g_armv7_shift_operand_hash(const GArmV7ShiftOperand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + a7shiftop_extra_data_t *extra; /* Données insérées à consulter*/ GArchOperandClass *class; /* Classe parente normalisée */ a7shiftop_extra_data_t *op_extra; /* Données internes à manipuler*/ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_ARMV7_SHIFT_OP_EXTRA(G_ARMV7_SHIFT_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); diff --git a/plugins/dalvik/operands/args.c b/plugins/dalvik/operands/args.c index b1aa59f..01ed122 100644 --- a/plugins/dalvik/operands/args.c +++ b/plugins/dalvik/operands/args.c @@ -324,8 +324,8 @@ GArchOperand *g_dalvik_args_operand_get(const GDalvikArgsOperand *operand, size_ static int g_dalvik_args_operand_compare(const GDalvikArgsOperand *a, const GDalvikArgsOperand *b, bool lock) { int result; /* Bilan à renvoyer */ - lockable_obj_extra_t *ea; /* Données insérées à consulter*/ - lockable_obj_extra_t *eb; /* Données insérées à consulter*/ + operand_extra_data_t *ea; /* Données insérées à consulter*/ + operand_extra_data_t *eb; /* Données insérées à consulter*/ size_t i; /* Boucle de parcours */ GArchOperandClass *class; /* Classe parente normalisée */ @@ -335,8 +335,8 @@ static int g_dalvik_args_operand_compare(const GDalvikArgsOperand *a, const GDal else { - ea = GET_GOBJECT_EXTRA(G_OBJECT(a), lockable_obj_extra_t); - eb = GET_GOBJECT_EXTRA(G_OBJECT(b), lockable_obj_extra_t); + ea = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(a)); + eb = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(b)); if (lock) { @@ -611,10 +611,10 @@ static void g_dalvik_args_operand_update_inner_instances(GDalvikArgsOperand *ope static guint g_dalvik_args_operand_hash(const GDalvikArgsOperand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + operand_extra_data_t *extra; /* Données insérées à consulter*/ GArchOperandClass *class; /* Classe parente normalisée */ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_ARCH_OP_EXTRA(G_ARCH_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); diff --git a/plugins/dalvik/operands/pool.c b/plugins/dalvik/operands/pool.c index 4570c86..a07b3e0 100644 --- a/plugins/dalvik/operands/pool.c +++ b/plugins/dalvik/operands/pool.c @@ -75,9 +75,9 @@ struct _GDalvikPoolOperandClass * Accès aux informations éventuellement déportées. */ -#if __SIZEOF_INT__ == __SIZEOF_LONG__ +#if 1 //__SIZEOF_INT__ == __SIZEOF_LONG__ -# define GET_DALVIK_POOL_OP_EXTRA(op) (dpoolop_extra_data_t *)&op->extra +# define GET_DALVIK_POOL_OP_EXTRA(op) ((dpoolop_extra_data_t *)&((GArchOperand *)op)->extra) #else @@ -662,12 +662,12 @@ static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *operand, GBuff static guint g_dalvik_pool_operand_hash(const GDalvikPoolOperand *operand, bool lock) { guint result; /* Valeur à retourner */ - lockable_obj_extra_t *extra; /* Données insérées à consulter*/ + dpoolop_extra_data_t *extra; /* Données insérées à consulter*/ GArchOperandClass *class; /* Classe parente normalisée */ DalvikPoolType type; /* Type porté par l'opérande */ uint32_t index; /* Indice de l'élément */ - extra = GET_GOBJECT_EXTRA(G_OBJECT(operand), lockable_obj_extra_t); + extra = GET_DALVIK_POOL_OP_EXTRA(G_DALVIK_POOL_OPERAND(operand)); if (lock) LOCK_GOBJECT_EXTRA(extra); |