diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-06-25 04:10:34 +0100 |
| commit | e973acde81462de0c205f27db2642a08022fb3a8 (patch) | |
| tree | c6862ead76ae12979b3c3d6d1ec20774884c72ef /py/emitinlinethumb.c | |
| parent | 780e54cdc3491409060f90003ca64fcdd3f9f1e6 (diff) | |
| parent | 939c2e7f448fbe6b44d0079d2fc33c7ac7eb32d0 (diff) | |
| download | micropython-e973acde81462de0c205f27db2642a08022fb3a8.tar.gz micropython-e973acde81462de0c205f27db2642a08022fb3a8.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/emitinlinethumb.c')
| -rw-r--r-- | py/emitinlinethumb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c index 79ed1c4a02..435e1b64d9 100644 --- a/py/emitinlinethumb.c +++ b/py/emitinlinethumb.c @@ -30,8 +30,8 @@ #include <stdarg.h> #include <assert.h> -#include "misc.h" #include "mpconfig.h" +#include "misc.h" #include "qstr.h" #include "lexer.h" #include "parse.h" @@ -167,7 +167,7 @@ STATIC uint get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t if (MP_PARSE_NODE_IS_ID(pn)) { qstr reg_qstr = MP_PARSE_NODE_LEAF_ARG(pn); const char *reg_str = qstr_str(reg_qstr); - for (uint i = 0; i < ARRAY_SIZE(reg_name_table); i++) { + for (uint i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) { const reg_name_t *r = ®_name_table[i]; if (reg_str[0] == r->name[0] && reg_str[1] == r->name[1] && reg_str[2] == r->name[2] && (reg_str[2] == '\0' || reg_str[3] == '\0')) { if (r->reg > max_reg) { @@ -286,7 +286,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, int n_args, m asm_thumb_b_n(emit->as, label_num); } else if (op_str[0] == 'b' && op_len == 3) { uint cc = -1; - for (uint i = 0; i < ARRAY_SIZE(cc_name_table); i++) { + for (uint i = 0; i < MP_ARRAY_SIZE(cc_name_table); i++) { if (op_str[1] == cc_name_table[i].name[0] && op_str[2] == cc_name_table[i].name[1]) { cc = cc_name_table[i].cc; } |