Skip to content

Commit

Permalink
py: Implement sdiv/udiv for inline Thumb assembler.
Browse files Browse the repository at this point in the history
  • Loading branch information
dpgeorge committed Feb 13, 2015
1 parent 0d967b8 commit 32f0b79
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 0 deletions.
11 changes: 11 additions & 0 deletions py/emitinlinethumb.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,17 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
src_b = get_arg_i(emit, op_str, pn_args[2], 0x7);
}
asm_thumb_format_2(emit->as, op_code, rlo_dest, rlo_src, src_b);
} else if (strcmp(op_str, "sdiv") == 0) {
op_code = 0xfb90; // sdiv high part
mp_uint_t rd, rn, rm;
op_sdiv_udiv:
rd = get_arg_reg(emit, op_str, pn_args[0], 15);
rn = get_arg_reg(emit, op_str, pn_args[1], 15);
rm = get_arg_reg(emit, op_str, pn_args[2], 15);
asm_thumb_op32(emit->as, op_code | rn, 0xf0f0 | (rd << 8) | rm);
} else if (strcmp(op_str, "udiv") == 0) {
op_code = 0xfbb0; // udiv high part
goto op_sdiv_udiv;
} else if (strcmp(op_str, "sub") == 0) {
op_code = ASM_THUMB_FORMAT_2_SUB;
goto op_format_2;
Expand Down
2 changes: 2 additions & 0 deletions py/objfun.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,8 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
return 0;
} else if (obj == mp_const_true) {
return 1;
} else if (MP_OBJ_IS_TYPE(obj, &mp_type_int)) {
return mp_obj_int_get_truncated(obj);
} else if (MP_OBJ_IS_STR(obj)) {
// pointer to the string (it's probably constant though!)
mp_uint_t l;
Expand Down
16 changes: 16 additions & 0 deletions tests/inlineasm/asmdiv.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@micropython.asm_thumb
def sdiv(r0, r1):
sdiv(r0, r0, r1)

@micropython.asm_thumb
def udiv(r0, r1):
udiv(r0, r0, r1)

print(sdiv(1234, 3))
print(sdiv(-1234, 3))
print(sdiv(1234, -3))
print(sdiv(-1234, -3))

print(udiv(1234, 3))
print(udiv(0xffffffff, 0x7fffffff))
print(udiv(0xffffffff, 0xffffffff))
7 changes: 7 additions & 0 deletions tests/inlineasm/asmdiv.py.exp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
411
-411
-411
411
411
2
1

0 comments on commit 32f0b79

Please sign in to comment.