diff options
| author | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
|---|---|---|
| committer | Brandon Potter <brandon.potter@amd.com> | 2016-11-09 14:27:40 -0600 |
| commit | 3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48 (patch) | |
| tree | 5a1ce6cbf42009fc9199c7ecfb068890ca74dbd4 /src/kern/linux | |
| parent | 7b6cf951e2f0fa70d6599f1e1d03f664b674a75e (diff) | |
| download | gem5-3886c4a8f2e1bfe17cbf7a5a76ba0fc978c6bb48.tar.xz | |
syscall_emul: [patch 5/22] remove LiveProcess class and use Process instead
The EIOProcess class was removed recently and it was the only other class
which derived from Process. Since every Process invocation is also a
LiveProcess invocation, it makes sense to simplify the organization by
combining the fields from LiveProcess into Process.
Diffstat (limited to 'src/kern/linux')
| -rw-r--r-- | src/kern/linux/linux.cc | 4 | ||||
| -rw-r--r-- | src/kern/linux/linux.hh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/kern/linux/linux.cc b/src/kern/linux/linux.cc index 6618fdbd9..493be9611 100644 --- a/src/kern/linux/linux.cc +++ b/src/kern/linux/linux.cc @@ -38,7 +38,7 @@ #include "sim/system.hh" int -Linux::openSpecialFile(std::string path, LiveProcess *process, +Linux::openSpecialFile(std::string path, Process *process, ThreadContext *tc) { DPRINTF(SyscallVerbose, "Opening special file: %s\n", path.c_str()); @@ -59,7 +59,7 @@ Linux::openSpecialFile(std::string path, LiveProcess *process, } std::string -Linux::procMeminfo(LiveProcess *process, ThreadContext *tc) +Linux::procMeminfo(Process *process, ThreadContext *tc) { return csprintf("MemTotal:%12d kB\nMemFree: %12d kB\n", process->system->memSize() >> 10, diff --git a/src/kern/linux/linux.hh b/src/kern/linux/linux.hh index 52a3bcd7b..e6899a9ca 100644 --- a/src/kern/linux/linux.hh +++ b/src/kern/linux/linux.hh @@ -223,8 +223,9 @@ class Linux : public OperatingSystem int64_t ru_nivcsw; //!< involuntary " }; - static int openSpecialFile(std::string path, LiveProcess *process, ThreadContext *tc); - static std::string procMeminfo(LiveProcess *process, ThreadContext *tc); + static int openSpecialFile(std::string path, Process *process, + ThreadContext *tc); + static std::string procMeminfo(Process *process, ThreadContext *tc); // For futex system call static const unsigned TGT_FUTEX_WAIT = 0; |