summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2012-09-07 14:20:53 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2012-09-07 14:20:53 -0500
commit2059c01673b6fd4d03048e21ee7feef7ae89ee37 (patch)
tree0dda87c706b059010eeaa1df710b40ab4b0ebbb5 /src
parent98e1ce638fba1111d1438dd3d6cafd2b14eb05d7 (diff)
downloadgem5-2059c01673b6fd4d03048e21ee7feef7ae89ee37.tar.xz
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.
Diffstat (limited to 'src')
-rw-r--r--src/dev/arm/timer_cpulocal.hh8
1 files changed, 4 insertions, 4 deletions
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: