X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=0a9535923d09de5346773a46968e1f92235b1c1b;hb=c34ea0fad3f9900c3b97efa229d221927422dacf;hp=3651f0c3acf9c5338104ff1490489877e3967af9;hpb=47e0f2e23aef98a584bf964754ab1e29c2897cfb;p=babeltrace.git diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c index 3651f0c3..0a953592 100644 --- a/formats/ctf/types/float.c +++ b/formats/ctf/types/float.c @@ -3,7 +3,9 @@ * * Floating point read/write functions. * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,13 +28,13 @@ /* * This library is limited to binary representation of floating point values. - * Sign-extension of the exponents is assumed to keep the NaN, +inf, -inf - * values, but this should be double-checked (TODO). + * We use hardware support for conversion between 32 and 64-bit floating + * point values. */ /* * Aliasing float/double and unsigned long is not strictly permitted by strict - * aliasing, but in practice type prunning is well supported, and this permits + * aliasing, but in practice declaration prunning is well supported, and this permits * us to use per-word read/writes rather than per-byte. */ @@ -47,7 +49,8 @@ #endif union doubleIEEE754 { - double v; + double vd; + float vf; #ifdef HAS_TYPE_PRUNING unsigned long bits[(sizeof(double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)]; #else @@ -55,128 +58,192 @@ union doubleIEEE754 { #endif }; -union ldoubleIEEE754 { - long double v; -#ifdef HAS_TYPE_PRUNING - unsigned long bits[(sizeof(long double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)]; -#else - unsigned char bits[sizeof(long double)]; -#endif -}; +static struct declaration_float *static_float_declaration, + *static_double_declaration; struct pos_len { size_t sign_start, exp_start, mantissa_start, len; }; -void _ctf_float_copy(struct stream_pos *destp, - const struct type_class_float *dest_class, - struct stream_pos *srcp, - const struct type_class_float *src_class) +int _ctf_float_copy(struct stream_pos *destp, + struct definition_float *dest_definition, + struct stream_pos *srcp, + const struct definition_float *src_definition) { - uint8_t sign; - int64_t exp; - uint64_t mantissa; - + int ret; + + /* We only support copy of same-size floats for now */ + assert(src_definition->declaration->sign->len == + dest_definition->declaration->sign->len); + assert(src_definition->declaration->exp->len == + dest_definition->declaration->exp->len); + assert(src_definition->declaration->mantissa->len == + dest_definition->declaration->mantissa->len); /* Read */ - if (src_class->byte_order == LITTLE_ENDIAN) { - mantissa = ctf_uint_read(srcp, src_class->mantissa); - exp = ctf_int_read(srcp, src_class->exp); - sign = ctf_uint_read(srcp, src_class->sign); + if (src_definition->declaration->byte_order == LITTLE_ENDIAN) { + ret = ctf_integer_read(srcp, &src_definition->mantissa->p); + if (ret) + return ret; + ret = ctf_integer_read(srcp, &src_definition->exp->p); + if (ret) + return ret; + ret = ctf_integer_read(srcp, &src_definition->sign->p); + if (ret) + return ret; } else { - sign = ctf_uint_read(srcp, src_class->sign); - exp = ctf_int_read(srcp, src_class->exp); - mantissa = ctf_uint_read(srcp, src_class->mantissa); + ret = ctf_integer_read(srcp, &src_definition->sign->p); + if (ret) + return ret; + ret = ctf_integer_read(srcp, &src_definition->exp->p); + if (ret) + return ret; + ret = ctf_integer_read(srcp, &src_definition->mantissa->p); + if (ret) + return ret; } + + dest_definition->mantissa->value._unsigned = + src_definition->mantissa->value._unsigned; + dest_definition->exp->value._signed = + src_definition->exp->value._signed; + dest_definition->sign->value._unsigned = + src_definition->sign->value._unsigned; + /* Write */ - if (dest_class->byte_order == LITTLE_ENDIAN) { - ctf_uint_write(destp, dest_class->mantissa, mantissa); - ctf_int_write(destp, dest_class->exp, exp); - ctf_uint_write(destp, dest_class->sign, sign); + if (dest_definition->declaration->byte_order == LITTLE_ENDIAN) { + ret = ctf_integer_write(destp, &dest_definition->mantissa->p); + if (ret) + return ret; + ret = ctf_integer_write(destp, &dest_definition->exp->p); + if (ret) + return ret; + ret = ctf_integer_write(destp, &dest_definition->sign->p); + if (ret) + return ret; } else { - ctf_uint_write(destp, dest_class->sign, sign); - ctf_int_write(destp, dest_class->exp, exp); - ctf_uint_write(destp, dest_class->mantissa, mantissa); + ret = ctf_integer_write(destp, &dest_definition->sign->p); + if (ret) + return ret; + ret = ctf_integer_write(destp, &dest_definition->exp->p); + if (ret) + return ret; + ret = ctf_integer_write(destp, &dest_definition->mantissa->p); + if (ret) + return ret; } + return 0; } -void ctf_float_copy(struct stream_pos *dest, struct stream_pos *src, - const struct type_class_float *float_class) +int ctf_float_read(struct stream_pos *ppos, struct definition *definition) { - align_pos(src, float_class->p.alignment); - align_pos(dest, float_class->p.alignment); - _ctf_float_copy(dest, float_class, src, float_class); + struct definition_float *float_definition = + container_of(definition, struct definition_float, p); + const struct declaration_float *float_declaration = + float_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); + union doubleIEEE754 u; + struct definition *tmpdef; + struct definition_float *tmpfloat; + struct ctf_stream_pos destp; + int ret; + + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + tmpdef = static_float_declaration->p.definition_new( + &static_float_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + case DBL_MANT_DIG: + tmpdef = static_double_declaration->p.definition_new( + &static_double_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + default: + return -EINVAL; + } + tmpfloat = container_of(tmpdef, struct definition_float, p); + ctf_init_pos(&destp, -1, O_RDWR); + destp.base = (char *) u.bits; + destp.packet_size = sizeof(u) * CHAR_BIT; + ctf_align_pos(pos, float_declaration->p.alignment); + ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition); + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + float_definition->value = u.vf; + break; + case DBL_MANT_DIG: + float_definition->value = u.vd; + break; + default: + return -EINVAL; + } + definition_unref(tmpdef); + return ret; } -double ctf_double_read(struct stream_pos *srcp, - const struct type_class_float *float_class) +int ctf_float_write(struct stream_pos *ppos, struct definition *definition) { + struct definition_float *float_definition = + container_of(definition, struct definition_float, p); + const struct declaration_float *float_declaration = + float_definition->declaration; + struct ctf_stream_pos *pos = ctf_pos(ppos); union doubleIEEE754 u; - struct type_class_float *dest_class = float_type_new(NULL, - DBL_MANT_DIG, - sizeof(double) * CHAR_BIT - DBL_MANT_DIG, - BYTE_ORDER, - __alignof__(double)); - struct stream_pos destp; - - align_pos(srcp, float_class->p.alignment); - init_pos(&destp, (char *) u.bits); - _ctf_float_copy(&destp, dest_class, srcp, float_class); - float_type_free(dest_class); - return u.v; + struct definition *tmpdef; + struct definition_float *tmpfloat; + struct ctf_stream_pos srcp; + int ret; + + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + tmpdef = static_float_declaration->p.definition_new( + &static_float_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + case DBL_MANT_DIG: + tmpdef = static_double_declaration->p.definition_new( + &static_double_declaration->p, + NULL, 0, 0, "__tmpfloat"); + break; + default: + return -EINVAL; + } + tmpfloat = container_of(tmpdef, struct definition_float, p); + ctf_init_pos(&srcp, -1, O_RDONLY); + srcp.base = (char *) u.bits; + srcp.packet_size = sizeof(u) * CHAR_BIT; + switch (float_declaration->mantissa->len + 1) { + case FLT_MANT_DIG: + u.vf = float_definition->value; + break; + case DBL_MANT_DIG: + u.vd = float_definition->value; + break; + default: + return -EINVAL; + } + ctf_align_pos(pos, float_declaration->p.alignment); + ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat); + definition_unref(tmpdef); + return ret; } -void ctf_double_write(struct stream_pos *destp, - const struct type_class_float *float_class, - double v) +void __attribute__((constructor)) ctf_float_init(void) { - union doubleIEEE754 u; - struct type_class_float *src_class = float_type_new(NULL, - DBL_MANT_DIG, + static_float_declaration = + float_declaration_new(FLT_MANT_DIG, + sizeof(float) * CHAR_BIT - FLT_MANT_DIG, + BYTE_ORDER, + __alignof__(float)); + static_double_declaration = + float_declaration_new(DBL_MANT_DIG, sizeof(double) * CHAR_BIT - DBL_MANT_DIG, BYTE_ORDER, __alignof__(double)); - struct stream_pos srcp; - - u.v = v; - align_pos(destp, float_class->p.alignment); - init_pos(&srcp, (char *) u.bits); - _ctf_float_copy(destp, float_class, &srcp, src_class); - float_type_free(src_class); -} - -long double ctf_ldouble_read(struct stream_pos *srcp, - const struct type_class_float *float_class) -{ - union ldoubleIEEE754 u; - struct type_class_float *dest_class = float_type_new(NULL, - LDBL_MANT_DIG, - sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG, - BYTE_ORDER, - __alignof__(long double)); - struct stream_pos destp; - - align_pos(srcp, float_class->p.alignment); - init_pos(&destp, (char *) u.bits); - _ctf_float_copy(&destp, dest_class, srcp, float_class); - float_type_free(dest_class); - return u.v; } -void ctf_ldouble_write(struct stream_pos *destp, - const struct type_class_float *float_class, - long double v) +void __attribute__((destructor)) ctf_float_fini(void) { - union ldoubleIEEE754 u; - struct type_class_float *src_class = float_type_new(NULL, - LDBL_MANT_DIG, - sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG, - BYTE_ORDER, - __alignof__(long double)); - struct stream_pos srcp; - - u.v = v; - align_pos(destp, float_class->p.alignment); - init_pos(&srcp, (char *) u.bits); - _ctf_float_copy(destp, float_class, &srcp, src_class); - float_type_free(src_class); + declaration_unref(&static_float_declaration->p); + declaration_unref(&static_double_declaration->p); }