Skip to content

Commit 6211d97

Browse files
dpgeorgedpgeorge
committed
py/emit: Combine load/store/delete attr into one emit function.
Reduces code size by: bare-arm: -20 minimal x86: -140 unix x64: -408 unix nanbox: -140 stm32: -68 cc3200: -16 esp8266: -80 esp32: -32
1 parent a4941a8 commit 6211d97

4 files changed

Lines changed: 43 additions & 41 deletions

File tree

‎py/compile.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,12 @@ STATIC void c_assign_atom_expr(compiler_t *comp, mp_parse_node_struct_t *pns, as
381381
assert(MP_PARSE_NODE_IS_ID(pns1->nodes[0]));
382382
if (assign_kind == ASSIGN_AUG_LOAD) {
383383
EMIT(dup_top);
384-
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]));
384+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]), MP_EMIT_ATTR_LOAD);
385385
} else {
386386
if (assign_kind == ASSIGN_AUG_STORE) {
387387
EMIT(rot_two);
388388
}
389-
EMIT_ARG(store_attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]));
389+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]), MP_EMIT_ATTR_STORE);
390390
}
391391
return;
392392
}
@@ -820,7 +820,7 @@ STATIC void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
820820
compile_node(comp, name_nodes[0]);
821821
for (int j = 1; j < name_len; j++) {
822822
assert(MP_PARSE_NODE_IS_ID(name_nodes[j])); // should be
823-
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(name_nodes[j]));
823+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(name_nodes[j]), MP_EMIT_ATTR_LOAD);
824824
}
825825

826826
// nodes[1] contains arguments to the decorator function, if any
@@ -887,7 +887,7 @@ STATIC void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {
887887
EMIT_ARG(subscr, MP_EMIT_SUBSCR_DELETE);
888888
} else if (MP_PARSE_NODE_STRUCT_KIND(pns1) == PN_trailer_period) {
889889
assert(MP_PARSE_NODE_IS_ID(pns1->nodes[0]));
890-
EMIT_ARG(delete_attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]));
890+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns1->nodes[0]), MP_EMIT_ATTR_DELETE);
891891
} else {
892892
goto cannot_delete;
893893
}
@@ -1061,7 +1061,7 @@ STATIC void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
10611061
EMIT_ARG(import_name, q_full);
10621062
if (is_as) {
10631063
for (int i = 1; i < n; i++) {
1064-
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[i]));
1064+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[i]), MP_EMIT_ATTR_LOAD);
10651065
}
10661066
}
10671067
}
@@ -1811,7 +1811,7 @@ STATIC void compile_async_with_stmt_helper(compiler_t *comp, int n, mp_parse_nod
18111811
// at this point the stack contains: ..., __aexit__, self, exc
18121812
EMIT(dup_top);
18131813
#if MICROPY_CPYTHON_COMPAT
1814-
EMIT_ARG(load_attr, MP_QSTR___class__); // get type(exc)
1814+
EMIT_ARG(attr, MP_QSTR___class__, MP_EMIT_ATTR_LOAD); // get type(exc)
18151815
#else
18161816
compile_load_id(comp, MP_QSTR_type);
18171817
EMIT(rot_two);
@@ -2541,7 +2541,7 @@ STATIC void compile_trailer_bracket(compiler_t *comp, mp_parse_node_struct_t *pn
25412541

25422542
STATIC void compile_trailer_period(compiler_t *comp, mp_parse_node_struct_t *pns) {
25432543
// object who's attribute we want is on top of stack
2544-
EMIT_ARG(load_attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[0])); // attribute to get
2544+
EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[0]), MP_EMIT_ATTR_LOAD); // attribute to get
25452545
}
25462546

25472547
#if MICROPY_PY_BUILTINS_SLICE

