diff options
| author | Camil Staps | 2016-11-10 11:11:18 +0000 |
|---|---|---|
| committer | Camil Staps | 2016-11-10 11:11:18 +0000 |
| commit | 7a8dc792476b88e143b12369bc7f80edca22dac6 (patch) | |
| tree | 776cf2d2ad178f348114854409e7362f945f260e | |
| parent | Fix offsets when storing pc in thumb2ap.s (diff) | |
Fix some more #9 -> #7 instances
| -rw-r--r-- | thumb2copy.s | 2 | ||||
| -rw-r--r-- | thumb2startup.s | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/thumb2copy.s b/thumb2copy.s index bc68a9e..61ac318 100644 --- a/thumb2copy.s +++ b/thumb2copy.s @@ -145,8 +145,6 @@ copy_lp2_: @ selectors:
continue_after_selector_2:
ldr r6,[r7]
- @orr r6,r6,#1
- @bic r6,r6,#1 @ TODO temporary fix
tst r6,#2
beq not_in_hnf_2
diff --git a/thumb2startup.s b/thumb2startup.s index 36d9cba..4210cec 100644 --- a/thumb2startup.s +++ b/thumb2startup.s @@ -524,7 +524,7 @@ abc_main: lao r12,start_address,1 ldo r4,r12,start_address,1 .align - add lr,pc,#9 + add lr,pc,#7 str lr,[sp,#-4]! blx r4 .else @@ -3264,7 +3264,7 @@ eval_fill: mov r6,r7 ldr r12,[r7] .align - add lr,pc,#9 + add lr,pc,#7 str lr,[sp,#-4]! blx r12 mov r7,r6 @@ -3323,7 +3323,7 @@ eval_fill2: mov r6,r7 .align - add lr,pc,#9 + add lr,pc,#7 str lr,[sp,#-4]! blx r4 mov r7,r6 |