Merge branch 'ks/hipe-cleanups' into dev

* ks/hipe-cleanups:
  Cleanup and small fixes in hipe files

3 files changed, 54 insertions, 60 deletions

diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index 6726d62b53..3f9488d7c3 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -2,19 +2,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%%--------------------------------------------------------------------
@@ -23,8 +23,6 @@
 %%% Description : Propagate type information.
 %%%
 %%% Created : 25 Feb 2003 by Tobias Lindahl <[email protected]>
-%%%
-%%% $Id$
 %%%--------------------------------------------------------------------
 
 -module(hipe_icode_type).
@@ -39,8 +37,6 @@
 	 update__info/2, new__info/1, return__info/1,
 	 return_none/0, return_none_args/2, return_any_args/2]).
 
--compile({no_auto_import,[min/2,max/2]}).
-
 %%=====================================================================
 
 -include("../main/hipe.hrl").
@@ -80,7 +76,7 @@
 %-define(server_debug, fun(X, Y) -> io:format("~p server: ~s ~p~n", [self(), X, Y]) end).
 -define(server_debug, fun(_, _) -> ok end).
 
--import(erl_types, [min/2, max/2, number_min/1, number_max/1,
+-import(erl_types, [number_min/1, number_max/1,
 		    t_any/0, t_atom/1, t_atom/0, t_atom_vals/1,
 		    t_binary/0, t_bitstr/0, t_bitstr_base/1, t_bitstr_unit/1, 
 		    t_boolean/0, t_cons/0, t_constant/0,
@@ -496,10 +492,10 @@ integer_range_less_then_propagator(IntArg1, IntArg2) ->
   Min2 = number_min(IntArg2),
   Max2 = number_max(IntArg2),
   %% is this the same as erl_types:t_subtract?? no ... ??
-  TrueMax1 = min(Max1, erl_bif_types:infinity_add(Max2, -1)),
-  TrueMin2 = max(erl_bif_types:infinity_add(Min1, 1), Min2),
-  FalseMin1 = max(Min1, Min2),
-  FalseMax2 = min(Max1, Max2),
+  TrueMax1 = erl_types:min(Max1, erl_bif_types:infinity_add(Max2, -1)),
+  TrueMin2 = erl_types:max(erl_bif_types:infinity_add(Min1, 1), Min2),
+  FalseMin1 = erl_types:max(Min1, Min2),
+  FalseMax2 = erl_types:min(Max1, Max2),
   {t_from_range(Min1, TrueMax1),
    t_from_range(TrueMin2, Max2),
    t_from_range(FalseMin1, Max1),
diff --git a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
index ac555b933c..ce33af453a 100644
--- a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
@@ -389,23 +389,23 @@ decrement_each([N|Ns], OldLow, IG, Vis, K) ->
 %%  {Spilled_node, Low_degree_neighbors, New_interference_graph}
 
 spill(IG, Vis, Spill, K, SpillLimit, Target) ->
-   Ns = list_ig(IG),
-   Costs = spill_costs(Ns, IG, Vis, Spill, SpillLimit, Target),
-   ?report3("spill costs are ~p~n",[Costs]),
-   ActualCosts = lists:sort(Costs),
-   ?report3("actual costs are ~p~n",[ActualCosts]),
+  Ns = list_ig(IG),
+  Costs = spill_costs(Ns, IG, Vis, Spill, SpillLimit, Target),
+  ?report3("spill costs are ~p~n", [Costs]),
+  ActualCosts = lists:sort(Costs),
+  ?report3("actual costs are ~p~n", [ActualCosts]),
   case ActualCosts of
-     [] ->
-      ?error_msg("There is no node to spill",[]),
+    [] ->
+      ?error_msg("There is no node to spill", []),
       ?EXIT('no node to spill');
     [{_Cost,N}|_] ->
       {Low, NewIG} = decrement_neighbors(N, [], IG, Vis, K),
-      %?report("spilled node ~p at cost ~p (~p now ready)~n",[N,Cost,Low]),
+      %% ?report("spilled node ~p at cost ~p (~p now ready)~n", [N,Cost,Low]),
       {N, Low, NewIG}
   end.
 
 spill_costs([], _IG, _Vis, _Spill, _SpillLimit, _Target) ->
-   [];
+  [];
 spill_costs([{N,Info}|Ns], IG, Vis, Spill, SpillLimit, Target) ->
   case degree(Info) of
     0 -> spill_costs(Ns,IG,Vis,Spill, SpillLimit, Target);
@@ -451,28 +451,28 @@ select_colors([{X,colorable}|Xs], IG, Cols, PhysRegs, K) ->
   {Reg,NewCols} = select_color(X, IG, Cols, PhysRegs),
   ?report("~p~n",[Reg]),
   [{X,{reg,Reg}} | select_colors(Xs, IG, NewCols, PhysRegs, K)];
-%select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
-%  ?report('spilled: ~p~n',[X]),
-%  %% Check if optimistic coloring could have found a color 
-%  case catch select_color(X,IG,Cols,K) of
-%    {'EXIT',_} ->   % no color possible
-%	?report('(no optimistic color)~n',[]),
-%	[{X,{spill,M}}|select_colors(Xs, IG, Cols, PhysRegs, K)];
-%    {Reg,NewCols} ->
-%	?report('(optimistic color: ~p)~n',[Reg]),
-%	[{X,{reg,Reg}}|select_colors(Xs, IG, Cols, PhysRegs, K)]
-%  end.
+%%select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
+%%  ?report('spilled: ~p~n',[X]),
+%%  %% Check if optimistic coloring could have found a color 
+%%  case catch select_color(X,IG,Cols,K) of
+%%    {'EXIT',_} ->   % no color possible
+%%	?report('(no optimistic color)~n',[]),
+%%	[{X,{spill,M}}|select_colors(Xs, IG, Cols, PhysRegs, K)];
+%%    {Reg,NewCols} ->
+%%	?report('(optimistic color: ~p)~n',[Reg]),
+%%	[{X,{reg,Reg}}|select_colors(Xs, IG, Cols, PhysRegs, K)]
+%%  end.
 
 %% Old code / pessimistic coloring:
 select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
   ?report("spilled: ~p~n",[X]),
   %% Check if optimistic coloring could have found a color
-%    case catch select_color(X,IG,Cols,K) of
-%	{'EXIT',_} ->   % no color possible
-%	    ?report('(no optimistic color)~n',[]);
-%	{Reg,NewCols} ->
-%	    ?report('(optimistic color: ~p)~n',[Reg])
-%    end,
+%%    case catch select_color(X,IG,Cols,K) of
+%%	{'EXIT',_} ->   % no color possible
+%%	    ?report('(no optimistic color)~n',[]);
+%%	{Reg,NewCols} ->
+%%	    ?report('(optimistic color: ~p)~n',[Reg])
+%%    end,
   [{X,{spill,M}} | select_colors(Xs, IG, Cols, PhysRegs, K)].
 
 select_color(X, IG, Cols, PhysRegs) ->
diff --git a/lib/hipe/x86/hipe_x86_spill_restore.erl b/lib/hipe/x86/hipe_x86_spill_restore.erl
index e60c446e17..cd927669fb 100644
--- a/lib/hipe/x86/hipe_x86_spill_restore.erl
+++ b/lib/hipe/x86/hipe_x86_spill_restore.erl
@@ -1,20 +1,20 @@
 %% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %% ====================================================================
@@ -71,9 +71,9 @@ firstPass(Defun) ->
   case hipe_x86_cfg:reverse_postorder(CFG0) of
     [Label1, Label2|_] ->
       SaveTreeElement = saveTreeLookup(Label2, SaveTree),
-      %% FilteredSaveTreeElement is the to be spilled temps around the function call. 
-      %% They are spilled just before move formals
-      FilteredSaveTreeElement = [Temp || Temp <- SaveTreeElement, temp_is_pseudo(Temp)],
+      %% FilteredSaveTreeElement is the to be spilled temps around the
+      %% function call. They are spilled just before move formals.
+      FilteredSaveTreeElement = [T || T <- SaveTreeElement, temp_is_pseudo(T)],
       Block = hipe_x86_cfg:bb(CFG1, Label1),
       Code = hipe_bb:code(Block),
       %% The following statements are tedious but work ok.
@@ -83,7 +83,7 @@ firstPass(Defun) ->
       %% Another solution may be to introduce another block.
       MoveCodes = lists:sublist(Code, length(Code)-1),
       JumpCode = lists:last(Code),
-      hipe_x86_cfg:bb_add(CFG1, Label1, hipe_bb:mk_bb(MoveCodes ++ [hipe_x86:mk_pseudo_spill(FilteredSaveTreeElement)] ++ [JumpCode]));
+      hipe_x86_cfg:bb_add(CFG1, Label1, hipe_bb:mk_bb(MoveCodes ++ [hipe_x86:mk_pseudo_spill(FilteredSaveTreeElement), JumpCode]));
     _ ->
       CFG1
   end.
@@ -110,13 +110,12 @@ firstPassHelper([Label|Labels], Liveness, CFG, SaveTree) ->
   NewBlock = hipe_bb:code_update(Block, NewCode),
   NewCFG = hipe_x86_cfg:bb_add(CFG, Label, NewBlock), 
   SizeOfSet = setSize(NewIntersectedList),
-  
   %% if the Intersected Save List is not empty, insert it in the save tree.
   if SizeOfSet =/= 0 ->
-      UpdatedSaveTree = gb_trees:insert(Label,NewIntersectedList,SaveTree),
-      firstPassHelper(Labels, Liveness, NewCFG,UpdatedSaveTree);
+      UpdatedSaveTree = gb_trees:insert(Label, NewIntersectedList, SaveTree),
+      firstPassHelper(Labels, Liveness, NewCFG, UpdatedSaveTree);
      true ->
-      firstPassHelper(Labels, Liveness, NewCFG,SaveTree)
+      firstPassHelper(Labels, Liveness, NewCFG, SaveTree)
   end;
 firstPassHelper([], _, CFG, SaveTree) ->
   {CFG, SaveTree}.
@@ -125,17 +124,15 @@ firstPassHelper([], _, CFG, SaveTree) ->
 firstPassDoBlock(Insts, LiveOut, IntersectedSaveList) -> 
   lists:foldr(fun firstPassDoInsn/2, {LiveOut,IntersectedSaveList,[]}, Insts).
 
-firstPassDoInsn(I, {LiveOut,IntersectedSaveList,PrevInsts} ) ->
+firstPassDoInsn(I, {LiveOut,IntersectedSaveList,PrevInsts}) ->
   case I of
     #pseudo_call{} ->
       do_pseudo_call(I, {LiveOut,IntersectedSaveList,PrevInsts});
     _ -> % other instructions
       DefinedList = from_list( ?HIPE_X86_LIVENESS:defines(I)),
       UsedList = from_list(?HIPE_X86_LIVENESS:uses(I)),
-      
       NewLiveOut = subtract(union(LiveOut, UsedList), DefinedList),
-      NewIntersectedSaveList = subtract(IntersectedSaveList, DefinedList), 
-      
+      NewIntersectedSaveList = subtract(IntersectedSaveList, DefinedList),
       {NewLiveOut, NewIntersectedSaveList, [I|PrevInsts]}
   end.
 
@@ -162,7 +159,7 @@ saveTreeLookup(Label, SaveTree) ->
       []
   end.
 
-%% Performs the second pass of the algoritm.
+%% Performs the second pass of the algorithm.
 %% It basically eliminates the unnecessary spills and introduces restores.
 %% Works top down
 secondPass(CFG0) ->
@@ -306,7 +303,8 @@ addRestoreBlockToEdge(PseudoCall, ContLabel, CFG, TempArgsList) ->
   NewCFG = hipe_x86_cfg:bb_add(CFG, NextLabel, NewBlock),
   {NewCFG, NewPseudoCall}.
 
-%% used instead of hipe_x86_cfg:redirect_jmp since it does not handle pseudo_call calls.
+%% used instead of hipe_x86_cfg:redirect_jmp since it does not handle
+%% pseudo_call calls.
 redirect_pseudo_call(I = #pseudo_call{contlab=ContLabel}, Old, New) ->
   case Old =:= ContLabel of
     true  -> I#pseudo_call{contlab=New};
@@ -323,8 +321,8 @@ temp_is_pseudo(Temp) ->
 %% Set operations where the module name is an easily changeable macro
 %%---------------------------------------------------------------------
 
-union(Set1,Set2) ->
-  ?SET_MODULE:union(Set1,Set2).
+union(Set1, Set2) ->
+  ?SET_MODULE:union(Set1, Set2).
 
 setSize(Set) ->
   ?SET_MODULE:size(Set).