aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/arm/hipe_arm_ra_finalise.erl
diff options
context:
space:
mode:
authorMagnus Lång <[email protected]>2016-06-10 19:29:22 +0200
committerMagnus Lång <[email protected]>2016-08-30 17:21:20 +0200
commitd9b091472f9afb216fe9f0c763053baf89390a6c (patch)
treee7904d4146ac66bcbae6ac4a7e20874c6a7c07e1 /lib/hipe/arm/hipe_arm_ra_finalise.erl
parent1567585dda8bc604871be06a37aa5d19ad6d28f3 (diff)
downloadotp-d9b091472f9afb216fe9f0c763053baf89390a6c.tar.gz
otp-d9b091472f9afb216fe9f0c763053baf89390a6c.tar.bz2
otp-d9b091472f9afb216fe9f0c763053baf89390a6c.zip
hipe_arm: Minimise CFG<->linear conversions
Now, there will only ever be a single Linear->CFG conversion, just after lowering from RTL, and only ever a single CFG->Linear conversion, just before the finalise pass. Both of these now happen in hipe_arm_main.
Diffstat (limited to 'lib/hipe/arm/hipe_arm_ra_finalise.erl')
-rw-r--r--lib/hipe/arm/hipe_arm_ra_finalise.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/hipe/arm/hipe_arm_ra_finalise.erl b/lib/hipe/arm/hipe_arm_ra_finalise.erl
index 4faeadcd7f..2a3fded147 100644
--- a/lib/hipe/arm/hipe_arm_ra_finalise.erl
+++ b/lib/hipe/arm/hipe_arm_ra_finalise.erl
@@ -23,12 +23,13 @@
-export([finalise/3]).
-include("hipe_arm.hrl").
-finalise(Defun, TempMap, _FPMap0=[]) ->
- Code = hipe_arm:defun_code(Defun),
- {_, SpillLimit} = hipe_arm:defun_var_range(Defun),
+finalise(CFG, TempMap, _FPMap0=[]) ->
+ {_, SpillLimit} = hipe_gensym:var_range(arm),
Map = mk_ra_map(TempMap, SpillLimit),
- NewCode = ra_code(Code, Map, []),
- Defun#defun{code=NewCode}.
+ hipe_arm_cfg:map_bbs(fun(_Lbl, BB) -> ra_bb(BB, Map) end, CFG).
+
+ra_bb(BB, Map) ->
+ hipe_bb:code_update(BB, ra_code(hipe_bb:code(BB), Map, [])).
ra_code([I|Insns], Map, Accum) ->
ra_code(Insns, Map, [ra_insn(I, Map) | Accum]);