extmod/moductypes: Convert pointers as unsigned integers.

projectgus · projectgus · commit 140c2c922ff0 · 2024-12-11T16:10:09.000+11:00
This fixes a test failure that only occurred on the qemu VIRT_RV32 board,
where RAM address range has the high bit set. Pointer addresses were being
return as negative small ints, which meant tobytes() now fails to convert
them.

Such a pointer needs to be represented as a long integer, instead.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton &lt;angus@redyak.com.au&gt;
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
@@ -602,7 +602,7 @@ static mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                 uint agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
                 if (agg_type == PTR) {
                     byte *p = *(void **)self->addr;
-                    return mp_obj_new_int((mp_int_t)(uintptr_t)p);
+                    return mp_obj_new_int_from_uint((uintptr_t)p);
                 }
             }
             MP_FALLTHROUGH
@@ -629,7 +629,7 @@ static mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
 static mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
-    return mp_obj_new_int((mp_int_t)(uintptr_t)bufinfo.buf);
+    return mp_obj_new_int_from_uint((uintptr_t)bufinfo.buf);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof);
 

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ static mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {`
`602`	`602`	`uint agg_type = GET_TYPE(offset, AGG_TYPE_BITS);`
`603`	`603`	`if (agg_type == PTR) {`
`604`	`604`	`byte p = (void **)self->addr;`
`605`		`- return mp_obj_new_int((mp_int_t)(uintptr_t)p);`
	`605`	`+ return mp_obj_new_int_from_uint((uintptr_t)p);`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`	`MP_FALLTHROUGH`
`@@ -629,7 +629,7 @@ static mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,`
`629`	`629`	`static mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {`
`630`	`630`	`mp_buffer_info_t bufinfo;`
`631`	`631`	`mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);`
`632`		`- return mp_obj_new_int((mp_int_t)(uintptr_t)bufinfo.buf);`
	`632`	`+ return mp_obj_new_int_from_uint((uintptr_t)bufinfo.buf);`
`633`	`633`	`}`
`634`	`634`	`MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof);`
`635`	`635`