From 00cdcec2c5272c59069c5c283c75fd4652e9122b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 13 Nov 2007 01:00:40 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 7 ------- libiberty/floatformat.c | 11 +++++++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 1260eeba20..78e74e52e2 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,10 +1,3 @@ -2007-11-12 Joseph Myers - - * floatformat.c (floatformat_ibm_long_double_is_valid): Fix - compiler warnings. - (floatformat_ibm_long_double): Use - floatformat_ibm_long_double_is_valid. - 2007-11-07 Joseph Myers Daniel Jacobowitz diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c index cbf13ea340..07af7264df 100644 --- a/libiberty/floatformat.c +++ b/libiberty/floatformat.c @@ -283,7 +283,7 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt, bot_exp = get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize, hfmt->exp_start, hfmt->exp_len); - if ((unsigned long) top_exp == hfmt->exp_nan) + if (top_exp == hfmt->exp_nan) top_nan = mant_bits_set (hfmt, ufrom); /* A NaN is valid with any low part. */ @@ -292,8 +292,11 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt, /* An infinity, zero or denormal requires low part 0 (positive or negative). */ - if ((unsigned long) top_exp == hfmt->exp_nan || top_exp == 0) + if (top_exp == hfmt->exp_nan || top_exp == 0) { + unsigned int mant_bits, mant_off; + int mant_bits_left; + if (bot_exp != 0) return 0; @@ -315,7 +318,7 @@ floatformat_ibm_long_double_is_valid (const struct floatformat *fmt, /* The bottom part is 0 or denormal. Determine which, and if denormal the first two set bits. */ int first_bit = -1, second_bit = -1, cur_bit; - for (cur_bit = 0; (unsigned int) cur_bit < hfmt->man_len; cur_bit++) + for (cur_bit = 0; cur_bit < hfmt->man_len; cur_bit++) if (get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize, hfmt->man_start + cur_bit, 1)) { @@ -360,7 +363,7 @@ const struct floatformat floatformat_ibm_long_double = floatformat_big, 128, 0, 1, 11, 1023, 2047, 12, 52, floatformat_intbit_no, "floatformat_ibm_long_double", - floatformat_ibm_long_double_is_valid, + floatformat_always_valid, &floatformat_ieee_double_big }; -- 2.11.0