10000 expose more types from obj.h to native modules by jeremyherbert · Pull Request #5643 · micropython/micropython · GitHub
[go: up one dir, main page]
Skip to content

expose more types from obj.h to native modules #5643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

expose more types from obj.h to native modules #5643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions py/dynruntime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,15 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
#define MP_OBJ_NEW_QSTR(x) MP_OBJ_NEW_QSTR_ ## x

#define mp_type_type (*mp_fun_table.type_type)
#define mp_type_NoneType (*mp_fun_table.type_NoneType)
#define mp_type_bool (*mp_fun_table.type_bool)
#define mp_type_int (*mp_fun_table.type_int)
#define mp_type_str (*mp_fun_table.type_str)
#define mp_type_bytes (*mp_fun_table.type_bytes)
#define mp_type_float (*mp_fun_table.type_float)
#define mp_type_tuple (*mp_fun_table.type_tuple)
#define mp_type_list (*mp_fun_table.type_list)
#define mp_type_dict (*mp_fun_table.type_dict)
#define mp_type_EOFError (*(mp_obj_type_t*)(mp_load_global(MP_QSTR_EOFError)))
#define mp_type_IndexError (*(mp_obj_type_t*)(mp_load_global(MP_QSTR_IndexError)))
#define mp_type_KeyError (*(mp_obj_type_t*)(mp_load_global(MP_QSTR_KeyError)))
Expand Down Expand Up @@ -104,18 +111,22 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
#define mp_obj_new_bytearray_by_ref(n, i) (mp_fun_table.obj_new_bytearray_by_ref((n), (i)))
#define mp_obj_new_tuple(n, items) (mp_fun_table.new_tuple((n), (items)))
#define mp_obj_new_list(n, items) (mp_fun_table.new_list((n), (items)))
#define mp_obj_new_dict(n) (mp_fun_table.new_dict((n)))

#define mp_obj_get_type(o) (mp_fun_table.obj_get_type((o)))
#define mp_obj_get_int(o) (mp_fun_table.native_from_obj(o, MP_NATIVE_TYPE_INT))
#define mp_obj_get_int_truncated(o) (mp_fun_table.native_from_obj(o, MP_NATIVE_TYPE_UINT))
#define mp_obj_str_get_str(s) ((void*)mp_fun_table.native_from_obj(s, MP_NATIVE_TYPE_PTR))
#define mp_obj_bytes_get_bytes(s) ((void*)mp_fun_table.native_from_obj(s, MP_NATIVE_TYPE_PTR))

#define mp_obj_str_get_data(o, len) (mp_obj_str_get_data_dyn((o), (len)))
#define mp_get_buffer_raise(o, bufinfo, fl) (mp_fun_table.get_buffer_raise((o), (bufinfo), (fl)))
#define mp_get_stream_raise(s, flags) (mp_fun_table.get_stream_raise((s), (flags)))

#define mp_obj_len(o) (mp_obj_len_dyn(o))
#define mp_obj_subscr(base, index, val) (mp_fun_table.obj_subscr((base), (index), (val)))
#define mp_obj_list_append(list, item) (mp_fun_table.list_append((list), (item)))
#define mp_obj_dict_store(dict, key, val) (mp_fun_table.dict_store(dict, key, val))

static inline mp_obj_t mp_obj_new_str_of_type_dyn(const mp_obj_type_t *type, const byte* data, size_t len) {
if (type == &mp_type_str) {
Expand Down
6 changes: 6 additions & 0 deletions py/nativeglue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,13 @@ const mp_fun_table_t mp_fun_table = {
mp_get_stream_raise,
&mp_plat_print,
&mp_type_type,
&mp_type_NoneType,
&mp_type_bool,
&mp_type_int,
&mp_type_str,
&mp_type_bytes,
&mp_type_float,
&mp_type_tuple,
&mp_type_list,
&mp_type_dict,
&mp_type_fun_builtin_0,
Expand Down
8 changes: 8 additions & 0 deletions py/nativeglue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,23 @@ typedef struct _mp_fun_table_t {
void (*get_buffer_raise)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
const mp_print_t *plat_print;

const mp_obj_type_t *type_type;
const mp_obj_type_t *type_NoneType;
const mp_obj_type_t *type_bool;
const mp_obj_type_t *type_int;
const mp_obj_type_t *type_str;
const mp_obj_type_t *type_bytes;
const mp_obj_type_t *type_float;
const mp_obj_type_t *type_tuple;
const mp_obj_type_t *type_list;
const mp_obj_type_t *type_dict;
const mp_obj_type_t *type_fun_builtin_0;
const mp_obj_type_t *type_fun_builtin_1;
const mp_obj_type_t *type_fun_builtin_2;
const mp_obj_type_t *type_fun_builtin_3;
const mp_obj_type_t *type_fun_builtin_var;

const mp_obj_fun_builtin_var_t *stream_read_obj;
const mp_obj_fun_builtin_var_t *stream_readinto_obj;
const mp_obj_fun_builtin_var_t *stream_unbuffered_readline_obj;
Expand Down
6 changes: 6 additions & 0 deletions tools/mpy_ld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,13 @@ def link_objects(env, native_qstr_vals_len, native_qstr_objs_len):
fun_table = {key: 67 + idx
for idx, key in enumerate([
'mp_type_type',
'mp_type_NoneType',
'mp_type_bool',
'mp_type_int',
'mp_type_str',
'mp_type_bytes',
'mp_type_float',
'mp_type_tuple',
'mp_type_list',
'mp_type_dict',
'mp_type_fun_builtin_0',
Expand Down
0