Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/30958 )
Change subject: arch: Delete the unused ProcessInfo class.
......................................................................
arch: Delete the unused ProcessInfo class.
Change-Id: Ie67f696005fa60e117e1e4e4e985aee5e767ccec
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30958
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/stacktrace.cc
M src/arch/arm/stacktrace.hh
M src/arch/mips/stacktrace.cc
M src/arch/mips/stacktrace.hh
M src/arch/power/stacktrace.cc
M src/arch/power/stacktrace.hh
M src/arch/riscv/stacktrace.cc
M src/arch/riscv/stacktrace.hh
M src/arch/x86/stacktrace.cc
M src/arch/x86/stacktrace.hh
10 files changed, 0 insertions(+), 311 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/stacktrace.cc b/src/arch/arm/stacktrace.cc
index 2c39576..a9f79e8 100644
--- a/src/arch/arm/stacktrace.cc
+++ b/src/arch/arm/stacktrace.cc
@@ -41,72 +41,6 @@
namespace ArmISA
{
-static int32_t
-readSymbol(ThreadContext *tc, const std::string name)
-{
- PortProxy &vp = tc->getVirtProxy();
- const auto &symtab = tc->getSystemPtr()->workload->symtab(tc);
-
- auto it = symtab.find(name);
- panic_if(it == symtab.end(), "Thread info not compiled into kernel.");
-
- return vp.read<int32_t>(it->address, GuestByteOrder);
-}
-
-ProcessInfo::ProcessInfo(ThreadContext *_tc) : tc(_tc)
-{
- thread_info_size = readSymbol(tc, "thread_info_size");
- task_struct_size = readSymbol(tc, "task_struct_size");
- task_off = readSymbol(tc, "thread_info_task");
- pid_off = readSymbol(tc, "task_struct_pid");
- name_off = readSymbol(tc, "task_struct_comm");
-}
-
-Addr
-ProcessInfo::task(Addr ksp) const
-{
- Addr base = ksp & ~0x1fff;
- if (base == ULL(0xffffffffc0000000))
- return 0;
-
- Addr tsk;
-
- PortProxy &vp = tc->getVirtProxy();
- tsk = vp.read<Addr>(base + task_off, GuestByteOrder);
-
- return tsk;
-}
-
-int
-ProcessInfo::pid(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return -1;
-
- uint16_t pd;
-
- PortProxy &vp = tc->getVirtProxy();
- pd = vp.read<uint16_t>(task + pid_off, GuestByteOrder);
-
- return pd;
-}
-
-std::string
-ProcessInfo::name(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return "unknown";
-
- char comm[256];
- tc->getVirtProxy().readString(comm, task + name_off, sizeof(comm));
- if (!comm[0])
- return "startup";
-
- return comm;
-}
-
StackTrace::StackTrace()
: tc(0), stack(64)
{
diff --git a/src/arch/arm/stacktrace.hh b/src/arch/arm/stacktrace.hh
index fd0ec1b..61bea29 100644
--- a/src/arch/arm/stacktrace.hh
+++ b/src/arch/arm/stacktrace.hh
@@ -37,27 +37,6 @@
namespace ArmISA
{
-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
{
protected:
diff --git a/src/arch/mips/stacktrace.cc b/src/arch/mips/stacktrace.cc
index ec5597c..0384e2b 100644
--- a/src/arch/mips/stacktrace.cc
+++ b/src/arch/mips/stacktrace.cc
@@ -40,54 +40,6 @@
using namespace MipsISA;
-ProcessInfo::ProcessInfo(ThreadContext *_tc) : tc(_tc)
-{}
-
-Addr
-ProcessInfo::task(Addr ksp) const
-{
- Addr base = ksp & ~0x3fff;
- if (base == ULL(0xfffffc0000000000))
- return 0;
-
- Addr tsk;
-
- PortProxy &vp = tc->getVirtProxy();
- tsk = vp.read<Addr>(base + task_off, GuestByteOrder);
-
- return tsk;
-}
-
-int
-ProcessInfo::pid(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return -1;
-
- uint16_t pd;
-
- PortProxy &vp = tc->getVirtProxy();
- pd = vp.read<uint16_t>(task + pid_off, GuestByteOrder);
-
- return pd;
-}
-
-std::string
-ProcessInfo::name(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return "console";
-
- char comm[256];
- tc->getVirtProxy().readString(comm, task + name_off, sizeof(comm));
- if (!comm[0])
- return "startup";
-
- return comm;
-}
-
StackTrace::StackTrace()
: tc(0), stack(64)
{
diff --git a/src/arch/mips/stacktrace.hh b/src/arch/mips/stacktrace.hh
index eb3a95a..9c02170 100644
--- a/src/arch/mips/stacktrace.hh
+++ b/src/arch/mips/stacktrace.hh
@@ -38,23 +38,6 @@
namespace MipsISA
{
-class ProcessInfo
-{
- private:
- ThreadContext *tc;
-
- 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
{
protected:
diff --git a/src/arch/power/stacktrace.cc b/src/arch/power/stacktrace.cc
index 64ea926..84f1b65 100644
--- a/src/arch/power/stacktrace.cc
+++ b/src/arch/power/stacktrace.cc
@@ -36,32 +36,6 @@
namespace PowerISA {
-ProcessInfo::ProcessInfo(ThreadContext *_tc)
-{
- panic("ProcessInfo constructor not implemented.\n");
-}
-
-Addr
-ProcessInfo::task(Addr ksp) const
-{
- panic("ProcessInfo::task not implemented.\n");
- return 0;
-}
-
-int
-ProcessInfo::pid(Addr ksp) const
-{
- panic("ProcessInfo::pid not implemented.\n");
- return 0;
-}
-
-string
-ProcessInfo::name(Addr ksp) const
-{
- panic("ProcessInfo::name not implemented.\n");
- return "";
-}
-
StackTrace::StackTrace()
: tc(0), stack(64)
{
diff --git a/src/arch/power/stacktrace.hh b/src/arch/power/stacktrace.hh
index bf43cc2..d67569f 100644
--- a/src/arch/power/stacktrace.hh
+++ b/src/arch/power/stacktrace.hh
@@ -41,16 +41,6 @@
namespace PowerISA
{
-class ProcessInfo
-{
- public:
- ProcessInfo(ThreadContext *_tc);
-
- Addr task(Addr ksp) const;
- int pid(Addr ksp) const;
- std::string name(Addr ksp) const;
-};
-
class StackTrace
{
private:
diff --git a/src/arch/riscv/stacktrace.cc b/src/arch/riscv/stacktrace.cc
index 69159b9..f495b60 100644
--- a/src/arch/riscv/stacktrace.cc
+++ b/src/arch/riscv/stacktrace.cc
@@ -36,32 +36,6 @@
namespace RiscvISA {
-ProcessInfo::ProcessInfo(ThreadContext *_tc)
-{
- panic("ProcessInfo constructor not implemented.\n");
-}
-
-Addr
-ProcessInfo::task(Addr ksp) const
-{
- panic("ProcessInfo::task not implemented.\n");
- return 0;
-}
-
-int
-ProcessInfo::pid(Addr ksp) const
-{
- panic("ProcessInfo::pid not implemented.\n");
- return 0;
-}
-
-string
-ProcessInfo::name(Addr ksp) const
-{
- panic("ProcessInfo::name not implemented.\n");
- return "";
-}
-
StackTrace::StackTrace()
: tc(0), stack(64)
{
diff --git a/src/arch/riscv/stacktrace.hh b/src/arch/riscv/stacktrace.hh
index b88db69..2813412 100644
--- a/src/arch/riscv/stacktrace.hh
+++ b/src/arch/riscv/stacktrace.hh
@@ -41,16 +41,6 @@
namespace RiscvISA
{
-class ProcessInfo
-{
- public:
- ProcessInfo(ThreadContext *_tc);
-
- Addr task(Addr ksp) const;
- int pid(Addr ksp) const;
- std::string name(Addr ksp) const;
-};
-
class StackTrace
{
private:
diff --git a/src/arch/x86/stacktrace.cc b/src/arch/x86/stacktrace.cc
index cb9e529..2d4e8fb 100644
--- a/src/arch/x86/stacktrace.cc
+++ b/src/arch/x86/stacktrace.cc
@@ -41,72 +41,6 @@
namespace X86ISA
{
-static int32_t
-readSymbol(ThreadContext *tc, const std::string name)
-{
- PortProxy &vp = tc->getVirtProxy();
- const auto &symtab = tc->getSystemPtr()->workload->symtab(tc);
-
- auto it = symtab.find(name);
- panic_if(it == symtab.end(), "Thread info not compiled into kernel.");
-
- return vp.read<int32_t>(it->address, GuestByteOrder);
-}
-
-ProcessInfo::ProcessInfo(ThreadContext *_tc) : tc(_tc)
-{
- thread_info_size = readSymbol(tc, "thread_info_size");
- task_struct_size = readSymbol(tc, "task_struct_size");
- task_off = readSymbol(tc, "thread_info_task");
- pid_off = readSymbol(tc, "task_struct_pid");
- name_off = readSymbol(tc, "task_struct_comm");
-}
-
-Addr
-ProcessInfo::task(Addr ksp) const
-{
- Addr base = ksp & ~0x3fff;
- if (base == ULL(0xfffffc0000000000))
- return 0;
-
- Addr tsk;
-
- PortProxy &vp = tc->getVirtProxy();
- tsk = vp.read<Addr>(base + task_off, GuestByteOrder);
-
- return tsk;
-}
-
-int
-ProcessInfo::pid(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return -1;
-
- uint16_t pd;
-
- PortProxy &vp = tc->getVirtProxy();
- pd = vp.read<uint16_t>(task + pid_off, GuestByteOrder);
-
- return pd;
-}
-
-std::string
-ProcessInfo::name(Addr ksp) const
-{
- Addr task = this->task(ksp);
- if (!task)
- return "console";
-
- char comm[256];
- tc->getVirtProxy().readString(comm, task + name_off, sizeof(comm));
- if (!comm[0])
- return "startup";
-
- return comm;
-}
-
StackTrace::StackTrace()
: tc(0), stack(64)
{
diff --git a/src/arch/x86/stacktrace.hh b/src/arch/x86/stacktrace.hh
index bd0a4b7..8ed89ec 100644
--- a/src/arch/x86/stacktrace.hh
+++ b/src/arch/x86/stacktrace.hh
@@ -36,27 +36,6 @@
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:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/30958
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ie67f696005fa60e117e1e4e4e985aee5e767ccec
Gerrit-Change-Number: 30958
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bradford Beckmann <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
