From 166bb40fb22b9c43209ce9792b6a8d48276ef7fa Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 18 Jan 2014 12:46:43 +0200 Subject: [PATCH 1/2] Add OverflowError and use it for small int overflow instead of assert. --- py/mpqstrraw.h | 1 + py/objint.c | 8 +++----- py/runtime.c | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/py/mpqstrraw.h b/py/mpqstrraw.h index 6674a2c398..328cb73fac 100644 --- a/py/mpqstrraw.h +++ b/py/mpqstrraw.h @@ -32,6 +32,7 @@ Q(OSError) Q(SyntaxError) Q(TypeError) Q(ValueError) +Q(OverflowError) Q(abs) Q(all) diff --git a/py/objint.c b/py/objint.c index 937bff7ae3..59181eaf6d 100644 --- a/py/objint.c +++ b/py/objint.c @@ -56,7 +56,7 @@ mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { // This is called only with strings whose value doesn't fit in SMALL_INT mp_obj_t mp_obj_new_int_from_long_str(const char *s) { - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "long int not supported in this build")); return mp_const_none; } @@ -66,8 +66,7 @@ mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) { if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) { return MP_OBJ_NEW_SMALL_INT(value); } - // TODO: Raise exception - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "small int overflow")); return mp_const_none; } @@ -75,8 +74,7 @@ mp_obj_t mp_obj_new_int(machine_int_t value) { if (MP_OBJ_FITS_SMALL_INT(value)) { return MP_OBJ_NEW_SMALL_INT(value); } - // TODO: Raise exception - assert(0); + nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "small int overflow")); return mp_const_none; } #endif diff --git a/py/runtime.c b/py/runtime.c index d6ef6f9be2..0d1381cff8 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -89,6 +89,9 @@ void rt_init(void) { mp_map_add_qstr(&map_builtins, MP_QSTR_TypeError, mp_obj_new_exception(MP_QSTR_TypeError)); mp_map_add_qstr(&map_builtins, MP_QSTR_SyntaxError, mp_obj_new_exception(MP_QSTR_SyntaxError)); mp_map_add_qstr(&map_builtins, MP_QSTR_ValueError, mp_obj_new_exception(MP_QSTR_ValueError)); + // Somehow CPython managed to have OverflowError not inherit from ValueError ;-/ + // TODO: For MICROPY_CPYTHON_COMPAT==0 use ValueError to avoid exc proliferation + mp_map_add_qstr(&map_builtins, MP_QSTR_OverflowError, mp_obj_new_exception(MP_QSTR_OverflowError)); mp_map_add_qstr(&map_builtins, MP_QSTR_OSError, mp_obj_new_exception(MP_QSTR_OSError)); mp_map_add_qstr(&map_builtins, MP_QSTR_AssertionError, mp_obj_new_exception(MP_QSTR_AssertionError)); From d26b379eec155ddd7a4aa64057c3d0507eee79f5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 18 Jan 2014 16:07:16 +0200 Subject: [PATCH 2/2] int: Add value accessors: mp_obj_int_get() & mp_obj_int_get_checked(). mp_obj_int_get() can be used when just full resolution of C machine_int_t is required (returns truncated value of long int). mp_obj_int_get_checked() will throw exception if Python int value not representable in machine_int_t. --- py/obj.c | 2 ++ py/obj.h | 4 ++++ py/objint.c | 9 +++++++++ py/objint_longlong.c | 10 +++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/py/obj.c b/py/obj.c index 9ca3d5d16b..4fe287d992 100644 --- a/py/obj.c +++ b/py/obj.c @@ -155,6 +155,8 @@ machine_int_t mp_obj_get_int(mp_obj_t arg) { return 1; } else if (MP_OBJ_IS_SMALL_INT(arg)) { return MP_OBJ_SMALL_INT_VALUE(arg); + } else if (MP_OBJ_IS_TYPE(arg, &int_type)) { + return mp_obj_int_get_checked(arg); #if MICROPY_ENABLE_FLOAT } else if (MP_OBJ_IS_TYPE(arg, &float_type)) { // TODO work out if this should be floor, ceil or trunc diff --git a/py/obj.h b/py/obj.h index 99d430f490..4984548de4 100644 --- a/py/obj.h +++ b/py/obj.h @@ -265,6 +265,10 @@ void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj); // int extern const mp_obj_type_t int_type; +// For long int, returns value truncated to machine_int_t +machine_int_t mp_obj_int_get(mp_obj_t self_in); +// Will rains exception if value doesn't fit into machine_int_t +machine_int_t mp_obj_int_get_checked(mp_obj_t self_in); // exception extern const mp_obj_type_t exception_type; diff --git a/py/objint.c b/py/objint.c index 59181eaf6d..905944d372 100644 --- a/py/objint.c +++ b/py/objint.c @@ -77,4 +77,13 @@ mp_obj_t mp_obj_new_int(machine_int_t value) { nlr_jump(mp_obj_new_exception_msg(MP_QSTR_OverflowError, "small int overflow")); return mp_const_none; } + +machine_int_t mp_obj_int_get(mp_obj_t self_in) { + return MP_OBJ_SMALL_INT_VALUE(self_in); +} + +machine_int_t mp_obj_int_get_checked(mp_obj_t self_in) { + return MP_OBJ_SMALL_INT_VALUE(self_in); +} + #endif diff --git a/py/objint_longlong.c b/py/objint_longlong.c index c940ce1ac3..24d693761e 100644 --- a/py/objint_longlong.c +++ b/py/objint_longlong.c @@ -120,9 +120,17 @@ mp_obj_t mp_obj_new_int_from_long_str(const char *s) { return o; } -machine_int_t mp_obj_int_get_int(mp_obj_t self_in) { +machine_int_t mp_obj_int_get(mp_obj_t self_in) { + if (MP_OBJ_IS_SMALL_INT(self_in)) { + return MP_OBJ_SMALL_INT_VALUE(self_in); + } mp_obj_int_t *self = self_in; return self->val; } +machine_int_t mp_obj_int_get_checked(mp_obj_t self_in) { + // TODO: Check overflow + return mp_obj_int_get(self_in); +} + #endif