mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softfloat: Fix compilation failures with USE_SOFTFLOAT_STRUCT_TYPES

Browse Source 
Make softfloat compile with USE_SOFTFLOAT_STRUCT_TYPES defined, by
adding and using new macros const_float16(), const_float32() and
const_float64() so you can use array initializers in an array of
float16/float32/float64 whether the types are bare or wrapped in the
structs.

[aurelien@aurel32.net: do the same for float16]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Peter Maydell 2011-02-10 13:59:34 +00:00 committed by Aurelien Jarno
parent 2d981da77d
commit d5138cf4a8
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fpu/softfloat.c
View File

@ -2199,21 +2199,21 @@ float32 float32_sqrt( float32 a STATUS_PARAM )
static const float64 float32_exp2_coefficients[15] = static const float64 float32_exp2_coefficients[15] =
{ {
make_float64( 0x3ff0000000000000ll ), /* 1 */ const_float64( 0x3ff0000000000000ll ), /* 1 */
make_float64( 0x3fe0000000000000ll ), /* 2 */ const_float64( 0x3fe0000000000000ll ), /* 2 */
make_float64( 0x3fc5555555555555ll ), /* 3 */ const_float64( 0x3fc5555555555555ll ), /* 3 */
make_float64( 0x3fa5555555555555ll ), /* 4 */ const_float64( 0x3fa5555555555555ll ), /* 4 */
make_float64( 0x3f81111111111111ll ), /* 5 */ const_float64( 0x3f81111111111111ll ), /* 5 */
make_float64( 0x3f56c16c16c16c17ll ), /* 6 */ const_float64( 0x3f56c16c16c16c17ll ), /* 6 */
make_float64( 0x3f2a01a01a01a01all ), /* 7 */ const_float64( 0x3f2a01a01a01a01all ), /* 7 */
make_float64( 0x3efa01a01a01a01all ), /* 8 */ const_float64( 0x3efa01a01a01a01all ), /* 8 */
make_float64( 0x3ec71de3a556c734ll ), /* 9 */ const_float64( 0x3ec71de3a556c734ll ), /* 9 */
make_float64( 0x3e927e4fb7789f5cll ), /* 10 */ const_float64( 0x3e927e4fb7789f5cll ), /* 10 */
make_float64( 0x3e5ae64567f544e4ll ), /* 11 */ const_float64( 0x3e5ae64567f544e4ll ), /* 11 */
make_float64( 0x3e21eed8eff8d898ll ), /* 12 */ const_float64( 0x3e21eed8eff8d898ll ), /* 12 */
make_float64( 0x3de6124613a86d09ll ), /* 13 */ const_float64( 0x3de6124613a86d09ll ), /* 13 */
make_float64( 0x3da93974a8c07c9dll ), /* 14 */ const_float64( 0x3da93974a8c07c9dll ), /* 14 */
make_float64( 0x3d6ae7f3e733b81fll ), /* 15 */ const_float64( 0x3d6ae7f3e733b81fll ), /* 15 */
}; };
float32 float32_exp2( float32 a STATUS_PARAM ) float32 float32_exp2( float32 a STATUS_PARAM )

6
fpu/softfloat.h
View File

@ -124,17 +124,20 @@ typedef struct {
} float16; } float16;
#define float16_val(x) (((float16)(x)).v) #define float16_val(x) (((float16)(x)).v)
#define make_float16(x) __extension__ ({ float16 f16_val = {x}; f16_val; }) #define make_float16(x) __extension__ ({ float16 f16_val = {x}; f16_val; })
#define const_float16(x) { x }
typedef struct { typedef struct {
uint32_t v; uint32_t v;
} float32; } float32;
/* The cast ensures an error if the wrong type is passed. */ /* The cast ensures an error if the wrong type is passed. */
#define float32_val(x) (((float32)(x)).v) #define float32_val(x) (((float32)(x)).v)
#define make_float32(x) __extension__ ({ float32 f32_val = {x}; f32_val; }) #define make_float32(x) __extension__ ({ float32 f32_val = {x}; f32_val; })
#define const_float32(x) { x }
typedef struct { typedef struct {
uint64_t v; uint64_t v;
} float64; } float64;
#define float64_val(x) (((float64)(x)).v) #define float64_val(x) (((float64)(x)).v)
#define make_float64(x) __extension__ ({ float64 f64_val = {x}; f64_val; }) #define make_float64(x) __extension__ ({ float64 f64_val = {x}; f64_val; })
#define const_float64(x) { x }
#else #else
typedef uint16_t float16; typedef uint16_t float16;
typedef uint32_t float32; typedef uint32_t float32;
@ -145,6 +148,9 @@ typedef uint64_t float64;
#define make_float16(x) (x) #define make_float16(x) (x)
#define make_float32(x) (x) #define make_float32(x) (x)
#define make_float64(x) (x) #define make_float64(x) (x)
#define const_float16(x) (x)
#define const_float32(x) (x)
#define const_float64(x) (x)
#endif #endif
#ifdef FLOATX80 #ifdef FLOATX80
typedef struct { typedef struct {