Rename access address to access direct

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/side/trace.h b/include/side/trace.h
index 90e8d5355ae262a3d5a8bd03b153cc41eba87b55..d4727dac4c75ad9798d7f6132317de2baf2f844a 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -242,8 +242,8 @@ enum side_type_label_byte_order {
 #endif
 
 enum side_type_gather_access_mode {
-       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
-       SIDE_TYPE_GATHER_ACCESS_POINTER,
+       SIDE_TYPE_GATHER_ACCESS_DIRECT,
+       SIDE_TYPE_GATHER_ACCESS_POINTER,        /* Pointer dereference */
 };
 
 typedef enum side_visitor_status (*side_visitor_func)(

diff --git a/src/test.c b/src/test.c
index 98c8a1ca26a76a6d863d2ffcc45936c1fe9e4444..a0feae943e9186f44431daeae94120ba5ace451b 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1479,40 +1479,40 @@ static side_define_struct(mystructgatherdef,
        side_field_list(
                side_field_gather_unsigned_integer("a", offsetof(struct test, a),
                        side_struct_field_sizeof_bit(struct test, a), 0,
-                       side_struct_field_sizeof_bit(struct test, a), SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       side_struct_field_sizeof_bit(struct test, a), SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_signed_integer("d", offsetof(struct test, d),
                        side_struct_field_sizeof_bit(struct test, d), 0,
-                       side_struct_field_sizeof_bit(struct test, d), SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       side_struct_field_sizeof_bit(struct test, d), SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_unsigned_integer("e", offsetof(struct test, e),
                        side_struct_field_sizeof_bit(struct test, e), 8, 4,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
                side_field_gather_signed_integer("f", offsetof(struct test, f),
                        side_struct_field_sizeof_bit(struct test, f), 1, 4,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_signed_integer("g", offsetof(struct test, g),
                        side_struct_field_sizeof_bit(struct test, g), 11, 4,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_signed_integer("h", offsetof(struct test, h),
                        side_struct_field_sizeof_bit(struct test, h), 1, 31,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_signed_integer("i", offsetof(struct test, i),
                        side_struct_field_sizeof_bit(struct test, i), 33, 20,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_signed_integer("j", offsetof(struct test, j),
                        side_struct_field_sizeof_bit(struct test, j), 63, 1,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_signed_integer("k", offsetof(struct test, k), 
                        side_struct_field_sizeof_bit(struct test, k), 1, 63,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
                side_field_gather_unsigned_integer_le("test", offsetof(struct test, test),
                        side_struct_field_sizeof_bit(struct test, test), 0, 64,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
                side_field_gather_unsigned_integer_le("test_le", offsetof(struct test, test),
                        side_struct_field_sizeof_bit(struct test, test), 0, 64,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
                side_field_gather_unsigned_integer_be("test_be", offsetof(struct test, test),
                        side_struct_field_sizeof_bit(struct test, test), 0, 64,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list(side_attr("std.integer.base", side_attr_u8(16)))),
        ),
        side_attr_list()
 );
@@ -1520,11 +1520,11 @@ static side_define_struct(mystructgatherdef,
 side_static_event(my_provider_event_structgather, "myprovider", "myeventstructgather", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgather", &mystructgatherdef, 0, sizeof(struct test),
-                               SIDE_TYPE_GATHER_ACCESS_ADDRESS),
-               side_field_gather_signed_integer("intgather", 0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                               SIDE_TYPE_GATHER_ACCESS_DIRECT),
+               side_field_gather_signed_integer("intgather", 0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list(side_attr("std.integer.base", side_attr_u8(10)))),
 #if __HAVE_FLOAT32
-               side_field_gather_float("f32", 0, 32, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+               side_field_gather_float("f32", 0, 32, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
 #endif
        ),
        side_attr_list()
@@ -1582,7 +1582,7 @@ static side_define_struct(mystructgathernest2,
        side_field_list(
                side_field_gather_unsigned_integer("c", offsetof(struct testnest2, c),
                        side_struct_field_sizeof_bit(struct testnest2, c), 0,
-                       side_struct_field_sizeof_bit(struct testnest2, c), SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       side_struct_field_sizeof_bit(struct testnest2, c), SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
        ),
        side_attr_list()
 );
@@ -1591,7 +1591,7 @@ static side_define_struct(mystructgathernest1,
        side_field_list(
                side_field_gather_unsigned_integer("b", offsetof(struct testnest1, b),
                        side_struct_field_sizeof_bit(struct testnest1, b), 0,
-                       side_struct_field_sizeof_bit(struct testnest1, b), SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       side_struct_field_sizeof_bit(struct testnest1, b), SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_struct("nest2", &mystructgathernest2,
                        offsetof(struct testnest1, nest), sizeof(struct testnest2),
                        SIDE_TYPE_GATHER_ACCESS_POINTER),
@@ -1603,7 +1603,7 @@ static side_define_struct(mystructgathernest0,
        side_field_list(
                side_field_gather_unsigned_integer("a", offsetof(struct testnest0, a),
                        side_struct_field_sizeof_bit(struct testnest0, a), 0,
-                       side_struct_field_sizeof_bit(struct testnest0, a), SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       side_struct_field_sizeof_bit(struct testnest0, a), SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_struct("nest1", &mystructgathernest1,
                        offsetof(struct testnest0, nest), sizeof(struct testnest1),
                        SIDE_TYPE_GATHER_ACCESS_POINTER),
@@ -1615,7 +1615,7 @@ side_static_event(my_provider_event_structgather_nest,
        "myprovider", "myeventstructgathernest", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("nest0", &mystructgathernest0, 0,
-                       sizeof(struct testnest0), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                       sizeof(struct testnest0), SIDE_TYPE_GATHER_ACCESS_DIRECT),
        ),
        side_attr_list()
 );
@@ -1662,22 +1662,22 @@ static side_define_struct(mystructgatherfloat,
        side_field_list(
 #if __HAVE_FLOAT16
                side_field_gather_float("f16", offsetof(struct testfloat, f16), 16,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
 #endif
 #if __HAVE_FLOAT32
                side_field_gather_float("f32", offsetof(struct testfloat, f32), 32,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
 #endif
 #if __HAVE_FLOAT64
                side_field_gather_float("f64", offsetof(struct testfloat, f64), 64,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
 #endif
 #if __HAVE_FLOAT128
                side_field_gather_float("f128", offsetof(struct testfloat, f128), 128,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
 #endif
        ),
@@ -1688,7 +1688,7 @@ side_static_event(my_provider_event_structgatherfloat,
        "myprovider", "myeventstructgatherfloat", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgatherfloat", &mystructgatherfloat, 0,
-                       sizeof(struct testfloat), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                       sizeof(struct testfloat), SIDE_TYPE_GATHER_ACCESS_DIRECT),
        ),
        side_attr_list()
 );
@@ -1731,7 +1731,7 @@ struct testarray {
 static side_define_struct(mystructgatherarray,
        side_field_list(
                side_field_gather_array("array",
-                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        SIDE_ARRAY_SIZE(mygatherarray),
                        offsetof(struct testarray, ptr),
                        SIDE_TYPE_GATHER_ACCESS_POINTER,
@@ -1744,11 +1744,11 @@ side_static_event(my_provider_event_structgatherarray,
        "myprovider", "myeventstructgatherarray", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgatherarray", &mystructgatherarray, 0,
-                               sizeof(struct testarray), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                               sizeof(struct testarray), SIDE_TYPE_GATHER_ACCESS_DIRECT),
                side_field_gather_array("array2",
-                       side_elem(side_type_gather_unsigned_integer(0, 16, 0, 16, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                       side_elem(side_type_gather_unsigned_integer(0, 16, 0, 16, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        SIDE_ARRAY_SIZE(mygatherarray2), 0,
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()
                ),
        ),
@@ -1789,15 +1789,15 @@ static side_define_struct(mystructgatherstructnest1,
                side_field_gather_signed_integer("b", offsetof(struct testgatherstructnest1, b),
                        side_struct_field_sizeof_bit(struct testgatherstructnest1, b), 0,
                        side_struct_field_sizeof_bit(struct testgatherstructnest1, b),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_array("c",
                        side_elem(
                                side_type_gather_signed_integer(0, 32, 0, 32, 
-                                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                        ),
                        TESTSGNESTARRAY_LEN,
                        offsetof(struct testgatherstructnest1, c),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
        ),
        side_attr_list()
@@ -1808,21 +1808,21 @@ static side_define_struct(mystructgatherstructnest0,
                side_field_gather_signed_integer("a", offsetof(struct testgatherstructnest0, a),
                        side_struct_field_sizeof_bit(struct testgatherstructnest0, a), 0,
                        side_struct_field_sizeof_bit(struct testgatherstructnest0, a),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_struct("structnest0", &mystructgatherstructnest1,
                        offsetof(struct testgatherstructnest0, nest),
                        sizeof(struct testgatherstructnest1),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT),
                side_field_gather_array("nestarray",
                        side_elem(
                                side_type_gather_struct(&mystructgatherstructnest1,
                                        0,
                                        sizeof(struct testgatherstructnest1),
-                                       SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                                       SIDE_TYPE_GATHER_ACCESS_DIRECT),
                        ),
                        2,
                        offsetof(struct testgatherstructnest0, nestarray),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_attr_list()),
        ),
        side_attr_list()
@@ -1832,7 +1832,7 @@ side_static_event(my_provider_event_gatherstructnest,
        "myprovider", "myeventgatherstructnest", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgather", &mystructgatherstructnest0, 0,
-                               sizeof(struct testgatherstructnest0), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                               sizeof(struct testgatherstructnest0), SIDE_TYPE_GATHER_ACCESS_DIRECT),
        ),
        side_attr_list()
 );
@@ -1880,14 +1880,14 @@ static side_define_struct(mystructgathervla,
                side_field_gather_signed_integer("a", offsetof(struct testgathervla, a),
                        side_struct_field_sizeof_bit(struct testgathervla, a), 0,
                        side_struct_field_sizeof_bit(struct testgathervla, a),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()
                ),
                side_field_gather_vla("nestvla",
-                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        offsetof(struct testgathervla, p),
                        SIDE_TYPE_GATHER_ACCESS_POINTER,
                        side_length(side_type_gather_unsigned_integer(offsetof(struct testgathervla, len),
-                                       16, 0, 16, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                                       16, 0, 16, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        side_attr_list()
                ),
        ),
@@ -1898,11 +1898,11 @@ side_static_event(my_provider_event_gathervla,
        "myprovider", "myeventgathervla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgathervla", &mystructgathervla, 0,
-                               sizeof(struct testgathervla), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                               sizeof(struct testgathervla), SIDE_TYPE_GATHER_ACCESS_DIRECT),
                side_field_gather_vla("vla",
-                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
-                       0, SIDE_TYPE_GATHER_ACCESS_ADDRESS,
-                       side_length(side_type_gather_unsigned_integer(0, 16, 0, 16, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                       side_elem(side_type_gather_unsigned_integer(0, 32, 0, 32, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
+                       0, SIDE_TYPE_GATHER_ACCESS_DIRECT,
+                       side_length(side_type_gather_unsigned_integer(0, 16, 0, 16, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        side_attr_list()
                ),
        ),
@@ -1937,11 +1937,11 @@ struct testgathervlaflex {
 static side_define_struct(mystructgathervlaflex,
        side_field_list(
                side_field_gather_vla("vlaflex",
-                       side_elem(side_type_gather_unsigned_integer(0, 64, 0, 64, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                       side_elem(side_type_gather_unsigned_integer(0, 64, 0, 64, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        offsetof(struct testgathervlaflex, array),
-                       SIDE_TYPE_GATHER_ACCESS_ADDRESS,
+                       SIDE_TYPE_GATHER_ACCESS_DIRECT,
                        side_length(side_type_gather_unsigned_integer(offsetof(struct testgathervlaflex, len),
-                                       8, 0, 8, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
+                                       8, 0, 8, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
                        side_attr_list()
                ),
        ),
@@ -1952,7 +1952,7 @@ side_static_event(my_provider_event_gathervlaflex,
        "myprovider", "myeventgathervlaflex", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_gather_struct("structgathervlaflex", &mystructgathervlaflex, 0,
-                               sizeof(struct testgathervlaflex), SIDE_TYPE_GATHER_ACCESS_ADDRESS),
+                               sizeof(struct testgathervlaflex), SIDE_TYPE_GATHER_ACCESS_DIRECT),
        ),
        side_attr_list()
 );
@@ -1984,10 +1984,10 @@ void test_gather_vla_flex(void)
 side_static_event(my_provider_event_gatherbyte,
        "myprovider", "myeventgatherbyte", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_gather_byte("byte", 0, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()),
+               side_field_gather_byte("byte", 0, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()),
                side_field_gather_array("array",
-                       side_elem(side_type_gather_byte(0, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list())),
-                       3, 0, SIDE_TYPE_GATHER_ACCESS_ADDRESS, side_attr_list()
+                       side_elem(side_type_gather_byte(0, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list())),
+                       3, 0, SIDE_TYPE_GATHER_ACCESS_DIRECT, side_attr_list()
                ),
        ),
        side_attr_list()

diff --git a/src/tracer.c b/src/tracer.c
index 1debb54c76d5fee7734377ea9eb598308d86de12..fc97e4dfb2510a72e86097e6bd28b7b57884149d 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -1065,7 +1065,7 @@ static
 const char *tracer_gather_access(enum side_type_gather_access_mode access_mode, const char *ptr)
 {
        switch (access_mode) {
-       case SIDE_TYPE_GATHER_ACCESS_ADDRESS:
+       case SIDE_TYPE_GATHER_ACCESS_DIRECT:
                return ptr;
        case SIDE_TYPE_GATHER_ACCESS_POINTER:
                /* Dereference pointer */
@@ -1080,7 +1080,7 @@ static
 uint32_t tracer_gather_size(enum side_type_gather_access_mode access_mode, uint32_t len)
 {
        switch (access_mode) {
-       case SIDE_TYPE_GATHER_ACCESS_ADDRESS:
+       case SIDE_TYPE_GATHER_ACCESS_DIRECT:
                return len;
        case SIDE_TYPE_GATHER_ACCESS_POINTER:
                return sizeof(void *);