diff options
| author | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:44 -0500 |
|---|---|---|
| committer | Andreas Sandberg <Andreas.Sandberg@ARM.com> | 2013-01-07 13:05:44 -0500 |
| commit | 6daada2701c7ea361843a7c2a50cb616b56b1519 (patch) | |
| tree | a43585695855049cbc84ff919dde117c92b49b85 /src/cpu/o3/commit_impl.hh | |
| parent | e2dad8236a95b5d7b1c1470385d0b543d3c7af4a (diff) | |
| download | gem5-6daada2701c7ea361843a7c2a50cb616b56b1519.tar.xz | |
cpu: Initialize the O3 pipeline from startup()
The entire O3 pipeline used to be initialized from init(), which is
called before initState() or unserialize(). This causes the pipeline
to be initialized from an incorrect thread context. This doesn't
currently lead to correctness problems as instructions fetched from
the incorrect start PC will be squashed a few cycles after
initialization.
This patch will affect the regressions since the O3 CPU now issues its
first instruction fetch to the correct PC instead of 0x0.
Diffstat (limited to 'src/cpu/o3/commit_impl.hh')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index 351b4794d..bff5c5ae9 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011 ARM Limited + * Copyright (c) 2010-2012 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -348,7 +348,7 @@ DefaultCommit<Impl>::setROB(ROB *rob_ptr) template <class Impl> void -DefaultCommit<Impl>::initStage() +DefaultCommit<Impl>::startupStage() { rob->setActiveThreads(activeThreads); rob->resetEntries(); |