diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
| commit | b565660c42cbf8f9ec9442cd6c0b7d488c7816af (patch) | |
| tree | aa977395b10e164190efdd5106da54a57bc23b44 /src/cpu/simple_thread.hh | |
| parent | 8dbab9f701150cf93d33f2a21d6b556507f3d617 (diff) | |
| parent | 9ef8bf74c7ab3d34889e804cb4b1e365da090d0b (diff) | |
| download | gem5-b565660c42cbf8f9ec9442cd6c0b7d488c7816af.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
Diffstat (limited to 'src/cpu/simple_thread.hh')
| -rw-r--r-- | src/cpu/simple_thread.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index 20f7f0d1c..b654c130e 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -117,8 +117,7 @@ class SimpleThread : public ThreadState TheISA::ITB *_itb, TheISA::DTB *_dtb, bool use_kernel_stats = true); #else - SimpleThread(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid, - MemObject *memobj); + SimpleThread(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid); #endif SimpleThread(); @@ -172,6 +171,9 @@ class SimpleThread : public ThreadState bool simPalCheck(int palFunc); #else + // Override this function. + TranslatingPort *getMemPort(); + Fault translateInstReq(RequestPtr &req) { return process->pTable->translate(req); |