diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
| commit | 0a3948bcfd96b16887a5501231890a05bd22c5a3 (patch) | |
| tree | 32c0f6cfd5ee4a670896c9fee01224ed944de62d /cpu/exec_context.cc | |
| parent | a574c260e35d99eedfe4927b21f8d3e5ca5ce3f5 (diff) | |
| parent | ee967995196739b90c0b1c384d7e245d1dffdc80 (diff) | |
| download | gem5-0a3948bcfd96b16887a5501231890a05bd22c5a3.tar.xz | |
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : b3fd8bcfbaf1e9d09bac8c1403944df36dde671e
Diffstat (limited to 'cpu/exec_context.cc')
| -rw-r--r-- | cpu/exec_context.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc index 6a5f463cd..b0ebb9622 100644 --- a/cpu/exec_context.cc +++ b/cpu/exec_context.cc @@ -48,10 +48,7 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_sys, kernelStats(this, _cpu), cpu(_cpu), thread_num(_thread_num), cpu_id(-1), mem(_mem), itb(_itb), dtb(_dtb), system(_sys), memCtrl(_sys->memCtrl), physmem(_sys->physmem), -#ifdef FS_MEASURE - swCtx(NULL), -#endif - func_exe_inst(0), storeCondFailures(0) + swCtx(NULL), func_exe_inst(0), storeCondFailures(0) { memset(®s, 0, sizeof(RegFile)); } |