hipe_arm: Add code rewrite RA callbacks

These will not only be useful for hipe_regalloc_prepass, but also, after
the introduction of a mk_move/2 (or similar) callback, for the purpose
of range splitting.

Since the substitution needed to case over all the instructions, a new
module, hipe_arm_subst, was introduced to the arm backend.

1 files changed, 24 insertions, 0 deletions

diff --git a/lib/hipe/regalloc/hipe_arm_specific.erl b/lib/hipe/regalloc/hipe_arm_specific.erl
index 614eb22a1f..251f1f7361 100644
--- a/lib/hipe/regalloc/hipe_arm_specific.erl
+++ b/lib/hipe/regalloc/hipe_arm_specific.erl
@@ -53,6 +53,12 @@
 %% callbacks for hipe_regalloc_loop
 -export([check_and_rewrite/2]).
 
+%% callbacks for hipe_regalloc_prepass
+-export([new_reg_nr/0,
+	 update_reg_nr/2,
+	 update_bb/3,
+	 subst_temps/2]).
+
 check_and_rewrite(CFG, Coloring) ->
   hipe_arm_ra_postconditions:check_and_rewrite(CFG, Coloring, 'normal').
 
@@ -113,6 +119,9 @@ number_of_temporaries(_CFG) ->
 bb(CFG,L) ->
   hipe_arm_cfg:bb(CFG,L).
 
+update_bb(CFG,L,BB) ->
+  hipe_arm_cfg:bb_add(CFG,L,BB).
+
 %% ARM stuff
 
 def_use(Instruction) ->
@@ -145,6 +154,21 @@ is_move(Instruction) ->
 reg_nr(Reg) ->
   hipe_arm:temp_reg(Reg).
 
+new_reg_nr() ->
+  hipe_gensym:get_next_var(arm).
+
+update_reg_nr(Nr, Temp) ->
+  hipe_arm:mk_temp(Nr, hipe_arm:temp_type(Temp)).
+
+subst_temps(SubstFun, Instr) ->
+  hipe_arm_subst:insn_temps(
+    fun(Op) ->
+	case hipe_arm:temp_is_allocatable(Op) of
+	  true -> SubstFun(Op);
+	  false -> Op
+	end
+    end, Instr).
+
 %%% Linear Scan stuff
 
 new_spill_index(SpillIndex) when is_integer(SpillIndex) ->