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.

1 files changed, 4 insertions, 4 deletions

diff --git a/py/objcell.c b/py/objcell.c
index 97f1ecd63c..06a88b9547 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -32,19 +32,19 @@ typedef struct _mp_obj_cell_t {
 } mp_obj_cell_t;
 
 mp_obj_t mp_obj_cell_get(mp_obj_t self_in) {
-    mp_obj_cell_t *self = self_in;
+    mp_obj_cell_t *self = MP_OBJ_TO_PTR(self_in);
     return self->obj;
 }
 
 void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj) {
-    mp_obj_cell_t *self = self_in;
+    mp_obj_cell_t *self = MP_OBJ_TO_PTR(self_in);
     self->obj = obj;
 }
 
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
 STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
-    mp_obj_cell_t *o = o_in;
+    mp_obj_cell_t *o = MP_OBJ_TO_PTR(o_in);
     mp_printf(print, "<cell %p ", o->obj);
     if (o->obj == MP_OBJ_NULL) {
         mp_print_str(print, "(nil)");
@@ -67,5 +67,5 @@ mp_obj_t mp_obj_new_cell(mp_obj_t obj) {
     mp_obj_cell_t *o = m_new_obj(mp_obj_cell_t);
     o->base.type = &mp_type_cell;
     o->obj = obj;
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 }