diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-09-06 19:17:23 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-09-06 20:22:06 +0300 |
| commit | 722e562736f83865333d8b3dd942f903b9db8a7c (patch) | |
| tree | 5aa17b165bd8393e5add7f6150c9ef09d984c88c | |
| parent | 17598d49e1091e2745d8f01288f95007189cdcf5 (diff) | |
| download | micropython-722e562736f83865333d8b3dd942f903b9db8a7c.tar.gz micropython-722e562736f83865333d8b3dd942f903b9db8a7c.zip | |
py: Correctly set sys.maxsize value for 64-bit.
Type representing signed size doesn't have to be int, so use special value
which defaults to SSIZE_MAX, but as it's not defined by C standard (but rather
by POSIX), allow ports to set it.
| -rw-r--r-- | py/mpconfig.h | 4 | ||||
| -rw-r--r-- | py/objint_longlong.c | 2 | ||||
| -rw-r--r-- | py/objint_mpz.c | 16 |
3 files changed, 13 insertions, 9 deletions
diff --git a/py/mpconfig.h b/py/mpconfig.h index 78c288d7c3..633a4a52dd 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -448,6 +448,10 @@ typedef double mp_float_t; #define MP_PLAT_FREE_EXEC(ptr, size) m_del(byte, ptr, size) #endif +#ifndef MP_SSIZE_MAX +#define MP_SSIZE_MAX SSIZE_MAX +#endif + // printf format spec to use for mp_int_t and friends #ifndef INT_FMT #ifdef __LP64__ diff --git a/py/objint_longlong.c b/py/objint_longlong.c index c4c16139fd..43bdcabdce 100644 --- a/py/objint_longlong.c +++ b/py/objint_longlong.c @@ -52,7 +52,7 @@ #if MICROPY_PY_SYS_MAXSIZE // Export value for sys.maxsize -const mp_obj_int_t mp_maxsize_obj = {{&mp_type_int}, INT_MAX}; +const mp_obj_int_t mp_maxsize_obj = {{&mp_type_int}, MP_SSIZE_MAX}; #endif mp_int_t mp_obj_int_hash(mp_obj_t self_in) { diff --git a/py/objint_mpz.c b/py/objint_mpz.c index 20fba00bf7..440b4f3187 100644 --- a/py/objint_mpz.c +++ b/py/objint_mpz.c @@ -47,14 +47,14 @@ // Export value for sys.maxsize #define DIG_MASK ((1L << MPZ_DIG_SIZE) - 1) STATIC const mpz_dig_t maxsize_dig[MPZ_NUM_DIG_FOR_INT] = { - (INT_MAX >> MPZ_DIG_SIZE * 0) & DIG_MASK, - #if (INT_MAX >> MPZ_DIG_SIZE * 0) > DIG_MASK - (INT_MAX >> MPZ_DIG_SIZE * 1) & DIG_MASK, - #if (INT_MAX >> MPZ_DIG_SIZE * 1) > DIG_MASK - (INT_MAX >> MPZ_DIG_SIZE * 2) & DIG_MASK, - (INT_MAX >> MPZ_DIG_SIZE * 3) & DIG_MASK, - (INT_MAX >> MPZ_DIG_SIZE * 4) & DIG_MASK, -// (INT_MAX >> MPZ_DIG_SIZE * 5) & DIG_MASK, + (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 0) & DIG_MASK, + #if (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 0) > DIG_MASK + (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 1) & DIG_MASK, + #if (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 1) > DIG_MASK + (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 2) & DIG_MASK, + (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 3) & DIG_MASK, + (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 4) & DIG_MASK, +// (MP_SSIZE_MAX >> MPZ_DIG_SIZE * 5) & DIG_MASK, #endif #endif }; |