Fix set_bits

kwolekr · kwolekr · commit 699e066beab9 · 2015-03-31T23:30:44.000-04:00
diff --git a/src/util/numeric.h b/src/util/numeric.h
@@ -258,7 +258,7 @@ inline u32 get_bits(u32 x, u32 pos, u32 len)
 inline void set_bits(u32 *x, u32 pos, u32 len, u32 val)
 {
 	u32 mask = (1 << len) - 1;
-	*x &= ~(mask << len);
+	*x &= ~(mask << pos);
 	*x |= (val & mask) << pos;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ inline u32 get_bits(u32 x, u32 pos, u32 len)`
`258`	`258`	`inline void set_bits(u32 *x, u32 pos, u32 len, u32 val)`Has a conversation. Original line has a conversation.
`259`	`259`	`{`
`260`	`260`	`u32 mask = (1 << len) - 1;`
`261`		`- *x &= ~(mask << len);`
	`261`	`+ *x &= ~(mask << pos);`
`262`	`262`	`*x \|= (val & mask) << pos;`
`263`	`263`	`}`
`264`	`264`