Mask #width bits in value to write in setBits

kostorr · kostorr · commit 140794ccc4d3 · 2018-12-20T09:57:36.000+01:00
diff --git a/src/Utilities/Util.h b/src/Utilities/Util.h
@@ -51,7 +51,7 @@ template <typename T>
 void setBits(T& bits, int index, int width, uint32_t value)
 {
   uint32_t mask = ~(~T(0)<<width) << index;
-  bits = (bits & ~mask) | (value << index);
+  bits = (bits & ~mask) | ((value << index) & mask);
 }
 
 template <typename T>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ template <typename T>`
`51`	`51`	`void setBits(T& bits, int index, int width, uint32_t value)`
`52`	`52`	`{`
`53`	`53`	`uint32_t mask = ~(~T(0)<<width) << index;`
`54`		`- bits = (bits & ~mask) \| (value << index);`
	`54`	`+ bits = (bits & ~mask) \| ((value << index) & mask);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`template <typename T>`