py: Use MP_SMALL_INT_POSITIVE_MASK to check if uint fits in a small int.

dpgeorge · dpgeorge · commit 9ae51257bd40 · 2016-03-10T21:52:56.000Z
Using the original WORD_MSBIT_HIGH-logic resulted in errors when the
object model is not REPR_A or REPR_C.
diff --git a/py/objint.c b/py/objint.c
@@ -311,9 +311,9 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
 }
 
 mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
-    // SMALL_INT accepts only signed numbers, of one bit less size
-    // then word size, which totals 2 bits less for unsigned numbers.
-    if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) {
+    // SMALL_INT accepts only signed numbers, so make sure the input
+    // value fits completely in the small-int positive range.
+    if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {
         return MP_OBJ_NEW_SMALL_INT(value);
     }
     nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "small int overflow"));
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
@@ -223,9 +223,9 @@ mp_obj_t mp_obj_new_int(mp_int_t value) {
 }
 
 mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
-    // SMALL_INT accepts only signed numbers, of one bit less size
-    // than word size, which totals 2 bits less for unsigned numbers.
-    if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) {
+    // SMALL_INT accepts only signed numbers, so make sure the input
+    // value fits completely in the small-int positive range.
+    if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {
         return MP_OBJ_NEW_SMALL_INT(value);
     }
     return mp_obj_new_int_from_ll(value);
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
@@ -357,9 +357,9 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
 }
 
 mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
-    // SMALL_INT accepts only signed numbers, of one bit less size
-    // than word size, which totals 2 bits less for unsigned numbers.
-    if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) {
+    // SMALL_INT accepts only signed numbers, so make sure the input
+    // value fits completely in the small-int positive range.
+    if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {
         return MP_OBJ_NEW_SMALL_INT(value);
     }
     return mp_obj_new_int_from_ull(value);

Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,9 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {`
`314`		`- // SMALL_INT accepts only signed numbers, of one bit less size`
`315`		`- // then word size, which totals 2 bits less for unsigned numbers.`
`316`		`- if ((value & (WORD_MSBIT_HIGH \| (WORD_MSBIT_HIGH >> 1))) == 0) {`
	`314`	`+ // SMALL_INT accepts only signed numbers, so make sure the input`
	`315`	`+ // value fits completely in the small-int positive range.`
	`316`	`+ if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {`
`317`	`317`	`return MP_OBJ_NEW_SMALL_INT(value);`
`318`	`318`	`}`
`319`	`319`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OverflowError, "small int overflow"));`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,9 @@ mp_obj_t mp_obj_new_int(mp_int_t value) {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {`
`226`		`- // SMALL_INT accepts only signed numbers, of one bit less size`
`227`		`- // than word size, which totals 2 bits less for unsigned numbers.`
`228`		`- if ((value & (WORD_MSBIT_HIGH \| (WORD_MSBIT_HIGH >> 1))) == 0) {`
	`226`	`+ // SMALL_INT accepts only signed numbers, so make sure the input`
	`227`	`+ // value fits completely in the small-int positive range.`
	`228`	`+ if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {`
`229`	`229`	`return MP_OBJ_NEW_SMALL_INT(value);`
`230`	`230`	`}`
`231`	`231`	`return mp_obj_new_int_from_ll(value);`
Original file line number	Diff line number	Diff line change
`@@ -357,9 +357,9 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {`
`360`		`- // SMALL_INT accepts only signed numbers, of one bit less size`
`361`		`- // than word size, which totals 2 bits less for unsigned numbers.`
`362`		`- if ((value & (WORD_MSBIT_HIGH \| (WORD_MSBIT_HIGH >> 1))) == 0) {`
	`360`	`+ // SMALL_INT accepts only signed numbers, so make sure the input`
	`361`	`+ // value fits completely in the small-int positive range.`
	`362`	`+ if ((value & ~MP_SMALL_INT_POSITIVE_MASK) == 0) {`
`363`	`363`	`return MP_OBJ_NEW_SMALL_INT(value);`
`364`	`364`	`}`
`365`	`365`	`return mp_obj_new_int_from_ull(value);`