X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=66036ae2511004fafe8bd3056cb848949f11a209;hp=e43e5547217011e5d3680574d18f87f825be4508;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=d11e9c4975d88591e2324b6b11f426a22995833f diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c index e43e5547..66036ae2 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 + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -14,17 +16,31 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include #include #include -#include +#include + +/* + * The aligned read/write functions are expected to be faster than the + * bitfield variants. They will be enabled eventually as an + * optimisation. + */ 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); @@ -34,15 +50,18 @@ 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: { uint8_t v; - v = *(const uint8_t *)pos->base; + v = *(const uint8_t *) ctf_get_pos_addr(pos); integer_definition->value._unsigned = v; break; } @@ -50,7 +69,7 @@ void _aligned_integer_read(struct stream_pos *ppos, { uint16_t v; - v = *(const uint16_t *)pos->base; + v = *(const uint16_t *) ctf_get_pos_addr(pos); integer_definition->value._unsigned = rbo ? GUINT16_SWAP_LE_BE(v) : v; break; @@ -59,7 +78,7 @@ void _aligned_integer_read(struct stream_pos *ppos, { uint32_t v; - v = *(const uint32_t *)pos->base; + v = *(const uint32_t *) ctf_get_pos_addr(pos); integer_definition->value._unsigned = rbo ? GUINT32_SWAP_LE_BE(v) : v; break; @@ -68,7 +87,7 @@ void _aligned_integer_read(struct stream_pos *ppos, { uint64_t v; - v = *(const uint64_t *)pos->base; + v = *(const uint64_t *) ctf_get_pos_addr(pos); integer_definition->value._unsigned = rbo ? GUINT64_SWAP_LE_BE(v) : v; break; @@ -82,7 +101,7 @@ void _aligned_integer_read(struct stream_pos *ppos, { int8_t v; - v = *(const int8_t *)pos->base; + v = *(const int8_t *) ctf_get_pos_addr(pos); integer_definition->value._signed = v; break; } @@ -90,27 +109,27 @@ void _aligned_integer_read(struct stream_pos *ppos, { int16_t v; - v = *(const int16_t *)pos->base; + 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: { int32_t v; - v = *(const int32_t *)pos->base; + 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: { int64_t v; - v = *(const int64_t *)pos->base; + 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: @@ -118,10 +137,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 = @@ -132,8 +152,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) { @@ -167,12 +190,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: @@ -185,9 +208,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); @@ -195,30 +219,44 @@ void ctf_integer_read(struct stream_pos *ppos, struct definition *definition) integer_definition->declaration; struct ctf_stream_pos *pos = ctf_pos(ppos); + if (!(integer_declaration->p.alignment % CHAR_BIT) + && !(integer_declaration->len % CHAR_BIT)) { + 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); @@ -226,28 +264,42 @@ void ctf_integer_write(struct stream_pos *ppos, struct definition *definition) integer_definition->declaration; struct ctf_stream_pos *pos = ctf_pos(ppos); + if (!(integer_declaration->p.alignment % CHAR_BIT) + && !(integer_declaration->len % CHAR_BIT)) { + 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; }