ISA: generic Linux thread info support

This patch takes the Linux thread info support scattered across
different ISA implementations (currently in ARM, ALPHA, and MIPS), and
unifies them into a single file.

Adds a few more helper functions to read out TGID, mm, etc.

ISA-specific information (e.g., ALPHA PCBB register) is now moved to
the corresponding isa_traits.hh files.

4 files changed, 6 insertions, 154 deletions

diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh
index 5738ccdb1..41b63ec5a 100644
--- a/src/arch/alpha/isa_traits.hh
+++ b/src/arch/alpha/isa_traits.hh
@@ -34,6 +34,7 @@
 
 namespace LittleEndianGuest {}
 
+#include "arch/alpha/ipr.hh"
 #include "arch/alpha/types.hh"
 #include "base/types.hh"
 #include "cpu/static_inst_fwd.hh"
@@ -129,6 +130,9 @@ const ExtMachInst NoopMachInst = 0x2ffe0000;
 // Memory accesses cannot be unaligned
 const bool HasUnalignedMemAcc = false;
 
+const bool CurThreadInfoImplemented = true;
+const int CurThreadInfoReg = AlphaISA::IPR_PALtemp23;
+
 } // namespace AlphaISA
 
 #endif // __ARCH_ALPHA_ISA_TRAITS_HH__
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index c057e7f16..bac5d26cd 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -33,7 +33,7 @@
 #include <stack>
 #include <string>
 
-#include "arch/alpha/linux/threadinfo.hh"
+#include "arch/generic/linux/threadinfo.hh"
 #include "arch/alpha/kernel_stats.hh"
 #include "arch/alpha/osfpal.hh"
 #include "base/trace.hh"
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index db3c16d7e..0507af029 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -41,9 +41,9 @@
  */
 
 #include "arch/alpha/linux/system.hh"
-#include "arch/alpha/linux/threadinfo.hh"
 #include "arch/alpha/idle_event.hh"
 #include "arch/alpha/system.hh"
+#include "arch/generic/linux/threadinfo.hh"
 #include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
 #include "cpu/base.hh"
diff --git a/src/arch/alpha/linux/threadinfo.hh b/src/arch/alpha/linux/threadinfo.hh
deleted file mode 100644
index 94e362fe7..000000000
--- a/src/arch/alpha/linux/threadinfo.hh
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2004 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Ali Saidi
- *          Nathan Binkert
- */
-
-#ifndef __ARCH_ALPHA_LINUX_LINUX_TREADNIFO_HH__
-#define __ARCH_ALPHA_LINUX_LINUX_TREADNIFO_HH__
-
-#include "cpu/thread_context.hh"
-#include "sim/system.hh"
-#include "sim/vptr.hh"
-
-namespace Linux {
-
-class ThreadInfo
-{
-  private:
-    ThreadContext *tc;
-    System *sys;
-    Addr pcbb;
-
-    template <typename T>
-    bool
-    get_data(const char *symbol, T &data)
-    {
-        Addr addr = 0;
-        if (!sys->kernelSymtab->findAddress(symbol, addr))
-            return false;
-
-        CopyOut(tc, &data, addr, sizeof(T));
-
-        data = AlphaISA::gtoh(data);
-
-        return true;
-    }
-
-  public:
-    ThreadInfo(ThreadContext *_tc, Addr _pcbb = 0)
-        : tc(_tc), sys(tc->getSystemPtr()), pcbb(_pcbb)
-    {
-
-    }
-    ~ThreadInfo()
-    {}
-
-    inline Addr
-    curThreadInfo()
-    {
-        Addr addr = pcbb;
-        Addr sp;
-
-        if (!addr)
-            addr = tc->readMiscRegNoEffect(AlphaISA::IPR_PALtemp23);
-
-        PortProxy &p = tc->getPhysProxy();
-        p.readBlob(addr, (uint8_t *)&sp, sizeof(Addr));
-
-        return sp & ~ULL(0x3fff);
-    }
-
-    inline Addr
-    curTaskInfo(Addr thread_info = 0)
-    {
-        int32_t offset;
-        if (!get_data("thread_info_task", offset))
-            return 0;
-
-        if (!thread_info)
-            thread_info = curThreadInfo();
-
-        Addr addr;
-        CopyOut(tc, &addr, thread_info + offset, sizeof(addr));
-
-        return addr;
-    }
-
-    int32_t
-    curTaskPID(Addr thread_info = 0)
-    {
-        int32_t offset;
-        if (!get_data("task_struct_pid", offset))
-            return -1;
-
-        int32_t pid;
-        CopyOut(tc, &pid, curTaskInfo(thread_info) + offset, sizeof(pid));
-
-        return pid;
-    }
-
-    int64_t
-    curTaskStart(Addr thread_info = 0)
-    {
-        int32_t offset;
-        if (!get_data("task_struct_start_time", offset))
-            return -1;
-
-        int64_t data;
-        // start_time is actually of type timespec, but if we just
-        // grab the first long, we'll get the seconds out of it
-        CopyOut(tc, &data, curTaskInfo(thread_info) + offset, sizeof(data));
-
-        return data;
-    }
-
-    std::string
-    curTaskName(Addr thread_info = 0)
-    {
-        int32_t offset;
-        int32_t size;
-
-        if (!get_data("task_struct_comm", offset))
-            return "FailureIn_curTaskName";
-
-        if (!get_data("task_struct_comm_size", size))
-            return "FailureIn_curTaskName";
-
-        char buffer[size + 1];
-        CopyStringOut(tc, buffer, curTaskInfo(thread_info) + offset, size);
-
-        return buffer;
-    }
-};
-
-} // namespace Linux
-
-#endif // __ARCH_ALPHA_LINUX_LINUX_THREADINFO_HH__