1 files changed, 20 insertions, 13 deletions
diff --git a/py/asmthumb.h b/py/asmthumb.h
index bbf4ef20b3..d712063871 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -38,23 +38,30 @@ void *asm_thumb_get_code(asm_thumb_t *as);
 void asm_thumb_entry(asm_thumb_t *as, int num_locals);
 void asm_thumb_exit(asm_thumb_t *as);
 
-int asm_thumb_label_new(asm_thumb_t *as);
 void asm_thumb_label_assign(asm_thumb_t *as, int label);
 
 // argument order follows ARM, in general dest is first
+// note there is a difference between movw and mov.w, and many others!
 
-void asm_thumb_mov_reg_i8(asm_thumb_t *as, uint rlo_dest, int i8_src);
-void asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, machine_uint_t i32_src);
-void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32_src);
+void asm_thumb_movs_rlo_i8(asm_thumb_t *as, uint rlo_dest, int i8_src);
+void asm_thumb_movw_reg_i16(asm_thumb_t *as, uint reg_dest, int i16_src);
+void asm_thumb_movt_reg_i16(asm_thumb_t *as, uint reg_dest, int i16_src);
 void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src);
-void asm_thumb_mov_local_reg(asm_thumb_t *as, int local_num_dest, uint rlo_src);
-void asm_thumb_mov_reg_local(asm_thumb_t *as, uint rlo_dest, int local_num);
-void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint reg_dest, int local_num);
+void asm_thumb_subs_rlo_rlo_i3(asm_thumb_t *as, uint rlo_dest, uint rlo_src, int i3_src);
+void asm_thumb_cmp_rlo_i8(asm_thumb_t *as, uint rlo, int i8);
+void asm_thumb_bgt_n(asm_thumb_t *as, int label);
 
-void asm_thumb_add_reg_reg_reg(asm_thumb_t *as, uint rlo_dest, uint rlo_src_a, uint rlo_src_b);
-void asm_thumb_cmp_reg_reg(asm_thumb_t *as, uint rlo_a, uint rlo_b);
-void asm_thumb_ite_ge(asm_thumb_t *as);
+void asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, machine_uint_t i32_src); // convenience
+void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32_src); // convenience
+void asm_thumb_mov_local_reg(asm_thumb_t *as, int local_num_dest, uint rlo_src); // convenience
+void asm_thumb_mov_reg_local(asm_thumb_t *as, uint rlo_dest, int local_num); // convenience
+void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint reg_dest, int local_num); // convenience
+
+void asm_thumb_add_reg_reg_reg(asm_thumb_t *as, uint rlo_dest, uint rlo_src_a, uint rlo_src_b); // convenience ?
+void asm_thumb_cmp_reg_reg(asm_thumb_t *as, uint rlo_a, uint rlo_b); // convenience ?
+void asm_thumb_ite_ge(asm_thumb_t *as); // convenience ?
+
+void asm_thumb_b_label(asm_thumb_t *as, int label); // convenience ?
+void asm_thumb_cmp_reg_bz_label(asm_thumb_t *as, uint rlo, int label); // convenience ?
+void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp); // convenience ?
 
-void asm_thumb_b_label(asm_thumb_t *as, int label);
-void asm_thumb_cmp_reg_bz_label(asm_thumb_t *as, uint rlo, int label);
-void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp);