py/objtype: Change type of enum-to-qstr table to uint16_t to save space.

dpgeorge · dpgeorge · commit 6c82cfc08946 · 2017-10-04T11:31:05.000+11:00
Qstr values fit in 16-bits (and this fact is used elsewhere in the code) so
no need to use more than that for the large lookup tables.  The compiler
will anyway give a warning if the qstr values don't fit in 16 bits.  Saves
around 80 bytes of code space for Thumb2 archs.
diff --git a/py/objtype.c b/py/objtype.c
@@ -334,7 +334,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
     return MP_OBJ_FROM_PTR(o);
 }
 
-const qstr mp_unary_op_method_name[] = {
+const uint16_t mp_unary_op_method_name[] = {
     [MP_UNARY_OP_BOOL] = MP_QSTR___bool__,
     [MP_UNARY_OP_LEN] = MP_QSTR___len__,
     [MP_UNARY_OP_HASH] = MP_QSTR___hash__,
@@ -408,7 +408,7 @@ STATIC mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     }
 }
 
-const qstr mp_binary_op_method_name[] = {
+const uint16_t mp_binary_op_method_name[] = {
     /*
     MP_BINARY_OP_OR,
     MP_BINARY_OP_XOR,
diff --git a/py/runtime.h b/py/runtime.h
@@ -57,9 +57,9 @@ typedef struct _mp_arg_t {
     mp_arg_val_t defval;
 } mp_arg_t;
 
-// defined in objtype.c
-extern const qstr mp_unary_op_method_name[];
-extern const qstr mp_binary_op_method_name[];
+// Tables mapping operator enums to qstrs, defined in objtype.c
+extern const uint16_t mp_unary_op_method_name[];
+extern const uint16_t mp_binary_op_method_name[];
 
 void mp_init(void);
 void mp_deinit(void);

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size`
`334`	`334`	`return MP_OBJ_FROM_PTR(o);`
`335`	`335`	`}`
`336`	`336`
`337`		`-const qstr mp_unary_op_method_name[] = {`
	`337`	`+const uint16_t mp_unary_op_method_name[] = {`
`338`	`338`	`[MP_UNARY_OP_BOOL] = MP_QSTR___bool__,`
`339`	`339`	`[MP_UNARY_OP_LEN] = MP_QSTR___len__,`
`340`	`340`	`[MP_UNARY_OP_HASH] = MP_QSTR___hash__,`
`@@ -408,7 +408,7 @@ STATIC mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {`
`408`	`408`	`}`
`409`	`409`	`}`
`410`	`410`
`411`		`-const qstr mp_binary_op_method_name[] = {`
	`411`	`+const uint16_t mp_binary_op_method_name[] = {`
`412`	`412`	`/*`
`413`	`413`	`MP_BINARY_OP_OR,`
`414`	`414`	`MP_BINARY_OP_XOR,`