From d9dc6fff211db1fb5947ec2003a1f650a8b80c4c Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 14 Jan 2015 00:38:33 +0000 Subject: py: Allocate memory for assembled code at start of PASS_EMIT. Previously was allocating at end of PASS_COMPUTE, and this pass was being run twice, so memory was being allocated twice. --- py/asmarm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'py/asmarm.c') diff --git a/py/asmarm.c b/py/asmarm.c index 0ca88fd97c..cf90d60c7b 100644 --- a/py/asmarm.c +++ b/py/asmarm.c @@ -70,20 +70,20 @@ void asm_arm_free(asm_arm_t *as, bool free_code) { } void asm_arm_start_pass(asm_arm_t *as, uint pass) { - as->pass = pass; - as->code_offset = 0; if (pass == ASM_ARM_PASS_COMPUTE) { memset(as->label_offsets, -1, as->max_num_labels * sizeof(mp_uint_t)); + } else if (pass == ASM_ARM_PASS_EMIT) { + MP_PLAT_ALLOC_EXEC(as->code_offset, (void**)&as->code_base, &as->code_size); + if (as->code_base == NULL) { + assert(0); + } } + as->pass = pass; + as->code_offset = 0; } void asm_arm_end_pass(asm_arm_t *as) { - if (as->pass == ASM_ARM_PASS_COMPUTE) { - MP_PLAT_ALLOC_EXEC(as->code_offset, (void**) &as->code_base, &as->code_size); - if(as->code_base == NULL) { - assert(0); - } - } else if(as->pass == ASM_ARM_PASS_EMIT) { + if (as->pass == ASM_ARM_PASS_EMIT) { #ifdef __arm__ // flush I- and D-cache asm volatile( -- cgit v1.2.3