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

diff --git a/types/float.c b/types/float.c
index 2f40d930..266f7579 100644
--- a/types/float.c
+++ b/types/float.c
@@ -29,12 +29,12 @@ 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);
 	}
 }
 
@@ -56,7 +56,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 +69,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 +90,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;
 }