From 9a7bace1e8afacb3f2be159dafd80b1723f005fd Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Sat, 25 Feb 2017 20:28:36 +0100 Subject: Fixed ARM register comparison. --- ChangeLog | 5 +++++ src/arch/arm/register.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b40554b..ab2c55a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +17-02-25 Cyrille Bagard + + * src/arch/arm/register.c: + Fix ARM register comparison. + 17-02-19 Cyrille Bagard * src/analysis/db/certs.c: diff --git a/src/arch/arm/register.c b/src/arch/arm/register.c index 3cda075..fc7ecde 100644 --- a/src/arch/arm/register.c +++ b/src/arch/arm/register.c @@ -25,6 +25,7 @@ #include "register-int.h" +#include "../../common/sort.h" @@ -44,7 +45,7 @@ static void g_arm_register_finalize(GArmRegister *); static guint g_arm_register_hash(const GArmRegister *); /* Compare un registre avec un autre. */ -static int g_arm_register_compare(const GArmRegister *, const GArmRegister *); +static int g_arm_register_compare(const GArmRegister * const *, const GArmRegister * const *); @@ -188,16 +189,11 @@ static guint g_arm_register_hash(const GArmRegister *reg) * * ******************************************************************************/ -static int g_arm_register_compare(const GArmRegister *a, const GArmRegister *b) +static int g_arm_register_compare(const GArmRegister * const *a, const GArmRegister * const *b) { int result; /* Bilan à retourner */ - if (a->index < b->index) - result = -1; - else if (a->index > b->index) - result = 1; - else - result = 0; + result = sort_unsigned_long((*a)->index, (*b)->index); return result; -- cgit v0.11.2-87-g4458