‎py/emit.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ typedef enum {
6868
#define MP_EMIT_SUBSCR_STORE (1)
6969
#define MP_EMIT_SUBSCR_DELETE (2)
7070

71+
// Kind for emit->attr()
72+
#define MP_EMIT_ATTR_LOAD (0)
73+
#define MP_EMIT_ATTR_STORE (1)
74+
#define MP_EMIT_ATTR_DELETE (2)
75+
7176
// Kind for emit->build()
7277
#define MP_EMIT_BUILD_TUPLE (0)
7378
#define MP_EMIT_BUILD_LIST (1)
@@ -105,12 +110,10 @@ typedef struct _emit_method_table_t {
105110
void (*load_const_str)(emit_t *emit, qstr qst);
106111
void (*load_const_obj)(emit_t *emit, mp_obj_t obj);
107112
void (*load_null)(emit_t *emit);
108-
void (*load_attr)(emit_t *emit, qstr qst);
109113
void (*load_method)(emit_t *emit, qstr qst, bool is_super);
110114
void (*load_build_class)(emit_t *emit);
111115
void (*subscr)(emit_t *emit, int kind);
112-
void (*store_attr)(emit_t *emit, qstr qst);
113-
void (*delete_attr)(emit_t *emit, qstr qst);
116+
void (*attr)(emit_t *emit, qstr qst, int kind);
114117
void (*dup_top)(emit_t *emit);
115118
void (*dup_top_two)(emit_t *emit);
116119
void (*pop_top)(emit_t *emit);
@@ -211,12 +214,10 @@ void mp_emit_bc_load_const_small_int(emit_t *emit, mp_int_t arg);
211214
void mp_emit_bc_load_const_str(emit_t *emit, qstr qst);
212215
void mp_emit_bc_load_const_obj(emit_t *emit, mp_obj_t obj);
213216
void mp_emit_bc_load_null(emit_t *emit);
214-
void mp_emit_bc_load_attr(emit_t *emit, qstr qst);
215217
void mp_emit_bc_load_method(emit_t *emit, qstr qst, bool is_super);
216218
void mp_emit_bc_load_build_class(emit_t *emit);
217219
void mp_emit_bc_subscr(emit_t *emit, int kind);
218-
void mp_emit_bc_store_attr(emit_t *emit, qstr qst);
219-
void mp_emit_bc_delete_attr(emit_t *emit, qstr qst);
220+
void mp_emit_bc_attr(emit_t *emit, qstr qst, int kind);
220221
void mp_emit_bc_dup_top(emit_t *emit);
221222
void mp_emit_bc_dup_top_two(emit_t *emit);
222223
void mp_emit_bc_pop_top(emit_t *emit);

‎py/emitbc.c‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -579,14 +579,6 @@ void mp_emit_bc_load_global(emit_t *emit, qstr qst, int kind) {
579579
}
580580
}
581581

582-
void mp_emit_bc_load_attr(emit_t *emit, qstr qst) {
583-
emit_bc_pre(emit, 0);
584-
emit_write_bytecode_byte_qstr(emit, MP_BC_LOAD_ATTR, qst);
585-
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
586-
emit_write_bytecode_byte(emit, 0);
587-
}
588-
}
589-
590582
void mp_emit_bc_load_method(emit_t *emit, qstr qst, bool is_super) {
591583
emit_bc_pre(emit, 1 - 2 * is_super);
592584
emit_write_bytecode_byte_qstr(emit, is_super ? MP_BC_LOAD_SUPER_METHOD : MP_BC_LOAD_METHOD, qst);
@@ -611,6 +603,23 @@ void mp_emit_bc_subscr(emit_t *emit, int kind) {
611603
}
612604
}
613605

606+
void mp_emit_bc_attr(emit_t *emit, qstr qst, int kind) {
607+
if (kind == MP_EMIT_ATTR_LOAD) {
608+
emit_bc_pre(emit, 0);
609+
emit_write_bytecode_byte_qstr(emit, MP_BC_LOAD_ATTR, qst);
610+
} else {
611+
if (kind == MP_EMIT_ATTR_DELETE) {
612+
mp_emit_bc_load_null(emit);
613+
mp_emit_bc_rot_two(emit);
614+
}
615+
emit_bc_pre(emit, -2);
616+
emit_write_bytecode_byte_qstr(emit, MP_BC_STORE_ATTR, qst);
617+
}
618+
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
619+
emit_write_bytecode_byte(emit, 0);
620+
}
621+
}
622+
614623
void mp_emit_bc_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
615624
MP_STATIC_ASSERT(MP_BC_STORE_FAST_N + MP_EMIT_IDOP_LOCAL_FAST == MP_BC_STORE_FAST_N);
616625
MP_STATIC_ASSERT(MP_BC_STORE_FAST_N + MP_EMIT_IDOP_LOCAL_DEREF == MP_BC_STORE_DEREF);
@@ -630,14 +639,6 @@ void mp_emit_bc_store_global(emit_t *emit, qstr qst, int kind) {
630639
emit_write_bytecode_byte_qstr(emit, MP_BC_STORE_NAME + kind, qst);
631640
}
632641

