Merge remote-tracking branch 'github/master' into profile-gui

[apitrace] / common / trace_parser.hpp

diff --git a/common/trace_parser.hpp b/common/trace_parser.hpp
index 73bb7764d6cd05195622bccd7312f4110b97133d..0ae3a28d682b80ad6034e1c8daa88fec91362064 100644 (file)
--- a/common/trace_parser.hpp
+++ b/common/trace_parser.hpp
@@ -33,6 +33,7 @@
 #include "trace_file.hpp"
 #include "trace_format.hpp"
 #include "trace_model.hpp"
+#include "trace_api.hpp"
 
 
 namespace trace {
@@ -94,6 +95,7 @@ protected:
 
 public:
     unsigned long long version;
+    API api;
 
     Parser();
 
@@ -130,6 +132,7 @@ protected:
 
     FunctionSigFlags *parse_function_sig(void);
     StructSig *parse_struct_sig();
+    EnumSig *parse_old_enum_sig();
     EnumSig *parse_enum_sig();
     BitmaskSig *parse_bitmask_sig();
     
@@ -192,9 +195,15 @@ protected:
     Value *parse_opaque();
     void scan_opaque();
 
+    Value *parse_repr();
+    void scan_repr();
+
     const char * read_string(void);
     void skip_string(void);
 
+    signed long long read_sint(void);
+    void skip_sint(void);
+
     unsigned long long read_uint(void);
     void skip_uint(void);