OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unwind-dw2-fde.c (fde_compare_t): Change return type to int.

Browse Source 
* unwind-dw2-fde.c (fde_compare_t): Change return type to int.
        (fde_unencoded_compare): Likewise.  Don't use subtraction to get
        a tristate comparison value.
        (fde_single_encoding_compare, fde_mixed_encoding_compare): Likewise.

From-SVN: r46157
This commit is contained in:
Richard Henderson 2001-10-10 12:53:29 -07:00 committed by Richard Henderson
parent e10f3d36e5
commit bde257ff59
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2001-10-10 Richard Henderson <rth@redhat.com>
* unwind-dw2-fde.c (fde_compare_t): Change return type to int.
(fde_unencoded_compare): Likewise. Don't use subtraction to get
a tristate comparison value.
(fde_single_encoding_compare, fde_mixed_encoding_compare): Likewise.
2001-10-10 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
PR c++/4512

26
gcc/unwind-dw2-fde.c
View File

@ -293,14 +293,18 @@ get_fde_encoding (struct dwarf_fde *f)
/* Comparison routines. Three variants of increasing complexity. */
static saddr
static int
fde_unencoded_compare (struct object *ob __attribute__((unused)),
fde *x, fde *y)
{
return *(saddr *)x->pc_begin - *(saddr *)y->pc_begin;
if (x->pc_begin > y->pc_begin)
return 1;
if (x->pc_begin < y->pc_begin)
return -1;
return 0;
}
static saddr
static int
fde_single_encoding_compare (struct object *ob, fde *x, fde *y)
{
_Unwind_Ptr base, x_ptr, y_ptr;
@ -309,10 +313,14 @@ fde_single_encoding_compare (struct object *ob, fde *x, fde *y)
read_encoded_value_with_base (ob->s.b.encoding, base, x->pc_begin, &x_ptr);
read_encoded_value_with_base (ob->s.b.encoding, base, y->pc_begin, &y_ptr);
return x_ptr - y_ptr;
if (x_ptr > y_ptr)
return 1;
if (x_ptr < y_ptr)
return -1;
return 0;
}
static saddr
static int
fde_mixed_encoding_compare (struct object *ob, fde *x, fde *y)
{
int x_encoding, y_encoding;
@ -326,10 +334,14 @@ fde_mixed_encoding_compare (struct object *ob, fde *x, fde *y)
read_encoded_value_with_base (y_encoding, base_from_object (y_encoding, ob),
y->pc_begin, &y_ptr);
return x_ptr - y_ptr;
if (x_ptr > y_ptr)
return 1;
if (x_ptr < y_ptr)
return -1;
return 0;
}
typedef saddr (*fde_compare_t) (struct object *, fde *, fde *);
typedef int (*fde_compare_t) (struct object *, fde *, fde *);
/* This is a special mix of insertion sort and heap sort, optimized for