changeset 02f63121a9a1 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=02f63121a9a1
description:
        ARM: Fix timer calculations.

        The timer calculations were a bit off so time would run faster than
        it otherwise should

diffstat:

 src/dev/arm/timer_sp804.cc |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r c122a3e1b204 -r 02f63121a9a1 src/dev/arm/timer_sp804.cc
--- a/src/dev/arm/timer_sp804.cc        Fri Feb 11 18:29:35 2011 -0600
+++ b/src/dev/arm/timer_sp804.cc        Fri Feb 11 18:29:35 2011 -0600
@@ -178,11 +178,11 @@
     if (!control.timerEnable)
         return;
 
-    Tick time = clock << power(16, control.timerPrescale);
+    Tick time = clock * power(16, control.timerPrescale);
     if (control.timerSize)
+        time *= val;
+    else
         time *= bits(val,15,0);
-    else
-        time *= val;
 
     if (zeroEvent.scheduled()) {
         DPRINTF(Timer, "-- Event was already schedule, de-scheduling\n");
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to