summaryrefslogtreecommitdiff
path: root/thumb2startup.s
diff options
context:
space:
mode:
authorCamil Staps2016-11-25 14:56:42 +0000
committerCamil Staps2016-11-25 14:56:42 +0000
commitece7642fc246a638ad90b284b1eaee8a40c240e9 (patch)
tree19f710bfe9811b28e94ab24dedcf79f3c5f934a9 /thumb2startup.s
parentSome fixes in copying collector; too hasty modification (diff)
Disable compacting collector for now
Diffstat (limited to 'thumb2startup.s')
-rw-r--r--thumb2startup.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/thumb2startup.s b/thumb2startup.s
index 4210cec..7ef4a08 100644
--- a/thumb2startup.s
+++ b/thumb2startup.s
@@ -2134,8 +2134,8 @@ no_mark3:
ldmia sp!,{r0-r4,pc}
.thumb_func
-collect:
.align
+collect:
add lr,pc,#9
str lr,[sp,#-4]!
bl add_execute_time
@@ -2183,7 +2183,7 @@ no_print_stack_sizes:
lao r12,flags,8
ldo r12,r12,flags,8
tst r12,#64
- bne compacting_collector
+ @bne compacting_collector
.else
.if MARK_GC
b compacting_collector
@@ -2194,7 +2194,7 @@ no_print_stack_sizes:
lao r12,garbage_collect_flag,4
ldosb r12,r12,garbage_collect_flag,4
cmp r12,#0
- bne compacting_collector
+ @bne compacting_collector
lao r12,heap_copied_vector,1
ldo r8,r12,heap_copied_vector,1