X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_dump.cpp;h=6e67e08ab53e0f2585d5a1e952b9d00bae220b02;hb=abaef29db0cf1a3e2adb0c254886162368b1645a;hp=5d545353e692178132ad235d2a743a3aa047aa23;hpb=aa1b2136cc72893e519ff73c47e2ecd29cafe1da;p=apitrace

diff --git a/common/trace_dump.cpp b/common/trace_dump.cpp
index 5d54535..6e67e08 100644
--- a/common/trace_dump.cpp
+++ b/common/trace_dump.cpp
@@ -178,7 +178,7 @@ public:
 
             if (!memberName || !*memberName) {
                 // Anonymous structure
-                Struct *memberStruct = dynamic_cast<Struct *>(memberValue);
+                Struct *memberStruct = memberValue->toStruct();
                 assert(memberStruct);
                 if (memberStruct) {
                     sep = visitMembers(memberStruct, sep);
@@ -229,34 +229,28 @@ public:
     }
 
     void visit(StackFrame *frame) {
-        String* tmp;
-        tmp = frame->module;
-        if (tmp != NULL) {
-            os << tmp->toString() << " ";
+        if (frame->module != NULL) {
+            os << frame->module << " ";
         }
-        tmp = frame->function;
-        if (tmp != NULL) {
-            os << "at " << tmp->toString() << "() ";
+        if (frame->function != NULL) {
+            os << "at " << frame->function << "() ";
         }
-        tmp = frame->filename;
-        if (tmp != NULL) {
-            os << "at " << tmp->toString();
-            tmp = frame->linenumber;
-            if (tmp != NULL) {
-                os << ":" << tmp->toString() << " ";
+        if (frame->filename != NULL) {
+            os << "at " << frame->filename;
+            if (frame->linenumber >= 0) {
+                os << ":" << frame->linenumber << " ";
             }
         }
         else {
-            tmp = frame->offset;
-            if (tmp != NULL) {
-                os << "[" << tmp->toString() << "]";
+            if (frame->offset >= 0) {
+                os << "[" << "0x" << std::hex << frame->offset << std::dec << "]";
             }
         }
     }
 
-    void visit(Backtrace* backtrace) {
-        for (int i = 0; i < backtrace->frames.size(); i ++) {
-            visit(backtrace->frames[i]);
+    void visit(Backtrace & backtrace) {
+        for (int i = 0; i < backtrace.size(); i ++) {
+            visit(backtrace[i]);
             os << "\n";
         }
     }
@@ -306,7 +300,7 @@ public:
 
         if (call->backtrace != NULL) {
             os << bold << red << "Backtrace:\n" << normal;
-            visit(call->backtrace);
+            visit(*call->backtrace);
         }
         if (callFlags & CALL_FLAG_END_FRAME) {
             os << "\n";