Update pretty-print

[babeltrace.git] / types / float.c

diff --git a/types/float.c b/types/float.c
index b12cf6be06d85241d5f9970e1f84ee1502d3f8b8..5ce6bb43628cfa907c32228be83c03696de8d30a 100644 (file)
--- a/types/float.c
+++ b/types/float.c
@@ -18,33 +18,15 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <endian.h>
 
 static
 struct definition *_float_definition_new(struct declaration *declaration,
-                                  struct definition_scope *parent_scope);
+                                  struct definition_scope *parent_scope,
+                                  GQuark field_name, int index);
 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);
-               fdest->double_write(destp, float_declaration, v);
-       }
-}
-
 static
 void _float_declaration_free(struct declaration *declaration)
 {
@@ -58,7 +40,7 @@ void _float_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_float *
-       float_declaration_new(const char *name, size_t mantissa_len,
+       float_declaration_new(size_t mantissa_len,
                       size_t exp_len, int byte_order, size_t alignment)
 {
        struct declaration_float *float_declaration;
@@ -67,20 +49,18 @@ struct declaration_float *
        float_declaration = g_new(struct declaration_float, 1);
        declaration = &float_declaration->p;
        declaration->id = CTF_TYPE_FLOAT;
-       declaration->name = g_quark_from_string(name);
        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;
        declaration->ref = 1;
        float_declaration->byte_order = byte_order;
 
-       float_declaration->sign = integer_declaration_new(NULL, 1,
+       float_declaration->sign = integer_declaration_new(1,
                                            byte_order, false, 1);
-       float_declaration->mantissa = integer_declaration_new(NULL, mantissa_len - 1,
+       float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
                                                byte_order, false, 1);
-       float_declaration->exp = integer_declaration_new(NULL, exp_len,
+       float_declaration->exp = integer_declaration_new(exp_len,
                                           byte_order, true, 1);
        return float_declaration;
 }
@@ -88,17 +68,43 @@ struct declaration_float *
 static
 struct definition *
        _float_definition_new(struct declaration *declaration,
-                             struct definition_scope *parent_scope)
+                             struct definition_scope *parent_scope,
+                             GQuark field_name, int index)
 {
        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.declaration = declaration;
+       _float->declaration = float_declaration;
+       if (float_declaration->byte_order == LITTLE_ENDIAN) {
+               tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
+                       parent_scope, g_quark_from_static_string("mantissa"), 0);
+               _float->mantissa = container_of(tmp, struct definition_integer, p);
+               tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
+                       parent_scope, g_quark_from_static_string("exp"), 1);
+               _float->exp = container_of(tmp, struct definition_integer, p);
+               tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
+                       parent_scope, g_quark_from_static_string("sign"), 2);
+               _float->sign = container_of(tmp, struct definition_integer, p);
+       } else {
+               tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
+                       parent_scope, g_quark_from_static_string("sign"), 0);
+               _float->sign = container_of(tmp, struct definition_integer, p);
+               tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
+                       parent_scope, g_quark_from_static_string("exp"), 1);
+               _float->exp = container_of(tmp, struct definition_integer, p);
+               tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
+                       parent_scope, g_quark_from_static_string("mantissa"), 2);
+               _float->mantissa = container_of(tmp, struct definition_integer, p);
+       }
        _float->p.ref = 1;
+       _float->p.index = index;
+       _float->p.name = field_name;
+       _float->p.path = new_definition_path(parent_scope, field_name);
        _float->value = 0.0;
        return &_float->p;
 }
@@ -109,6 +115,9 @@ 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);
        declaration_unref(_float->p.declaration);
        g_free(_float);
 }