633-
void mp_emit_bc_store_attr(emit_t *emit, qstr qst) {
634-
emit_bc_pre(emit, -2);
635-
emit_write_bytecode_byte_qstr(emit, MP_BC_STORE_ATTR, qst);
636-
if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
637-
emit_write_bytecode_byte(emit, 0);
638-
}
639-
}
640-
641642
void mp_emit_bc_delete_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
642643
MP_STATIC_ASSERT(MP_BC_DELETE_FAST + MP_EMIT_IDOP_LOCAL_FAST == MP_BC_DELETE_FAST);
643644
MP_STATIC_ASSERT(MP_BC_DELETE_FAST + MP_EMIT_IDOP_LOCAL_DEREF == MP_BC_DELETE_DEREF);
@@ -652,12 +653,6 @@ void mp_emit_bc_delete_global(emit_t *emit, qstr qst, int kind) {
652653
emit_write_bytecode_byte_qstr(emit, MP_BC_DELETE_NAME + kind, qst);
653654
}
654655

655-
void mp_emit_bc_delete_attr(emit_t *emit, qstr qst) {
656-
mp_emit_bc_load_null(emit);
657-
mp_emit_bc_rot_two(emit);
658-
mp_emit_bc_store_attr(emit, qst);
659-
}
660-
661656
void mp_emit_bc_dup_top(emit_t *emit) {
662657
emit_bc_pre(emit, 1);
663658
emit_write_bytecode_byte(emit, MP_BC_DUP_TOP);
@@ -959,12 +954,10 @@ const emit_method_table_t emit_bc_method_table = {
959954
mp_emit_bc_load_const_str,
960955
mp_emit_bc_load_const_obj,
961956
mp_emit_bc_load_null,
962-
mp_emit_bc_load_attr,
963957
mp_emit_bc_load_method,
964958
mp_emit_bc_load_build_class,
965959
mp_emit_bc_subscr,
966-
mp_emit_bc_store_attr,
967-
mp_emit_bc_delete_attr,
960+
mp_emit_bc_attr,
968961
mp_emit_bc_dup_top,
969962
mp_emit_bc_dup_top_two,
970963
mp_emit_bc_pop_top,

‎py/emitnative.c‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,6 +1457,16 @@ STATIC void emit_native_subscr(emit_t *emit, int kind) {
14571457
}
14581458
}
14591459

1460+
STATIC void emit_native_attr(emit_t *emit, qstr qst, int kind) {
1461+
if (kind == MP_EMIT_ATTR_LOAD) {
1462+
emit_native_load_attr(emit, qst);
1463+
} else if (kind == MP_EMIT_ATTR_STORE) {
1464+
emit_native_store_attr(emit, qst);
1465+
} else {
1466+
emit_native_delete_attr(emit, qst);
1467+
}
1468+
}
1469+
14601470
STATIC void emit_native_dup_top(emit_t *emit) {
14611471
DEBUG_printf("dup_top\n");
14621472
vtype_kind_t vtype;
@@ -2226,12 +2236,10 @@ const emit_method_table_t EXPORT_FUN(method_table) = {
22262236
emit_native_load_const_str,
22272237
emit_native_load_const_obj,
22282238
emit_native_load_null,
2229-
emit_native_load_attr,
22302239
emit_native_load_method,
22312240
emit_native_load_build_class,
22322241
emit_native_subscr,
2233-
emit_native_store_attr,
2234-
emit_native_delete_attr,
2242+
emit_native_attr,
22352243
emit_native_dup_top,
22362244
emit_native_dup_top_two,
22372245
emit_native_pop_top,

0 commit comments

Comments
 (0)