X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=71ac0f448c0a446b59edf9a5b86688763dde33db;hb=09349576c27925daab50630bff7d219eebc8df98;hp=3381b585cd61e203eb21a8be3adb2a717e56145a;hpb=5385cf15115d777de4a220a164c101da0e4c3bac;p=babeltrace.git

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 3381b585..71ac0f44 100644
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -3,7 +3,9 @@
  *
  * Integers read/write functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +22,7 @@
 #include <babeltrace/bitfield.h>
 #include <stdint.h>
 #include <glib.h>
-#include <endian.h>
+#include <babeltrace/endian.h>
 
 /*
  * The aligned read/write functions are expected to be faster than the
@@ -29,8 +31,8 @@
  */
 
 static
-void _aligned_integer_read(struct stream_pos *ppos,
-			   struct definition *definition)
+int _aligned_integer_read(struct stream_pos *ppos,
+			  struct definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -40,8 +42,11 @@ void _aligned_integer_read(struct stream_pos *ppos,
 	int rbo = (integer_declaration->byte_order != BYTE_ORDER);	/* reverse byte order */
 
 	ctf_align_pos(pos, integer_declaration->p.alignment);
-	assert(!(pos->offset % CHAR_BIT));
 
+	if (!ctf_pos_access_ok(pos, integer_declaration->len))
+		return -EFAULT;
+
+	assert(!(pos->offset % CHAR_BIT));
 	if (!integer_declaration->signedness) {
 		switch (integer_declaration->len) {
 		case 8:
@@ -98,7 +103,7 @@ void _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int16_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT16_SWAP_LE_BE(v) : v;
+				rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v;
 			break;
 		}
 		case 32:
@@ -107,7 +112,7 @@ void _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int32_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT32_SWAP_LE_BE(v) : v;
+				rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v;
 			break;
 		}
 		case 64:
@@ -116,7 +121,7 @@ void _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int64_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT64_SWAP_LE_BE(v) : v;
+				rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v;
 			break;
 		}
 		default:
@@ -124,10 +129,11 @@ void _aligned_integer_read(struct stream_pos *ppos,
 		}
 	}
 	ctf_move_pos(pos, integer_declaration->len);
+	return 0;
 }
 
 static
-void _aligned_integer_write(struct stream_pos *ppos,
+int _aligned_integer_write(struct stream_pos *ppos,
 			    struct definition *definition)
 {
 	struct definition_integer *integer_definition =
@@ -138,8 +144,11 @@ void _aligned_integer_write(struct stream_pos *ppos,
 	int rbo = (integer_declaration->byte_order != BYTE_ORDER);	/* reverse byte order */
 
 	ctf_align_pos(pos, integer_declaration->p.alignment);
-	assert(!(pos->offset % CHAR_BIT));
 
+	if (!ctf_pos_access_ok(pos, integer_declaration->len))
+		return -EFAULT;
+
+	assert(!(pos->offset % CHAR_BIT));
 	if (pos->dummy)
 		goto end;
 	if (!integer_declaration->signedness) {
@@ -173,12 +182,12 @@ void _aligned_integer_write(struct stream_pos *ppos,
 			break;
 		case 16:
 			*(int16_t *) ctf_get_pos_addr(pos) = rbo ?
-						 GUINT16_SWAP_LE_BE((int16_t) v) :
+						 (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) :
 						 (int16_t) v;
 			break;
 		case 32:
 			*(int32_t *) ctf_get_pos_addr(pos) = rbo ?
-						 GUINT32_SWAP_LE_BE((int32_t) v) :
+						 (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) :
 						 (int32_t) v;
 			break;
 		case 64:
@@ -191,9 +200,10 @@ void _aligned_integer_write(struct stream_pos *ppos,
 	}
 end:
 	ctf_move_pos(pos, integer_declaration->len);
+	return 0;
 }
 
-void ctf_integer_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_integer_read(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -203,34 +213,42 @@ void ctf_integer_read(struct stream_pos *ppos, struct definition *definition)
 
 	if (!(integer_declaration->p.alignment % CHAR_BIT)
 	    && !(integer_declaration->len % CHAR_BIT)) {
-		_aligned_integer_read(ppos, definition);
-		return;
+		return _aligned_integer_read(ppos, definition);
 	}
 
 	ctf_align_pos(pos, integer_declaration->p.alignment);
+
+	if (!ctf_pos_access_ok(pos, integer_declaration->len))
+		return -EFAULT;
+
 	if (!integer_declaration->signedness) {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_read_le(pos->base, unsigned long,
+			bt_bitfield_read_le(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				&integer_definition->value._unsigned);
 		else
-			bt_bitfield_read_be(pos->base, unsigned long,
+			bt_bitfield_read_be(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				&integer_definition->value._unsigned);
 	} else {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_read_le(pos->base, unsigned long,
+			bt_bitfield_read_le(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				&integer_definition->value._signed);
 		else
-			bt_bitfield_read_be(pos->base, unsigned long,
+			bt_bitfield_read_be(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				&integer_definition->value._signed);
 	}
 	ctf_move_pos(pos, integer_declaration->len);
+	return 0;
 }
 
-void ctf_integer_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_integer_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -240,32 +258,40 @@ void ctf_integer_write(struct stream_pos *ppos, struct definition *definition)
 
 	if (!(integer_declaration->p.alignment % CHAR_BIT)
 	    && !(integer_declaration->len % CHAR_BIT)) {
-		_aligned_integer_write(ppos, definition);
-		return;
+		return _aligned_integer_write(ppos, definition);
 	}
 
 	ctf_align_pos(pos, integer_declaration->p.alignment);
+
+	if (!ctf_pos_access_ok(pos, integer_declaration->len))
+		return -EFAULT;
+
 	if (pos->dummy)
 		goto end;
 	if (!integer_declaration->signedness) {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_write_le(pos->base, unsigned long,
+			bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				integer_definition->value._unsigned);
 		else
-			bt_bitfield_write_be(pos->base, unsigned long,
+			bt_bitfield_write_be(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				integer_definition->value._unsigned);
 	} else {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_write_le(pos->base, unsigned long,
+			bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				integer_definition->value._signed);
 		else
-			bt_bitfield_write_be(pos->base, unsigned long,
+			bt_bitfield_write_be(mmap_align_addr(pos->base_mma) +
+					pos->mmap_base_offset, unsigned long,
 				pos->offset, integer_declaration->len,
 				integer_definition->value._signed);
 	}
 end:
 	ctf_move_pos(pos, integer_declaration->len);
+	return 0;
 }