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.
---
 stmhal/servo.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'stmhal/servo.c')

diff --git a/stmhal/servo.c b/stmhal/servo.c
index 17722dc6c..ad33db75c 100644
--- a/stmhal/servo.c
+++ b/stmhal/servo.c
@@ -7,6 +7,7 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
+#include "map.h"
 #include "servo.h"
 
 // this servo driver uses hardware PWM to drive servos on PA0, PA1, PA2, PA3 = X1, X2, X3, X4
@@ -205,15 +206,16 @@ STATIC mp_obj_t pyb_servo_angle(uint n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_angle_obj, 1, 3, pyb_servo_angle);
 
-STATIC const mp_method_t pyb_servo_methods[] = {
-    { MP_QSTR_angle, &pyb_servo_angle_obj },
-    { MP_QSTR_NULL, NULL },
+STATIC const mp_map_elem_t pyb_servo_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_angle), (mp_obj_t)&pyb_servo_angle_obj },
 };
 
+STATIC MP_DEFINE_CONST_DICT(pyb_servo_locals_dict, pyb_servo_locals_dict_table);
+
 const mp_obj_type_t pyb_servo_type = {
     { &mp_type_type },
     .name = MP_QSTR_Servo,
     .print = pyb_servo_print,
     .make_new = pyb_servo_make_new,
-    .methods = pyb_servo_methods,
+    .locals_dict = (mp_obj_t)&pyb_servo_locals_dict,
 };
-- 
cgit v1.2.3