djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/obj: Remove mp_generic_unary_op(). 

Since converting to variable sized slots in mp_obj_type_t, we can now
reduce the code size a bit by removing mp_generic_unary_op() and the
corresponding slots where it is used. Instead we just implement the
generic `__hash__` operation in the runtime.

Signed-off-by: David Lechner <david@pybricks.com>
This commit is contained in:
David Lechner 2022-12-27 16:30:05 -06:00 committed by Damien George
parent 53cb073571
commit eaccaa3677
9 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/obj.c
View File

@ -594,12 +594,3 @@ void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flag
mp_raise_TypeError(MP_ERROR_TEXT("object with buffer protocol required")); mp_raise_TypeError(MP_ERROR_TEXT("object with buffer protocol required"));
} }
} }
mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
switch (op) {
case MP_UNARY_OP_HASH:
return MP_OBJ_NEW_SMALL_INT((mp_uint_t)o_in);
default:
return MP_OBJ_NULL; // op not supported
}
}

1
py/obj.h
View File

@ -1016,7 +1016,6 @@ mp_obj_t mp_obj_id(mp_obj_t o_in);
mp_obj_t mp_obj_len(mp_obj_t o_in); mp_obj_t mp_obj_len(mp_obj_t o_in);
mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); // may return MP_OBJ_NULL mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); // may return MP_OBJ_NULL
mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val); mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val);
mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in);
// cell // cell

24
py/objfun.c
View File

@ -58,8 +58,7 @@ STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_builtin_0, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, mp_type_fun_builtin_0, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
call, fun_builtin_0_call, call, fun_builtin_0_call
unary_op, mp_generic_unary_op
); );
STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@ -71,8 +70,7 @@ STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_builtin_1, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, mp_type_fun_builtin_1, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
call, fun_builtin_1_call, call, fun_builtin_1_call
unary_op, mp_generic_unary_op
); );
STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@ -84,8 +82,7 @@ STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_builtin_2, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, mp_type_fun_builtin_2, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
call, fun_builtin_2_call, call, fun_builtin_2_call
unary_op, mp_generic_unary_op
); );
STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@ -97,8 +94,7 @@ STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_builtin_3, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, mp_type_fun_builtin_3, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
call, fun_builtin_3_call, call, fun_builtin_3_call
unary_op, mp_generic_unary_op
); );
STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@ -126,8 +122,7 @@ STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_builtin_var, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, mp_type_fun_builtin_var, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
call, fun_builtin_var_call, call, fun_builtin_var_call
unary_op, mp_generic_unary_op
); );
/******************************************************************************/ /******************************************************************************/
@ -370,8 +365,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
MP_TYPE_FLAG_BINDS_SELF, MP_TYPE_FLAG_BINDS_SELF,
FUN_BC_TYPE_PRINT FUN_BC_TYPE_PRINT
FUN_BC_TYPE_ATTR FUN_BC_TYPE_ATTR
call, fun_bc_call, call, fun_bc_call
unary_op, mp_generic_unary_op
); );
mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *context, struct _mp_raw_code_t *const *child_table) { mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *context, struct _mp_raw_code_t *const *child_table) {
@ -432,8 +426,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
MP_TYPE_FLAG_BINDS_SELF, MP_TYPE_FLAG_BINDS_SELF,
FUN_BC_TYPE_PRINT FUN_BC_TYPE_PRINT
FUN_BC_TYPE_ATTR FUN_BC_TYPE_ATTR
call, fun_native_call, call, fun_native_call
unary_op, mp_generic_unary_op
); );
mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *mc, struct _mp_raw_code_t *const *child_table) { mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *mc, struct _mp_raw_code_t *const *child_table) {
@ -540,8 +533,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
mp_type_fun_asm, mp_type_fun_asm,
MP_QSTR_function, MP_QSTR_function,
MP_TYPE_FLAG_BINDS_SELF, MP_TYPE_FLAG_BINDS_SELF,
call, fun_asm_call, call, fun_asm_call
unary_op, mp_generic_unary_op
); );
mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig) { mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig) {

9
py/objgenerator.c
View File

@ -81,8 +81,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
MP_QSTR_generator, MP_QSTR_generator,
MP_TYPE_FLAG_BINDS_SELF, MP_TYPE_FLAG_BINDS_SELF,
GEN_WRAP_TYPE_ATTR GEN_WRAP_TYPE_ATTR
call, gen_wrap_call, call, gen_wrap_call
unary_op, mp_generic_unary_op
); );
/******************************************************************************/ /******************************************************************************/
@ -136,7 +135,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
} }
#if MICROPY_PY_FUNCTION_ATTRS #if MICROPY_PY_FUNCTION_ATTRS
#define NATIVE_GEN_WRAP_TYPE_ATTR attr, mp_obj_fun_bc_attr, #define NATIVE_GEN_WRAP_TYPE_ATTR , attr, mp_obj_fun_bc_attr
#else #else
#define NATIVE_GEN_WRAP_TYPE_ATTR #define NATIVE_GEN_WRAP_TYPE_ATTR
#endif #endif
@ -145,9 +144,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
mp_type_native_gen_wrap, mp_type_native_gen_wrap,
MP_QSTR_generator, MP_QSTR_generator,
MP_TYPE_FLAG_BINDS_SELF, MP_TYPE_FLAG_BINDS_SELF,
call, native_gen_wrap_call, call, native_gen_wrap_call
NATIVE_GEN_WRAP_TYPE_ATTR NATIVE_GEN_WRAP_TYPE_ATTR
unary_op, mp_generic_unary_op
); );
#endif // MICROPY_EMIT_NATIVE #endif // MICROPY_EMIT_NATIVE
@ -370,7 +368,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
MP_QSTR_generator, MP_QSTR_generator,
MP_TYPE_FLAG_ITER_IS_ITERNEXT, MP_TYPE_FLAG_ITER_IS_ITERNEXT,
print, gen_instance_print, print, gen_instance_print,
unary_op, mp_generic_unary_op,
iter, gen_instance_iternext, iter, gen_instance_iternext,
locals_dict, &gen_instance_locals_dict locals_dict, &gen_instance_locals_dict
); );

