1 files changed, 84 insertions, 2 deletions
diff --git a/src/arch/x86/stacktrace.hh b/src/arch/x86/stacktrace.hh
index 4e2e351b2..854fb397c 100644
--- a/src/arch/x86/stacktrace.hh
+++ b/src/arch/x86/stacktrace.hh
@@ -31,10 +31,92 @@
 #ifndef __ARCH_X86_STACKTRACE_HH__
 #define __ARCH_X86_STACKTRACE_HH__
 
-#error X86 is not yet supported!
+#include "base/trace.hh"
+#include "cpu/static_inst.hh"
 
+class ThreadContext;
 namespace X86ISA
 {
-};
+    class StackTrace;
+
+    class ProcessInfo
+    {
+      private:
+        ThreadContext *tc;
+
+        int thread_info_size;
+        int task_struct_size;
+        int task_off;
+        int pid_off;
+        int name_off;
+
+      public:
+        ProcessInfo(ThreadContext *_tc);
+
+        Addr task(Addr ksp) const;
+        int pid(Addr ksp) const;
+        std::string name(Addr ksp) const;
+    };
+
+    class StackTrace
+    {
+      private:
+        ThreadContext *tc;
+        std::vector<Addr> stack;
+
+      private:
+        bool isEntry(Addr addr);
+        bool decodePrologue(Addr sp, Addr callpc, Addr func, int &size, Addr &ra);
+        bool decodeSave(MachInst inst, int &reg, int &disp);
+        bool decodeStack(MachInst inst, int &disp);
+
+        void trace(ThreadContext *tc, bool is_call);
+
+      public:
+        StackTrace();
+        StackTrace(ThreadContext *tc, StaticInstPtr inst);
+        ~StackTrace();
+
+        void clear()
+        {
+            tc = 0;
+            stack.clear();
+        }
+
+        bool valid() const { return tc != NULL; }
+        bool trace(ThreadContext *tc, StaticInstPtr inst);
+
+      public:
+        const std::vector<Addr> &getstack() const { return stack; }
+
+        static const int user = 1;
+        static const int console = 2;
+        static const int unknown = 3;
+
+#if TRACING_ON
+      private:
+        void dump();
+
+      public:
+        void dprintf() { if (DTRACE(Stack)) dump(); }
+#else
+      public:
+        void dprintf() {}
+#endif
+    };
+
+    inline bool
+    StackTrace::trace(ThreadContext *tc, StaticInstPtr inst)
+    {
+        if (!inst->isCall() && !inst->isReturn())
+            return false;
+
+        if (valid())
+            clear();
+
+        trace(tc, !inst->isReturn());
+        return true;
+    }
+}
 
 #endif // __ARCH_X86_STACKTRACE_HH__