register_set: do not shift when ITEM_WIDTH is 64

Issue #2507.
2017-08-24 14:37:56 +02:00 · 2017-08-24 14:37:56 +02:00 · 404a82d5ee
commit 404a82d5ee
parent 7f29eff75a
1 changed files with 2 additions and 1 deletions
--- a/repos/base/include/util/register_set.h
+++ b/repos/base/include/util/register_set.h
@ -289,7 +289,8 @@ class Genode::Register_set : Noncopyable
 				ITEM_WIDTH      = _ITEM_WIDTH,
 				ITEM_WIDTH_LOG2 = Item::WIDTH_LOG2,
 				MAX_INDEX       = ITEMS - 1,
-				ITEM_MASK       = (1ULL << ITEM_WIDTH) - 1,
+				/* prevent shifting more than bit width by setting all bits explicitly */
+				ITEM_MASK       = (ITEM_WIDTH == 64) ? ~0ULL : (1ULL << ITEM_WIDTH) - 1,
 			};

 			/* analogous to 'Register_set::Register::Register_base' */