X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=3e49a4b1fbc7c2c995cb7adc490de0fe49d61d6b;hp=5ceb9f3ada1fa5a54fdd7c2be579b7efc21df74e;hb=5f0b5523775fe5fe8dcc7c232aa831979a36498c;hpb=05628561ca57ff5d269571a72a12cb86854c5f70 diff --git a/types/float.c b/types/float.c index 5ceb9f3a..3e49a4b1 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 @@ -18,97 +20,124 @@ #include #include +#include +#include static -struct declaration *_float_declaration_new(struct type *type, - struct declaration_scope *parent_scope); +struct definition *_float_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index, + const char *root_name); static -void _float_declaration_free(struct declaration *declaration); - -void float_copy(struct stream_pos *destp, - const struct format *fdest, - struct stream_pos *srcp, - const struct format *fsrc, - struct declaration *declaration) -{ - struct declaration_float *_float = - container_of(declaration, struct declaration_float, p); - struct type_float *float_type = _float->type; - - if (fsrc->float_copy == fdest->float_copy) { - fsrc->float_copy(destp, srcp, float_type); - } else { - double v; - - v = fsrc->double_read(srcp, float_type); - fdest->double_write(destp, float_type, v); - } -} +void _float_definition_free(struct definition *definition); static -void _float_type_free(struct type *type) +void _float_declaration_free(struct declaration *declaration) { - struct type_float *float_type = - container_of(type, struct type_float, p); + struct declaration_float *float_declaration = + container_of(declaration, struct declaration_float, p); - type_unref(&float_type->exp->p); - type_unref(&float_type->mantissa->p); - type_unref(&float_type->sign->p); - g_free(float_type); + declaration_unref(&float_declaration->exp->p); + declaration_unref(&float_declaration->mantissa->p); + declaration_unref(&float_declaration->sign->p); + g_free(float_declaration); } -struct type_float * - float_type_new(const char *name, size_t mantissa_len, +struct declaration_float * + float_declaration_new(size_t mantissa_len, size_t exp_len, int byte_order, size_t alignment) { - struct type_float *float_type; - struct type *type; + struct declaration_float *float_declaration; + struct declaration *declaration; - float_type = g_new(struct type_float, 1); - type = &float_type->p; - type->id = CTF_TYPE_FLOAT; - type->name = g_quark_from_string(name); - type->alignment = alignment; - type->copy = float_copy; - type->type_free = _float_type_free; - type->declaration_new = _float_declaration_new; - type->declaration_free = _float_declaration_free; - type->ref = 1; - float_type->byte_order = byte_order; + float_declaration = g_new(struct declaration_float, 1); + declaration = &float_declaration->p; + declaration->id = CTF_TYPE_FLOAT; + declaration->alignment = alignment; + declaration->declaration_free = _float_declaration_free; + declaration->definition_new = _float_definition_new; + declaration->definition_free = _float_definition_free; + declaration->ref = 1; + float_declaration->byte_order = byte_order; - float_type->sign = integer_type_new(NULL, 1, - byte_order, false, 1); - float_type->mantissa = integer_type_new(NULL, mantissa_len - 1, - byte_order, false, 1); - float_type->exp = integer_type_new(NULL, exp_len, - byte_order, true, 1); - return float_type; + float_declaration->sign = integer_declaration_new(1, + byte_order, false, 1, 2, + CTF_STRING_NONE, NULL); + float_declaration->mantissa = integer_declaration_new(mantissa_len - 1, + byte_order, false, 1, 10, + CTF_STRING_NONE, NULL); + float_declaration->exp = integer_declaration_new(exp_len, + byte_order, true, 1, 10, + CTF_STRING_NONE, NULL); + return float_declaration; } static -struct declaration * - _float_declaration_new(struct type *type, - struct declaration_scope *parent_scope) +struct definition * + _float_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index, + const char *root_name) { - struct type_float *float_type = - container_of(type, struct type_float, p); - struct declaration_float *_float; + struct declaration_float *float_declaration = + container_of(declaration, struct declaration_float, p); + struct definition_float *_float; + struct definition *tmp; + int ret; - _float = g_new(struct declaration_float, 1); - type_ref(&float_type->p); - _float->p.type= type; - _float->type= float_type; + _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; + /* + * 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) { + ret = register_field_definition(field_name, &_float->p, + parent_scope); + assert(!ret); + } return &_float->p; } static -void _float_declaration_free(struct declaration *declaration) +void _float_definition_free(struct definition *definition) { - struct declaration_float *_float = - container_of(declaration, struct declaration_float, p); + struct definition_float *_float = + container_of(definition, struct definition_float, p); - type_unref(_float->p.type); + 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); }