diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-06-30 20:51:07 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-06-30 20:51:07 -0400 |
| commit | ed821702e02b9c02c3b5f18dc61dad1f0fbc7164 (patch) | |
| tree | e299605370852ed8331e512b92590f0fcd875f9d /src/cpu/o3/cpu.hh | |
| parent | 7a4929813423c6f72827c58453cb9bd591f1801c (diff) | |
| parent | 51261196bde3403544631cdb4895c2d2a51c3f1e (diff) | |
| download | gem5-ed821702e02b9c02c3b5f18dc61dad1f0fbc7164.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : 3c1405d8b4831c6240e02ba65a72043ca55f4a46
Diffstat (limited to 'src/cpu/o3/cpu.hh')
| -rw-r--r-- | src/cpu/o3/cpu.hh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index b1ebcce9d..9565bbe4f 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -49,11 +49,14 @@ #include "cpu/o3/cpu_policy.hh" #include "cpu/o3/scoreboard.hh" #include "cpu/o3/thread_state.hh" +//#include "cpu/o3/thread_context.hh" #include "sim/process.hh" template <class> class Checker; class ThreadContext; +template <class> +class O3ThreadContext; class MemObject; class Process; @@ -67,6 +70,10 @@ class BaseO3CPU : public BaseCPU void regStats(); + /** Sets this CPU's ID. */ + void setCpuId(int id) { cpu_id = id; } + + /** Reads this CPU's ID. */ int readCpuId() { return cpu_id; } protected: @@ -94,6 +101,7 @@ class FullO3CPU : public BaseO3CPU typedef typename std::list<DynInstPtr>::iterator ListIt; + friend class O3ThreadContext<Impl>; public: enum Status { Running, |