diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-02-03 11:24:03 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-02-03 11:24:03 -0500 |
| commit | 85bc028185830fb534c10c244d5f39fcfe8c4da6 (patch) | |
| tree | 59a830bc1aa9e0623cb997f20437925c300aff06 /cpu/exec_context.cc | |
| parent | 5164de4a03422090b253404a11b069d7d588c55e (diff) | |
| parent | 368e6e3e570430b207b0194290242a2f98e565ca (diff) | |
| download | gem5-85bc028185830fb534c10c244d5f39fcfe8c4da6.tar.xz | |
merge
--HG--
extra : convert_revision : 47425264e672f727cbb13aa7b9bb2a67790b25e8
Diffstat (limited to 'cpu/exec_context.cc')
| -rw-r--r-- | cpu/exec_context.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc index 23ae7eda8..6a5f463cd 100644 --- a/cpu/exec_context.cc +++ b/cpu/exec_context.cc @@ -51,7 +51,7 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_sys, #ifdef FS_MEASURE swCtx(NULL), #endif - func_exe_insn(0), storeCondFailures(0) + func_exe_inst(0), storeCondFailures(0) { memset(®s, 0, sizeof(RegFile)); } @@ -61,14 +61,14 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, : _status(ExecContext::Unallocated), cpu(_cpu), thread_num(_thread_num), cpu_id(-1), process(_process), mem(process->getMemory()), asid(_asid), - func_exe_insn(0), storeCondFailures(0) + func_exe_inst(0), storeCondFailures(0) { } ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, FunctionalMemory *_mem, int _asid) : cpu(_cpu), thread_num(_thread_num), process(0), mem(_mem), asid(_asid), - func_exe_insn(0), storeCondFailures(0) + func_exe_inst(0), storeCondFailures(0) { } #endif @@ -92,7 +92,7 @@ ExecContext::takeOverFrom(ExecContext *oldContext) #endif regs = oldContext->regs; cpu_id = oldContext->cpu_id; - func_exe_insn = oldContext->func_exe_insn; + func_exe_inst = oldContext->func_exe_inst; storeCondFailures = 0; @@ -106,7 +106,7 @@ ExecContext::serialize(ostream &os) SERIALIZE_ENUM(_status); regs.serialize(os); // thread_num and cpu_id are deterministic from the config - SERIALIZE_SCALAR(func_exe_insn); + SERIALIZE_SCALAR(func_exe_inst); } @@ -116,7 +116,7 @@ ExecContext::unserialize(Checkpoint *cp, const std::string §ion) UNSERIALIZE_ENUM(_status); regs.unserialize(cp, section); // thread_num and cpu_id are deterministic from the config - UNSERIALIZE_SCALAR(func_exe_insn); + UNSERIALIZE_SCALAR(func_exe_inst); } |