Skip to content

Commit 851f15f

Browse files
dpgeorgedpgeorge
committed
py: In asmthumb, clean up unit/int types and ite ops.
1 parent 860805a commit 851f15f

File tree

4 files changed

+33
-29
lines changed

4 files changed

+33
-29
lines changed

‎py/asmthumb.c‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,24 @@
4242
#define SIGNED_FIT12(x) (((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800)
4343

4444
struct _asm_thumb_t {
45-
uint pass;
46-
uint code_offset;
47-
uint code_size;
45+
mp_uint_t pass;
46+
mp_uint_t code_offset;
47+
mp_uint_t code_size;
4848
byte *code_base;
4949
byte dummy_data[4];
5050

51-
uint max_num_labels;
52-
int *label_offsets;
53-
int num_locals;
54-
uint push_reglist;
55-
uint stack_adjust;
51+
mp_uint_t max_num_labels;
52+
mp_uint_t *label_offsets;
53+
mp_uint_t push_reglist;
54+
mp_uint_t stack_adjust;
5655
};
5756

5857
asm_thumb_t *asm_thumb_new(uint max_num_labels) {
5958
asm_thumb_t *as;
6059

6160
as = m_new0(asm_thumb_t, 1);
6261
as->max_num_labels = max_num_labels;
63-
as->label_offsets = m_new(int, max_num_labels);
62+
as->label_offsets = m_new(mp_uint_t, max_num_labels);
6463

6564
return as;
6665
}
@@ -88,7 +87,7 @@ void asm_thumb_start_pass(asm_thumb_t *as, uint pass) {
8887
as->pass = pass;
8988
as->code_offset = 0;
9089
if (pass == ASM_THUMB_PASS_COMPUTE) {
91-
memset(as->label_offsets, -1, as->max_num_labels * sizeof(int));
90+
memset(as->label_offsets, -1, as->max_num_labels * sizeof(mp_uint_t));
9291
}
9392
}
9493

@@ -169,7 +168,7 @@ STATIC void asm_thumb_write_word32(asm_thumb_t *as, int w32) {
169168

170169
// locals:
171170
// - stored on the stack in ascending order
172-
// - numbered 0 through as->num_locals-1
171+
// - numbered 0 through num_locals-1
173172
// - SP points to first local
174173
//
175174
// | SP
@@ -222,7 +221,6 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
222221
}
223222
as->push_reglist = reglist;
224223
as->stack_adjust = stack_adjust;
225-
as->num_locals = num_locals;
226224
}
227225

228226
void asm_thumb_exit(asm_thumb_t *as) {
@@ -262,7 +260,7 @@ void asm_thumb_data(asm_thumb_t* as, uint bytesize, uint val) {
262260
}
263261
}
264262

