diff options
| author | Camil Staps | 2016-10-11 11:56:41 +0000 |
|---|---|---|
| committer | Camil Staps | 2016-10-11 11:56:41 +0000 |
| commit | 7262fc3ede3a5ab4e68347532bc9f911dab38933 (patch) | |
| tree | 86f0e89edbf36315c4e72378cb53be75b91d8615 | |
| parent | Fix storing the program counter as with 5effb5b in clean-code-generator (diff) | |
Rollback erroneous bl->blx from 4b601f9
| -rw-r--r-- | thumb2startup.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/thumb2startup.s b/thumb2startup.s index b753cf1..16986fa 100644 --- a/thumb2startup.s +++ b/thumb2startup.s @@ -912,7 +912,7 @@ exit_clean: .align add lr,pc,#8 str lr,[sp,#-4]! - blx add_execute_time + bl add_execute_time lao r4,flags,4 ldo r4,r4,flags,4 @@ -921,7 +921,7 @@ exit_clean: lao r0,time_string_1,0 otoa r0,time_string_1,0 - blx ew_print_string + bl ew_print_string lao r12,execute_time,0 ldo r4,r12,execute_time,0 @@ -933,7 +933,7 @@ exit_clean: lao r0,time_string_2,0 otoa r0,time_string_2,0 - blx ew_print_string + bl ew_print_string lao r12,garbage_collect_time,0 ldo r4,r12,garbage_collect_time,0 @@ -945,7 +945,7 @@ exit_clean: lao r0,time_string_4,0 otoa r0,time_string_4,0 - blx ew_print_string + bl ew_print_string lao r12,execute_time,1 ldo r4,r12,execute_time,1 @@ -962,7 +962,7 @@ exit_clean: bl print_time mov r0,#10 - blx ew_print_char + bl ew_print_char .thumb_func no_print_execution_time: @@ -1115,10 +1115,10 @@ print_time: lao r0,sprintf_time_buffer,1 otoa r0,sprintf_time_buffer,1 - blx ew_print_string + bl ew_print_string .else mov r0,r6 - blx ew_print_int + bl ew_print_int lao r6,sprintf_time_buffer,0 otoa r6,sprintf_time_buffer,0 @@ -2017,7 +2017,7 @@ collect_1: .ifdef PROFILE b profile_r .else - ldr lr,[sp],#4 + ldr pc,[sp],#4 orr lr,lr,#1 mov pc,lr .endif |