X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=common%2Ftrace_parser.hpp;h=7bf0a7dce1058f2fd111ab45b2aa5ba5f1d34ca7;hb=6d953b4f49f893cc26cc1aa4e419d1eae7da65bf;hp=3aaa6d3a93f16cb71c85116185cee0d4d9cba14e;hpb=ae2b4d32ed56e3ac193cc7205aeb58082c448ce8;p=apitrace

diff --git a/common/trace_parser.hpp b/common/trace_parser.hpp
index 3aaa6d3..7bf0a7d 100644
--- a/common/trace_parser.hpp
+++ b/common/trace_parser.hpp
@@ -33,9 +33,10 @@
 #include "trace_file.hpp"
 #include "trace_format.hpp"
 #include "trace_model.hpp"
+#include "trace_api.hpp"
 
 
-namespace Trace {
+namespace trace {
 
 
 struct ParseBookmark
@@ -59,6 +60,10 @@ protected:
     typedef std::list<Call *> CallList;
     CallList calls;
 
+    struct FunctionSigFlags : public FunctionSig {
+        CallFlags flags;
+    };
+
     // Helper template that extends a base signature structure, with additional
     // parsing information.
     template< class T >
@@ -66,28 +71,34 @@ protected:
         // Offset in the file of where signature was defined.  It is used when
         // reparsing to determine whether the signature definition is to be
         // expected next or not.
-        File::Offset offset;
+        File::Offset fileOffset;
     };
 
-    typedef SigState<FunctionSig> FunctionSigState;
+    typedef SigState<FunctionSigFlags> FunctionSigState;
     typedef SigState<StructSig> StructSigState;
     typedef SigState<EnumSig> EnumSigState;
     typedef SigState<BitmaskSig> BitmaskSigState;
+    typedef SigState<StackFrame> StackFrameState;
 
     typedef std::vector<FunctionSigState *> FunctionMap;
     typedef std::vector<StructSigState *> StructMap;
     typedef std::vector<EnumSigState *> EnumMap;
     typedef std::vector<BitmaskSigState *> BitmaskMap;
+    typedef std::vector<StackFrameState *> StackFrameMap;
 
     FunctionMap functions;
     StructMap structs;
     EnumMap enums;
     BitmaskMap bitmasks;
+    StackFrameMap frames;
+
+    FunctionSig *glGetErrorSig;
 
     unsigned next_call_no;
 
 public:
     unsigned long long version;
+    API api;
 
     Parser();
 
@@ -122,11 +133,15 @@ public:
 protected:
     Call *parse_call(Mode mode);
 
-    FunctionSig *parse_function_sig(void);
+    FunctionSigFlags *parse_function_sig(void);
     StructSig *parse_struct_sig();
+    EnumSig *parse_old_enum_sig();
     EnumSig *parse_enum_sig();
     BitmaskSig *parse_bitmask_sig();
     
+    static CallFlags
+    lookupCallFlags(const char *name);
+
     Call *parse_Call(Mode mode);
 
     void parse_enter(Mode mode);
@@ -135,6 +150,11 @@ protected:
 
     bool parse_call_details(Call *call, Mode mode);
 
+    bool parse_call_backtrace(Call *call, Mode mode);
+    StackFrame * parse_backtrace_frame(Mode mode);
+
+    void adjust_call_flags(Call *call);
+
     void parse_arg(Call *call, Mode mode);
 
     Value *parse_value(void);
@@ -181,9 +201,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);
 
@@ -192,6 +218,6 @@ protected:
 };
 
 
-} /* namespace Trace */
+} /* namespace trace */
 
 #endif /* _TRACE_PARSER_HPP_ */