From d7dbc185bcdf3118eebc882ad3de815cb90aacdd Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Mon, 21 Apr 2008 20:56:29 +0000 Subject: [PATCH] Fix sparc64 build with -DNO_ASM and reduce compiler warnings. --- ChangeLog | 5 +++++ include/cln/floatformat.h | 2 +- src/base/cl_low.h | 13 +++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e32a692..a565181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-21 Richard B. Kreckel + + * src/base/cl_low.h: Fix sparc64 build with -DNO_ASM. + * include/cln/floatformat.h: Avoid compiler warning. + 2008-04-18 Bruno Haible * src/integer/cl_I.h (FN_MSD1_mask, FN_MSD2_mask, FN_MSD3_mask): diff --git a/include/cln/floatformat.h b/include/cln/floatformat.h index 7a84c2e..35eb4d1 100644 --- a/include/cln/floatformat.h +++ b/include/cln/floatformat.h @@ -13,7 +13,7 @@ enum float_format_t { float_format_ffloat = 24, float_format_dfloat = 53, float_format_lfloat_min = ((53+intDsize-1)/intDsize)*intDsize, // = round_up(53,intDsize) - float_format_lfloat_max = ~((sintE)(1) << intEsize-1) // force correct underlying type of float_format_t + float_format_lfloat_max = ~((sintE)(1) << (intEsize-1)) // force correct underlying type of float_format_t }; } // namespace cln diff --git a/src/base/cl_low.h b/src/base/cl_low.h index 73a9e7d..553f126 100644 --- a/src/base/cl_low.h +++ b/src/base/cl_low.h @@ -144,7 +144,7 @@ inline uint32 mulu16 (uint16 arg1, uint16 arg2) ); return highlow32(_hi,_lo); } -#elif defined(__sparc__) || defined(__sparc64__) +#elif (defined(__sparc__) || defined(__sparc64__)) && !defined(NO_ASM) extern "C" uint32 mulu16_ (uint16 arg1, uint16 arg2); #define mulu16 mulu16_ // extern in Assembler #else @@ -384,14 +384,10 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2) #else #define mulu64(x,y,hi_zuweisung,lo_zuweisung) \ { lo_zuweisung mulu64_(x,y); hi_zuweisung mulu64_high; } - #if defined(__sparc64__) + #if defined(__sparc64__) && !defined(NO_ASM) // mulu64_ extern in Assembler - #if defined(__sparc64__) - extern "C" uint64 _get_g2 (void); - #define mulu64_high (_get_g2()) // Rückgabe im Register %g2 - #else - #define NEED_VAR_mulu64_high - #endif + extern "C" uint64 _get_g2 (void); + #define mulu64_high (_get_g2()) // Rückgabe im Register %g2 #else #define NEED_FUNCTION_mulu64_ #endif @@ -585,6 +581,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2) q_zuweisung (uint32)__q; \ r_zuweisung (uint32)__r; \ }) + #define divu_3232_3232_(x,y) divu_6432_3232_(0,x,y) #elif defined(__sparc__) || defined(__sparc64__) || defined(__i386__) || defined(__x86_64__) #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung) \ divu_6432_3232(0,x,y,q_zuweisung,r_zuweisung)