X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=a1c77366b367d14d3dd105204215a0f3eda6acfb;hp=552ac32d33983d47f4b0dd30ba15abc4e198d25b;hb=8d2d41f7862ac57d00a0a93242bb8a5831626a76;hpb=13441bf58f43115c03856276005260dc2b869ea7

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index 552ac32..a1c7736 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -233,7 +233,7 @@ defined by the size of the type "unit_type".
 
 TSDL meta-data representation:
 
-  unit_type name:size:
+  unit_type name:size;
 
 As an example, the following structure declared in C compiled by GCC:
 
@@ -776,7 +776,7 @@ struct event_header_1 {
       uint64_t timestamp;		 /* 64-bit timestamps */
     } extended;
   } v;
-};
+} align(32);	/* or align(8) */
 
 
 6.1.2 Type 2 - Many event IDs
@@ -804,7 +804,7 @@ struct event_header_2 {
       uint64_t timestamp;		 /* 64-bit timestamps */ 
     } extended;
   } v;
-};
+} align(16);	/* or align(8) */
 
 
 6.2 Event Context
@@ -1468,8 +1468,8 @@ struct-or-variant-declaration-list:
 struct-or-variant-declaration:
 	specifier-qualifier-list struct-or-variant-declarator-list ;
 	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list ;
 
 specifier-qualifier-list:
 	type-specifier specifier-qualifier-list-opt
@@ -1503,8 +1503,8 @@ enumerator-list:
 
 enumerator:
 	enumeration-constant
-	enumeration-constant = unary-expression
-	enumeration-constant = constant-expression-range
+	enumeration-constant assignment-operator unary-expression
+	enumeration-constant assignment-operator constant-expression-range
 
 type-qualifier:
 	const
@@ -1543,8 +1543,8 @@ ctf-specifier:
 	event { ctf-assignment-expression-list-opt }
 	stream { ctf-assignment-expression-list-opt }
 	trace { ctf-assignment-expression-list-opt }
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list ;
 
 ctf-type-specifier:
 	floating_point { ctf-assignment-expression-list-opt }
@@ -1559,5 +1559,5 @@ ctf-assignment-expression:
 	unary-expression assignment-operator unary-expression
 	unary-expression type-assignment-operator type-specifier
 	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list
-	typealias declaration-specifiers abstract-declarator-list := declarator-list
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list