From 9b196cddab80e24b9ce66b1c922cb757b11fb16a Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 26 Mar 2014 21:47:19 +0000 Subject: Remove mp_obj_type_t.methods entry and use .locals_dict instead. Originally, .methods was used for methods in a ROM class, and locals_dict for methods in a user-created class. That distinction is unnecessary, and we can use locals_dict for ROM classes now that we have ROMable maps. This removes an entry in the bloated mp_obj_type_t struct, saving a word for each ROM object and each RAM object. ROM objects that have a methods table (now a locals_dict) need an extra word in total (removed the methods pointer (1 word), no longer need the sentinel (2 words), but now need an mp_obj_dict_t wrapper (4 words)). But RAM objects save a word because they never used the methods entry. Overall the ROM usage is down by a few hundred bytes, and RAM usage is down 1 word per user-defined type/class. There is less code (no need to check 2 tables), and now consistent with the way ROM modules have their tables initialised. Efficiency is very close to equivaluent. --- py/objlist.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'py/objlist.c') diff --git a/py/objlist.c b/py/objlist.c index afc4f3cf85..6677a8f8ce 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -328,21 +328,22 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove); STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse); STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort); -STATIC const mp_method_t list_type_methods[] = { - { MP_QSTR_append, &list_append_obj }, - { MP_QSTR_clear, &list_clear_obj }, - { MP_QSTR_copy, &list_copy_obj }, - { MP_QSTR_count, &list_count_obj }, - { MP_QSTR_extend, &list_extend_obj }, - { MP_QSTR_index, &list_index_obj }, - { MP_QSTR_insert, &list_insert_obj }, - { MP_QSTR_pop, &list_pop_obj }, - { MP_QSTR_remove, &list_remove_obj }, - { MP_QSTR_reverse, &list_reverse_obj }, - { MP_QSTR_sort, &list_sort_obj }, - { MP_QSTR_NULL, NULL }, // end-of-list sentinel +STATIC const mp_map_elem_t list_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_append), (mp_obj_t)&list_append_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&list_clear_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_copy), (mp_obj_t)&list_copy_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&list_count_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_extend), (mp_obj_t)&list_extend_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&list_index_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_insert), (mp_obj_t)&list_insert_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_pop), (mp_obj_t)&list_pop_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_remove), (mp_obj_t)&list_remove_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_reverse), (mp_obj_t)&list_reverse_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_sort), (mp_obj_t)&list_sort_obj }, }; +STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table); + const mp_obj_type_t list_type = { { &mp_type_type }, .name = MP_QSTR_list, @@ -351,7 +352,7 @@ const mp_obj_type_t list_type = { .unary_op = list_unary_op, .binary_op = list_binary_op, .getiter = list_getiter, - .methods = list_type_methods, + .locals_dict = (mp_obj_t)&list_locals_dict, }; STATIC mp_obj_list_t *list_new(uint n) { -- cgit v1.2.3