OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for macros used for bit masks creation. 

Bit mask setting macros for for specific parameters were expanded
in a way that was causing unexpected compiler behaviour. Specifically:
literal 1 was treated as 32bit integer ((1 << ((b_hi)-(b_lo) + 1)) -1)
was expanded to shift the 32bit integer by 32. ((1 << (31 - 0 + 1)) -1)
Macro MASK() was was missing left shift.

Signed-off-by: Lech Betlej <lech.betlej@linux.intel.com>
This commit is contained in:
Lech Betlej 2018-11-21 19:23:55 +01:00
parent 43081afa6d
commit 0cc0ab6061
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/sof/bit.h
View File

@ -32,9 +32,10 @@
#define __INCLUDE_BIT__
#define BIT(b) (1 << (b))
#define MASK(b_hi, b_lo) ((1 << ((b_hi) - (b_lo) + 1)) - 1)
#define MASK(b_hi, b_lo) \
(((1ULL << ((b_hi) - (b_lo) + 1ULL)) - 1ULL) << (b_lo))
#define SET_BIT(b, x) (((x) & 1) << (b))
#define SET_BITS(b_hi, b_lo, x) \
(((x) & ((1 << ((b_hi) - (b_lo) + 1)) - 1)) << (b_lo))
(((x) & ((1ULL << ((b_hi) - (b_lo) + 1ULL)) - 1ULL)) << (b_lo))
#endif