From 999cedb90ff0827cdb9dfe0e4faa6ebc1739d271 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 27 Nov 2015 17:01:44 +0000 Subject: py: Wrap all obj-ptr conversions in MP_OBJ_TO_PTR/MP_OBJ_FROM_PTR. This allows the mp_obj_t type to be configured to something other than a pointer-sized primitive type. This patch also includes additional changes to allow the code to compile when sizeof(mp_uint_t) != sizeof(void*), such as using size_t instead of mp_uint_t, and various casts. --- py/obj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'py/obj.c') diff --git a/py/obj.c b/py/obj.c index 42bf0c500..baac1f568 100644 --- a/py/obj.c +++ b/py/obj.c @@ -41,16 +41,16 @@ mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) { if (MP_OBJ_IS_SMALL_INT(o_in)) { - return (mp_obj_t)&mp_type_int; + return (mp_obj_type_t*)&mp_type_int; } else if (MP_OBJ_IS_QSTR(o_in)) { - return (mp_obj_t)&mp_type_str; + return (mp_obj_type_t*)&mp_type_str; #if MICROPY_PY_BUILTINS_FLOAT } else if (mp_obj_is_float(o_in)) { - return (mp_obj_t)&mp_type_float; + return (mp_obj_type_t*)&mp_type_float; #endif } else { - const mp_obj_base_t *o = o_in; - return (mp_obj_t)o->type; + const mp_obj_base_t *o = MP_OBJ_TO_PTR(o_in); + return (mp_obj_type_t*)o->type; } } @@ -62,7 +62,7 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t // There can be data structures nested too deep, or just recursive MP_STACK_CHECK(); #ifndef NDEBUG - if (o_in == NULL) { + if (o_in == MP_OBJ_NULL) { mp_print_str(print, "(nil)"); return; } -- cgit v1.2.3