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).

4 files changed, 13 insertions, 12 deletions

diff --git a/lib/hipe/sparc/hipe_sparc_ra.erl b/lib/hipe/sparc/hipe_sparc_ra.erl
index a567e62e46..c4b909528d 100644
--- a/lib/hipe/sparc/hipe_sparc_ra.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra.erl
@@ -27,15 +27,15 @@ ra(CFG0, Options) ->
   {CFG1, _FPLiveness1, Coloring_fp, SpillIndex}
     = case proplists:get_bool(inline_fp, Options) of
 	true ->
-	  FPLiveness0 = hipe_sparc_specific_fp:analyze(CFG0),
+	  FPLiveness0 = hipe_sparc_specific_fp:analyze(CFG0, no_context),
 	  hipe_regalloc_loop:ra_fp(CFG0, FPLiveness0, Options,
 				   hipe_coalescing_regalloc,
-				   hipe_sparc_specific_fp);
+				   hipe_sparc_specific_fp, no_context);
 	false ->
 	  {CFG0,undefined,[],0}
       end,
   %% hipe_sparc_pp:pp(hipe_sparc_cfg:linearise(CFG1)),
-  GPLiveness1 = hipe_sparc_specific:analyze(CFG1),
+  GPLiveness1 = hipe_sparc_specific:analyze(CFG1, no_context),
   {CFG2, _GPLiveness2, Coloring}
     = case proplists:get_value(regalloc, Options, coalescing) of
 	coalescing ->
@@ -57,4 +57,4 @@ ra(CFG0, Options) ->
 
 ra(CFG, Liveness, SpillIndex, Options, RegAllocMod) ->
   hipe_regalloc_loop:ra(CFG, Liveness, SpillIndex, Options, RegAllocMod,
-			hipe_sparc_specific).
+			hipe_sparc_specific, no_context).
diff --git a/lib/hipe/sparc/hipe_sparc_ra_ls.erl b/lib/hipe/sparc/hipe_sparc_ra_ls.erl
index 4d4a870a69..7019937737 100644
--- a/lib/hipe/sparc/hipe_sparc_ra_ls.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra_ls.erl
@@ -24,7 +24,7 @@
 -export([ra/4]).
 
 ra(CFG, Liveness, SpillIndex, Options) ->
-  SpillLimit = hipe_sparc_specific:number_of_temporaries(CFG),
+  SpillLimit = hipe_sparc_specific:number_of_temporaries(CFG, no_context),
   alloc(CFG, Liveness, SpillIndex, SpillLimit, Options).
 
 alloc(CFG, Liveness, SpillIndex, SpillLimit, Options) ->
@@ -37,19 +37,19 @@ alloc(CFG, Liveness, SpillIndex, SpillLimit, Options) ->
        hipe_sparc_registers:temp1()],
       [hipe_sparc_cfg:start_label(CFG)],
       SpillIndex, SpillLimit, Options,
-      hipe_sparc_specific),
+      hipe_sparc_specific, no_context),
   {NewCFG, _DidSpill} =
     hipe_sparc_ra_postconditions:check_and_rewrite(
       CFG, Coloring, 'linearscan'),
-  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific),
+  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific, no_context),
   {TempMap2,_NewSpillIndex2} =
     hipe_spillmin:stackalloc(CFG, Liveness, [], SpillIndex, Options,
-			     hipe_sparc_specific, TempMap),
+			     hipe_sparc_specific, no_context, TempMap),
   Coloring2 =
     hipe_spillmin:mapmerge(hipe_temp_map:to_substlist(TempMap), TempMap2),
   {NewCFG, Liveness, Coloring2}.
 
 regalloc(CFG, Liveness, PhysRegs, Entrypoints, SpillIndex, DontSpill, Options,
-	 Target) ->
+	 TgtMod, TgtCtx) ->
   hipe_ls_regalloc:regalloc(CFG, Liveness, PhysRegs, Entrypoints, SpillIndex,
-			    DontSpill, Options, Target).
+			    DontSpill, Options, TgtMod, TgtCtx).
diff --git a/lib/hipe/sparc/hipe_sparc_ra_postconditions.erl b/lib/hipe/sparc/hipe_sparc_ra_postconditions.erl
index 0336a6c59f..e8e231e35c 100644
--- a/lib/hipe/sparc/hipe_sparc_ra_postconditions.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra_postconditions.erl
@@ -26,7 +26,7 @@
 -include("hipe_sparc.hrl").
 
 check_and_rewrite(CFG, Coloring, Allocator) ->
-  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific),
+  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific, no_context),
   check_and_rewrite2(CFG, TempMap, Allocator).
 
 check_and_rewrite2(CFG, TempMap, Allocator) ->
diff --git a/lib/hipe/sparc/hipe_sparc_ra_postconditions_fp.erl b/lib/hipe/sparc/hipe_sparc_ra_postconditions_fp.erl
index d3e1d8cf93..544b8b05a8 100644
--- a/lib/hipe/sparc/hipe_sparc_ra_postconditions_fp.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra_postconditions_fp.erl
@@ -26,7 +26,8 @@
 -include("hipe_sparc.hrl").
 
 check_and_rewrite(CFG, Coloring) ->
-  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific_fp),
+  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific_fp,
+				     no_context),
   do_bbs(hipe_sparc_cfg:labels(CFG), TempMap, CFG, false).
 
 do_bbs([], _TempMap, CFG, DidSpill) -> {CFG, DidSpill};