X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=71ac0f448c0a446b59edf9a5b86688763dde33db;hb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7;hp=07c07be6e709aeb7eccd065fe17f02fc320a8b57;hpb=aee35fcc7e82d20396d82d151de93b1b51325398;p=babeltrace.git

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 07c07be6..71ac0f44 100644
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -223,20 +223,24 @@ int ctf_integer_read(struct stream_pos *ppos, struct definition *definition)
 
 	if (!integer_declaration->signedness) {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_read_le(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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);
 	}
@@ -266,20 +270,24 @@ int ctf_integer_write(struct stream_pos *ppos, struct definition *definition)
 		goto end;
 	if (!integer_declaration->signedness) {
 		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_write_le(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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(mmap_align_addr(pos->base_mma), 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);
 	}