Remove FunctionSig::backtrace member.

[apitrace] / common / trace_model.hpp

diff --git a/common/trace_model.hpp b/common/trace_model.hpp
index 3ddd9a0db13dc81bf5b7f959ecc64ededef67a69..fbfa1fbbc989102710a5e4a99cc3eb48a259b9a0 100644 (file)
--- a/common/trace_model.hpp
+++ b/common/trace_model.hpp
@@ -320,6 +320,58 @@ public:
 };
 
 
+class Repr : public Value
+{
+public:
+    Repr(Value *human, Value *machine) :
+        humanValue(human),
+        machineValue(machine)
+    {}
+
+    /** Human-readible value */
+    Value *humanValue;
+
+    /** Machine-readible value */
+    Value *machineValue;
+    
+    virtual bool toBool(void) const;
+    virtual signed long long toSInt(void) const;
+    virtual unsigned long long toUInt(void) const;
+    virtual float toFloat(void) const;
+    virtual double toDouble(void) const;
+
+    virtual void *toPointer(void) const;
+    virtual void *toPointer(bool bind);
+    virtual unsigned long long toUIntPtr(void) const;
+    virtual const char *toString(void) const;
+
+    void visit(Visitor &visitor);
+};
+
+class StackFrame {
+public:
+    String* module;
+    String* function;
+    String* filename;
+    String* linenumber;
+    String* offset;
+    StackFrame() :
+        module(NULL),
+        function(NULL),
+        filename(NULL),
+        linenumber(NULL),
+        offset(NULL)
+    {}
+    ~StackFrame();
+};
+
+class Backtrace {
+public:
+    std::vector<StackFrame*> frames;
+    ~Backtrace();
+    void addFrame(StackFrame* frame);
+};
+
 class Visitor
 {
 public:
@@ -336,7 +388,9 @@ public:
     virtual void visit(Array *);
     virtual void visit(Blob *);
     virtual void visit(Pointer *);
-
+    virtual void visit(Repr *);
+    virtual void visit(Backtrace *);
+    virtual void visit(StackFrame *);
 protected:
     inline void _visit(Value *value) {
         if (value) { 
@@ -438,13 +492,15 @@ public:
     Value *ret;
 
     CallFlags flags;
+    Backtrace* backtrace;
 
-    Call(FunctionSig *_sig, const CallFlags &_flags, unsigned _thread_id) :
+    Call(const FunctionSig *_sig, const CallFlags &_flags, unsigned _thread_id) :
         thread_id(_thread_id), 
         sig(_sig), 
         args(_sig->num_args), 
         ret(0),
-        flags(_flags) {
+        flags(_flags),
+        backtrace(0) {
     }
 
     ~Call();