py/objint: Fix classification of float so it works for OBJ_REPR_D.

dpgeorge · dpgeorge · commit da3dffa79dda · 2016-01-08T17:57:30.000Z
diff --git a/py/objint.c b/py/objint.c
@@ -107,7 +107,9 @@ mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
     } else {
         e &= ~((1 << MP_FLOAT_EXP_SHIFT_I32) - 1);
     }
-    if (e <= ((BITS_PER_WORD + MP_FLOAT_EXP_BIAS - 3) << MP_FLOAT_EXP_SHIFT_I32)) {
+    // 8 * sizeof(uintptr_t) counts the number of bits for a small int
+    // TODO provide a way to configure this properly
+    if (e <= ((8 * sizeof(uintptr_t) + MP_FLOAT_EXP_BIAS - 3) << MP_FLOAT_EXP_SHIFT_I32)) {
         return MP_FP_CLASS_FIT_SMALLINT;
     }
 #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {`
`107`	`107`	`} else {`
`108`	`108`	`e &= ~((1 << MP_FLOAT_EXP_SHIFT_I32) - 1);`
`109`	`109`	`}`
`110`		`- if (e <= ((BITS_PER_WORD + MP_FLOAT_EXP_BIAS - 3) << MP_FLOAT_EXP_SHIFT_I32)) {`
	`110`	`+ // 8 * sizeof(uintptr_t) counts the number of bits for a small int`
	`111`	`+ // TODO provide a way to configure this properly`
	`112`	`+ if (e <= ((8 * sizeof(uintptr_t) + MP_FLOAT_EXP_BIAS - 3) << MP_FLOAT_EXP_SHIFT_I32)) {`
`111`	`113`	`return MP_FP_CLASS_FIT_SMALLINT;`
`112`	`114`	`}`
`113`	`115`	`#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG`