X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=b3e0dc1cfc3808c27ebf16ee8be6e731a91a39f0;hp=2f40d930b6d87c119da1c95fe350439ed2adfc5b;hb=ccd7e1c86f36342b0b06651cc52df86bb663c271;hpb=bed864a75d2315c344a6e625db66ae9bfbc51e27

diff --git a/types/float.c b/types/float.c
index 2f40d930..b3e0dc1c 100644
--- a/types/float.c
+++ b/types/float.c
@@ -1,21 +1,19 @@
 /*
- * BabelTrace - Float Type Converter
+ * float.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Float Type Converter
  *
- * 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.
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
  */
 
 #include <babeltrace/compiler.h>
@@ -29,17 +27,20 @@ void float_copy(struct stream_pos *dest, const struct format *fdest,
 		container_of(type_class, struct type_class_float, p);
 
 	if (fsrc->float_copy == fdest->float_copy) {
-		fsrc->float_copy(dest, float_class, src, float_class);
+		fsrc->float_copy(dest, src, float_class);
 	} else {
 		double v;
 
-		v = fsrc->double_read(src, fsrc);
-		fdest->double_write(dest, fdest, v);
+		v = fsrc->double_read(src, float_class);
+		fdest->double_write(dest, float_class, v);
 	}
 }
 
 void float_type_free(struct type_class_float *float_class)
 {
+	integer_type_free(float_class->exp);
+	integer_type_free(float_class->mantissa);
+	integer_type_free(float_class->sign);
 	g_free(float_class);
 }
 
@@ -56,7 +57,6 @@ struct type_class_float *float_type_new(const char *name,
 					size_t alignment)
 {
 	struct type_class_float *float_class;
-	struct type_class_bitfield *bitfield_class;
 	struct type_class_integer *int_class;
 	struct type_class *type_class;
 	int ret;
@@ -70,12 +70,16 @@ struct type_class_float *float_type_new(const char *name,
 	type_class->free = _float_type_free;
 	float_class->byte_order = byte_order;
 
-	float_class->mantissa = bitfield_type_new(NULL, mantissa_len,
-						  byte_order, false, 1);
+	float_class->sign = integer_type_new(NULL, 1,
+					     byte_order, false, 1);
+	if (!float_class->mantissa)
+		goto error_sign;
+	float_class->mantissa = integer_type_new(NULL, mantissa_len - 1,
+						 byte_order, false, 1);
 	if (!float_class->mantissa)
 		goto error_mantissa;
-	float_class->exp = bitfield_type_new(NULL, exp_len,
-					     byte_order, true, 1);
+	float_class->exp = integer_type_new(NULL, exp_len,
+					    byte_order, true, 1);
 	if (!float_class->exp)
 		goto error_exp;
 
@@ -87,10 +91,12 @@ struct type_class_float *float_type_new(const char *name,
 	return float_class;
 
 error_register:
-	bitfield_type_free(float_class->exp);
+	integer_type_free(float_class->exp);
 error_exp:
-	bitfield_type_free(float_class->mantissa);
+	integer_type_free(float_class->mantissa);
 error_mantissa:
+	integer_type_free(float_class->sign);
+error_sign:
 	g_free(float_class);
 	return NULL;
 }