Merge branch 'master' into sverker/master/load_nif-print-init-error

1 files changed, 17 insertions, 19 deletions

diff --git a/lib/hipe/sparc/hipe_sparc_ra_ls.erl b/lib/hipe/sparc/hipe_sparc_ra_ls.erl
index 19e7c92d2f..7019937737 100644
--- a/lib/hipe/sparc/hipe_sparc_ra_ls.erl
+++ b/lib/hipe/sparc/hipe_sparc_ra_ls.erl
@@ -21,37 +21,35 @@
 %% Linear Scan register allocator for SPARC
 
 -module(hipe_sparc_ra_ls).
--export([ra/3]).
+-export([ra/4]).
 
-ra(Defun, SpillIndex, Options) ->
-  NewDefun = Defun, %% hipe_${ARCH}_ra_rename:rename(Defun,Options),
-  CFG = hipe_sparc_cfg:init(NewDefun),
-  SpillLimit = hipe_sparc_specific:number_of_temporaries(CFG),
-  alloc(NewDefun, SpillIndex, SpillLimit, Options).
+ra(CFG, Liveness, SpillIndex, Options) ->
+  SpillLimit = hipe_sparc_specific:number_of_temporaries(CFG, no_context),
+  alloc(CFG, Liveness, SpillIndex, SpillLimit, Options).
 
-alloc(Defun, SpillIndex, SpillLimit, Options) ->
-  CFG = hipe_sparc_cfg:init(Defun),
+alloc(CFG, Liveness, SpillIndex, SpillLimit, Options) ->
   {Coloring, _NewSpillIndex} =
     regalloc(
-      CFG,
+      CFG, Liveness,
       hipe_sparc_registers:allocatable_gpr()--
       [hipe_sparc_registers:temp3(),
        hipe_sparc_registers:temp2(),
        hipe_sparc_registers:temp1()],
       [hipe_sparc_cfg:start_label(CFG)],
       SpillIndex, SpillLimit, Options,
-      hipe_sparc_specific),
-  {NewDefun, _DidSpill} =
+      hipe_sparc_specific, no_context),
+  {NewCFG, _DidSpill} =
     hipe_sparc_ra_postconditions:check_and_rewrite(
-      Defun, Coloring, 'linearscan'),
-  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific),
+      CFG, Coloring, 'linearscan'),
+  TempMap = hipe_temp_map:cols2tuple(Coloring, hipe_sparc_specific, no_context),
   {TempMap2,_NewSpillIndex2} =
-    hipe_spillmin:stackalloc(CFG, [], SpillIndex, Options,
-			     hipe_sparc_specific, TempMap),
+    hipe_spillmin:stackalloc(CFG, Liveness, [], SpillIndex, Options,
+			     hipe_sparc_specific, no_context, TempMap),
   Coloring2 =
     hipe_spillmin:mapmerge(hipe_temp_map:to_substlist(TempMap), TempMap2),
-  {NewDefun, Coloring2}.
+  {NewCFG, Liveness, Coloring2}.
 
-regalloc(CFG, PhysRegs, Entrypoints, SpillIndex, DontSpill, Options, Target) ->
-  hipe_ls_regalloc:regalloc(
-    CFG, PhysRegs, Entrypoints, SpillIndex, DontSpill, Options, Target).
+regalloc(CFG, Liveness, PhysRegs, Entrypoints, SpillIndex, DontSpill, Options,
+	 TgtMod, TgtCtx) ->
+  hipe_ls_regalloc:regalloc(CFG, Liveness, PhysRegs, Entrypoints, SpillIndex,
+			    DontSpill, Options, TgtMod, TgtCtx).