X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=028749bc92a177f91237283797a234a65fd21284;hp=3b2523e24f5c6fee571c367852b04667a9f8d88a;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=0f980a3595f61930659e392b1248c59490dd5a22 diff --git a/types/float.c b/types/float.c index 3b2523e2..028749bc 100644 --- a/types/float.c +++ b/types/float.c @@ -3,7 +3,9 @@ * * BabelTrace - Float Type Converter * - * Copyright 2010, 2011 - 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 @@ -14,39 +16,29 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include +#include static struct definition *_float_definition_new(struct declaration *declaration, struct definition_scope *parent_scope, - GQuark field_name, int index); + GQuark field_name, int index, + const char *root_name); static void _float_definition_free(struct definition *definition); -void float_copy(struct stream_pos *destp, - const struct format *fdest, - struct stream_pos *srcp, - const struct format *fsrc, - struct definition *definition) -{ - struct definition_float *_float = - container_of(definition, struct definition_float, p); - struct declaration_float *float_declaration = _float->declaration; - - if (fsrc->float_copy == fdest->float_copy) { - fsrc->float_copy(destp, srcp, float_declaration); - } else { - double v; - - v = fsrc->double_read(srcp, float_declaration); - if (fdest) - fdest->double_write(destp, float_declaration, v); - } -} - static void _float_declaration_free(struct declaration *declaration) { @@ -70,7 +62,6 @@ struct declaration_float * declaration = &float_declaration->p; declaration->id = CTF_TYPE_FLOAT; declaration->alignment = alignment; - declaration->copy = float_copy; declaration->declaration_free = _float_declaration_free; declaration->definition_new = _float_definition_new; declaration->definition_free = _float_definition_free; @@ -78,11 +69,14 @@ struct declaration_float * float_declaration->byte_order = byte_order; float_declaration->sign = integer_declaration_new(1, - byte_order, false, 1); + byte_order, false, 1, 2, + CTF_STRING_NONE, NULL); float_declaration->mantissa = integer_declaration_new(mantissa_len - 1, - byte_order, false, 1); + byte_order, false, 1, 10, + CTF_STRING_NONE, NULL); float_declaration->exp = integer_declaration_new(exp_len, - byte_order, true, 1); + byte_order, true, 1, 10, + CTF_STRING_NONE, NULL); return float_declaration; } @@ -90,19 +84,56 @@ static struct definition * _float_definition_new(struct declaration *declaration, struct definition_scope *parent_scope, - GQuark field_name, int index) + GQuark field_name, int index, + const char *root_name) { struct declaration_float *float_declaration = container_of(declaration, struct declaration_float, p); struct definition_float *_float; + struct definition *tmp; _float = g_new(struct definition_float, 1); declaration_ref(&float_declaration->p); _float->p.declaration = declaration; _float->declaration = float_declaration; + _float->p.scope = new_definition_scope(parent_scope, field_name, root_name); + _float->p.path = new_definition_path(parent_scope, field_name, root_name); + if (float_declaration->byte_order == LITTLE_ENDIAN) { + tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p, + _float->p.scope, g_quark_from_static_string("mantissa"), 0, NULL); + _float->mantissa = container_of(tmp, struct definition_integer, p); + tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p, + _float->p.scope, g_quark_from_static_string("exp"), 1, NULL); + _float->exp = container_of(tmp, struct definition_integer, p); + tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p, + _float->p.scope, g_quark_from_static_string("sign"), 2, NULL); + _float->sign = container_of(tmp, struct definition_integer, p); + } else { + tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p, + _float->p.scope, g_quark_from_static_string("sign"), 0, NULL); + _float->sign = container_of(tmp, struct definition_integer, p); + tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p, + _float->p.scope, g_quark_from_static_string("exp"), 1, NULL); + _float->exp = container_of(tmp, struct definition_integer, p); + tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p, + _float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL); + _float->mantissa = container_of(tmp, struct definition_integer, p); + } _float->p.ref = 1; - _float->p.index = index; + /* + * Use INT_MAX order to ensure that all fields of the parent + * scope are seen as being prior to this scope. + */ + _float->p.index = root_name ? INT_MAX : index; + _float->p.name = field_name; _float->value = 0.0; + if (parent_scope) { + int ret; + + ret = register_field_definition(field_name, &_float->p, + parent_scope); + assert(!ret); + } return &_float->p; } @@ -112,6 +143,10 @@ void _float_definition_free(struct definition *definition) struct definition_float *_float = container_of(definition, struct definition_float, p); + definition_unref(&_float->sign->p); + definition_unref(&_float->exp->p); + definition_unref(&_float->mantissa->p); + free_definition_scope(_float->p.scope); declaration_unref(_float->p.declaration); g_free(_float); }