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/runtime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'py/runtime.h') diff --git a/py/runtime.h b/py/runtime.h index 144961966..10b133ebd 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -140,8 +140,8 @@ mp_obj_t mp_convert_native_to_obj(mp_uint_t val, mp_uint_t type); mp_obj_t mp_native_call_function_n_kw(mp_obj_t fun_in, mp_uint_t n_args_kw, const mp_obj_t *args); void mp_native_raise(mp_obj_t o); -#define mp_sys_path ((mp_obj_t)&MP_STATE_VM(mp_sys_path_obj)) -#define mp_sys_argv ((mp_obj_t)&MP_STATE_VM(mp_sys_argv_obj)) +#define mp_sys_path (MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_sys_path_obj))) +#define mp_sys_argv (MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_sys_argv_obj))) #if MICROPY_WARNINGS void mp_warning(const char *msg, ...); -- cgit v1.2.3