diff options
| author | blmorris <bryan.morrissey@gmail.com> | 2014-07-18 16:06:22 -0400 |
|---|---|---|
| committer | blmorris <bryan.morrissey@gmail.com> | 2014-07-18 16:06:22 -0400 |
| commit | 0f4ee2e44a1e47258a8b07fb25e28286d131390c (patch) | |
| tree | 7bfb507183544d14236c0be8a232a92f4113abb1 /py | |
| parent | 0429d35f37532d2a981e704f014a248da9b157d8 (diff) | |
| parent | 5467186b0eaa6e856b00f60f807bb988ae2ef8c5 (diff) | |
| download | micropython-0f4ee2e44a1e47258a8b07fb25e28286d131390c.tar.gz micropython-0f4ee2e44a1e47258a8b07fb25e28286d131390c.zip | |
Merge https://github.com/micropython/micropython
Diffstat (limited to 'py')
| -rw-r--r-- | py/emitinlinethumb.c | 3 | ||||
| -rw-r--r-- | py/formatfloat.c | 2 | ||||
| -rw-r--r-- | py/objarray.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c index 435e1b64d9..3d0efd5645 100644 --- a/py/emitinlinethumb.c +++ b/py/emitinlinethumb.c @@ -315,7 +315,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, int n_args, m uint reg_dest = get_arg_reg(emit, op_str, pn_args[0], 15); uint reg_src = get_arg_reg(emit, op_str, pn_args[1], 15); asm_thumb_mov_reg_reg(emit->as, reg_dest, reg_src); - } else if (strcmp(op_str, "and") == 0) { + } else if (strcmp(op_str, "and_") == 0) { op_code = ASM_THUMB_FORMAT_4_AND; uint reg_dest, reg_src; op_format_4: @@ -323,7 +323,6 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, int n_args, m reg_src = get_arg_reg(emit, op_str, pn_args[1], 7); asm_thumb_format_4(emit->as, op_code, reg_dest, reg_src); // TODO probably uses less ROM if these ops are in a lookup table - } else if (strcmp(op_str, "and") == 0) { op_code = ASM_THUMB_FORMAT_4_AND; goto op_format_4; } else if (strcmp(op_str, "eor") == 0) { op_code = ASM_THUMB_FORMAT_4_EOR; goto op_format_4; } else if (strcmp(op_str, "lsl") == 0) { op_code = ASM_THUMB_FORMAT_4_LSL; goto op_format_4; } else if (strcmp(op_str, "lsr") == 0) { op_code = ASM_THUMB_FORMAT_4_LSR; goto op_format_4; diff --git a/py/formatfloat.c b/py/formatfloat.c index caecb0f29b..d1b12cdd5b 100644 --- a/py/formatfloat.c +++ b/py/formatfloat.c @@ -75,7 +75,7 @@ int format_float(float f, char *buf, size_t buf_size, char fmt, int prec, char s if (buf_size < 7) { // Smallest exp notion is -9e+99 which is 6 chars plus terminating - // nulll. + // null. if (buf_size >= 2) { *s++ = '?'; diff --git a/py/objarray.c b/py/objarray.c index ca907fd01d..27da662a61 100644 --- a/py/objarray.c +++ b/py/objarray.c @@ -59,7 +59,7 @@ STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg); STATIC void array_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_array_t *o = o_in; if (o->typecode == BYTEARRAY_TYPECODE) { - print(env, "bytearray(b", o->typecode); + print(env, "bytearray(b"); mp_str_print_quoted(print, env, o->items, o->len, true); } else { print(env, "array('%c'", o->typecode); |