diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-09-13 21:58:34 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-09-13 21:58:34 -0700 |
commit | 8f3fbd2d13dbfc3699dc43b27b3c2a389049078d (patch) | |
tree | 10c9d799ea81529b13fb924094a12b462c168dcd /src/cpu/o3 | |
parent | 6833ca7eedd351596bb1518620af7465f5172fcd (diff) | |
download | gem5-8f3fbd2d13dbfc3699dc43b27b3c2a389049078d.tar.xz |
CPU: Get rid of the now unnecessary getInst/setInst family of functions.
This code is no longer needed because of the preceeding change which adds a
StaticInstPtr parameter to the fault's invoke method, obviating the only use
for this pair of functions.
Diffstat (limited to 'src/cpu/o3')
-rw-r--r-- | src/cpu/o3/commit_impl.hh | 6 | ||||
-rwxr-xr-x | src/cpu/o3/thread_context.hh | 4 | ||||
-rwxr-xr-x | src/cpu/o3/thread_context_impl.hh | 7 |
3 files changed, 0 insertions, 17 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index 468781e4d..87f18d4e4 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -1033,12 +1033,6 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num) } #endif - // DTB will sometimes need the machine instruction for when - // faults happen. So we will set it here, prior to the DTB - // possibly needing it for its fault. - thread[tid]->setInst( - static_cast<TheISA::MachInst>(head_inst->staticInst->machInst)); - if (inst_fault != NoFault) { DPRINTF(Commit, "Inst [sn:%lli] PC %#x has a fault\n", head_inst->seqNum, head_inst->readPC()); diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index 78b266014..b7790cfda 100755 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -151,10 +151,6 @@ class O3ThreadContext : public ThreadContext /** Samples the function profiling information. */ virtual void profileSample(); #endif - /** Returns the instruction this thread is currently committing. - * Only used when an instruction faults. - */ - virtual TheISA::MachInst getInst(); /** Copies the architectural registers from another TC into this TC. */ virtual void copyArchRegs(ThreadContext *tc); diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh index a1a96933a..0b7a2b172 100755 --- a/src/cpu/o3/thread_context_impl.hh +++ b/src/cpu/o3/thread_context_impl.hh @@ -216,13 +216,6 @@ O3ThreadContext<Impl>::profileSample() #endif template <class Impl> -TheISA::MachInst -O3ThreadContext<Impl>:: getInst() -{ - return thread->getInst(); -} - -template <class Impl> void O3ThreadContext<Impl>::copyArchRegs(ThreadContext *tc) { |