diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/BaseCPU.py | 6 | ||||
| -rw-r--r-- | src/cpu/dummy_checker.cc | 2 | ||||
| -rw-r--r-- | src/cpu/o3/checker.cc | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py index e7613c5bb..7ec79ad0a 100644 --- a/src/cpu/BaseCPU.py +++ b/src/cpu/BaseCPU.py @@ -52,6 +52,7 @@ from InstTracer import InstTracer from ExeTracer import ExeTracer from MemObject import MemObject from BranchPredictor import BranchPredictor +from ClockDomain import * default_tracer = ExeTracer() @@ -226,7 +227,10 @@ class BaseCPU(MemObject): elif buildEnv['TARGET_ISA'] == 'alpha': self.interrupts = AlphaInterrupts() elif buildEnv['TARGET_ISA'] == 'x86': - self.interrupts = X86LocalApic(clock = Parent.clock * 16, + self.apic_clk_domain = DerivedClockDomain(clk_domain = + Parent.clk_domain, + clk_divider = 16) + self.interrupts = X86LocalApic(clk_domain = self.apic_clk_domain, pio_addr=0x2000000000000000) _localApic = self.interrupts elif buildEnv['TARGET_ISA'] == 'mips': diff --git a/src/cpu/dummy_checker.cc b/src/cpu/dummy_checker.cc index 7a5b46e43..bbd905492 100644 --- a/src/cpu/dummy_checker.cc +++ b/src/cpu/dummy_checker.cc @@ -54,7 +54,7 @@ DummyCheckerParams::create() params->max_insts_all_threads = 0; params->max_loads_any_thread = 0; params->max_loads_all_threads = 0; - params->clock = clock; + params->clk_domain = clk_domain; // Hack to touch all parameters. Consider not deriving Checker // from BaseCPU..it's not really a CPU in the end. Counter temp; diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc index 3ff3d86bc..ce7a99f0f 100644 --- a/src/cpu/o3/checker.cc +++ b/src/cpu/o3/checker.cc @@ -66,7 +66,7 @@ O3CheckerParams::create() params->exitOnError = exitOnError; params->updateOnError = updateOnError; params->warnOnlyOnLoadError = warnOnlyOnLoadError; - params->clock = clock; + params->clk_domain = clk_domain; params->tracer = tracer; // Hack to touch all parameters. Consider not deriving Checker // from BaseCPU..it's not really a CPU in the end. |