aboutsummaryrefslogtreecommitdiff
path: root/stmhal/led.c
diff options
context:
space:
mode:
authorDamien George2014-03-26 21:47:19 +0000
committerDamien George2014-03-26 21:47:19 +0000
commit9b196cddab80e24b9ce66b1c922cb757b11fb16a (patch)
tree0906c4b454a984c51218aa8e0a1c1d9073e4cc77 /stmhal/led.c
parentc12b2213c16ba8839981c362c4d5f133a84b374b (diff)
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 'stmhal/led.c')
-rw-r--r--stmhal/led.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/stmhal/led.c b/stmhal/led.c
index 989ce3897..13dc81d18 100644
--- a/stmhal/led.c
+++ b/stmhal/led.c
@@ -8,6 +8,7 @@
#include "mpconfig.h"
#include "qstr.h"
#include "obj.h"
+#include "map.h"
#include "runtime.h"
#include "led.h"
#include "pin.h"
@@ -256,18 +257,19 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(led_obj_intensity_obj, 1, 2, led_obj_intensity);
-STATIC const mp_method_t led_methods[] = {
- { MP_QSTR_on, &led_obj_on_obj },
- { MP_QSTR_off, &led_obj_off_obj },
- { MP_QSTR_toggle, &led_obj_toggle_obj },
- { MP_QSTR_intensity, &led_obj_intensity_obj },
- { MP_QSTR_NULL, NULL },
+STATIC const mp_map_elem_t led_locals_dict_table[] = {
+ { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&led_obj_on_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&led_obj_off_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_toggle), (mp_obj_t)&led_obj_toggle_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_intensity), (mp_obj_t)&led_obj_intensity_obj },
};
+STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
+
const mp_obj_type_t pyb_led_type = {
{ &mp_type_type },
.name = MP_QSTR_Led,
.print = led_obj_print,
.make_new = led_obj_make_new,
- .methods = led_methods,
+ .locals_dict = (mp_obj_t)&led_locals_dict,
};