X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace_model.hpp;h=5c51bba7d06c345a541b8dca59cebe1291d546f6;hb=712429a22a8cc9d51b620d433ade6d327fbabbf0;hp=6560346368f4955fe670cc52f960045ea6553b7a;hpb=e0f0b6f5d9ff4530889a90e41b617ac6c008269c;p=apitrace

diff --git a/trace_model.hpp b/trace_model.hpp
index 6560346..5c51bba 100644
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -34,16 +34,52 @@
 #include <assert.h>
 
 #include <map>
-#include <list>
 #include <vector>
 #include <iostream>
 
-#include "trace_writer.hpp"
-
 
 namespace Trace {
 
 
+typedef unsigned Id;
+
+
+struct FunctionSig {
+    Id id;
+    const char *name;
+    unsigned num_args;
+    const char **arg_names;
+};
+
+
+struct StructSig {
+    Id id;
+    const char *name;
+    unsigned num_members;
+    const char **member_names;
+};
+
+
+struct EnumSig {
+    Id id;
+    const char *name;
+    signed long long value;
+};
+
+
+struct BitmaskFlag {
+    const char *name;
+    unsigned long long value;
+};
+
+
+struct BitmaskSig {
+    Id id;
+    unsigned num_flags;
+    const BitmaskFlag *flags;
+};
+
+
 class Visitor;
 
 
@@ -64,6 +100,8 @@ public:
     virtual const char *toString(void) const;
 
     const Value & operator[](size_t index) const;
+
+    void dump(std::ostream &os, bool color=true);
 };
 
 
@@ -162,21 +200,7 @@ public:
 class Enum : public Value
 {
 public:
-    struct Signature : public std::pair<const char *, Value *>
-    {
-        Signature()
-            : std::pair<const char *, Value *>()
-        {}
-        Signature(const char *n, Trace::Value *val)
-            : std::pair<const char *, Value *>(n, val)
-        {}
-        ~Signature()
-        {
-            delete second;
-        }
-    };
-
-    Enum(const Signature *_sig) : sig(_sig) {}
+    Enum(const EnumSig *_sig) : sig(_sig) {}
 
     bool toBool(void) const;
     signed long long toSInt(void) const;
@@ -185,7 +209,7 @@ public:
     virtual double toDouble(void) const;
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const EnumSig *sig;
 };
 
 
@@ -203,18 +227,13 @@ public:
 class Struct : public Value
 {
 public:
-    struct Signature {
-        const char *name;
-        std::vector<const char *> member_names;
-    };
-
-    Struct(Signature *_sig) : sig(_sig), members(_sig->member_names.size()) { }
+    Struct(StructSig *_sig) : sig(_sig), members(_sig->num_members) { }
     ~Struct();
 
     bool toBool(void) const;
     void visit(Visitor &visitor);
 
-    const Signature *sig;
+    const StructSig *sig;
     std::vector<Value *> members;
 };
 
@@ -288,23 +307,23 @@ protected:
 };
 
 
-std::ostream & operator <<(std::ostream &os, Value *value);
+inline std::ostream & operator <<(std::ostream &os, Value *value) {
+    if (value) {
+        value->dump(os);
+    }
+    return os;
+}
 
 
 class Call
 {
 public:
-    struct Signature {
-        const char * name;
-        std::vector<const char *> arg_names;
-    };
-
     unsigned no;
-    const Signature *sig;
+    const FunctionSig *sig;
     std::vector<Value *> args;
     Value *ret;
 
-    Call(Signature *_sig) : sig(_sig), args(_sig->arg_names.size()), ret(0) { }
+    Call(FunctionSig *_sig) : sig(_sig), args(_sig->num_args), ret(0) { }
     ~Call();
 
     inline const char * name(void) const {
@@ -315,10 +334,15 @@ public:
         assert(index < args.size());
         return *(args[index]);
     }
+
+    void dump(std::ostream &os, bool color=true);
 };
 
 
-std::ostream & operator <<(std::ostream &os, Call &call);
+inline std::ostream & operator <<(std::ostream &os, Call &call) {
+    call.dump(os);
+    return os;
+}
 
 
 } /* namespace Trace */