hipe: Refactor ra callbacks to accept context arg

This allows us to pass around the context data that
hipe_regalloc_prepass needs cleanly, without using process dictionary or
parameterised modules (like it was previous to this change).

1 files changed, 41 insertions, 21 deletions

diff --git a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
index 225f06bded..e91734d8be 100644
--- a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
@@ -51,7 +51,7 @@
 %% 
 
 -module(hipe_graph_coloring_regalloc).
--export([regalloc/6]).
+-export([regalloc/7]).
 
 %%-ifndef(DO_ASSERT).
 %%-define(DO_ASSERT, true).
@@ -78,10 +78,12 @@
 %% no neighbors have the same register or spill location).
 
 %% @spec regalloc(#cfg{}, liveness(), non_neg_fixnum(), non_neg_fixnum(),
-%%                atom(), list()) -> {, non_neg_fixnum()}
+%%                module(), tgt_ctx(), list()) -> {, non_neg_fixnum()}
 
-regalloc(CFG, Live, SpillIndex, SpillLimit, Target, _Options) ->
-  PhysRegs = Target:allocatable(),
+regalloc(CFG, Live, SpillIndex, SpillLimit, TargetMod, TargetContext,
+	 _Options) ->
+  Target = {TargetMod, TargetContext},
+  PhysRegs = allocatable(Target),
   ?report2("building IG~n", []),
   {IG, Spill} = build_ig(CFG, Live, Target),
 
@@ -89,7 +91,7 @@ regalloc(CFG, Live, SpillIndex, SpillLimit, Target, _Options) ->
   ?report3("graph: ~p~nphysical regs: ~p~n", [list_ig(IG), PhysRegs]),
 
   %% These nodes *can't* be allocated to registers. 
-  NotAllocatable = [Target:reg_nr(X) || X <- Target:non_alloc(CFG)],
+  NotAllocatable = non_alloc(CFG, Target),
   %% i.e. Arguments on x86
   ?report2("Nonalloc ~w~n", [NotAllocatable]),
 
@@ -98,7 +100,7 @@ regalloc(CFG, Live, SpillIndex, SpillLimit, Target, _Options) ->
 	  ordsets:from_list(PhysRegs), 
 	  SpillIndex,
 	  SpillLimit,
-	  Target:number_of_temporaries(CFG),
+	  number_of_temporaries(CFG, Target),
 	  Target, NotAllocatable),
   Coloring = [{X, {reg, X}} || X <- NotAllocatable] ++ Cols,
   ?ASSERT(check_coloring(Coloring, IG, Target)),
@@ -114,8 +116,8 @@ regalloc(CFG, Live, SpillIndex, SpillLimit, Target, _Options) ->
 %%
 
 build_ig(CFG, Live, Target) ->
-  NumN = Target:number_of_temporaries(CFG),  % poss. N-1?
-  {IG, Spill} = build_ig_bbs(Target:labels(CFG), 
+  NumN = number_of_temporaries(CFG, Target),  % poss. N-1?
+  {IG, Spill} = build_ig_bbs(labels(CFG, Target),
 			     CFG, 
 			     Live,
 			     empty_ig(NumN), 
@@ -220,7 +222,7 @@ color(IG, Spill, PhysRegs, SpillIx, SpillLimit, NumNodes, Target,
       
   ?report(" starting with low degree nodes ~p~n",[Low]),
   EmptyStk = [],
-  Precolored = Target:all_precoloured(),
+  Precolored = all_precoloured(Target),
   {Stk, NewSpillIx} = 
     simplify(Low, NumNodes, Precolored,
 	     IG, Spill, K, SpillIx, EmptyStk,
@@ -401,7 +403,7 @@ spill_costs([{N,Info}|Ns], IG, Vis, Spill, SpillLimit, Target) ->
 	true ->
 	  spill_costs(Ns,IG,Vis,Spill, SpillLimit, Target);
 	_ ->
-	  case Target:is_fixed(N) of
+	  case is_fixed(N, Target) of
 	    true ->
 	      spill_costs(Ns, IG, Vis, Spill, SpillLimit, Target);
 	    false ->
@@ -758,18 +760,36 @@ valid_coloring(X, C, [_|Ys]) ->
 %% *** INTERFACES TO OTHER MODULES ***
 %%
 
-liveout(CFG, L, Target) ->
-  ordsets:from_list(reg_names(Target:liveout(CFG, L), Target)).
+all_precoloured({TgtMod,TgtCtx}) ->
+  TgtMod:all_precoloured(TgtCtx).
 
-bb(CFG, L, Target) ->
-  hipe_bb:code(Target:bb(CFG, L)).
+allocatable({TgtMod,TgtCtx}) ->
+  TgtMod:allocatable(TgtCtx).
 
-def_use(X, Target) ->
-  {ordsets:from_list(reg_names(Target:defines(X), Target)), 
-   ordsets:from_list(reg_names(Target:uses(X), Target))}.
+is_fixed(Reg, {TgtMod,TgtCtx}) ->
+  TgtMod:is_fixed(Reg, TgtCtx).
 
-reg_names(Regs, Target) ->
-  [Target:reg_nr(X) || X <- Regs].
+labels(CFG, {TgtMod,TgtCtx}) ->
+  TgtMod:labels(CFG, TgtCtx).
+
+liveout(CFG, L, Target={TgtMod,TgtCtx}) ->
+  ordsets:from_list(reg_names(TgtMod:liveout(CFG, L, TgtCtx), Target)).
+
+bb(CFG, L, {TgtMod,TgtCtx}) ->
+  hipe_bb:code(TgtMod:bb(CFG, L, TgtCtx)).
+
+def_use(X, Target={TgtMod,TgtCtx}) ->
+  {ordsets:from_list(reg_names(TgtMod:defines(X,TgtCtx), Target)),
+   ordsets:from_list(reg_names(TgtMod:uses(X,TgtCtx), Target))}.
+
+non_alloc(CFG, Target={TgtMod,TgtCtx}) ->
+  reg_names(TgtMod:non_alloc(CFG, TgtCtx), Target).
+
+number_of_temporaries(CFG, {TgtMod,TgtCtx}) ->
+  TgtMod:number_of_temporaries(CFG, TgtCtx).
+
+reg_names(Regs, {TgtMod,TgtCtx}) ->
+  [TgtMod:reg_nr(X,TgtCtx) || X <- Regs].
 
 %%
 %% Precoloring: use this version when a proper implementation of
@@ -789,5 +809,5 @@ precolor0([R|Rs], Cols, Target) ->
   {[{R, {reg, physical_name(R, Target)}}|Cs], 
    set_color(R, physical_name(R, Target), Cols1)}.
 
-physical_name(X, Target) ->
-  Target:physical_name(X).
+physical_name(X, {TgtMod,TgtCtx}) ->
+  TgtMod:physical_name(X, TgtCtx).