Merge branch 'bugfix/cast_int_to_size_t_in_cpu_ll' into 'master'

igrr · igrr · commit 58e1100473b1 · 2020-06-08T15:40:42.000+08:00
soc: cast int to size_t in cpu_ll

Closes IDFGH-3352

See merge request espressif/esp-idf!9077
diff --git a/components/soc/src/esp32/include/hal/cpu_ll.h b/components/soc/src/esp32/include/hal/cpu_ll.h
@@ -116,7 +116,7 @@ static inline void cpu_ll_set_watchpoint(int id,
 
     //We support watching 2^n byte values, from 1 to 64. Calculate the mask for that.
     for (int x = 0; x < 7; x++) {
-        if (size == (1 << x)) {
+        if (size == (size_t)(1 << x)) {
             break;
         }
         dbreakc <<= 1;
diff --git a/components/soc/src/esp32s2/include/hal/cpu_ll.h b/components/soc/src/esp32s2/include/hal/cpu_ll.h
@@ -110,7 +110,7 @@ static inline void cpu_ll_set_watchpoint(int id,
 
     //We support watching 2^n byte values, from 1 to 64. Calculate the mask for that.
     for (int x = 0; x < 7; x++) {
-        if (size == (1 << x)) {
+        if (size == (size_t)(1 << x)) {
             break;
         }
         dbreakc <<= 1;

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ static inline void cpu_ll_set_watchpoint(int id,`
`116`	`116`
`117`	`117`	`//We support watching 2^n byte values, from 1 to 64. Calculate the mask for that.`
`118`	`118`	`for (int x = 0; x < 7; x++) {`
`119`		`- if (size == (1 << x)) {`
	`119`	`+ if (size == (size_t)(1 << x)) {`
`120`	`120`	`break;`
`121`	`121`	`}`
`122`	`122`	`dbreakc <<= 1;`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ static inline void cpu_ll_set_watchpoint(int id,`
`110`	`110`
`111`	`111`	`//We support watching 2^n byte values, from 1 to 64. Calculate the mask for that.`
`112`	`112`	`for (int x = 0; x < 7; x++) {`
`113`		`- if (size == (1 << x)) {`
	`113`	`+ if (size == (size_t)(1 << x)) {`
`114`	`114`	`break;`
`115`	`115`	`}`
`116`	`116`	`dbreakc <<= 1;`