github
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

py: Remove unnecessary id_flags argument from emitter's load_fast. 

Saves 24 bytes in bare-arm.
pull/1069/head
Damien George 10 years ago
parent
2276eb8084
commit
0abb5609b0
6 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      py/compile.c
  2. 2
      py/emit.h
  3. 2
      py/emitbc.c
  4. 2
      py/emitcommon.c
  5. 2
      py/emitcpy.c
  6. 4
      py/emitnative.c

6
py/compile.c
View File

@ -981,7 +981,7 @@ STATIC void close_over_variables_etc(compiler_t *comp, scope_t *this_scope, int
EMIT_ARG(load_closure, id->qst, id->local_num); EMIT_ARG(load_closure, id->qst, id->local_num);
#else #else
// in Micro Python we load closures using LOAD_FAST // in Micro Python we load closures using LOAD_FAST
EMIT_ARG(load_fast, id->qst, id->flags, id->local_num); EMIT_ARG(load_fast, id->qst, id->local_num);
#endif #endif
nfree += 1; nfree += 1;
} }
@ -2487,7 +2487,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
for (int i = 0; i < comp->scope_cur->id_info_len; i++) { for (int i = 0; i < comp->scope_cur->id_info_len; i++) {
if (comp->scope_cur->id_info[i].flags & ID_FLAG_IS_PARAM) { if (comp->scope_cur->id_info[i].flags & ID_FLAG_IS_PARAM) {
// first argument found; load it and call super // first argument found; load it and call super
EMIT_ARG(load_fast, MP_QSTR_, comp->scope_cur->id_info[i].flags, comp->scope_cur->id_info[i].local_num); EMIT_ARG(load_fast, MP_QSTR_, comp->scope_cur->id_info[i].local_num);
EMIT_ARG(call_function, 2, 0, 0); EMIT_ARG(call_function, 2, 0, 0);
return; return;
} }
@ -3384,7 +3384,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
#if MICROPY_EMIT_CPYTHON #if MICROPY_EMIT_CPYTHON
EMIT_ARG(load_closure, MP_QSTR___class__, 0); // XXX check this is the correct local num EMIT_ARG(load_closure, MP_QSTR___class__, 0); // XXX check this is the correct local num
#else #else
EMIT_ARG(load_fast, MP_QSTR___class__, id->flags, id->local_num); EMIT_ARG(load_fast, MP_QSTR___class__, id->local_num);
#endif #endif
} }
EMIT(return_value); EMIT(return_value);

2
py/emit.h
View File

@ -82,7 +82,7 @@ typedef struct _emit_method_table_t {
void (*load_const_str)(emit_t *emit, qstr qst, bool bytes); void (*load_const_str)(emit_t *emit, qstr qst, bool bytes);
void (*load_const_obj)(emit_t *emit, void *obj); void (*load_const_obj)(emit_t *emit, void *obj);
void (*load_null)(emit_t *emit); void (*load_null)(emit_t *emit);
void (*load_fast)(emit_t *emit, qstr qst, mp_uint_t id_flags, mp_uint_t local_num); void (*load_fast)(emit_t *emit, qstr qst, mp_uint_t local_num);
void (*load_deref)(emit_t *emit, qstr qst, mp_uint_t local_num); void (*load_deref)(emit_t *emit, qstr qst, mp_uint_t local_num);
void (*load_name)(emit_t *emit, qstr qst); void (*load_name)(emit_t *emit, qstr qst);
void (*load_global)(emit_t *emit, qstr qst); void (*load_global)(emit_t *emit, qstr qst);

2
py/emitbc.c
View File

@ -498,7 +498,7 @@ STATIC void emit_bc_load_null(emit_t *emit) {
emit_write_bytecode_byte(emit, MP_BC_LOAD_NULL); emit_write_bytecode_byte(emit, MP_BC_LOAD_NULL);
}; };
STATIC void emit_bc_load_fast(emit_t *emit, qstr qst, mp_uint_t id_flags, mp_uint_t local_num) { STATIC void emit_bc_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
assert(local_num >= 0); assert(local_num >= 0);
emit_bc_pre(emit, 1); emit_bc_pre(emit, 1);
if (local_num <= 15) { if (local_num <= 15) {

2
py/emitcommon.c
View File

@ -44,7 +44,7 @@ void emit_common_load_id(emit_t *emit, const emit_method_table_t *emit_method_ta
} else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) { } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
EMIT(load_global, qst); EMIT(load_global, qst);
} else if (id->kind == ID_INFO_KIND_LOCAL) { } else if (id->kind == ID_INFO_KIND_LOCAL) {
EMIT(load_fast, qst, id->flags, id->local_num); EMIT(load_fast, qst, id->local_num);
} else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) { } else if (id->kind == ID_INFO_KIND_CELL || id->kind == ID_INFO_KIND_FREE) {
EMIT(load_deref, qst, id->local_num); EMIT(load_deref, qst, id->local_num);
} else { } else {

2
py/emitcpy.c
View File

@ -245,7 +245,7 @@ STATIC void emit_cpy_load_null(emit_t *emit) {
assert(0); assert(0);
} }
STATIC void emit_cpy_load_fast(emit_t *emit, qstr qst, mp_uint_t id_flags, mp_uint_t local_num) { STATIC void emit_cpy_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
emit_pre(emit, 1, 3); emit_pre(emit, 1, 3);
if (emit->pass == MP_PASS_EMIT) { if (emit->pass == MP_PASS_EMIT) {
printf("LOAD_FAST " UINT_FMT " %s\n", local_num, qstr_str(qst)); printf("LOAD_FAST " UINT_FMT " %s\n", local_num, qstr_str(qst));

4
py/emitnative.c
View File

@ -1184,8 +1184,8 @@ STATIC void emit_native_load_null(emit_t *emit) {
emit_post_push_imm(emit, VTYPE_PYOBJ, 0); emit_post_push_imm(emit, VTYPE_PYOBJ, 0);
} }
STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t id_flags, mp_uint_t local_num) { STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
DEBUG_printf("load_fast(%s, " UINT_FMT ", " UINT_FMT ")\n", qstr_str(qst), id_flags, local_num); DEBUG_printf("load_fast(%s, " UINT_FMT ")\n", qstr_str(qst), local_num);
vtype_kind_t vtype = emit->local_vtype[local_num]; vtype_kind_t vtype = emit->local_vtype[local_num];
if (vtype == VTYPE_UNBOUND) { if (vtype == VTYPE_UNBOUND) {
printf("ViperTypeError: local %s used before type known\n", qstr_str(qst)); printf("ViperTypeError: local %s used before type known\n", qstr_str(qst));

Write Preview
Loading…
Cancel
Save