265-
STATIC int get_label_dest(asm_thumb_t *as, uint label) {
263+
STATIC mp_uint_t get_label_dest(asm_thumb_t *as, uint label) {
266264
assert(label < as->max_num_labels);
267265
return as->label_offsets[label];
268266
}
@@ -348,15 +346,11 @@ void asm_thumb_movt_reg_i16(asm_thumb_t *as, uint reg_dest, int i16_src) {
348346
asm_thumb_mov_reg_i16(as, OP_MOVT, reg_dest, i16_src);
349347
}
350348

351-
void asm_thumb_ite_ge(asm_thumb_t *as) {
352-
asm_thumb_op16(as, 0xbfac);
353-
}
354-
355349
#define OP_B_N(byte_offset) (0xe000 | (((byte_offset) >> 1) & 0x07ff))
356350

357351
void asm_thumb_b_n(asm_thumb_t *as, uint label) {
358-
int dest = get_label_dest(as, label);
359-
int rel = dest - as->code_offset;
352+
mp_uint_t dest = get_label_dest(as, label);
353+
mp_int_t rel = dest - as->code_offset;
360354
rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
361355
if (SIGNED_FIT12(rel)) {
362356
asm_thumb_op16(as, OP_B_N(rel));
@@ -368,8 +362,8 @@ void asm_thumb_b_n(asm_thumb_t *as, uint label) {
368362
#define OP_BCC_N(cond, byte_offset) (0xd000 | ((cond) << 8) | (((byte_offset) >> 1) & 0x00ff))
369363

370364
void asm_thumb_bcc_n(asm_thumb_t *as, int cond, uint label) {
371-
int dest = get_label_dest(as, label);
372-
int rel = dest - as->code_offset;
365+
mp_uint_t dest = get_label_dest(as, label);
366+
mp_int_t rel = dest - as->code_offset;
373367
rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
374368
if (SIGNED_FIT9(rel)) {
375369
asm_thumb_op16(as, OP_BCC_N(cond, rel));
@@ -442,8 +436,8 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num)
442436
#define OP_BW_LO(byte_offset) (0xb800 | (((byte_offset) >> 1) & 0x07ff))
443437

444438
void asm_thumb_b_label(asm_thumb_t *as, uint label) {
445-
int dest = get_label_dest(as, label);
446-
int rel = dest - as->code_offset;
439+
mp_uint_t dest = get_label_dest(as, label);
440+
mp_int_t rel = dest - as->code_offset;
447441
rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
448442
if (dest >= 0 && rel <= -4) {
449443
// is a backwards jump, so we know the size of the jump on the first pass
@@ -465,8 +459,8 @@ void asm_thumb_b_label(asm_thumb_t *as, uint label) {
465459
#define OP_BCC_W_LO(byte_offset) (0x8000 | ((byte_offset) & 0x2000) | (((byte_offset) >> 1) & 0x0fff))
466460

467461
void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
468-
int dest = get_label_dest(as, label);
469-
int rel = dest - as->code_offset;
462+
mp_uint_t dest = get_label_dest(as, label);
463+
mp_int_t rel = dest - as->code_offset;
470464
rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
471465
if (dest >= 0 && rel <= -4) {
472466
// is a backwards jump, so we know the size of the jump on the first pass

‎py/asmthumb.h‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@ void asm_thumb_data(asm_thumb_t* as, uint bytesize, uint val);
8080
// argument order follows ARM, in general dest is first
8181
// note there is a difference between movw and mov.w, and many others!
8282

83+
#define ASM_THUMB_OP_ITE_EQ (0xbf0c)
84+
#define ASM_THUMB_OP_ITE_CS (0xbf2c)
85+
#define ASM_THUMB_OP_ITE_MI (0xbf4c)
86+
#define ASM_THUMB_OP_ITE_VS (0xbf6c)
87+
#define ASM_THUMB_OP_ITE_HI (0xbf8c)
88+
#define ASM_THUMB_OP_ITE_GE (0xbfac)
89+
#define ASM_THUMB_OP_ITE_GT (0xbfcc)
90+
8391
#define ASM_THUMB_OP_NOP (0xbf00)
8492
#define ASM_THUMB_OP_WFI (0xbf30)
8593
#define ASM_THUMB_OP_CPSID_I (0xb672) // cpsid i, disable irq
@@ -165,17 +173,20 @@ static inline void asm_thumb_str_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint
165173
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_STR | ASM_THUMB_FORMAT_9_WORD_TRANSFER, rlo_src, rlo_base, word_offset); }
166174
static inline void asm_thumb_strb_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint byte_offset)
167175
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_STR | ASM_THUMB_FORMAT_9_BYTE_TRANSFER, rlo_src, rlo_base, byte_offset); }
176+
static inline void asm_thumb_strh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint byte_offset)
177+
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_STRH, rlo_src, rlo_base, byte_offset); }
168178
static inline void asm_thumb_ldr_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint word_offset)
169179
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_WORD_TRANSFER, rlo_dest, rlo_base, word_offset); }
170180
static inline void asm_thumb_ldrb_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint byte_offset)
171181
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_BYTE_TRANSFER , rlo_dest, rlo_base, byte_offset); }
182+
static inline void asm_thumb_ldrh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint byte_offset)
183+
{ asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_LDRH, rlo_dest, rlo_base, byte_offset); }
172184

173185
// TODO convert these to above format style
174186

175187
void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src);
176188
void asm_thumb_movw_reg_i16(asm_thumb_t *as, uint reg_dest, int i16_src);
177189
void asm_thumb_movt_reg_i16(asm_thumb_t *as, uint reg_dest, int i16_src);
178-
void asm_thumb_ite_ge(asm_thumb_t *as);
179190
void asm_thumb_b_n(asm_thumb_t *as, uint label);
180191
void asm_thumb_bcc_n(asm_thumb_t *as, int cond, uint label);
181192

@@ -189,4 +200,3 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num)
189200
void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience ?
190201
void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch
191202
void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp); // convenience ?
192-

‎py/emitinlinethumb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
274274
} else if (strcmp(op_str, "wfi") == 0) {
275275
asm_thumb_op16(emit->as, ASM_THUMB_OP_WFI);
276276
} else if (strcmp(op_str, "ite.ge") == 0) { // TODO correct name for this op?
277-
asm_thumb_ite_ge(emit->as);
277+
asm_thumb_op16(emit->as, ASM_THUMB_OP_ITE_GE);
278278
} else {
279279
goto unknown_op;
280280
}

‎py/emitnative.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
15371537
asm_x86_setcc_r8(emit->as, ASM_X86_CC_JL, REG_RET);
15381538
#elif N_THUMB
15391539
asm_thumb_cmp_rlo_rlo(emit->as, REG_ARG_2, REG_ARG_3);
1540-
asm_thumb_ite_ge(emit->as);
1540+
asm_thumb_op16(emit->as, ASM_THUMB_OP_ITE_GE);
15411541
asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0); // if r0 >= r1
15421542
asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1); // if r0 < r1
15431543
#elif N_ARM

0 commit comments

Comments
 (0)