diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-26 21:47:19 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-26 21:47:19 +0000 |
| commit | 9b196cddab80e24b9ce66b1c922cb757b11fb16a (patch) | |
| tree | 0906c4b454a984c51218aa8e0a1c1d9073e4cc77 /py/objtuple.c | |
| parent | c12b2213c16ba8839981c362c4d5f133a84b374b (diff) | |
| download | micropython-9b196cddab80e24b9ce66b1c922cb757b11fb16a.tar.gz micropython-9b196cddab80e24b9ce66b1c922cb757b11fb16a.zip | |
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.
Diffstat (limited to 'py/objtuple.c')
| -rw-r--r-- | py/objtuple.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/py/objtuple.c b/py/objtuple.c index 334cf0562e..eb3d8259a6 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -6,6 +6,7 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" +#include "map.h" #include "runtime0.h" #include "runtime.h" #include "objtuple.h" @@ -165,12 +166,13 @@ STATIC mp_obj_t tuple_index(uint n_args, const mp_obj_t *args) { } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index); -STATIC const mp_method_t tuple_type_methods[] = { - { MP_QSTR_count, &tuple_count_obj }, - { MP_QSTR_index, &tuple_index_obj }, - { MP_QSTR_NULL, NULL }, // end-of-list sentinel +STATIC const mp_map_elem_t tuple_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&tuple_count_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_index), (mp_obj_t)&tuple_index_obj }, }; +STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table); + const mp_obj_type_t tuple_type = { { &mp_type_type }, .name = MP_QSTR_tuple, @@ -179,7 +181,7 @@ const mp_obj_type_t tuple_type = { .unary_op = tuple_unary_op, .binary_op = tuple_binary_op, .getiter = tuple_getiter, - .methods = tuple_type_methods, + .locals_dict = (mp_obj_t)&tuple_locals_dict, }; // the zero-length tuple |