Fix log2 and alignment calculation - 64bit issue

This commit is contained in:
Alexander Boettcher 2012-09-21 09:34:31 +02:00 committed by Norman Feske
parent 55a8bae2f8
commit 9eeec09ebe

View File

@ -31,15 +31,15 @@ namespace Genode {
*/ */
template <typename T> template <typename T>
static inline T _align_mask(T align) { static inline T _align_mask(T align) {
return ~((1 << align) - 1); } return ~(((T)1 << align) - 1); }
template <typename T> template <typename T>
static inline T _align_offset(T align) { static inline T _align_offset(T align) {
return (1 << align) - 1; } return ((T)1 << align) - 1; }
template <typename T> template <typename T>
static inline T align_addr(T addr, int align) { static inline T align_addr(T addr, int align) {
return (addr + _align_offset(align)) & _align_mask(align); } return (addr + _align_offset(align)) & _align_mask((T)align); }
/** /**
@ -52,7 +52,7 @@ namespace Genode {
{ {
if (!value) return -1; if (!value) return -1;
for (int i = 8 * sizeof(value) - 1; i >= 0; --i) for (int i = 8 * sizeof(value) - 1; i >= 0; --i)
if ((1 << i) & value) return i; if (((T)1 << i) & value) return i;
return -1; return -1;
} }