ARM: Decode neon memory instructions.

[gem5.git] / src / arch / alpha / stacktrace.hh

diff --git a/src/arch/alpha/stacktrace.hh b/src/arch/alpha/stacktrace.hh
index d12aee211595c564aabaf389aaa3083598f16678..c09ab357630f8c406d9c75a6861cfa221c3c02d9 100644 (file)
--- a/src/arch/alpha/stacktrace.hh
+++ b/src/arch/alpha/stacktrace.hh
@@ -35,6 +35,9 @@
 #include "cpu/static_inst.hh"
 
 class ThreadContext;
+
+namespace AlphaISA {
+
 class StackTrace;
 
 class ProcessInfo
@@ -58,8 +61,6 @@ class ProcessInfo
 
 class StackTrace
 {
-  protected:
-    typedef TheISA::MachInst MachInst;
   private:
     ThreadContext *tc;
     std::vector<Addr> stack;
@@ -77,7 +78,8 @@ class StackTrace
     StackTrace(ThreadContext *tc, StaticInstPtr inst);
     ~StackTrace();
 
-    void clear()
+    void
+    clear()
     {
         tc = 0;
         stack.clear();
@@ -89,9 +91,11 @@ class StackTrace
   public:
     const std::vector<Addr> &getstack() const { return stack; }
 
-    static const int user = 1;
-    static const int console = 2;
-    static const int unknown = 3;
+    enum {
+        user = 1,
+        console = 2,
+        unknown = 3
+    };
 
 #if TRACING_ON
   private:
@@ -118,4 +122,6 @@ StackTrace::trace(ThreadContext *tc, StaticInstPtr inst)
     return true;
 }
 
+} // namespace AlphaISA
+
 #endif // __ARCH_ALPHA_STACKTRACE_HH__