projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
callsite: support instruction pointer field
[babeltrace.git]
/
formats
/
ctf
/
metadata
/
ctf-visitor-semantic-validator.c
diff --git
a/formats/ctf/metadata/ctf-visitor-semantic-validator.c
b/formats/ctf/metadata/ctf-visitor-semantic-validator.c
index 5a5de793b7417abd00bef0b1fec8590875f5bb51..1af74c42a8db04577d47a4d35c28c5509f9195f0 100644
(file)
--- a/
formats/ctf/metadata/ctf-visitor-semantic-validator.c
+++ b/
formats/ctf/metadata/ctf-visitor-semantic-validator.c
@@
-30,8
+30,8
@@
#include "ctf-parser.h"
#include "ctf-ast.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
-#define _
cds_list_first_entry(ptr, type, member)
\
-
cds
_list_entry((ptr)->next, type, member)
+#define _
bt_list_first_entry(ptr, type, member)
\
+
bt
_list_entry((ptr)->next, type, member)
#define fprintf_dbg(fd, fmt, args...) fprintf(fd, "%s: " fmt, __func__, ## args)
#define fprintf_dbg(fd, fmt, args...) fprintf(fd, "%s: " fmt, __func__, ## args)
@@
-47,7
+47,7
@@
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
switch (node->parent->type) {
case NODE_CTF_EXPRESSION:
is_ctf_exp = 1;
switch (node->parent->type) {
case NODE_CTF_EXPRESSION:
is_ctf_exp = 1;
-
cds
_list_for_each_entry(iter, &node->parent->u.ctf_expression.left,
+
bt
_list_for_each_entry(iter, &node->parent->u.ctf_expression.left,
siblings) {
if (iter == node) {
is_ctf_exp_left = 1;
siblings) {
if (iter == node) {
is_ctf_exp_left = 1;
@@
-110,6
+110,7
@@
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_TYPEDEF:
case NODE_TYPEALIAS_TARGET:
case NODE_TYPEALIAS_ALIAS:
case NODE_TYPEDEF:
case NODE_TYPEALIAS_TARGET:
case NODE_TYPEALIAS_ALIAS:
@@
-129,7
+130,7
@@
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
switch (node->u.unary_expression.link) {
case UNARY_LINK_UNKNOWN:
/* We don't allow empty link except on the first node of the list */
switch (node->u.unary_expression.link) {
case UNARY_LINK_UNKNOWN:
/* We don't allow empty link except on the first node of the list */
- if (is_ctf_exp && _
cds
_list_first_entry(is_ctf_exp_left ?
+ if (is_ctf_exp && _
bt
_list_first_entry(is_ctf_exp_left ?
&node->parent->u.ctf_expression.left :
&node->parent->u.ctf_expression.right,
struct ctf_node,
&node->parent->u.ctf_expression.left :
&node->parent->u.ctf_expression.right,
struct ctf_node,
@@
-154,7
+155,7
@@
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
goto errperm;
}
/* We don't allow link on the first node of the list */
goto errperm;
}
/* We don't allow link on the first node of the list */
- if (is_ctf_exp && _
cds
_list_first_entry(is_ctf_exp_left ?
+ if (is_ctf_exp && _
bt
_list_first_entry(is_ctf_exp_left ?
&node->parent->u.ctf_expression.left :
&node->parent->u.ctf_expression.right,
struct ctf_node,
&node->parent->u.ctf_expression.left :
&node->parent->u.ctf_expression.right,
struct ctf_node,
@@
-170,7
+171,7
@@
int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
goto errperm;
}
/* We don't allow link on the first node of the list */
goto errperm;
}
/* We don't allow link on the first node of the list */
- if (_
cds
_list_first_entry(&node->parent->u.enumerator.values,
+ if (_
bt
_list_first_entry(&node->parent->u.enumerator.values,
struct ctf_node,
siblings) == node) {
fprintf(fd, "[error]: semantic error (link \"...\" is not allowed on the first node of the unary expression list)\n");
struct ctf_node,
siblings) == node) {
fprintf(fd, "[error]: semantic error (link \"...\" is not allowed on the first node of the unary expression list)\n");
@@
-214,6
+215,7
@@
int ctf_visitor_type_specifier_list(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
case NODE_TYPE_SPECIFIER:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
case NODE_TYPE_SPECIFIER:
@@
-255,6
+257,7
@@
int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
case NODE_TYPE_SPECIFIER:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
case NODE_TYPE_SPECIFIER:
@@
-288,7
+291,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
/*
* A nested type declarator is not allowed to contain pointers.
*/
/*
* A nested type declarator is not allowed to contain pointers.
*/
- if (!
cds
_list_empty(&node->u.type_declarator.pointers))
+ if (!
bt
_list_empty(&node->u.type_declarator.pointers))
goto errperm;
break; /* OK */
case NODE_TYPEALIAS_TARGET:
goto errperm;
break; /* OK */
case NODE_TYPEALIAS_TARGET:
@@
-307,7
+310,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
*/
if (node->u.type_declarator.type == TYPEDEC_NESTED)
goto errperm;
*/
if (node->u.type_declarator.type == TYPEDEC_NESTED)
goto errperm;
-
cds
_list_for_each_entry(iter, &node->parent->u.typealias_alias.type_specifier_list->u.type_specifier_list.head,
+
bt
_list_for_each_entry(iter, &node->parent->u.typealias_alias.type_specifier_list->u.type_specifier_list.head,
siblings) {
switch (iter->u.type_specifier.type) {
case TYPESPEC_FLOATING_POINT:
siblings) {
switch (iter->u.type_specifier.type) {
case TYPESPEC_FLOATING_POINT:
@@
-316,7
+319,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
case TYPESPEC_STRUCT:
case TYPESPEC_VARIANT:
case TYPESPEC_ENUM:
case TYPESPEC_STRUCT:
case TYPESPEC_VARIANT:
case TYPESPEC_ENUM:
- if (
cds
_list_empty(&node->u.type_declarator.pointers))
+ if (
bt
_list_empty(&node->u.type_declarator.pointers))
goto errperm;
break;
default:
goto errperm;
break;
default:
@@
-337,6
+340,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_CTF_EXPRESSION:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
case NODE_CTF_EXPRESSION:
case NODE_UNARY_EXPRESSION:
case NODE_TYPEALIAS:
@@
-353,7
+357,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.type_declarator.pointers,
+
bt
_list_for_each_entry(iter, &node->u.type_declarator.pointers,
siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
@@
-372,7
+376,7
@@
int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
return ret;
}
if (!node->u.type_declarator.u.nested.abstract_array) {
return ret;
}
if (!node->u.type_declarator.u.nested.abstract_array) {
-
cds
_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
+
bt
_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
siblings) {
if (iter->type != NODE_UNARY_EXPRESSION) {
fprintf(fd, "[error] %s: expecting unary expression as length\n", __func__);
siblings) {
if (iter->type != NODE_UNARY_EXPRESSION) {
fprintf(fd, "[error] %s: expecting unary expression as length\n", __func__);
@@
-424,22
+428,22
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
switch (node->type) {
case NODE_ROOT:
switch (node->type) {
case NODE_ROOT:
-
cds
_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
-
cds
_list_for_each_entry(iter, &node->u.root.trace, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.root.trace, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
-
cds
_list_for_each_entry(iter, &node->u.root.stream, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.root.stream, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
-
cds
_list_for_each_entry(iter, &node->u.root.event, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.root.event, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-454,7
+458,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-468,7
+472,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-482,7
+486,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-496,7
+500,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-510,13
+514,26
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errinval;
}
goto errinval;
}
-
cds
_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
break;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
break;
+ case NODE_CALLSITE:
+ switch (node->parent->type) {
+ case NODE_ROOT:
+ break; /* OK */
+ default:
+ goto errinval;
+ }
+ bt_list_for_each_entry(iter, &node->u.callsite.declaration_list, siblings) {
+ ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ break;
case NODE_CTF_EXPRESSION:
switch (node->parent->type) {
case NODE_CTF_EXPRESSION:
switch (node->parent->type) {
@@
-526,6
+543,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
case NODE_ENV:
case NODE_TRACE:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_FLOATING_POINT:
case NODE_INTEGER:
case NODE_STRING:
case NODE_FLOATING_POINT:
case NODE_INTEGER:
case NODE_STRING:
@@
-551,12
+569,12
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
}
depth++;
}
depth++;
-
cds
_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
}
-
cds
_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-593,6
+611,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENUMERATOR:
case NODE_ENUM:
case NODE_CLOCK:
case NODE_ENUMERATOR:
case NODE_ENUM:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_ENV:
default:
goto errinval;
case NODE_ENV:
default:
goto errinval;
@@
-603,7
+622,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
node->u._typedef.type_specifier_list);
if (ret)
return ret;
node->u._typedef.type_specifier_list);
if (ret)
return ret;
-
cds
_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) {
+
bt
_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-627,7
+646,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
if (ret)
return ret;
nr_declarators = 0;
if (ret)
return ret;
nr_declarators = 0;
-
cds
_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-658,7
+677,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
if (ret)
return ret;
nr_declarators = 0;
if (ret)
return ret;
nr_declarators = 0;
-
cds
_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-699,6
+718,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_ENUMERATOR:
case NODE_ENUM:
case NODE_CLOCK:
case NODE_ENUMERATOR:
case NODE_ENUM:
case NODE_CLOCK:
+ case NODE_CALLSITE:
case NODE_ENV:
default:
goto errinval;
case NODE_ENV:
default:
goto errinval;
@@
-746,7
+766,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_UNARY_EXPRESSION:
goto errperm;
}
case NODE_UNARY_EXPRESSION:
goto errperm;
}
-
cds
_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-761,7
+781,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
}
}
-
cds
_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-778,7
+798,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
goto errperm;
}
goto errperm;
}
-
cds
_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-799,7
+819,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
{
int count = 0;
{
int count = 0;
-
cds
_list_for_each_entry(iter, &node->u.enumerator.values,
+
bt
_list_for_each_entry(iter, &node->u.enumerator.values,
siblings) {
switch (count++) {
case 0: if (iter->type != NODE_UNARY_EXPRESSION
siblings) {
switch (count++) {
case 0: if (iter->type != NODE_UNARY_EXPRESSION
@@
-824,7
+844,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
}
}
}
}
-
cds
_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-846,7
+866,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
if (ret)
return ret;
if (ret)
return ret;
-
cds
_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-865,7
+885,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
node->u.struct_or_variant_declaration.type_specifier_list);
if (ret)
return ret;
node->u.struct_or_variant_declaration.type_specifier_list);
if (ret)
return ret;
-
cds
_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-881,7
+901,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_UNARY_EXPRESSION:
goto errperm;
}
case NODE_UNARY_EXPRESSION:
goto errperm;
}
-
cds
_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
@@
-898,7
+918,7
@@
int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
case NODE_UNARY_EXPRESSION:
goto errperm;
}
case NODE_UNARY_EXPRESSION:
goto errperm;
}
-
cds
_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
+
bt
_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
if (ret)
return ret;
This page took
0.030303 seconds
and
4
git commands to generate.