Rename "type" to "declaration"
[babeltrace.git] / formats / ctf / types / integer.c
index f7f5f23df1135353374f2366ef3a257a3c564b93..fb6e0d425d2c7cbf420b11595aeff664ff1516a6 100644 (file)
@@ -3,44 +3,40 @@
  *
  * Integers read/write functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
- *
- * 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 <ctf/ctf-types.h>
-#include <ctf/bitfield.h>
+#include <babeltrace/ctf/types.h>
+#include <babeltrace/bitfield.h>
 #include <stdint.h>
 #include <glib.h>
 #include <endian.h>
 
 static
 uint64_t _aligned_uint_read(struct stream_pos *pos,
-                      const struct type_class_integer *int_class)
+                      const struct declaration_integer *integer_declaration)
 {
-       int rbo = (int_class->byte_order != BYTE_ORDER);        /* reverse byte order */
+       int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        assert(!(pos->offset % CHAR_BIT));
-       switch (int_class->len) {
+       switch (integer_declaration->len) {
        case 8:
        {
                uint8_t v;
 
                v = *(const uint8_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return v;
        }
        case 16:
@@ -48,7 +44,7 @@ uint64_t _aligned_uint_read(struct stream_pos *pos,
                uint16_t v;
 
                v = *(const uint16_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT16_SWAP_LE_BE(v) : v;
        }
        case 32:
@@ -56,7 +52,7 @@ uint64_t _aligned_uint_read(struct stream_pos *pos,
                uint32_t v;
 
                v = *(const uint32_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT32_SWAP_LE_BE(v) : v;
        }
        case 64:
@@ -64,7 +60,7 @@ uint64_t _aligned_uint_read(struct stream_pos *pos,
                uint64_t v;
 
                v = *(const uint64_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT64_SWAP_LE_BE(v) : v;
        }
        default:
@@ -74,19 +70,19 @@ uint64_t _aligned_uint_read(struct stream_pos *pos,
 
 static
 int64_t _aligned_int_read(struct stream_pos *pos,
-                    const struct type_class_integer *int_class)
+                    const struct declaration_integer *integer_declaration)
 {
-       int rbo = (int_class->byte_order != BYTE_ORDER);        /* reverse byte order */
+       int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        assert(!(pos->offset % CHAR_BIT));
-       switch (int_class->len) {
+       switch (integer_declaration->len) {
        case 8:
        {
                int8_t v;
 
                v = *(const int8_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return v;
        }
        case 16:
@@ -94,7 +90,7 @@ int64_t _aligned_int_read(struct stream_pos *pos,
                int16_t v;
 
                v = *(const int16_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT16_SWAP_LE_BE(v) : v;
        }
        case 32:
@@ -102,7 +98,7 @@ int64_t _aligned_int_read(struct stream_pos *pos,
                int32_t v;
 
                v = *(const int32_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT32_SWAP_LE_BE(v) : v;
        }
        case 64:
@@ -110,7 +106,7 @@ int64_t _aligned_int_read(struct stream_pos *pos,
                int64_t v;
 
                v = *(const int64_t *)pos->base;
-               move_pos(pos, int_class->len);
+               move_pos(pos, integer_declaration->len);
                return rbo ? GUINT64_SWAP_LE_BE(v) : v;
        }
        default:
@@ -120,17 +116,17 @@ int64_t _aligned_int_read(struct stream_pos *pos,
 
 static
 void _aligned_uint_write(struct stream_pos *pos,
-                   const struct type_class_integer *int_class,
+                   const struct declaration_integer *integer_declaration,
                    uint64_t v)
 {
-       int rbo = (int_class->byte_order != BYTE_ORDER);        /* reverse byte order */
+       int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        assert(!(pos->offset % CHAR_BIT));
        if (pos->dummy)
                goto end;
 
-       switch (int_class->len) {
+       switch (integer_declaration->len) {
        case 8: *(uint8_t *) get_pos_addr(pos) = (uint8_t) v;
                break;
        case 16:
@@ -151,22 +147,22 @@ void _aligned_uint_write(struct stream_pos *pos,
                assert(0);
        }
 end:
-       move_pos(pos, int_class->len);
+       move_pos(pos, integer_declaration->len);
 }
 
 static
 void _aligned_int_write(struct stream_pos *pos,
-                  const struct type_class_integer *int_class,
+                  const struct declaration_integer *integer_declaration,
                   int64_t v)
 {
-       int rbo = (int_class->byte_order != BYTE_ORDER);        /* reverse byte order */
+       int rbo = (integer_declaration->byte_order != BYTE_ORDER);      /* reverse byte order */
 
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        assert(!(pos->offset % CHAR_BIT));
        if (pos->dummy)
                goto end;
 
-       switch (int_class->len) {
+       switch (integer_declaration->len) {
        case 8: *(int8_t *) get_pos_addr(pos) = (int8_t) v;
                break;
        case 16:
@@ -187,72 +183,72 @@ void _aligned_int_write(struct stream_pos *pos,
                assert(0);
        }
 end:
-       move_pos(pos, int_class->len);
+       move_pos(pos, integer_declaration->len);
        return;
 }
 
 uint64_t ctf_uint_read(struct stream_pos *pos,
-                       const struct type_class_bitfield *int_class)
+                       const struct declaration_integer *integer_declaration)
 {
-       uint64_t v;
+       uint64_t v = 0;
 
-       align_pos(pos, int_class->p.alignment);
-       if (int_class->byte_order == LITTLE_ENDIAN)
-               ctf_bitfield_read_le(pos->base, pos->offset,
-                                    int_class->len, &v);
+       align_pos(pos, integer_declaration->p.alignment);
+       if (integer_declaration->byte_order == LITTLE_ENDIAN)
+               bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+                                   integer_declaration->len, &v);
        else
-               ctf_bitfield_read_be(pos->base, pos->offset,
-                                    int_class->len, &v);
-       move_pos(pos, int_class->len);
+               bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+                                   integer_declaration->len, &v);
+       move_pos(pos, integer_declaration->len);
        return v;
 }
 
 int64_t ctf_int_read(struct stream_pos *pos,
-                       const struct type_class_bitfield *int_class)
+                       const struct declaration_integer *integer_declaration)
 {
-       int64_t v;
+       int64_t v = 0;
 
-       align_pos(pos, int_class->p.alignment);
-       if (int_class->byte_order == LITTLE_ENDIAN)
-               ctf_bitfield_read_le(pos->base, pos->offset,
-                                    int_class->len, &v);
+       align_pos(pos, integer_declaration->p.alignment);
+       if (integer_declaration->byte_order == LITTLE_ENDIAN)
+               bt_bitfield_read_le(pos->base, unsigned long, pos->offset,
+                                   integer_declaration->len, &v);
        else
-               ctf_bitfield_read_be(pos->base, pos->offset,
-                                    int_class->len, &v);
-       move_pos(pos, int_class->len);
+               bt_bitfield_read_be(pos->base, unsigned long, pos->offset,
+                                   integer_declaration->len, &v);
+       move_pos(pos, integer_declaration->len);
        return v;
 }
 
 void ctf_uint_write(struct stream_pos *pos,
-                       const struct type_class_bitfield *int_class,
+                       const struct declaration_integer *integer_declaration,
                        uint64_t v)
 {
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        if (pos->dummy)
                goto end;
-       if (int_class->byte_order == LITTLE_ENDIAN)
-               ctf_bitfield_write_le(pos->base, pos->offset,
-                                     int_class->len, v);
+       if (integer_declaration->byte_order == LITTLE_ENDIAN)
+               bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+                                    integer_declaration->len, v);
        else
-               ctf_bitfield_write_be(pos->base, pos->offset,
-                                     int_class->len,, v);
+               bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+                                    integer_declaration->len, v);
 end:
-       move_pos(pos, int_class->len);
+       move_pos(pos, integer_declaration->len);
 }
 
 void ctf_int_write(struct stream_pos *pos,
-                       const struct type_class_bitfield *int_class,
+                       const struct declaration_integer *integer_declaration,
                        int64_t v)
 {
-       align_pos(pos, int_class->p.alignment);
+       align_pos(pos, integer_declaration->p.alignment);
        if (pos->dummy)
                goto end;
-       if (int_class->byte_order == LITTLE_ENDIAN)
-               ctf_bitfield_write_le(pos->base, pos->offset,
-                                     int_class->len, v);
+       if (integer_declaration->byte_order == LITTLE_ENDIAN)
+               bt_bitfield_write_le(pos->base, unsigned long, pos->offset,
+                                    integer_declaration->len, v);
        else
-               ctf_bitfield_write_be(pos->base, pos->offset,
-                                     int_class->len, v);
+               bt_bitfield_write_be(pos->base, unsigned long, pos->offset,
+                                    integer_declaration->len, v);
 end:
-       move_pos(pos, int_class->len);
+       move_pos(pos, integer_declaration->len);
 }
This page took 0.028734 seconds and 4 git commands to generate.