diff options
Diffstat (limited to 'kern/linux')
| -rw-r--r-- | kern/linux/aligned.hh | 2 | ||||
| -rw-r--r-- | kern/linux/linux_system.cc | 1 | ||||
| -rw-r--r-- | kern/linux/linux_threadinfo.hh | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh index 18d1b43c0..137f65076 100644 --- a/kern/linux/aligned.hh +++ b/kern/linux/aligned.hh @@ -37,7 +37,7 @@ #if __GNUC__ == 3 && __GNUC_MINOR__ != 3 typedef uint64_t uint64_ta __attribute__ ((aligned (8))) ; typedef int64_t int64_ta __attribute__ ((aligned (8))) ; -typedef Addr Addr_a __attribute__ ((aligned (8))) ; +typedef TheISA::Addr Addr_a __attribute__ ((aligned (8))) ; #else #define uint64_ta uint64_t __attribute__ ((aligned (8))) #define int64_ta int64_t __attribute__ ((aligned (8))) diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc index 26a4c0d3e..c5a9e184a 100644 --- a/kern/linux/linux_system.cc +++ b/kern/linux/linux_system.cc @@ -50,6 +50,7 @@ #include "targetarch/vtophys.hh" using namespace std; +using namespace TheISA; LinuxSystem::LinuxSystem(Params *p) : System(p) diff --git a/kern/linux/linux_threadinfo.hh b/kern/linux/linux_threadinfo.hh index 9bab1dc49..f20188360 100644 --- a/kern/linux/linux_threadinfo.hh +++ b/kern/linux/linux_threadinfo.hh @@ -37,6 +37,8 @@ namespace Linux { class ThreadInfo { + protected: + typedef TheISA::Addr Addr; private: ExecContext *xc; @@ -53,7 +55,7 @@ class ThreadInfo * thread_info struct. So we can get the address by masking off * the lower 14 bits. */ - current = xc->regs.intRegFile[StackPointerReg] & ~0x3fff; + current = xc->regs.intRegFile[TheISA::StackPointerReg] & ~0x3fff; return VPtr<thread_info>(xc, current); } |