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 /stm/sdcard.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 'stm/sdcard.c')
-rw-r--r-- | stm/sdcard.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/stm/sdcard.c b/stm/sdcard.c index 0898c42a57..566fe70d53 100644 --- a/stm/sdcard.c +++ b/stm/sdcard.c @@ -9,6 +9,7 @@ #include "mpconfig.h" #include "qstr.h" #include "obj.h" +#include "map.h" #include "runtime.h" #include "sdcard.h" @@ -194,17 +195,18 @@ static mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) { static MP_DEFINE_CONST_FUN_OBJ_2(sd_read_obj, sd_read); -static const mp_method_t sdcard_methods[] = { - { MP_QSTR_present, &sd_present_obj }, - { MP_QSTR_power, &sd_power_obj }, - { MP_QSTR_read, &sd_read_obj }, - { MP_QSTR_NULL, NULL }, +STATIC const mp_map_elem_t sdcard_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_present), (mp_obj_t)&sd_present_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_power), (mp_obj_t)&sd_power_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&sd_read_obj }, }; +STATIC MP_DEFINE_CONST_DICT(sdcard_locals_dict, sdcard_locals_dict_table); + static const mp_obj_type_t sdcard_type = { { &mp_type_type }, .name = MP_QSTR_SDcard, - .methods = sdcard_methods, + .locals_dict = (mp_obj_t)&sdcard_locals_dict, }; const mp_obj_base_t pyb_sdcard_obj = {&sdcard_type}; |