3
py/objnone.c
View File

@ -47,8 +47,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
mp_type_NoneType, mp_type_NoneType,
MP_QSTR_NoneType, MP_QSTR_NoneType,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
print, none_print, print, none_print
unary_op, mp_generic_unary_op
); );
#if !MICROPY_OBJ_IMMEDIATE_OBJS #if !MICROPY_OBJ_IMMEDIATE_OBJS

3
py/objsingleton.c
View File

@ -45,8 +45,7 @@ STATIC void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
mp_type_singleton, MP_QSTR_, MP_TYPE_FLAG_NONE, mp_type_singleton, MP_QSTR_, MP_TYPE_FLAG_NONE,
print, singleton_print, print, singleton_print
unary_op, mp_generic_unary_op
); );
const mp_obj_singleton_t mp_const_ellipsis_obj = {{&mp_type_singleton}, MP_QSTR_Ellipsis}; const mp_obj_singleton_t mp_const_ellipsis_obj = {{&mp_type_singleton}, MP_QSTR_Ellipsis};

1
py/objtype.c
View File

@ -1112,7 +1112,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
make_new, type_make_new, make_new, type_make_new,
print, type_print, print, type_print,
call, type_call, call, type_call,
unary_op, mp_generic_unary_op,
attr, type_attr attr, type_attr
); );

2
py/profile.c
View File

@ -177,7 +177,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
MP_QSTR_code, MP_QSTR_code,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
print, code_print, print, code_print,
unary_op, mp_generic_unary_op,
attr, code_attr attr, code_attr
); );
@ -247,7 +246,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
MP_QSTR_frame, MP_QSTR_frame,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
print, frame_print, print, frame_print,
unary_op, mp_generic_unary_op,
attr, frame_attr attr, frame_attr
); );

3
py/runtime.c
View File

@ -314,6 +314,9 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
if (result != MP_OBJ_NULL) { if (result != MP_OBJ_NULL) {
return result; return result;
} }
} else if (op == MP_UNARY_OP_HASH) {
// Type doesn't have unary_op so use hash of object instance.
return MP_OBJ_NEW_SMALL_INT((mp_uint_t)arg);
} }
if (op == MP_UNARY_OP_BOOL) { if (op == MP_UNARY_OP_BOOL) {
// Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL), // Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL),