From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 7 Sep 2012 19:20:53 +0000 (-0500)
Subject: dev: Fix bifield definition in timer_cpulocal.hh
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2059c01673b6fd4d03048e21ee7feef7ae89ee37;p=gem5.git

dev: Fix bifield definition in timer_cpulocal.hh

Bitfield definition in the local timer model for ARM had the bitfield
range numbers reversed which could lead to buggy behavior.
---

diff --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh
index 5357ac0eb..144e0b807 100644
--- a/src/dev/arm/timer_cpulocal.hh
+++ b/src/dev/arm/timer_cpulocal.hh
@@ -77,8 +77,8 @@ class CpuLocalTimer : public BasicPioDevice
             Bitfield<0>   enable;
             Bitfield<1>   autoReload;
             Bitfield<2>   intEnable;
-            Bitfield<3,7> reserved;
-            Bitfield<8,15> prescalar;
+            Bitfield<7,3> reserved;
+            Bitfield<15,8> prescalar;
         EndBitUnion(TimerCtrl)
 
         BitUnion32(WatchdogCtrl)
@@ -86,8 +86,8 @@ class CpuLocalTimer : public BasicPioDevice
             Bitfield<1>   autoReload;
             Bitfield<2>   intEnable;
             Bitfield<3>   watchdogMode;
-            Bitfield<4,7> reserved;
-            Bitfield<8,15> prescalar;
+            Bitfield<7,4> reserved;
+            Bitfield<15,8> prescalar;
         EndBitUnion(WatchdogCtrl)
 
       protected: