diff options
Diffstat (limited to 'src/arch/mips/linux')
| -rw-r--r-- | src/arch/mips/linux/system.cc | 2 | ||||
| -rw-r--r-- | src/arch/mips/linux/threadinfo.hh | 153 |
2 files changed, 1 insertions, 154 deletions
diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc index f97426f85..dc2ac7da5 100644 --- a/src/arch/mips/linux/system.cc +++ b/src/arch/mips/linux/system.cc @@ -39,8 +39,8 @@ * up boot time. */ +#include "arch/generic/linux/threadinfo.hh" #include "arch/mips/linux/system.hh" -#include "arch/mips/linux/threadinfo.hh" #include "arch/mips/idle_event.hh" #include "arch/mips/system.hh" #include "arch/vtophys.hh" diff --git a/src/arch/mips/linux/threadinfo.hh b/src/arch/mips/linux/threadinfo.hh deleted file mode 100644 index 5788b3b43..000000000 --- a/src/arch/mips/linux/threadinfo.hh +++ /dev/null @@ -1,153 +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_MIPS_LINUX_LINUX_TREADNIFO_HH__ -#define __ARCH_MIPS_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 = MipsISA::gtoh(data); - - return true; - } - - public: - ThreadInfo(ThreadContext *_tc, Addr _pcbb = 0) - : tc(_tc), sys(tc->getSystemPtr()), pcbb(_pcbb) - { - - } - ~ThreadInfo() - {} - - inline Addr - curThreadInfo() - { - panic("curThreadInfo not implemented for MIPS"); - Addr addr = pcbb; - Addr sp; - - if (!addr) - addr = tc->readMiscRegNoEffect(0/*MipsISA::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) - { - Addr 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) - { - Addr 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_MIPS_LINUX_LINUX_THREADINFO_HH__ |