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/nlr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'py/nlr.h') diff --git a/py/nlr.h b/py/nlr.h index 16cab1c66..aacac6a59 100644 --- a/py/nlr.h +++ b/py/nlr.h @@ -39,7 +39,7 @@ typedef struct _nlr_buf_t nlr_buf_t; struct _nlr_buf_t { // the entries here must all be machine word size nlr_buf_t *prev; - void *ret_val; + void *ret_val; // always a concrete object (an exception instance) #if !defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP #if defined(__i386__) void *regs[6]; @@ -86,16 +86,16 @@ void nlr_jump_fail(void *val); // use nlr_raise instead of nlr_jump so that debugging is easier #ifndef DEBUG -#define nlr_raise(val) nlr_jump(val) +#define nlr_raise(val) nlr_jump(MP_OBJ_TO_PTR(val)) #else #include "mpstate.h" #define nlr_raise(val) \ do { \ /*printf("nlr_raise: nlr_top=%p\n", MP_STATE_VM(nlr_top)); \ fflush(stdout);*/ \ - void *_val = val; \ + void *_val = MP_OBJ_TO_PTR(val); \ assert(_val != NULL); \ - assert(mp_obj_is_exception_instance(_val)); \ + assert(mp_obj_is_exception_instance(val)); \ nlr_jump(_val); \ } while (0) -- cgit v1.2.3