X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=8bb3f743be2a27bc0e79cbf8380093ce5a6797ef;hp=20cf7fa537c8e96e7a4e14359688f58f967655c3;hb=8563e754804a60faf870282d494ea419dc87016b;hpb=11d43b909baeee566511acfec577d4605386fa09 diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c index 20cf7fa5..8bb3f743 100644 --- a/formats/ctf/types/float.c +++ b/formats/ctf/types/float.c @@ -3,21 +3,17 @@ * * Floating point read/write functions. * - * Copyright (c) 2010 Mathieu Desnoyers + * Copyright 2010 - Mathieu Desnoyers * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * * Reference: ISO C99 standard 5.2.4 */ @@ -36,7 +32,7 @@ /* * 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. */ @@ -68,123 +64,105 @@ union ldoubleIEEE754 { #endif }; +static struct declaration_float *static_ldouble_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 definition_float *dest_definition, struct stream_pos *srcp, - const struct type_class_float *src_class) + const struct definition_float *src_definition) { - uint8_t sign; - int64_t exp; - uint64_t mantissa; - /* Read */ - if (src->byte_order == LITTLE_ENDIAN) { - mantissa = ctf_bitfield_unsigned_read(srcp, - src_class->mantissa); - exp = ctf_bitfield_signed_read(srcp, src_class->exp); - sign = ctf_bitfield_unsigned_read(srcp, src_class->sign); + if (src_definition->declaration->byte_order == LITTLE_ENDIAN) { + ctf_integer_read(srcp, &src_definition->mantissa->p); + ctf_integer_read(srcp, &src_definition->exp->p); + ctf_integer_read(srcp, &src_definition->sign->p); } else { - sign = ctf_bitfield_unsigned_read(srcp, src_class->sign); - exp = ctf_bitfield_signed_read(srcp, src_class->exp); - mantissa = ctf_bitfield_unsigned_read(srcp, - src_class->mantissa); + ctf_integer_read(srcp, &src_definition->sign->p); + ctf_integer_read(srcp, &src_definition->exp->p); + ctf_integer_read(srcp, &src_definition->mantissa->p); } + + 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->byte_order == LITTLE_ENDIAN) { - ctf_bitfield_unsigned_write(destp, dest_class->mantissa, - mantissa); - ctf_bitfield_signed_write(destp, dest_class->exp, exp); - ctf_bitfield_unsigned_write(destp, dest_class->sign, sign); + if (dest_definition->declaration->byte_order == LITTLE_ENDIAN) { + ctf_integer_write(destp, &dest_definition->mantissa->p); + ctf_integer_write(destp, &dest_definition->exp->p); + ctf_integer_write(destp, &dest_definition->sign->p); } else { - ctf_bitfield_unsigned_write(destp, dest_class->sign, sign); - ctf_bitfield_signed_write(destp, dest_class->exp, exp); - ctf_bitfield_unsigned_write(destp, dest_class->mantissa, - mantissa); + ctf_integer_write(destp, &dest_definition->sign->p); + ctf_integer_write(destp, &dest_definition->exp->p); + ctf_integer_write(destp, &dest_definition->mantissa->p); } } -void ctf_float_copy(struct stream_pos *dest, struct stream_pos *src, - const struct type_class_float *float_class) +void 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); -} - -double ctf_double_read(struct stream_pos *srcp, - const struct type_class_float *float_class) -{ - union doubleIEEE754 u; - struct ctf_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, &u.bits); - _ctf_float_copy(&destp, dest_class, srcp, float_class); - float_type_free(dest_class); - return u.v; + 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 ldoubleIEEE754 u; + struct definition *tmpdef = + static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p, + NULL, 0, 0); + struct definition_float *tmpfloat = + container_of(tmpdef, struct definition_float, p); + struct ctf_stream_pos destp; + + ctf_init_pos(&destp, -1, O_WRONLY); + destp.base = (char *) u.bits; + + ctf_align_pos(pos, float_declaration->p.alignment); + _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition); + float_definition->value = u.v; + definition_unref(tmpdef); } -void ctf_double_write(struct stream_pos *destp, - const struct type_class_float *float_class, - double v) +void ctf_float_write(struct stream_pos *ppos, struct definition *definition) { - union doubleIEEE754 u; - struct ctf_float *src_class = float_type_new(NULL, - 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, &u.bits); - _ctf_float_copy(destp, float_class, &srcp, src_class); - float_type_free(src_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 ldoubleIEEE754 u; + struct definition *tmpdef = + static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p, + NULL, 0, 0); + struct definition_float *tmpfloat = + container_of(tmpdef, struct definition_float, p); + struct ctf_stream_pos srcp; + + ctf_init_pos(&srcp, -1, O_RDONLY); + srcp.base = (char *) u.bits; + + u.v = float_definition->value; + ctf_align_pos(pos, float_declaration->p.alignment); + _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat); + definition_unref(tmpdef); } -long double ctf_ldouble_read(struct stream_pos *srcp, - const struct type_class_float *float_class) +void __attribute__((constructor)) ctf_float_init(void) { - union ldoubleIEEE754 u; - struct ctf_float *dest_class = float_type_new(NULL, - LDBL_MANT_DIG, + static_ldouble_declaration = + float_declaration_new(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, &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 ctf_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, &u.bits); - _ctf_float_copy(destp, float_class, &srcp, src_class); - float_type_free(src_class); + declaration_unref(&static_ldouble_declaration->p); }