auto import from //depot/cupcake/@135843
diff --git a/emulator/qtools/stack_dump.cpp b/emulator/qtools/stack_dump.cpp
new file mode 100644
index 0000000..b5014ef
--- /dev/null
+++ b/emulator/qtools/stack_dump.cpp
@@ -0,0 +1,105 @@
+// Copyright 2006 The Android Open Source Project
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <assert.h>
+#include "trace_reader.h"
+#include "bitvector.h"
+#include "parse_options.h"
+#include "armdis.h"
+
+typedef TraceReader<> TraceReaderType;
+
+#include "parse_options-inl.h"
+#include "callstack.h"
+
+class MyFrame : public StackFrame<symbol_type> {
+  public:
+    void    push(int stackLevel, uint64_t time, CallStackBase *base);
+    void    pop(int stackLevel, uint64_t time, CallStackBase *base);
+};
+
+typedef CallStack<MyFrame> CallStackType;
+
+void MyFrame::push(int stackLevel, uint64_t time, CallStackBase *base)
+{
+    printf("%llu en thr %d %3d", time, base->getId(), stackLevel);
+    for (int ii = 0; ii < stackLevel; ++ii)
+        printf(".");
+    printf(" 0x%08x %s\n", addr, function->name);
+}
+
+void MyFrame::pop(int stackLevel, uint64_t time, CallStackBase *base)
+{
+    printf("%llu x  thr %d %3d", time, base->getId(), stackLevel);
+    for (int ii = 0; ii < stackLevel; ++ii)
+        printf(".");
+    printf(" 0x%08x %s\n", addr, function->name);
+}
+
+static const int kNumStackFrames = 500;
+static const int kMaxThreads = (32 * 1024);
+CallStackType *stacks[kMaxThreads];
+
+static uint64_t debugTime;
+
+void Usage(const char *program)
+{
+    fprintf(stderr, "Usage: %s [options] trace_name elf_file\n",
+            program);
+    OptionsUsage();
+}
+
+int main(int argc, char **argv)
+{
+    ParseOptions(argc, argv);
+    if (argc - optind != 2) {
+        Usage(argv[0]);
+        exit(1);
+    }
+
+    char *qemu_trace_file = argv[optind++];
+    char *elf_file = argv[optind++];
+    TraceReaderType *trace = new TraceReaderType;
+    trace->Open(qemu_trace_file);
+    trace->ReadKernelSymbols(elf_file);
+    trace->SetRoot(root);
+    TraceHeader *qheader = trace->GetHeader();
+    uint64_t startTime = qheader->start_sec;
+    startTime = (startTime << 32) | qheader->start_usec;
+
+    BBEvent event;
+    while (1) {
+        BBEvent ignored;
+        symbol_type *function;
+
+        if (GetNextValidEvent(trace, &event, &ignored, &function))
+            break;
+        if (event.bb_num == 0)
+            break;
+
+        // Get the stack for the current thread
+        CallStackType *pStack = stacks[event.pid];
+
+        // If the stack does not exist, then allocate a new one.
+        if (pStack == NULL) {
+            pStack = new CallStackType(event.pid, kNumStackFrames, trace);
+            stacks[event.pid] = pStack;
+        }
+        if (debugTime != 0 && event.time >= debugTime)
+            printf("debug time: %lld\n", debugTime);
+
+        // Update the stack
+        pStack->updateStack(&event, function);
+    }
+
+    for (int ii = 0; ii < kMaxThreads; ++ii) {
+        if (stacks[ii])
+            stacks[ii]->popAll(event.time);
+    }
+
+    delete trace;
+    return 0;
+}