aboutsummaryrefslogtreecommitdiff
path: root/py/asmarm.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-01-14 00:38:33 +0000
committerDamien George <damien.p.george@gmail.com>2015-01-14 00:38:33 +0000
commitd9dc6fff211db1fb5947ec2003a1f650a8b80c4c (patch)
tree28a51a26ea33cdd5581554195c03fb4c7658fa8c /py/asmarm.c
parentbc47c287dfe15909de6b76f19b8b0968ba54724a (diff)
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.
Diffstat (limited to 'py/asmarm.c')
-rw-r--r--py/asmarm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/py/asmarm.c b/py/asmarm.c
index 0ca88fd97..cf90d60c7 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(