diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 05:12:50 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 05:12:50 +0000 |
commit | 5c7683955994b965270598559e979c581ddc1950 (patch) | |
tree | eb8744b2d6dc8f12a8a069df3199c7cca31dae08 /py/vm.c | |
parent | 07205ec323ca98d1c23af51e099119954d0fe7a4 (diff) | |
download | micropython-5c7683955994b965270598559e979c581ddc1950.tar.gz micropython-5c7683955994b965270598559e979c581ddc1950.zip |
sorted
Diffstat (limited to 'py/vm.c')
-rw-r--r-- | py/vm.c | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -440,10 +440,17 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t ** case MP_BC_CALL_FUNCTION: DECODE_UINT; - assert((unum & 0xff00) == 0); // n_keyword - unum &= 0xff; // n_positional - sp += unum; - *sp = rt_call_function_n(*sp, unum, sp - unum); + if ((unum & 0xff00) == 0) { + // no keywords + unum &= 0xff; // n_positional + sp += unum; + *sp = rt_call_function_n(*sp, unum, sp - unum); + } else { + // keywords + int argsize = (unum & 0xff) + ((unum >> 7) & 0x1fe); + sp += argsize; + *sp = rt_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp - argsize); + } break; case MP_BC_CALL_METHOD: |