From d325f49b70e52044fd1072afed27227ecd4b2a60 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Fri, 28 Sep 2007 13:21:52 -0400 Subject: Rename cycles() function to ticks() --HG-- extra : convert_revision : 790eddb793d4f5ba35813d001037bd8601bd76a5 --- src/cpu/ozone/cpu.hh | 4 ++-- src/cpu/ozone/cpu_impl.hh | 2 +- src/cpu/ozone/lw_back_end_impl.hh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/cpu/ozone') diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh index 78d0892c4..036db1351 100644 --- a/src/cpu/ozone/cpu.hh +++ b/src/cpu/ozone/cpu.hh @@ -315,9 +315,9 @@ class OzoneCPU : public BaseCPU void scheduleTickEvent(int delay) { if (tickEvent.squashed()) - tickEvent.reschedule(curTick + cycles(delay)); + tickEvent.reschedule(curTick + ticks(delay)); else if (!tickEvent.scheduled()) - tickEvent.schedule(curTick + cycles(delay)); + tickEvent.schedule(curTick + ticks(delay)); } /// Unschedule tick event, regardless of its current state. diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index 37a91c630..5080c54f6 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -613,7 +613,7 @@ OzoneCPU::tick() comInstEventQueue[0]->serviceEvents(numInst); if (!tickEvent.scheduled() && _status == Running) - tickEvent.schedule(curTick + cycles(1)); + tickEvent.schedule(curTick + ticks(1)); } template diff --git a/src/cpu/ozone/lw_back_end_impl.hh b/src/cpu/ozone/lw_back_end_impl.hh index f84bda348..42788cee1 100644 --- a/src/cpu/ozone/lw_back_end_impl.hh +++ b/src/cpu/ozone/lw_back_end_impl.hh @@ -45,7 +45,7 @@ LWBackEnd::generateTrapEvent(Tick latency) TrapEvent *trap = new TrapEvent(this); - trap->schedule(curTick + cpu->cycles(latency)); + trap->schedule(curTick + cpu->ticks(latency)); thread->trapPending = true; } -- cgit v1.2.3 From 3eeda8008dc3899d20747e152342cf7a5648ea25 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 2 Oct 2007 18:22:36 -0700 Subject: CPU: Make sure the system parameter gets set in the cpu builders. Other parameters need to be fixed as well. --HG-- extra : convert_revision : 0401970a79855ee0a96eb29305346ce07b5c98ea --- src/cpu/ozone/checker_builder.cc | 2 +- src/cpu/ozone/cpu_builder.cc | 2 +- src/cpu/ozone/simple_cpu_builder.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cpu/ozone') diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc index 625b2a39a..eacec6461 100644 --- a/src/cpu/ozone/checker_builder.cc +++ b/src/cpu/ozone/checker_builder.cc @@ -89,8 +89,8 @@ OzoneCheckerParams::create() params->itb = itb; params->dtb = dtb; -#if FULL_SYSTEM params->system = system; +#if FULL_SYSTEM params->cpu_id = cpu_id; params->profile = profile; #else diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc index 7edbe41c9..927370339 100644 --- a/src/cpu/ozone/cpu_builder.cc +++ b/src/cpu/ozone/cpu_builder.cc @@ -82,8 +82,8 @@ DerivOzoneCPUParams::create() params->itb = itb; params->dtb = dtb; -#if FULL_SYSTEM params->system = system; +#if FULL_SYSTEM params->cpu_id = cpu_id; params->profile = profile; params->do_quiesce = do_quiesce; diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc index ca55cdca4..23f5455e4 100644 --- a/src/cpu/ozone/simple_cpu_builder.cc +++ b/src/cpu/ozone/simple_cpu_builder.cc @@ -85,8 +85,8 @@ SimpleOzoneCPUParams::create() params->itb = itb; params->dtb = dtb; -#if FULL_SYSTEM params->system = system; +#if FULL_SYSTEM params->cpu_id = cpu_id; #else params->workload = workload; -- cgit v1.2.3 From 7571e8346d0ebbc38806c30a75dbcf298d50f08e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 2 Oct 2007 18:33:57 -0700 Subject: CPU: Make the cpuid parameter get set in SE mode as well. --HG-- extra : convert_revision : bc47206acb683ebaaa31f57af79b4b8db64e4d31 --- src/cpu/ozone/checker_builder.cc | 2 +- src/cpu/ozone/cpu_builder.cc | 2 +- src/cpu/ozone/simple_cpu_builder.cc | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/cpu/ozone') diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc index eacec6461..37b9f951a 100644 --- a/src/cpu/ozone/checker_builder.cc +++ b/src/cpu/ozone/checker_builder.cc @@ -90,8 +90,8 @@ OzoneCheckerParams::create() params->itb = itb; params->dtb = dtb; params->system = system; -#if FULL_SYSTEM params->cpu_id = cpu_id; +#if FULL_SYSTEM params->profile = profile; #else params->process = workload; diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc index 927370339..beb179d41 100644 --- a/src/cpu/ozone/cpu_builder.cc +++ b/src/cpu/ozone/cpu_builder.cc @@ -83,8 +83,8 @@ DerivOzoneCPUParams::create() params->dtb = dtb; params->system = system; -#if FULL_SYSTEM params->cpu_id = cpu_id; +#if FULL_SYSTEM params->profile = profile; params->do_quiesce = do_quiesce; params->do_checkpoint_insts = do_checkpoint_insts; diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc index 23f5455e4..9cd56fdb4 100644 --- a/src/cpu/ozone/simple_cpu_builder.cc +++ b/src/cpu/ozone/simple_cpu_builder.cc @@ -86,9 +86,8 @@ SimpleOzoneCPUParams::create() params->dtb = dtb; params->system = system; -#if FULL_SYSTEM params->cpu_id = cpu_id; -#else +#if !FULL_SYSTEM params->workload = workload; // params->pTable = page_table; #endif // FULL_SYSTEM -- cgit v1.2.3