diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-04 14:16:24 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-04 14:16:24 +0000 |
commit | 505dd00f07f984abed50024df6f88820cceba7db (patch) | |
tree | 4ef614d9811df3cdb814257d12a0b3b247a35de9 /py/asmthumb.c | |
parent | ff9a24f6f7c576e129685ce59cd9e0a87925cef8 (diff) | |
parent | e67ed5d285bb2ae7b83eb8be3ee488ab08fa4db1 (diff) | |
download | micropython-505dd00f07f984abed50024df6f88820cceba7db.tar.gz micropython-505dd00f07f984abed50024df6f88820cceba7db.zip |
Merge remote-tracking branch 'upstream/master' into list_count
Diffstat (limited to 'py/asmthumb.c')
-rw-r--r-- | py/asmthumb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/py/asmthumb.c b/py/asmthumb.c index ee8041ac9f..ba95d80c68 100644 --- a/py/asmthumb.c +++ b/py/asmthumb.c @@ -7,6 +7,9 @@ #include "mpconfig.h" #include "asmthumb.h" +// wrapper around everything in this file +#if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB + #define UNSIGNED_FIT8(x) (((x) & 0xffffff00) == 0) #define UNSIGNED_FIT16(x) (((x) & 0xffff0000) == 0) #define SIGNED_FIT8(x) (((x) & 0xffffff80) == 0) || (((x) & 0xffffff80) == 0xffffff80) @@ -447,3 +450,5 @@ void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp asm_thumb_write_op16(as, OP_SVC(fun_id)); } } + +#endif // MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB |