Merge branch 'kostis/hipe-cleanup-19-rc1'

author: Sverker Eriksson <[email protected]> 2016-05-31 15:00:02 +0200
committer: Sverker Eriksson <[email protected]> 2016-05-31 15:00:02 +0200
commit: 78b50b543395f9af748e2b00afb8c0266e708514 (patch)
tree: acf9bfb112d9c276c52d6ad7d460be1ff10d1b7e /lib
parent: 17e95dd8dcb0149b771d4aafaeeebc715ee59d3d (diff)
parent: f2ef57d35c27e62f7df6de312ff613bd9afd3c1d (diff)
download: otp-78b50b543395f9af748e2b00afb8c0266e708514.tar.gz
otp-78b50b543395f9af748e2b00afb8c0266e708514.tar.bz2
otp-78b50b543395f9af748e2b00afb8c0266e708514.zip
32 files changed, 734 insertions, 738 deletions
diff --git a/lib/hipe/amd64/Makefile b/lib/hipe/amd64/Makefile
index 0d81ff4d72..8dc2af2679 100644
--- a/lib/hipe/amd64/Makefile
+++ b/lib/hipe/amd64/Makefile
@@ -73,7 +73,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += -DHIPE_AMD64 +warn_exported_vars
+ERL_COMPILE_FLAGS += -DHIPE_AMD64 -Werror +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/arm/Makefile b/lib/hipe/arm/Makefile
index 6622680ee1..00b6732afa 100644
--- a/lib/hipe/arm/Makefile
+++ b/lib/hipe/arm/Makefile
@@ -74,7 +74,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
index 78930154a9..9f50d6bf91 100644
--- a/lib/hipe/cerl/Makefile
+++ b/lib/hipe/cerl/Makefile
@@ -66,7 +66,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += -Werror +inline +warn_exported_vars +warn_unused_import +warn_missing_spec #+warn_untyped_record
+ERL_COMPILE_FLAGS += +inline -Werror +warn_export_vars +warn_unused_import +warn_missing_spec #+warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index b037a4360c..c383541020 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -1751,14 +1751,14 @@ map_def_val(?map(_,_,DefV)) ->
 -spec mapdict_store(t_map_pair(), t_map_dict()) -> t_map_dict().
 
 mapdict_store(E={K,_,_}, [{K,_,_}|T]) -> [E|T];
-mapdict_store(E1={K1,_,_}, [E2={K2,_,_}|T]) when K1 > K2->
+mapdict_store(E1={K1,_,_}, [E2={K2,_,_}|T]) when K1 > K2 ->
   [E2|mapdict_store(E1, T)];
 mapdict_store(E={_,_,_}, T) -> [E|T].
 
 -spec mapdict_insert(t_map_pair(), t_map_dict()) -> t_map_dict().
 
 mapdict_insert(E={K,_,_}, D=[{K,_,_}|_]) -> error(badarg, [E, D]);
-mapdict_insert(E1={K1,_,_}, [E2={K2,_,_}|T]) when K1 > K2->
+mapdict_insert(E1={K1,_,_}, [E2={K2,_,_}|T]) when K1 > K2 ->
   [E2|mapdict_insert(E1, T)];
 mapdict_insert(E={_,_,_}, T) -> [E|T].
 
@@ -1769,25 +1769,26 @@ mapdict_insert(E={_,_,_}, T) -> [E|T].
 			      t_map_mandatoriness(), erl_type())
 			     -> t_map_pair() | false),
 			 erl_type(), erl_type()) -> t_map_dict().
-map_pairwise_merge(F, ?map(APairs, ADefK, ADefV),
-		       ?map(BPairs, BDefK, BDefV)) ->
+map_pairwise_merge(F, ?map(APairs, ADefK, ADefV), ?map(BPairs, BDefK, BDefV)) ->
   map_pairwise_merge(F, APairs, ADefK, ADefV, BPairs, BDefK, BDefV).
 
 map_pairwise_merge(_, [], _, _, [], _, _) -> [];
 map_pairwise_merge(F, As0, ADefK, ADefV, Bs0, BDefK, BDefV) ->
-  case {As0, Bs0} of
-    {[{K,AMNess,AV}|As], [{K, BMNess,BV}|Bs]} -> ok;
-    {[{K,AMNess,AV}|As], [{BK,_,     _ }|_]=Bs} when K < BK ->
-      {BMNess, BV} = {?opt, mapmerge_otherv(K, BDefK, BDefV)};
-    {As,                 [{K, BMNess,BV}|Bs]} ->
-      {AMNess, AV} = {?opt, mapmerge_otherv(K, ADefK, ADefV)};
-    {[{K,AMNess,AV}|As], []=Bs} ->
-      {BMNess, BV} = {?opt, mapmerge_otherv(K, BDefK, BDefV)}
-  end,
-  MK = K, %% Rename to make clear that we are matching below
-  case F(K, AMNess, AV, BMNess, BV) of
-    false ->         map_pairwise_merge(F,As,ADefK,ADefV,Bs,BDefK,BDefV);
-    M={MK,_,_} -> [M|map_pairwise_merge(F,As,ADefK,ADefV,Bs,BDefK,BDefV)]
+  {K1, AMNess1, AV1, As1, BMNess1, BV1, Bs1} =
+    case {As0, Bs0} of
+      {[{K,AMNess,AV}|As], [{K, BMNess,BV}|Bs]} ->
+	{K, AMNess, AV, As, BMNess, BV, Bs};
+      {[{K,AMNess,AV}|As], [{BK,_,     _ }|_]=Bs} when K < BK ->
+        {K, AMNess, AV, As, ?opt, mapmerge_otherv(K, BDefK, BDefV), Bs};
+      {As,                 [{K, BMNess,BV}|Bs]} ->
+        {K, ?opt, mapmerge_otherv(K, ADefK, ADefV), As, BMNess, BV, Bs};
+      {[{K,AMNess,AV}|As], []=Bs} ->
+        {K, AMNess, AV, As, ?opt, mapmerge_otherv(K, BDefK, BDefV), Bs}
+    end,
+  MK = K1, %% Rename to make clear that we are matching below
+  case F(K1, AMNess1, AV1, BMNess1, BV1) of
+    false ->         map_pairwise_merge(F,As1,ADefK,ADefV,Bs1,BDefK,BDefV);
+    {MK,_,_}=M -> [M|map_pairwise_merge(F,As1,ADefK,ADefV,Bs1,BDefK,BDefV)]
   end.
 
 %% Folds over the pairs in two maps simultaneously in reverse key order. Missing
@@ -1804,17 +1805,19 @@ map_pairwise_merge_foldr(F, AccIn, ?map(APairs, ADefK, ADefV),
 
 map_pairwise_merge_foldr(_, Acc,   [],  _,     _,     [],  _,     _) -> Acc;
 map_pairwise_merge_foldr(F, AccIn, As0, ADefK, ADefV, Bs0, BDefK, BDefV) ->
-  case {As0, Bs0} of
-    {[{K,AMNess,AV}|As], [{K, BMNess,BV}|Bs]} -> ok;
-    {[{K,AMNess,AV}|As], [{BK,_,     _ }|_]=Bs} when K < BK ->
-      {BMNess, BV} = {?opt, mapmerge_otherv(K, BDefK, BDefV)};
-    {As,                 [{K, BMNess,BV}|Bs]} ->
-      {AMNess, AV} = {?opt, mapmerge_otherv(K, ADefK, ADefV)};
-    {[{K,AMNess,AV}|As], []=Bs} ->
-      {BMNess, BV} = {?opt, mapmerge_otherv(K, BDefK, BDefV)}
-  end,
-  F(K, AMNess, AV, BMNess, BV,
-    map_pairwise_merge_foldr(F,AccIn,As,ADefK,ADefV,Bs,BDefK,BDefV)).
+  {K1, AMNess1, AV1, As1, BMNess1, BV1, Bs1} =
+    case {As0, Bs0} of
+      {[{K,AMNess,AV}|As], [{K,BMNess,BV}|Bs]} ->
+	{K, AMNess, AV, As, BMNess, BV, Bs};
+      {[{K,AMNess,AV}|As], [{BK,_,     _ }|_]=Bs} when K < BK ->
+	{K, AMNess, AV, As, ?opt, mapmerge_otherv(K, BDefK, BDefV), Bs};
+      {As,                 [{K,BMNess,BV}|Bs]} ->
+        {K, ?opt, mapmerge_otherv(K, ADefK, ADefV), As, BMNess, BV, Bs};
+      {[{K,AMNess,AV}|As], []=Bs} ->
+        {K, AMNess, AV, As, ?opt, mapmerge_otherv(K, BDefK, BDefV), Bs}
+    end,
+  F(K1, AMNess1, AV1, BMNess1, BV1,
+    map_pairwise_merge_foldr(F,AccIn,As1,ADefK,ADefV,Bs1,BDefK,BDefV)).
 
 %% By observing that a missing pair in a map is equivalent to an optional pair,
 %% with ?none or DefV value, depending on whether K \in DefK, we can simplify
diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
index fe1675b7dd..d883eecf36 100644
--- a/lib/hipe/flow/Makefile
+++ b/lib/hipe/flow/Makefile
@@ -66,7 +66,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec # +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/flow/cfg.hrl b/lib/hipe/flow/cfg.hrl
index 641ec102db..2575b9e38a 100644
--- a/lib/hipe/flow/cfg.hrl
+++ b/lib/hipe/flow/cfg.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@
                    is_closure    :: boolean(),
                    closure_arity = none :: 'none' | arity(),
                    is_leaf       :: boolean(),
-                   params,     % :: list()
-                   info = []}).  %% this field seems not needed; take out??
+                   params        :: list(),    %% XXX: refine
+                   info = []     :: list()}).  %% seems not needed; take out??
 -type cfg_info() :: #cfg_info{}.
 
 %%
diff --git a/lib/hipe/flow/hipe_dominators.erl b/lib/hipe/flow/hipe_dominators.erl
index 1b147607c7..72c16b5688 100644
--- a/lib/hipe/flow/hipe_dominators.erl
+++ b/lib/hipe/flow/hipe_dominators.erl
@@ -59,7 +59,7 @@
 -record(domTree, {root                     :: cfg_lbl(),
 		  size  = 0		   :: non_neg_integer(),
 		  nodes = gb_trees:empty() :: gb_trees:tree()}).
--type domTree() :: #domTree{}.
+-opaque domTree() :: #domTree{}.
 
 %%>----------------------------------------------------------------------<
 %% Procedure : domTree_create/1
diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
index c86562a981..b220bc16a0 100644
--- a/lib/hipe/icode/Makefile
+++ b/lib/hipe/icode/Makefile
@@ -84,7 +84,7 @@ DOC_FILES= $(DOC_MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_unused_import +warn_exported_vars +warn_missing_spec # +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_unused_import +warn_export_vars +warn_missing_spec # +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 07d230491d..78508dff22 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -610,7 +610,9 @@
 %% Exported types
 %%
 
--export_type([icode/0]).
+-export_type([icode/0, params/0]).
+
+-type params() :: [icode_var()].
 
 %%---------------------------------------------------------------------
 %% 
@@ -618,7 +620,7 @@
 %%
 %%---------------------------------------------------------------------
 
--spec mk_icode(mfa(), [icode_var()], boolean(), boolean(), [icode_instr()],
+-spec mk_icode(mfa(), params(), boolean(), boolean(), [icode_instr()],
 	       {non_neg_integer(),non_neg_integer()}, 
 	       {icode_lbl(),icode_lbl()}) -> icode().
 mk_icode(Fun, Params, IsClosure, IsLeaf, Code, VarRange, LabelRange) ->
@@ -629,7 +631,7 @@ mk_icode(Fun, Params, IsClosure, IsLeaf, Code, VarRange, LabelRange) ->
 	 var_range=VarRange,
 	 label_range=LabelRange}.
 
--spec mk_icode(mfa(), [icode_var()], boolean(), boolean(), [icode_instr()],
+-spec mk_icode(mfa(), params(), boolean(), boolean(), [icode_instr()],
 	       hipe_consttab(), {non_neg_integer(),non_neg_integer()}, 
 	       {icode_lbl(),icode_lbl()}) -> icode().
 mk_icode(Fun, Params, IsClosure, IsLeaf, Code, Data, VarRange, LabelRange) ->
@@ -640,11 +642,11 @@ mk_icode(Fun, Params, IsClosure, IsLeaf, Code, Data, VarRange, LabelRange) ->
 -spec icode_fun(icode()) -> mfa().
 icode_fun(#icode{'fun' = MFA}) -> MFA.
 
--spec icode_params(icode()) -> [icode_var()].
+-spec icode_params(icode()) -> params().
 icode_params(#icode{params = Params}) -> Params.
 
--spec icode_params_update(icode(), [icode_var()]) -> icode().
-icode_params_update(Icode, Params) -> 
+-spec icode_params_update(icode(), params()) -> icode().
+icode_params_update(Icode, Params) ->
   Icode#icode{params = Params}.
 
 -spec icode_is_closure(icode()) -> boolean().
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 999c54732b..b2e0d86b28 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -169,7 +169,7 @@
 %%---------------------------------------------------------------------
 
 -record(icode, {'fun'		:: mfa(),
-		params		:: [icode_var()],
+		params		:: hipe_icode:params(),
 		%% TODO: merge is_closure and closure_arity into one field
 		is_closure	:: boolean(),
 		closure_arity = none	:: 'none' | arity(),
diff --git a/lib/hipe/icode/hipe_icode_cfg.erl b/lib/hipe/icode/hipe_icode_cfg.erl
index b9969fa69d..9a602c0283 100644
--- a/lib/hipe/icode/hipe_icode_cfg.erl
+++ b/lib/hipe/icode/hipe_icode_cfg.erl
@@ -55,6 +55,9 @@
 -spec postorder(cfg()) -> [icode_lbl()].
 -spec reverse_postorder(cfg()) -> [icode_lbl()].
 
+-spec params(cfg()) -> hipe_icode:params().
+-spec params_update(cfg(), hipe_icode:params()) -> cfg().
+
 -spec is_visited(icode_lbl(), gb_sets:set()) -> boolean().
 -spec visit(icode_lbl(), gb_sets:set()) -> gb_sets:set().
 
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index 24ffc71237..12ed796690 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -89,6 +89,7 @@
 		ret_type			:: range(),
 		lookup_fun			:: call_fun(),
 		result_action			:: final_fun()}).
+-type state() :: #state{}.
 
 -define(WIDEN, 1).
 
@@ -172,7 +173,7 @@ analyse(Cfg, Data) ->
   catch throw:no_input -> ok
   end.
 
--spec safe_analyse(cfg(), data()) -> #state{}.
+-spec safe_analyse(cfg(), data()) -> state().
 
 safe_analyse(CFG, Data={MFA,_,_,_}) ->
   State = state__init(CFG, Data),
@@ -181,14 +182,14 @@ safe_analyse(CFG, Data={MFA,_,_,_}) ->
   (state__result_action(NewState))(MFA, [state__ret_type(NewState)]),
   NewState.
 
--spec rewrite_blocks(#state{}) -> #state{}.
+-spec rewrite_blocks(state()) -> state().
 
 rewrite_blocks(State) ->
   CFG = state__cfg(State),
   Start = hipe_icode_cfg:start_label(CFG),
   rewrite_blocks([Start], State, [Start]).
 
--spec rewrite_blocks([label()], #state{}, [label()]) -> #state{}.
+-spec rewrite_blocks([label()], state(), [label()]) -> state().
 
 rewrite_blocks([Next|Rest], State, Visited) ->
   Info = state__info_in(State, Next),
@@ -201,7 +202,7 @@ rewrite_blocks([Next|Rest], State, Visited) ->
 rewrite_blocks([], State, _) ->
   State.
 
--spec analyse_blocks(#state{}, work_list()) -> #state{}.
+-spec analyse_blocks(state(), work_list()) -> state().
 
 analyse_blocks(State, Work) ->
   case get_work(Work) of
@@ -218,7 +219,7 @@ analyse_blocks(State, Work) ->
       analyse_blocks(NewState, NewWork2)
   end.
 
--spec analyse_block(label(), info(), #state{}, boolean()) -> {#state{}, [label()]}.
+-spec analyse_block(label(), info(), state(), boolean()) -> {state(), [label()]}.
 
 analyse_block(Label, Info, State, Rewrite) ->
   BB = state__bb(State, Label),
@@ -612,36 +613,32 @@ analyse_if(If, Info, Rewrite) ->
 	 {#icode_goto{} | #icode_if{}, [{label(), info()}]}.
 
 analyse_sane_if(If, Info, [Arg1, Arg2], [Range1, Range2], Rewrite) ->
-  case normalize_name(hipe_icode:if_op(If)) of
-    '>' ->
-      {TrueRange2, TrueRange1, FalseRange2, FalseRange1} = 
-	range_inequality_propagation(Range2, Range1);
-    '<' ->
-      {TrueRange1, TrueRange2, FalseRange1, FalseRange2} =
+  {TrueRange1, TrueRange2, FalseRange1, FalseRange2} =
+    case normalize_name(hipe_icode:if_op(If)) of
+      '>' ->
+	{TR2, TR1, FR2, FR1} = range_inequality_propagation(Range2, Range1),
+	{TR1, TR2, FR1, FR2};
+      '<' ->
 	range_inequality_propagation(Range1, Range2);
-    '>=' ->
-      {FalseRange1, FalseRange2, TrueRange1, TrueRange2} =
-	range_inequality_propagation(Range1, Range2);
-    '=<' ->
-      {FalseRange2, FalseRange1, TrueRange2, TrueRange1} =
-	range_inequality_propagation(Range2, Range1);
-    '=:=' ->
-      {TrueRange1, TrueRange2, FalseRange1, FalseRange2} =
-	range_equality_propagation(Range1, Range2);
-    '=/=' ->
-      {FalseRange1, FalseRange2, TrueRange1, TrueRange2} =
-	range_equality_propagation(Range1, Range2);
-    '==' ->
-      {TempTrueRange1, TempTrueRange2, FalseRange1, FalseRange2} =
-	range_equality_propagation(Range1, Range2),
-      TrueRange1 = set_other(TempTrueRange1, other(Range1)),
-      TrueRange2 = set_other(TempTrueRange2, other(Range2));
-    '/=' -> 
-      {TempFalseRange1, TempFalseRange2, TrueRange1, TrueRange2} =
-	range_equality_propagation(Range1, Range2),
-      FalseRange1 = set_other(TempFalseRange1, other(Range1)),
-      FalseRange2 = set_other(TempFalseRange2, other(Range2))
-  end,
+      '>=' ->
+	{FR1, FR2, TR1, TR2} = range_inequality_propagation(Range1, Range2),
+	{TR1, TR2, FR1, FR2};
+      '=<' ->
+	{FR2, FR1, TR2, TR1} = range_inequality_propagation(Range2, Range1),
+	{TR1, TR2, FR1, FR2};
+      '=:=' ->
+	{TR1, TR2, FR1, FR2} = range_equality_propagation(Range1, Range2),
+	{TR1, TR2, FR1, FR2};
+      '=/=' ->
+	{FR1, FR2, TR1, TR2} = range_equality_propagation(Range1, Range2),
+	{TR1, TR2, FR1, FR2};
+      '==' ->
+	{TR1, TR2, FR1, FR2} = range_equality_propagation(Range1, Range2),
+	{set_other(TR1,other(Range1)), set_other(TR2,other(Range2)), FR1, FR2};
+      '/=' ->
+	{FR1, FR2, TR1, TR2} = range_equality_propagation(Range1, Range2),
+	{TR1, TR2, set_other(FR1,other(Range1)), set_other(FR2,other(Range2))}
+    end,
   %% io:format("TR1 = ~w\nTR2 = ~w\n", [TrueRange1, TrueRange2]),
   True =
     case lists:all(fun range__is_none/1, [TrueRange1, TrueRange2]) of
@@ -694,26 +691,24 @@ normalize_name(Name) ->
 -spec range_equality_propagation(range(), range()) ->
 	  {range(), range(), range(), range()}.
 
-range_equality_propagation(Range_1, Range_2) ->  
-  True_range = inf(Range_1, Range_2),
-  case {range(Range_1), range(Range_2)} of
-    {{N,N}, {N,N}} ->
-      False_range_1 = none_range(),
-      False_range_2 = none_range();
-    {{N1,N1}, {N2,N2}} ->
-      False_range_1 = Range_1,
-      False_range_2 = Range_2;
-    {{N,N}, _} ->
-      False_range_1 = Range_1,
-      {_,False_range_2} = compare_with_integer(N, Range_2);
-    {_, {N,N}} ->
-      False_range_2 = Range_2,
-      {_,False_range_1} = compare_with_integer(N, Range_1);
-    {_, _} ->
-      False_range_1 = Range_1,
-      False_range_2 = Range_2
-  end,
-  {True_range, True_range, False_range_1, False_range_2}.
+range_equality_propagation(Range1, Range2) ->  
+  TrueRange = inf(Range1, Range2),
+  {FalseRange1, FalseRange2} =
+    case {range(Range1), range(Range2)} of
+      {{N,N}, {N,N}} ->
+	{none_range(), none_range()};
+      {{N1,N1}, {N2,N2}} ->
+	{Range1, Range2};
+      {{N,N}, _} ->
+	{_,FR2} = compare_with_integer(N, Range2),
+	{Range1, FR2};
+      {_, {N,N}} ->
+	{_,FR1} = compare_with_integer(N, Range1),
+	{FR1, Range2};
+      {_, _} ->
+	{Range1, Range2}
+    end,
+  {TrueRange, TrueRange, FalseRange1, FalseRange2}.
 
 -spec range_inequality_propagation(range(), range()) ->
 	  {range(), range(), range(), range()}.
@@ -779,18 +774,17 @@ analyse_type(Type, Info, Rewrite) ->
   TypeTest = hipe_icode:type_test(Type),
   [Arg|_] = hipe_icode:type_args(Type),
   OldVarRange = get_range_from_arg(Arg),
-  case TypeTest of
-    {integer, N} ->
-      {TrueRange,FalseRange} = compare_with_integer(N,OldVarRange);
-    integer ->
-      TrueRange = inf(any_range(), OldVarRange),
-      FalseRange = inf(none_range(), OldVarRange);
-    number ->
-      TrueRange = FalseRange = OldVarRange;
-    _ ->
-      TrueRange = inf(none_range(), OldVarRange),
-      FalseRange = OldVarRange
-  end,
+  {TrueRange, FalseRange} =
+    case TypeTest of
+      {integer, N} ->
+	compare_with_integer(N, OldVarRange);
+      integer ->
+	{inf(any_range(), OldVarRange), inf(none_range(), OldVarRange)};
+      number ->
+	{OldVarRange, OldVarRange};
+      _ ->
+	{inf(none_range(), OldVarRange), OldVarRange}
+    end,
   TrueLabel = hipe_icode:type_true_label(Type),
   FalseLabel = hipe_icode:type_false_label(Type),
   TrueInfo = enter_define({Arg, TrueRange}, Info),
@@ -1201,14 +1195,12 @@ basic_type(#unsafe_update_element{}) -> not_analysed.
 
 analyse_bs_get_integer(Size, Flags, true) ->
   Signed = Flags band 4,
-  if Signed =:= 0 ->
-      Max = inf_add(inf_bsl(1, Size), -1),
-      Min = 0;
-     true ->
-      Max = inf_add(inf_bsl(1, Size-1), -1),
-      Min = inf_inv(inf_bsl(1, Size-1))
-  end,
-  {Min, Max};
+  case Signed =:= 0 of
+    true ->
+      {0, inf_add(inf_bsl(1, Size), -1)};	% return {Min, Max}
+    false ->
+      {inf_inv(inf_bsl(1, Size-1)), inf_add(inf_bsl(1, Size-1), -1)}
+  end;
 analyse_bs_get_integer(Size, Flags, false) when is_integer(Size),
 						is_integer(Flags) ->
   any_r().
@@ -1653,7 +1645,7 @@ inf_bsl(Number1, Number2) when is_integer(Number1), is_integer(Number2) ->
 
 %% State
 
--spec state__init(cfg(), data()) -> #state{}.
+-spec state__init(cfg(), data()) -> state().
 
 state__init(Cfg, {MFA, ArgsFun, CallFun, FinalFun}) ->
   Start = hipe_icode_cfg:start_label(Cfg),  
@@ -1676,19 +1668,19 @@ state__init(Cfg, {MFA, ArgsFun, CallFun, FinalFun}) ->
 	     lookup_fun=CallFun, result_action=FinalFun}
   end.
 
--spec state__cfg(#state{}) -> cfg().
+-spec state__cfg(state()) -> cfg().
 
 state__cfg(#state{cfg=Cfg}) ->
   Cfg.
 
--spec state__bb(#state{}, label()) -> bb().
+-spec state__bb(state(), label()) -> bb().
 
 state__bb(#state{cfg=Cfg}, Label) ->
   BB = hipe_icode_cfg:bb(Cfg, Label),
   true = hipe_bb:is_bb(BB), % Just an assert
   BB.
   
--spec state__bb_add(#state{}, label(), bb()) -> #state{}.
+-spec state__bb_add(state(), label(), bb()) -> state().
 
 state__bb_add(S=#state{cfg=Cfg}, Label, BB) ->
   NewCfg = hipe_icode_cfg:bb_add(Cfg, Label, BB),
@@ -1774,14 +1766,12 @@ join_info_in([Var|Left], Info1, Info2, Acc, Changed) ->
       NewTree = gb_trees:insert(Var, Val, Acc),
       join_info_in(Left, Info1, Info2, NewTree, Changed);
     {{value, Val1}, {value, Val2}} ->
-      NewVal = 
+      {NewChanged, NewVal} = 
 	case sup(Val1, Val2) of
 	  Val1 ->
-	    NewChanged = Changed,
-	    Val1;
+	    {Changed, Val1};
 	  Val ->
-	    NewChanged = true,
-	    Val
+	    {true, Val}
 	end,
       NewTree = gb_trees:insert(Var, NewVal, Acc),
       join_info_in(Left, Info1, Info2, NewTree, NewChanged)
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index 5eae8d440a..794c27ebcc 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -105,6 +105,7 @@
 		ret_type  = [t_none()]       :: [erl_types:erl_type()],
 		lookupfun                    :: call_fun(),
 		resultaction                 :: final_fun()}).
+-type state() :: #state{}.
 
 %%-----------------------------------------------------------------------
 %% The main exported function
@@ -193,7 +194,7 @@ analyse(Cfg, Data) ->
   catch throw:no_input -> ok % No need to do anything since we have no input
   end.
 
--spec safe_analyse(cfg(), data()) -> #state{}.
+-spec safe_analyse(cfg(), data()) -> state().
 
 safe_analyse(Cfg, {MFA,_,_,_}=Data) ->
   State = new_state(Cfg, Data),
@@ -461,24 +462,24 @@ integer_range_inequality_propagation(Op, A1, A2, TrueLab, FalseLab, Info) ->
   NonIntArg1 = t_subtract(Arg1, t_integer()),
   NonIntArg2 = t_subtract(Arg2, t_integer()),
   ?ineq_debug("nonintargs", [NonIntArg1,NonIntArg2]),
-  case t_is_none(IntArg1) or t_is_none(IntArg2) of
+  case t_is_none(IntArg1) orelse t_is_none(IntArg2) of
     true ->
       ?ineq_debug("one is none", [IntArg1,IntArg2]),
       [{TrueLab, Info}, {FalseLab, Info}];
     false ->
-      case Op of
-	'>=' ->
- 	  {FalseArg1, FalseArg2, TrueArg1, TrueArg2} =
- 	    integer_range_less_then_propagator(IntArg1, IntArg2);
- 	'>' ->
- 	  {TrueArg2, TrueArg1, FalseArg2, FalseArg1} =
- 	    integer_range_less_then_propagator(IntArg2, IntArg1);
- 	'<' ->
- 	  {TrueArg1, TrueArg2, FalseArg1, FalseArg2} =
- 	    integer_range_less_then_propagator(IntArg1, IntArg2);
- 	'=<' ->
- 	  {FalseArg2, FalseArg1, TrueArg2, TrueArg1} =
- 	    integer_range_less_then_propagator(IntArg2, IntArg1)
+      {TrueArg1, TrueArg2, FalseArg1, FalseArg2} =
+	case Op of
+	  '>=' ->
+	    {FA1, FA2, TA1, TA2} = int_range_lt_propagator(IntArg1, IntArg2),
+	    {TA1, TA2, FA1, FA2};
+	  '>' ->
+	    {TA2, TA1, FA2, FA1} = int_range_lt_propagator(IntArg2, IntArg1),
+	    {TA1, TA2, FA1, FA2};
+	  '<' ->
+	    int_range_lt_propagator(IntArg1, IntArg2);
+	  '=<' ->
+	    {FA2, FA1, TA2, TA1} = int_range_lt_propagator(IntArg2, IntArg1),
+	    {TA1, TA2, FA1, FA2}
 	end,
       ?ineq_debug("int res", [TrueArg1, TrueArg2, FalseArg1, FalseArg2]),
       False = {FalseLab, enter(A1, t_sup(FalseArg1, NonIntArg1),
@@ -488,7 +489,7 @@ integer_range_inequality_propagation(Op, A1, A2, TrueLab, FalseLab, Info) ->
       [True, False]
   end.
 
-integer_range_less_then_propagator(IntArg1, IntArg2) ->
+int_range_lt_propagator(IntArg1, IntArg2) ->
   Min1 = number_min(IntArg1),
   Max1 = number_max(IntArg1),
   Min2 = number_min(IntArg2),
diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile
index 25b47a580f..88016a7d8b 100644
--- a/lib/hipe/llvm/Makefile
+++ b/lib/hipe/llvm/Makefile
@@ -52,8 +52,7 @@ endif
 
 MODULES = $(HIPE_MODULES)
 
-HRL_FILES= elf_format.hrl elf32_format.hrl elf64_format.hrl \
-	hipe_llvm_arch.hrl
+HRL_FILES= elf_format.hrl elf32_format.hrl elf64_format.hrl hipe_llvm_arch.hrl
 ERL_FILES= $(MODULES:%=%.erl)
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
@@ -71,7 +70,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +inline +warn_export_vars #+warn_missing_spec
+ERL_COMPILE_FLAGS += -Werror +inline +warn_export_vars #+warn_missing_spec
 
 # if in 32 bit backend define BIT32 symbol
 ARCH = $(shell echo $(TARGET) | sed 's/^\(x86_64\)-.*/64bit/')
diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
index 6b6cad3ed3..8ef31dbb46 100644
--- a/lib/hipe/main/Makefile
+++ b/lib/hipe/main/Makefile
@@ -70,7 +70,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +nowarn_shadow_vars +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +nowarn_shadow_vars +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 981265b3e9..6c525dd143 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -449,16 +449,16 @@ compile(Name, File, Opts0) when is_atom(Name) ->
     true ->
       case filename:find_src(filename:rootname(File, ".beam")) of
 	{error, _} ->
-	  ?error_msg("Cannot find source code for ~p.",[File]),
+	  ?error_msg("Cannot find source code for ~p.", [File]),
 	  ?EXIT({cant_find_source_code});
 	{Source, CompOpts} ->
 	  CoreOpts = [X || X = {core_transform, _} <- Opts],
-	  %%io:format("Using: ~w\n", [CoreOpts]),
+	  %% io:format("Using: ~w\n", [CoreOpts]),
 	  case compile:file(Source, CoreOpts ++ [to_core, binary|CompOpts]) of
 	    {ok, _, Core} ->
 	      compile_core(Name, Core, File, Opts);
 	    Error ->
-	      ?error_msg("Error compiling ~p:\n~p.",[File, Error]),
+	      ?error_msg("Error compiling ~p:\n~p.", [File, Error]),
 	      ?EXIT({cant_compile_source_code})
 	  end
       end;
@@ -470,7 +470,7 @@ compile(Name, File, Opts0) when is_atom(Name) ->
 	{ok, _, Core} ->
 	  compile_core(Name, Core, File, Opts);
 	Error ->
-	  ?error_msg("Error compiling ~p:\n~p\n",[Source, Error]),
+	  ?error_msg("Error compiling ~p:\n~p\n", [Source, Error]),
 	  ?EXIT({cant_compile_source_code, Error})
       end;
     Other when Other =:= false; Other =:= undefined ->
@@ -573,8 +573,7 @@ file(File, Options) when is_atom(File) ->
 disasm(File) ->
   case beam_disasm:file(File) of
     #beam_file{labeled_exports = LabeledExports,
-	       compile_info = CompInfo,
-	       code = BeamCode} ->
+	       compile_info = CompInfo, code = BeamCode} ->
       CompOpts = proplists:get_value(options, CompInfo, []),
       HCompOpts = case lists:keyfind(hipe, 1, CompOpts) of
 		    {hipe, L} when is_list(L) -> L;
@@ -597,16 +596,16 @@ fix_beam_exports([], Exports) ->
   Exports.
 
 get_beam_icode(Mod, {BeamCode, Exports}, File, Options) ->
-  ?option_time({ok, Icode} =
-	       (catch {ok, hipe_beam_to_icode:module(BeamCode, Options)}),
-	       "BEAM-to-Icode", Options),
+  {ok, Icode} =
+    ?option_time((catch {ok, hipe_beam_to_icode:module(BeamCode, Options)}),
+	         "BEAM-to-Icode", Options),
   BeamBin = get_beam_code(File),
   {{Mod, Exports, Icode}, BeamBin}.
 
 get_core_icode(Mod, Core, File, Options) ->
-  ?option_time({ok, Icode} =
-	       (catch {ok, cerl_to_icode:module(Core, Options)}),
-	       "BEAM-to-Icode", Options),
+  {ok, Icode} =
+    ?option_time((catch {ok, cerl_to_icode:module(Core, Options)}),
+		 "BEAM-to-Icode", Options),
   NeedBeamCode = not proplists:get_bool(load, Options),
   BeamBin = 
     case NeedBeamCode of
@@ -619,7 +618,7 @@ get_core_icode(Mod, Core, File, Options) ->
 get_beam_code(Bin) when is_binary(Bin) -> Bin;
 get_beam_code(FileName) ->
   case erl_prim_loader:get_file(FileName) of
-    {ok,Bin,_} ->
+    {ok, Bin, _} ->
       Bin;
     error ->
       ?EXIT(no_beam_file)
diff --git a/lib/hipe/main/hipe.hrl.src b/lib/hipe/main/hipe.hrl.src
index 3be824ac34..53b59f88f0 100644
--- a/lib/hipe/main/hipe.hrl.src
+++ b/lib/hipe/main/hipe.hrl.src
@@ -152,7 +152,7 @@
 	STMNT,
 	?untagged_msg(Msg ++ "~.2f s\n",[hipe_timing:stop_timer(Timer)/1000])).
 -else.
--define(TIME_STMNT(STMNT,Msg,Timer),STMNT).
+-define(TIME_STMNT(STMNT,Msg,Timer), STMNT).
 -endif.
 
 -define(start_timer(Text), hipe_timing:start(Text, ?MODULE)).
@@ -162,22 +162,24 @@
 -define(get_hipe_timer_val(Timer), get(Timer)).
 -define(set_hipe_timer_val(Timer, Val), put(Timer, Val)).
 -define(option_time(Stmnt, Text, Options),
-        if true -> ?when_option(time, Options, ?start_timer(Text)),
-                   fun(R) ->
-                           ?when_option(time, Options, ?stop_timer(Text)),
-                           R
-                   end(Stmnt)end).
+        begin
+	    ?when_option(time, Options, ?start_timer(Text)),
+	    fun(R) ->
+		    ?when_option(time, Options, ?stop_timer(Text)),
+		    R
+	    end(Stmnt)
+	end).
 
--define(option_start_time(Text,Options),
+-define(option_start_time(Text, Options),
 	?when_option(time, Options, ?start_timer(Text))).
 
--define(option_stop_time(Text,Options),
+-define(option_stop_time(Text, Options),
 	?when_option(time, Options, ?stop_timer(Text))).
 
 -define(opt_start_timer(Text),
-	hipe_timing:start_optional_timer(Text,?MODULE)).
+	hipe_timing:start_optional_timer(Text, ?MODULE)).
 -define(opt_stop_timer(Text),
-	hipe_timing:stop_optional_timer(Text,?MODULE)).
+	hipe_timing:stop_optional_timer(Text, ?MODULE)).
      
 %%
 %% Turn on instrumentation of the compiler.
@@ -187,15 +189,15 @@
 -define(count_pre_ra_instructions(Options, NoInstrs),
 	?when_option(count_instrs, Options,
 		     put(pre_ra_instrs,
-			 get(pre_ra_instrs)+ NoInstrs))).
+			 get(pre_ra_instrs) + NoInstrs))).
 -define(count_post_ra_instructions(Options, NoInstrs),
 	?when_option(count_instrs, Options,
 		     put(post_ra_instrs,
-			 get(post_ra_instrs)+ NoInstrs))).
+			 get(post_ra_instrs) + NoInstrs))).
 
 -define(start_time_regalloc(Options),
 	?when_option(timeregalloc, Options, 
-		     put(regalloctime1,erlang:statistics(runtime)))).
+		     put(regalloctime1, erlang:statistics(runtime)))).
 -define(stop_time_regalloc(Options),
 	?when_option(timeregalloc, Options, 
 		     put(regalloctime,
@@ -215,11 +217,11 @@
 -define(count_pre_ra_temps(Options, NoTemps),
 	?when_option(count_temps, Options,
 		     put(pre_ra_temps,
-			 get(pre_ra_temps)+ NoTemps))).
+			 get(pre_ra_temps) + NoTemps))).
 -define(count_post_ra_temps(Options, NoTemps),
 	?when_option(count_temps, Options,
 		     put(post_ra_temps,
-			 get(post_ra_temps)+ NoTemps))).
+			 get(post_ra_temps) + NoTemps))).
 
 -define(inc_counter(Counter, Val),
 	case get(Counter) of
@@ -255,7 +257,7 @@
 	  ?count_post_ra_instructions(Options, NoInstrs),
 	  ?cons_counter(counter_mem_temps, get(counter_mfa_mem_temps)),
 	  ?cons_counter(ra_all_iterations_counter, get(ra_iteration_counter)),
-	  put(ra_iteration_counter,0),
+	  put(ra_iteration_counter, 0),
 	  ?count_post_ra_temps(Options, NoTemps)
 	end).
 
@@ -264,12 +266,12 @@
 		     put(spilledtemps, get(spilledtemps) + NoSpills))).
 
 -define(optional_start_timer(Timer, Options),
-	case lists:member(Timer, proplists:get_value(timers,Options++[{timers,[]}])) of
+	case lists:member(Timer, proplists:get_value(timers, Options++[{timers,[]}])) of
 	  true -> ?start_hipe_timer(Timer);
 	  false -> true
 	end).
 -define(optional_stop_timer(Timer, Options),
-	case lists:member(Timer, proplists:get_value(timers,Options++[{timers,[]}])) of
+	case lists:member(Timer, proplists:get_value(timers, Options++[{timers,[]}])) of
 	  true -> ?stop_hipe_timer(Timer);
 	  false -> true
 	end).
@@ -316,4 +318,4 @@
 	                    'unknown' | {'reg' | 'fp_reg' | 'spill',
 	                                 non_neg_integer()}}].
 -type hipe_temp_map()  :: tuple().
--type hipe_spill_map() :: [{non_neg_integer(), {'spill',non_neg_integer()}}].
+-type hipe_spill_map() :: [{non_neg_integer(), {'spill', non_neg_integer()}}].
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index b9d783d20a..4b89feb48a 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -296,7 +296,7 @@ icode_ssa_convert(IcodeCfg, Options) ->
 icode_ssa_const_prop(IcodeSSA, Options) ->
   case proplists:get_bool(icode_ssa_const_prop, Options) of
     true ->
-      ?option_time(Tmp=hipe_icode_ssa_const_prop:propagate(IcodeSSA),
+      Tmp = ?option_time(hipe_icode_ssa_const_prop:propagate(IcodeSSA),
 		   "Icode SSA sparse conditional constant propagation", Options),
       ?option_time(hipe_icode_ssa:remove_dead_code(Tmp),
 		   "Icode SSA dead code elimination pass 1", Options);
diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
index 60d2861c62..72cfff21a8 100644
--- a/lib/hipe/misc/Makefile
+++ b/lib/hipe/misc/Makefile
@@ -69,7 +69,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/opt/Makefile b/lib/hipe/opt/Makefile
index ec0d01b42e..684d6f45b4 100644
--- a/lib/hipe/opt/Makefile
+++ b/lib/hipe/opt/Makefile
@@ -64,7 +64,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec # +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars +warn_missing_spec # +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/ppc/Makefile b/lib/hipe/ppc/Makefile
index 576c089f15..1901dfa671 100644
--- a/lib/hipe/ppc/Makefile
+++ b/lib/hipe/ppc/Makefile
@@ -76,7 +76,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/regalloc/Makefile b/lib/hipe/regalloc/Makefile
index 2b94f5ecfe..aaa4418f37 100644
--- a/lib/hipe/regalloc/Makefile
+++ b/lib/hipe/regalloc/Makefile
@@ -77,7 +77,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars# +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars #+warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index e0ff225a25..b4cdf8b1f2 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -75,7 +75,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += -Werror +inline +warn_unused_import +warn_exported_vars
+ERL_COMPILE_FLAGS += -Werror +inline +warn_unused_import +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/rtl/hipe_rtl.erl b/lib/hipe/rtl/hipe_rtl.erl
index 1d627ed024..0726827299 100644
--- a/lib/hipe/rtl/hipe_rtl.erl
+++ b/lib/hipe/rtl/hipe_rtl.erl
@@ -366,7 +366,7 @@
 
 -export([subst_uses_llvm/2]).
 
--export_type([alub_cond/0]).
+-export_type([alub_cond/0, rtl/0]).
 
 %%
 %% RTL
@@ -384,6 +384,7 @@
 	      label_range,  %% {Min,Max} First and last name used for labels
 	      info=[]       %% A keylist with arbitrary information.
 	     }).
+-opaque rtl() :: #rtl{}.
 
 mk_rtl(Fun, ArgList, Closure, Leaf, Code, Data, VarRange, LabelRange) ->
   #rtl{'fun'=Fun, arglist=ArgList, code=Code, 
@@ -414,7 +415,9 @@ rtl_info_update(Rtl, Info) -> Rtl#rtl{info=Info}.
 %% move
 %%
 
-mk_move(Dst, Src) -> false = is_fpreg(Dst), false = is_fpreg(Src), #move{dst=Dst, src=Src}.
+mk_move(Dst, Src) ->
+  false = is_fpreg(Dst), false = is_fpreg(Src),
+  #move{dst=Dst, src=Src}.
 move_dst(#move{dst=Dst}) -> Dst.
 move_dst_update(M, NewDst) -> false = is_fpreg(NewDst), M#move{dst=NewDst}.
 move_src(#move{src=Src}) -> Src.
diff --git a/lib/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index 645bc83f9f..0c396c8e76 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -47,73 +47,80 @@ eval_alu(Op, Arg1, Arg2)
       Res = (Arg1 - Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),
-      V = (Sign1 and (not Sign2) and (not N)) 
+      V = (Sign1 andalso (not Sign2) andalso (not N)) 
 	or
-          ((not Sign1) and Sign2 and N),
-      C = ((not Sign1) and Sign2) 
+          ((not Sign1) andalso Sign2 andalso N),
+      C = ((not Sign1) andalso Sign2) 
 	or 
-	  (N and ((not Sign1) or Sign2));
+	  (N andalso ((not Sign1) orelse Sign2)),
+     {Res, N, Z, V, C};
     'add' ->
       Res = (Arg1 + Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),
-      V = (Sign1 and Sign2 and (not N)) 
+      V = (Sign1 andalso Sign2 andalso (not N)) 
 	or
-          ((not Sign1) and (not Sign2) and N),
-      C = (Sign1 and Sign2)
+          ((not Sign1) andalso (not Sign2) andalso N),
+      C = (Sign1 andalso Sign2)
 	or 
-	  ((not N) and (Sign1 or Sign2));
+	  ((not N) andalso (Sign1 orelse Sign2)),
+     {Res, N, Z, V, C};
     'mul' ->
       FullRes = Arg1 * Arg2,
       Res = FullRes band ?WORDMASK,
       ResHi = FullRes bsr ?BITS,
       N = sign_bit(Res),
       Z = zero(Res),
-      V = (N and (ResHi =/= -1)) or ((not N) and (ResHi =/= 0)),
-      C = V;
+      V = (N andalso (ResHi =/= -1)) orelse ((not N) andalso (ResHi =/= 0)),
+      C = V,
+     {Res, N, Z, V, C};
     'sra' ->
       Res = (Arg1 bsr Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),    
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     'srl' ->
       Res = (Arg1 bsr Arg2) band shiftmask(Arg2),
       N = sign_bit(Res),
       Z = zero(Res),     
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     'sll' ->
       Res = (Arg1 bsl Arg2) band ?WORDMASK, 
       N = sign_bit(Res),
       Z = zero(Res),     
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     'or' ->
       Res = (Arg1 bor Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),     
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     'and' ->
       Res = (Arg1 band Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),     
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     'xor' ->
       Res = (Arg1 bxor Arg2) band ?WORDMASK,
       N = sign_bit(Res),
       Z = zero(Res),     
       V = 0,
-      C = 0;
+      C = 0,
+     {Res, N, Z, V, C};
     Op ->
-      Res = N = Z = V = C = 0,
       ?EXIT({"unknown alu op", Op})
-  end,
-  {Res, N, Z, V, C};
+  end;
 eval_alu(Op, Arg1, Arg2) ->
-  ?EXIT({argument_overflow,Op,Arg1,Arg2}).
+  ?EXIT({argument_overflow, Op, Arg1, Arg2}).
 
 %% Björn & Bjarni:
 %% We need to be able to do evaluations based only on the bits, since
@@ -130,9 +137,9 @@ eval_cond_bits(Cond, N, Z, V, C) ->
     'ne' -> 
       not Z;
     'gt' ->
-      not (Z or (N xor V));
+      not (Z orelse (N xor V));
     'gtu' -> 
-      not (C or Z);
+      not (C orelse Z);
     'ge' -> 
       not (N xor V);
     'geu'-> 
@@ -142,9 +149,9 @@ eval_cond_bits(Cond, N, Z, V, C) ->
     'ltu'->
       C;
     'le' ->
-      Z or (N xor V);
+      Z orelse (N xor V);
     'leu'->
-      C or Z;
+      C orelse Z;
     'overflow' ->
       V;
     'not_overflow' ->
diff --git a/lib/hipe/rtl/hipe_rtl_binary_construct.erl b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
index 4403aa552f..367d76b24d 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_construct.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,25 +19,21 @@
 %% %CopyrightEnd%
 %%
 %% ====================================================================
-%%  Module   :	hipe_rtl_inline_bs_ops
+%%  Module   : hipe_rtl_binary_construct
 %%  Purpose  :  
 %%  Notes    : 
-%%  History  :	* 2001-06-14 Erik Johansson ([email protected]): Created.
+%%  History  : Written mostly by Per Gustafsson
 %% ====================================================================
 %%  Exports  :
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -module(hipe_rtl_binary_construct).
+
 -export([gen_rtl/7]).
--import(hipe_tagscheme, [set_field_from_term/3,
-			 get_field_from_term/3,
-			 set_field_from_pointer/3,
-			 get_field_from_pointer/3]).
-
--import(hipe_rtl_binary, [floorlog2/1,
-			  get_word_integer/4,
-			  make_size/4]).
+
+-import(hipe_rtl_binary, [get_word_integer/4]).
+
 %%-------------------------------------------------------------------------
 
 -include("../main/hipe.hrl").
@@ -50,7 +46,6 @@
 -define(BYTE_SIZE, 8).
 -define(MAX_BINSIZE, ((1 bsl ((hipe_rtl_arch:word_size()*?BYTE_SIZE)-3)) - 1)).
 
-
 %% -------------------------------------------------------------------------
 %% The code is generated as a list of lists, it will be flattened later.
 %% 
@@ -61,12 +56,12 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
     {bs_put_string, String, SizeInBytes} ->
       [NewOffset] = get_real(Dst),
       [Base, Offset] = Args,
-      put_string(NewOffset, ConstTab, String, SizeInBytes, Base, Offset, 
+      put_string(NewOffset, ConstTab, String, SizeInBytes, Base, Offset,
 		 TrueLblName);
-    _ -> 
-      Code = 
+    _ ->
+      Code =
 	case BsOP of
-	  {bs_init, Size, _Flags} -> 
+	  {bs_init, Size, _Flags} ->
 	    [] = Args,
 	    [Dst0, Base, Offset] = Dst,
 	    case is_illegal_const(Size bsl 3) of
@@ -75,14 +70,14 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	      false ->
 		const_init2(Size, Dst0, Base, Offset, TrueLblName)
 	    end;
-	  
-	  {bs_init, _Flags} -> 
+
+	  {bs_init, _Flags} ->
 	    [Size] = Args,
 	    [Dst0, Base, Offset] = Dst,
-	    var_init2(Size, Dst0, Base, Offset, TrueLblName, 
+	    var_init2(Size, Dst0, Base, Offset, TrueLblName,
 		      SystemLimitLblName, FalseLblName);
 
-	  {bs_init_bits, Size, _Flags} -> 
+	  {bs_init_bits, Size, _Flags} ->
 	    [] = Args,
 	    [Dst0, Base, Offset] = Dst,
 	    case is_illegal_const(Size) of
@@ -91,19 +86,19 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	      false ->
 		const_init_bits(Size, Dst0, Base, Offset, TrueLblName)
 	    end;
-	  
-	  {bs_init_bits, _Flags} -> 
+
+	  {bs_init_bits, _Flags} ->
 	    [Size] = Args,
 	    [Dst0, Base, Offset] = Dst,
-	    var_init_bits(Size, Dst0, Base, Offset, TrueLblName, 
+	    var_init_bits(Size, Dst0, Base, Offset, TrueLblName,
 			  SystemLimitLblName, FalseLblName);
-	  
+
 	  {bs_put_binary_all, Unit, _Flags} ->
 	    [Src, Base, Offset] = Args,
 	    [NewOffset] = get_real(Dst),
 	    put_binary_all(NewOffset, Src, Base, Offset, Unit,
 			   TrueLblName, FalseLblName);
-	   
+
 	  {bs_put_binary, Size, _Flags} ->
 	    case is_illegal_const(Size) of
 	      true ->
@@ -112,19 +107,19 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 		[NewOffset] = get_real(Dst),
 		case Args of
 		  [Src, Base, Offset] ->
-		    put_static_binary(NewOffset, Src, Size, Base, Offset, 
+		    put_static_binary(NewOffset, Src, Size, Base, Offset,
 				      TrueLblName, FalseLblName);
 		  [Src, Bits, Base, Offset]  ->
-		    {SizeCode, SizeReg} = make_size(Size, Bits,
-						    SystemLimitLblName,
-						    FalseLblName),
-		    InCode = put_dynamic_binary(NewOffset, Src, SizeReg, Base, 
+		    {SizeCode, SizeReg} =
+		      hipe_rtl_binary:make_size(Size, Bits, SystemLimitLblName,
+						FalseLblName),
+		    InCode = put_dynamic_binary(NewOffset, Src, SizeReg, Base,
 						Offset, TrueLblName, FalseLblName),
 		    SizeCode ++ InCode
 		end
 	    end;
-		
-	  {bs_put_float, Size, Flags, ConstInfo} ->    
+
+	  {bs_put_float, Size, Flags, ConstInfo} ->
 	    [NewOffset] = get_real(Dst),
 	    Aligned = aligned(Flags),
 	    LittleEndian = littleendian(Flags),
@@ -134,106 +129,108 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	     false ->
 	       case Args of
 		 [Src, Base, Offset] ->
-		   CCode = static_float_c_code(NewOffset, Src, Base, Offset, Size, Flags, 
+		   CCode = static_float_c_code(NewOffset, Src, Base, Offset, Size, Flags,
 					       TrueLblName, FalseLblName),
-		   put_float(NewOffset, Src, Base, Offset, Size, CCode, Aligned, 
+		   put_float(NewOffset, Src, Base, Offset, Size, CCode, Aligned,
 			     LittleEndian, ConstInfo, TrueLblName);
 		 [Src, Bits, Base, Offset] ->
-		   {SizeCode, SizeReg} = make_size(Size, Bits,
-						   SystemLimitLblName,
-						   FalseLblName),
-		   InCode = float_c_code(NewOffset, Src, Base, Offset, SizeReg, 
+		   {SizeCode, SizeReg} =
+		     hipe_rtl_binary:make_size(Size, Bits, SystemLimitLblName,
+					       FalseLblName),
+		   InCode = float_c_code(NewOffset, Src, Base, Offset, SizeReg,
 					 Flags, TrueLblName, FalseLblName),
 		   SizeCode ++ InCode
 	       end
 	   end;
 
-	  {bs_put_integer, Size, Flags, ConstInfo} -> 
-	    Aligned = aligned(Flags), 
+	  {bs_put_integer, Size, Flags, ConstInfo} ->
+	    Aligned = aligned(Flags),
 	    LittleEndian = littleendian(Flags),
 	    [NewOffset] = get_real(Dst),
 	    case is_illegal_const(Size) of
 	      true ->
 		[hipe_rtl:mk_goto(FalseLblName)];
 	      false ->
-		case ConstInfo of 
+		case ConstInfo of
 		  fail ->
 		    [hipe_rtl:mk_goto(FalseLblName)];
-		  _ -> 
-		    case Args of 
-		      [Src, Base, Offset] ->  
+		  _ ->
+		    case Args of
+		      [Src, Base, Offset] ->
 			CCode = static_int_c_code(NewOffset, Src,
-						  Base, Offset, Size, 
-						  Flags, TrueLblName, 
+						  Base, Offset, Size,
+						  Flags, TrueLblName,
 						  FalseLblName),
-			put_static_int(NewOffset, Src, Base, Offset, Size, 
-				       CCode, Aligned, LittleEndian, TrueLblName); 
-		      [Src, Bits, Base, Offset] -> 
-		    {SizeCode, SizeReg} = make_size(Size, Bits,
+			put_static_int(NewOffset, Src, Base, Offset, Size,
+				       CCode, Aligned, LittleEndian, TrueLblName);
+		      [Src, Bits, Base, Offset] ->
+			{SizeCode, SizeReg} =
+			  hipe_rtl_binary:make_size(Size, Bits,
 						    SystemLimitLblName,
 						    FalseLblName), 
 			CCode = int_c_code(NewOffset, Src, Base,
-					   Offset, SizeReg, Flags, 
-					   TrueLblName, FalseLblName), 
+					   Offset, SizeReg, Flags,
+					   TrueLblName, FalseLblName),
 			InCode =
-			  put_dynamic_int(NewOffset, Src, Base, Offset, 
+			  put_dynamic_int(NewOffset, Src, Base, Offset,
 					  SizeReg, CCode, Aligned,
-					  LittleEndian, TrueLblName), 
-			SizeCode ++ InCode 
-		    end 
-		end 
+					  LittleEndian, TrueLblName),
+			SizeCode ++ InCode
+		    end
+		end
 	    end;
-	  
-	  {unsafe_bs_put_integer, 0, _Flags, _ConstInfo} -> 
-	    [NewOffset] = get_real(Dst), 
+
+	  {unsafe_bs_put_integer, 0, _Flags, _ConstInfo} ->
+	    [NewOffset] = get_real(Dst),
 	    case Args of
 	      [_Src, _Base, Offset] ->
 		[hipe_rtl:mk_move(NewOffset,Offset),
-		 hipe_rtl:mk_goto(TrueLblName)]; 
-	      [_Src, _Bits, _Base, Offset] -> 
+		 hipe_rtl:mk_goto(TrueLblName)];
+	      [_Src, _Bits, _Base, Offset] ->
 		[hipe_rtl:mk_move(NewOffset,Offset),
-		 hipe_rtl:mk_goto(TrueLblName)] 
-	    end; 
-	  
-	  {unsafe_bs_put_integer, Size, Flags, ConstInfo} -> 
+		 hipe_rtl:mk_goto(TrueLblName)]
+	    end;
+
+	  {unsafe_bs_put_integer, Size, Flags, ConstInfo} ->
 	     case is_illegal_const(Size) of
 	      true ->
 		[hipe_rtl:mk_goto(FalseLblName)];
 	      false ->
 		 Aligned = aligned(Flags),
-		 LittleEndian = littleendian(Flags), 
-		 [NewOffset] = get_real(Dst), 
-		 case ConstInfo of 
+		 LittleEndian = littleendian(Flags),
+		 [NewOffset] = get_real(Dst),
+		 case ConstInfo of
 		   fail ->
-		     [hipe_rtl:mk_goto(FalseLblName)]; 
-		   _ -> 
-		     case Args of 
-		       [Src, Base, Offset] -> 
+		     [hipe_rtl:mk_goto(FalseLblName)];
+		   _ ->
+		     case Args of
+		       [Src, Base, Offset] ->
 			 CCode = static_int_c_code(NewOffset, Src,
-						   Base, Offset, Size, 
-						   Flags, TrueLblName, 
+						   Base, Offset, Size,
+						   Flags, TrueLblName,
 						   FalseLblName),
-			 put_unsafe_static_int(NewOffset, Src, Base, 
+			 put_unsafe_static_int(NewOffset, Src, Base,
 					       Offset, Size,
-					       CCode, Aligned, LittleEndian, 
-					       TrueLblName); 
-		       [Src, Bits, Base, Offset] -> 
-			 {SizeCode, SizeReg} = make_size(Size, Bits,
-							 SystemLimitLblName,
-							 FalseLblName), 
+					       CCode, Aligned, LittleEndian,
+					       TrueLblName);
+		       [Src, Bits, Base, Offset] ->
+			 {SizeCode, SizeReg} =
+			   hipe_rtl_binary:make_size(Size, Bits,
+						     SystemLimitLblName,
+						     FalseLblName),
 			 CCode = int_c_code(NewOffset, Src, Base,
-					    Offset, SizeReg, Flags, 
-					    TrueLblName, FalseLblName), 
+					    Offset, SizeReg, Flags,
+					    TrueLblName, FalseLblName),
 			 InCode =
-			   put_unsafe_dynamic_int(NewOffset, Src, Base, 
-						  Offset, SizeReg, CCode, 
-						  Aligned, LittleEndian, 
+			   put_unsafe_dynamic_int(NewOffset, Src, Base,
+						  Offset, SizeReg, CCode,
+						  Aligned, LittleEndian,
 						  TrueLblName),
-			 SizeCode ++ InCode 
-		     end 
+			 SizeCode ++ InCode
+		     end
 		 end
-	     end; 
-	  
+	     end;
+
 	  bs_utf8_size ->
 	    case Dst of
 	      [_DstVar] ->
@@ -276,13 +273,13 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    [hipe_rtl:mk_call([], bs_validate_unicode, Args,
 			      TrueLblName, FalseLblName, not_remote)];
 
-	  bs_final -> 
+	  bs_final ->
 	    Zero = hipe_rtl:mk_imm(0),
-	    [Src, Offset] = Args, 
+	    [Src, Offset] = Args,
 	    [BitSize, ByteSize] = create_regs(2),
 	    [ShortLbl, LongLbl] = create_lbls(2),
-	    case Dst of 
-	      [DstVar] -> 
+	    case Dst of
+	      [DstVar] ->
 		[hipe_rtl:mk_alub(BitSize, Offset, 'and', ?LOW_BITS, eq,
 				  hipe_rtl:label_name(ShortLbl),
 				  hipe_rtl:label_name(LongLbl)), ShortLbl,
@@ -292,11 +289,11 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 		 hipe_rtl:mk_alu(ByteSize, Offset, 'srl', ?BYTE_SHIFT),
 		 hipe_tagscheme:mk_sub_binary(DstVar, ByteSize,
 					      Zero, BitSize, Zero, Src),
-		 hipe_rtl:mk_goto(TrueLblName)]; 
+		 hipe_rtl:mk_goto(TrueLblName)];
 	      [] ->
-		[hipe_rtl:mk_goto(TrueLblName)] 
-	    end; 
-	  
+		[hipe_rtl:mk_goto(TrueLblName)]
+	    end;
+
 	  bs_init_writable ->
 	    Zero = hipe_rtl:mk_imm(0),
 	    [Size] = Args,
@@ -306,29 +303,29 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    [hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE + ?SUB_BIN_WORDSIZE),
 	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
 	     allocate_writable(DstVar, Base, SizeReg, Zero, Zero),
-	     hipe_rtl:mk_goto(TrueLblName)]; 
-	  
+	     hipe_rtl:mk_goto(TrueLblName)];
+
 	  {bs_private_append, _U, _F} ->
-	    [Size, Bin] = Args, 
+	    [Size, Bin] = Args,
 	    [DstVar, Base, Offset] = Dst,
 	    [ProcBin] = create_vars(1),
 	    [SubSize, SizeReg, EndSubSize, EndSubBitSize] = create_regs(4),
 	    SubBinSize = {sub_binary, binsize},
-	    [get_field_from_term({sub_binary, orig}, Bin, ProcBin),
-	     get_field_from_term(SubBinSize, Bin, SubSize),
+	    [hipe_tagscheme:get_field_from_term({sub_binary, orig}, Bin, ProcBin),
+	     hipe_tagscheme:get_field_from_term(SubBinSize, Bin, SubSize),
 	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
 	     realloc_binary(SizeReg, ProcBin, Base),
 	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
-	     set_field_from_term(SubBinSize, Bin, EndSubSize),
-	     set_field_from_term({sub_binary, bitsize}, Bin, EndSubBitSize),
+	     hipe_tagscheme:set_field_from_term(SubBinSize, Bin, EndSubSize),
+	     hipe_tagscheme:set_field_from_term({sub_binary, bitsize}, Bin, EndSubBitSize),
 	     hipe_rtl:mk_move(DstVar, Bin),
 	     hipe_rtl:mk_goto(TrueLblName)]; 
 
 	  {bs_append, _U, _F, Unit, _Bla} ->
-	    [Size, Bin] = Args, 
-	    [DstVar, Base, Offset] = Dst, 
+	    [Size, Bin] = Args,
+	    [DstVar, Base, Offset] = Dst,
 	    [ProcBin] = create_vars(1),
-	    [Flags, SizeReg, IsWritable, EndSubSize, EndSubBitSize] = 
+	    [Flags, SizeReg, IsWritable, EndSubSize, EndSubBitSize] =
 	      create_regs(5),
 	    [ContLbl,ContLbl2,ContLbl3,ContLbl4,WritableLbl,NotWritableLbl] =
 	      Lbls = create_lbls(6),
@@ -339,24 +336,24 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    SubIsWritable = {sub_binary, is_writable},
 	    [hipe_rtl:mk_gctest(?SUB_BIN_WORDSIZE + ?PROC_BIN_WORDSIZE),
 	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
-	     hipe_tagscheme:test_bitstr(Bin, ContLblName, FalseLblName, 0.99), 
-	     ContLbl, 
-	     hipe_tagscheme:test_subbinary(Bin,ContLbl2Name, NotWritable), 
+	     hipe_tagscheme:test_bitstr(Bin, ContLblName, FalseLblName, 0.99),
+	     ContLbl,
+	     hipe_tagscheme:test_subbinary(Bin,ContLbl2Name, NotWritable),
 	     ContLbl2,
-	     get_field_from_term(SubIsWritable, Bin, IsWritable),
+	     hipe_tagscheme:get_field_from_term(SubIsWritable, Bin, IsWritable),
 	     hipe_rtl:mk_branch(IsWritable, 'ne', Zero,
 				ContLbl3Name, NotWritable),
 	     ContLbl3,
-	     get_field_from_term({sub_binary, orig}, Bin, ProcBin),
-	     get_field_from_term({proc_bin, flags}, ProcBin, Flags),
+	     hipe_tagscheme:get_field_from_term({sub_binary, orig}, Bin, ProcBin),
+	     hipe_tagscheme:get_field_from_term({proc_bin, flags}, ProcBin, Flags),
 	     hipe_rtl:mk_alub(Flags, Flags, 'and',
-			      hipe_rtl:mk_imm(?PB_IS_WRITABLE), 
+			      hipe_rtl:mk_imm(?PB_IS_WRITABLE),
 			      eq, NotWritable, ContLbl4Name, 0.01),
 	     ContLbl4,
 	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
 	     is_divisible(Offset, Unit, Writable, FalseLblName),
 	     WritableLbl,
-	     set_field_from_term(SubIsWritable, Bin, Zero),
+	     hipe_tagscheme:set_field_from_term(SubIsWritable, Bin, Zero),
 	     realloc_binary(SizeReg, ProcBin, Base),
 	     hipe_tagscheme:mk_sub_binary(DstVar, EndSubSize, Zero,
 					  EndSubBitSize, Zero,
@@ -394,7 +391,7 @@ not_writable_code(Bin, SizeReg, Dst, Base, Offset, Unit,
    allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize),
    put_binary_all(Offset, Bin, Base, hipe_rtl:mk_imm(0), Unit,
 		  TrueLblName, FalseLblName)].
-  
+
 allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
   Zero = hipe_rtl:mk_imm(0),
   [NextLbl] = create_lbls(1),
@@ -411,7 +408,7 @@ allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
    hipe_tagscheme:mk_sub_binary(Dst, EndSubSize, Zero, EndSubBitSize,
 				Zero, hipe_rtl:mk_imm(1), ProcBin)].
 
-realloc_binary(SizeReg, ProcBin, Base) -> 
+realloc_binary(SizeReg, ProcBin, Base) ->
   [NoReallocLbl, ReallocLbl, NextLbl, ContLbl] = Lbls = create_lbls(4),
   [NoReallocLblName, ReallocLblName, NextLblName, ContLblName] =
     [hipe_rtl:label_name(Lbl) || Lbl <- Lbls],
@@ -422,36 +419,36 @@ realloc_binary(SizeReg, ProcBin, Base) ->
   ProcBinValTag = {proc_bin, val},
   ProcBinBytesTag = {proc_bin, bytes},
   BinOrigSizeTag = {binary, orig_size},
-  [get_field_from_term(ProcBinSizeTag, ProcBin, PBSize),
+  [hipe_tagscheme:get_field_from_term(ProcBinSizeTag, ProcBin, PBSize),
    hipe_rtl:mk_alu(Tmp, SizeReg, 'add', ?LOW_BITS),
    hipe_rtl:mk_alu(ByteSize, Tmp, 'srl', ?BYTE_SHIFT),
    hipe_rtl:mk_alu(ResultingSize, ByteSize, 'add', PBSize),
-   set_field_from_term(ProcBinSizeTag, ProcBin, ResultingSize),
-   get_field_from_term(ProcBinFlagsTag, ProcBin, Flags),
+   hipe_tagscheme:set_field_from_term(ProcBinSizeTag, ProcBin, ResultingSize),
+   hipe_tagscheme:get_field_from_term(ProcBinFlagsTag, ProcBin, Flags),
    hipe_rtl:mk_alu(Flags, Flags, 'or', hipe_rtl:mk_imm(?PB_ACTIVE_WRITER)),
-   set_field_from_term(ProcBinFlagsTag, ProcBin, Flags),
-   get_field_from_term(ProcBinValTag, ProcBin, BinPointer),
-   get_field_from_pointer(BinOrigSizeTag, BinPointer, OrigSize),
+   hipe_tagscheme:set_field_from_term(ProcBinFlagsTag, ProcBin, Flags),
+   hipe_tagscheme:get_field_from_term(ProcBinValTag, ProcBin, BinPointer),
+   hipe_tagscheme:get_field_from_pointer(BinOrigSizeTag, BinPointer, OrigSize),
    hipe_rtl:mk_branch(OrigSize, 'ltu', ResultingSize,
 		      ReallocLblName, NoReallocLblName),
    NoReallocLbl,
-   get_field_from_term(ProcBinBytesTag, ProcBin, Base),
+   hipe_tagscheme:get_field_from_term(ProcBinBytesTag, ProcBin, Base),
    hipe_rtl:mk_goto(ContLblName),
    ReallocLbl,
    hipe_rtl:mk_alu(NewSize, ResultingSize, 'sll', hipe_rtl:mk_imm(1)),
-   hipe_rtl:mk_call([BinPointer], bs_reallocate, [BinPointer, NewSize], 
+   hipe_rtl:mk_call([BinPointer], bs_reallocate, [BinPointer, NewSize],
 		    NextLblName, [], not_remote),
    NextLbl,
-   set_field_from_pointer(BinOrigSizeTag, BinPointer, NewSize),
-   set_field_from_term(ProcBinValTag, ProcBin, BinPointer),
+   hipe_tagscheme:set_field_from_pointer(BinOrigSizeTag, BinPointer, NewSize),
+   hipe_tagscheme:set_field_from_term(ProcBinValTag, ProcBin, BinPointer),
    hipe_tagscheme:extract_binary_bytes(BinPointer, Base),
-   set_field_from_term(ProcBinBytesTag, ProcBin, Base),
+   hipe_tagscheme:set_field_from_term(ProcBinBytesTag, ProcBin, Base),
    ContLbl].
 
 calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize) ->
   [SubSize, SubBitSize, EndSize] = create_regs(3),
-  [get_field_from_term({sub_binary, binsize}, Bin, SubSize),
-   get_field_from_term({sub_binary, bitsize}, Bin, SubBitSize),
+  [hipe_tagscheme:get_field_from_term({sub_binary, binsize}, Bin, SubSize),
+   hipe_tagscheme:get_field_from_term({sub_binary, bitsize}, Bin, SubBitSize),
    hipe_rtl:mk_alu(Offset, SubSize, 'sll', ?BYTE_SHIFT),
    hipe_rtl:mk_alu(Offset, Offset, 'add', SubBitSize),
    hipe_rtl:mk_alu(EndSize, Offset, 'add', SizeReg),
@@ -492,7 +489,7 @@ static_int_c_code(NewOffset, Src, Base, Offset, Size, Flags,
 
 int_c_code(NewOffset, Src, Base, Offset, SizeReg, Flags,
 	   TrueLblName, FalseLblName) ->
-  put_c_code(bs_put_big_integer, NewOffset, Src, Base, Offset, SizeReg, 
+  put_c_code(bs_put_big_integer, NewOffset, Src, Base, Offset, SizeReg,
 	     Flags, TrueLblName, FalseLblName).
 
 binary_c_code(NewOffset, Src, Base, Offset, Size, TrueLblName) ->
@@ -500,8 +497,8 @@ binary_c_code(NewOffset, Src, Base, Offset, Size, TrueLblName) ->
   [SizeReg, FlagsReg] = create_regs(2),
   [hipe_rtl:mk_move(FlagsReg, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_move(SizeReg, Size),
-   hipe_rtl:mk_call([], bs_put_bits, [Src, SizeReg, Base, Offset, FlagsReg], 
-		    hipe_rtl:label_name(PassedLbl),[],not_remote),
+   hipe_rtl:mk_call([], bs_put_bits, [Src, SizeReg, Base, Offset, FlagsReg],
+		    hipe_rtl:label_name(PassedLbl), [], not_remote),
    PassedLbl,
    hipe_rtl:mk_alu(NewOffset, Offset, add, SizeReg),
    hipe_rtl:mk_goto(TrueLblName)].
@@ -511,7 +508,7 @@ put_c_code(Func, NewOffset, Src, Base, Offset, SizeReg, Flags,
   PassedLbl = hipe_rtl:mk_new_label(),
   [FlagsReg] = create_regs(1),
   [hipe_rtl:mk_move(FlagsReg, hipe_rtl:mk_imm(Flags)),
-   gen_test_sideffect_bs_call(Func, [Src, SizeReg, Base, Offset, FlagsReg], 
+   gen_test_sideffect_bs_call(Func, [Src, SizeReg, Base, Offset, FlagsReg],
 			      hipe_rtl:label_name(PassedLbl), FalseLblName),
    PassedLbl,
    hipe_rtl:mk_alu(NewOffset, Offset, add, SizeReg),
@@ -523,7 +520,7 @@ gen_test_sideffect_bs_call(Name, Args, TrueLblName, FalseLblName) ->
   [hipe_rtl:mk_call([Tmp1], Name, Args,
 		    hipe_rtl:label_name(RetLbl), [], not_remote),
    RetLbl,
-   hipe_rtl:mk_branch(Tmp1, eq, hipe_rtl:mk_imm(0), 
+   hipe_rtl:mk_branch(Tmp1, eq, hipe_rtl:mk_imm(0),
 		      FalseLblName, TrueLblName, 0.01)].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -544,7 +541,7 @@ create_unsafe_regs(0) ->
 
 create_vars(X) when X > 0 ->
   [hipe_rtl:mk_new_var()|create_vars(X-1)];
-create_vars(0) -> 
+create_vars(0) ->
   [].
 
 create_lbls(X) when X > 0 ->
@@ -582,7 +579,7 @@ get_real(Dst) ->
 %% The following functions are called from the translation switch:
 %%
 %% - put_string/7 creates code to copy a string to a binary
-%%       starting at base+offset and ending at base+newoffset   
+%%       starting at base+offset and ending at base+newoffset
 %%
 %% - const_init2/6 initializes the creation of a binary of constant size
 %%
@@ -609,10 +606,9 @@ put_string(NewOffset, ConstTab, String, SizeInBytes, Base, Offset, TLName) ->
   [StringBase] = create_regs(1),
   {NewTab, Lbl} = hipe_consttab:insert_block(ConstTab, byte, String),
   {[hipe_rtl:mk_load_address(StringBase, Lbl, constant)|
-    copy_string(StringBase, SizeInBytes, Base, Offset, 
-		NewOffset, TLName)],
+    copy_string(StringBase, SizeInBytes, Base, Offset, NewOffset, TLName)],
    NewTab}.
-							  
+
 const_init2(Size, Dst, Base, Offset, TrueLblName) ->
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
   WordSize = hipe_rtl_arch:word_size(),
@@ -642,27 +638,29 @@ const_init_bits(Size, Dst, Base, Offset, TrueLblName) ->
   TmpDst = hipe_rtl:mk_new_var(),
   Zero = hipe_rtl:mk_imm(0),
   {ExtraSpace, SubBinCode} =
-    if (Size rem ?BYTE_SIZE) =:= 0 -> 
-	{0,[hipe_rtl:mk_move(Dst, TmpDst)]};
-       true ->
+    case (Size rem ?BYTE_SIZE) =:= 0 of
+      true ->
+	{0, [hipe_rtl:mk_move(Dst, TmpDst)]};
+      false ->
 	{?SUB_BIN_WORDSIZE,
-	 hipe_tagscheme:mk_sub_binary(Dst, hipe_rtl:mk_imm(Size bsr 3), Zero, 
+	 hipe_tagscheme:mk_sub_binary(Dst, hipe_rtl:mk_imm(Size bsr 3), Zero,
 				      hipe_rtl:mk_imm(Size band ?LOW_BITS_INT),
 				      Zero, TmpDst)}
     end,
   BaseBinCode =
-    if Size =< (?MAX_HEAP_BIN_SIZE * 8) ->
-	ByteSize  = (Size + 7) div 8,
-	[hipe_rtl:mk_gctest(((ByteSize+ 3*WordSize-1) bsr Log2WordSize)+ ExtraSpace),
+    case Size =< (?MAX_HEAP_BIN_SIZE * 8) of
+      true ->
+	ByteSize = (Size + 7) div 8,
+	[hipe_rtl:mk_gctest(((ByteSize + 3*WordSize-1) bsr Log2WordSize) + ExtraSpace),
 	 hipe_tagscheme:create_heap_binary(Base, ByteSize, TmpDst),
 	 hipe_rtl:mk_move(Offset, Zero)];
-       true ->
+      false ->
 	ByteSize = hipe_rtl:mk_new_reg(),
 	[hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE+ExtraSpace),
 	 hipe_rtl:mk_move(Offset, Zero),
 	 hipe_rtl:mk_move(ByteSize, hipe_rtl:mk_imm((Size+7) bsr 3)),
 	 hipe_rtl:mk_call([Base], bs_allocate, [ByteSize],
-			  hipe_rtl:label_name(NextLbl),[],not_remote),
+			  hipe_rtl:label_name(NextLbl), [], not_remote),
 	 NextLbl,
 	 hipe_tagscheme:create_refc_binary(Base, ByteSize, TmpDst)]
     end,
@@ -671,12 +669,12 @@ const_init_bits(Size, Dst, Base, Offset, TrueLblName) ->
 var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName) ->
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
   WordSize = hipe_rtl_arch:word_size(),
-  [ContLbl,HeapLbl,REFCLbl,NextLbl] = create_lbls(4),
-  [USize,Tmp] = create_unsafe_regs(2),
+  [ContLbl, HeapLbl, REFCLbl, NextLbl] = create_lbls(4),
+  [USize, Tmp] = create_unsafe_regs(2),
   [get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_BINSIZE),
-                     hipe_rtl:label_name(ContLbl),
-                     SystemLimitLblName),
+		      hipe_rtl:label_name(ContLbl),
+		      SystemLimitLblName),
    ContLbl,
    hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
@@ -698,20 +696,20 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
    hipe_rtl:mk_goto(TrueLblName)].
 
 var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName) ->
-  [HeapLbl,REFCLbl,NextLbl,NoSubLbl,SubLbl,
+  [HeapLbl, REFCLbl, NextLbl, NoSubLbl, SubLbl,
    NoCreateSubBin, CreateSubBin, JoinLbl, JoinLbl2] = create_lbls(9),
-  [USize,ByteSize,TotByteSize,OffsetBits] = create_regs(4),
+  [USize, ByteSize, TotByteSize, OffsetBits] = create_regs(4),
   [TmpDst] = create_unsafe_regs(1),
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
   WordSize = hipe_rtl_arch:word_size(),
-  MaximumWords = 
+  MaximumWords =
     erlang:max((?MAX_HEAP_BIN_SIZE + 3*WordSize) bsr Log2WordSize,
 	       ?PROC_BIN_WORDSIZE) + ?SUB_BIN_WORDSIZE,
   Zero = hipe_rtl:mk_imm(0),
   [hipe_rtl:mk_gctest(MaximumWords),
    get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
    hipe_rtl:mk_alu(ByteSize, USize, srl, ?BYTE_SHIFT),
-   hipe_rtl:mk_alub(OffsetBits, USize, 'and', ?LOW_BITS, eq, 
+   hipe_rtl:mk_alub(OffsetBits, USize, 'and', ?LOW_BITS, eq,
 		    hipe_rtl:label_name(NoSubLbl),
 		    hipe_rtl:label_name(SubLbl)),
    NoSubLbl,
@@ -721,20 +719,20 @@ var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLbl
    hipe_rtl:mk_alu(TotByteSize, ByteSize, 'add', hipe_rtl:mk_imm(1)),
    JoinLbl,
    hipe_rtl:mk_branch(TotByteSize, 'leu', hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
-		      hipe_rtl:label_name(HeapLbl), 
+		      hipe_rtl:label_name(HeapLbl),
 		      hipe_rtl:label_name(REFCLbl)),
    HeapLbl,
    hipe_tagscheme:create_heap_binary(Base, TotByteSize, TmpDst),
    hipe_rtl:mk_goto(hipe_rtl:label_name(JoinLbl2)),
    REFCLbl,
    hipe_rtl:mk_call([Base], bs_allocate, [TotByteSize],
-		    hipe_rtl:label_name(NextLbl),[],not_remote),
+		    hipe_rtl:label_name(NextLbl), [], not_remote),
    NextLbl,
    hipe_tagscheme:create_refc_binary(Base, TotByteSize, TmpDst),
    JoinLbl2,
    hipe_rtl:mk_move(Offset, Zero),
    hipe_rtl:mk_branch(OffsetBits, 'eq', Zero,
-		      hipe_rtl:label_name(NoCreateSubBin), 
+		      hipe_rtl:label_name(NoCreateSubBin),
 		      hipe_rtl:label_name(CreateSubBin)),
    CreateSubBin,
    hipe_tagscheme:mk_sub_binary(Dst, ByteSize, Zero, OffsetBits, Zero, TmpDst),
@@ -744,10 +742,10 @@ var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLbl
    hipe_rtl:mk_goto(TrueLblName)].
 
 put_binary_all(NewOffset, Src, Base, Offset, Unit, TLName, FLName) ->
-  [SrcBase,SrcOffset,NumBits] = create_regs(3),
+  [SrcBase, SrcOffset, NumBits] = create_regs(3),
   [ContLbl] = create_lbls(1),
   CCode = binary_c_code(NewOffset, Src, Base, Offset, NumBits, TLName),
-  AlignedCode = copy_aligned_bytes(SrcBase, SrcOffset, NumBits, Base, Offset, 
+  AlignedCode = copy_aligned_bytes(SrcBase, SrcOffset, NumBits, Base, Offset,
 				   NewOffset, TLName),
   [get_base_offset_size(Src, SrcBase, SrcOffset, NumBits,FLName),
    is_divisible(NumBits, Unit, hipe_rtl:label_name(ContLbl), FLName),
@@ -755,11 +753,11 @@ put_binary_all(NewOffset, Src, Base, Offset, Unit, TLName, FLName) ->
    |test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode)].
 
 test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode) ->
-  [Tmp] = create_regs(1),  
-  [AlignedLbl,CLbl] = create_lbls(2),
+  [Tmp] = create_regs(1),
+  [AlignedLbl, CLbl] = create_lbls(2),
    [hipe_rtl:mk_alu(Tmp, SrcOffset, 'or', NumBits),
    hipe_rtl:mk_alu(Tmp, Tmp, 'or', Offset),
-   hipe_rtl:mk_alub(Tmp, Tmp, 'and', ?LOW_BITS, 'eq', 
+   hipe_rtl:mk_alub(Tmp, Tmp, 'and', ?LOW_BITS, 'eq',
 		    hipe_rtl:label_name(AlignedLbl),
 		    hipe_rtl:label_name(CLbl)),
    AlignedLbl,
@@ -768,12 +766,12 @@ test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode) ->
    CCode].
  
 put_static_binary(NewOffset, Src, Size, Base, Offset, TLName, FLName) ->
-  [SrcBase] = create_unsafe_regs(1), 
+  [SrcBase] = create_unsafe_regs(1),
   [SrcOffset, SrcSize] = create_regs(2),
     case Size of
       0 ->
 	get_base_offset_size(Src, SrcBase, SrcOffset, SrcSize, FLName) ++
-	[hipe_rtl:mk_move(NewOffset, Offset), 
+	[hipe_rtl:mk_move(NewOffset, Offset),
 	 hipe_rtl:mk_goto(TLName)];
       _ ->
 	SizeImm = hipe_rtl:mk_imm(Size),
@@ -789,13 +787,13 @@ put_dynamic_binary(NewOffset, Src, SizeReg, Base, Offset, TLName, FLName) ->
   [SrcBase] = create_unsafe_regs(1), 
   [SrcOffset, SrcSize] = create_regs(2),
   CCode = binary_c_code(NewOffset, Src, Base, Offset, SizeReg, TLName),
-  AlignedCode = copy_aligned_bytes(SrcBase, SrcOffset, SizeReg, Base, Offset, 
+  AlignedCode = copy_aligned_bytes(SrcBase, SrcOffset, SizeReg, Base, Offset,
 				   NewOffset, TLName),
   get_base_offset_size(Src, SrcBase, SrcOffset, SrcSize, FLName) ++
     small_check(SizeReg, SrcSize, FLName) ++
     test_alignment(SrcOffset, SizeReg, Offset, AlignedCode, CCode).
 
-put_float(NewOffset, Src, Base, Offset, 64, CCode, Aligned, LittleEndian, 
+put_float(NewOffset, Src, Base, Offset, 64, CCode, Aligned, LittleEndian,
 	  ConstInfo, TrueLblName) ->
   [CLbl] = create_lbls(1),
   case {Aligned, LittleEndian} of
@@ -829,12 +827,12 @@ put_static_int(NewOffset, Src, Base, Offset, Size, CCode, Aligned,
     {false, true} ->
       CCode;
     {false, false} ->
-       Init ++
+      Init ++
 	copy_offset_int_big(Base, Offset, NewOffset, Size, UntaggedSrc) ++
 	End
   end.
 
-put_unsafe_static_int(NewOffset, Src, Base, Offset, Size, CCode, Aligned, 
+put_unsafe_static_int(NewOffset, Src, Base, Offset, Size, CCode, Aligned,
 		      LittleEndian, TrueLblName) ->
   {Init, End, UntaggedSrc} = make_init_end(Src, TrueLblName),
   case {Aligned, LittleEndian} of
@@ -849,7 +847,7 @@ put_unsafe_static_int(NewOffset, Src, Base, Offset, Size, CCode, Aligned,
     {false, true} ->
       CCode;
     {false, false} ->
-       Init ++
+      Init ++
 	copy_offset_int_big(Base, Offset, NewOffset, Size, UntaggedSrc) ++
 	End
   end.
@@ -861,7 +859,7 @@ put_dynamic_int(NewOffset, Src, Base, Offset, SizeReg, CCode, Aligned,
     true ->
       case LittleEndian of
 	true ->
-	   Init ++
+	  Init ++
 	    copy_int_little(Base, Offset, NewOffset, SizeReg, UntaggedSrc) ++
 	    End;
 	false ->
@@ -880,7 +878,7 @@ put_unsafe_dynamic_int(NewOffset, Src, Base, Offset, SizeReg, CCode, Aligned,
     true ->
       case LittleEndian of
 	true ->
-	   Init ++
+	  Init ++
 	    copy_int_little(Base, Offset, NewOffset, SizeReg, UntaggedSrc) ++
 	    End;
 	false ->
@@ -891,7 +889,7 @@ put_unsafe_dynamic_int(NewOffset, Src, Base, Offset, SizeReg, CCode, Aligned,
     false ->
       CCode
   end.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
@@ -902,7 +900,7 @@ put_unsafe_dynamic_int(NewOffset, Src, Base, Offset, SizeReg, CCode, Aligned,
 make_init_end(Src, CCode, TrueLblName) ->
   [CLbl, SuccessLbl] = create_lbls(2),
   [UntaggedSrc] = create_regs(1),
-  Init = [hipe_tagscheme:test_fixnum(Src, hipe_rtl:label_name(SuccessLbl), 
+  Init = [hipe_tagscheme:test_fixnum(Src, hipe_rtl:label_name(SuccessLbl),
 				     hipe_rtl:label_name(CLbl), 0.99),
 	  SuccessLbl,
 	  hipe_tagscheme:untag_fixnum(UntaggedSrc,Src)],
@@ -915,28 +913,28 @@ make_init_end(Src, TrueLblName) ->
   End = [hipe_rtl:mk_goto(TrueLblName)],
   {Init, End, UntaggedSrc}.
 
-get_base_offset_size(Binary, SrcBase, SrcOffset, SrcSize, FLName) -> 
+get_base_offset_size(Binary, SrcBase, SrcOffset, SrcSize, FLName) ->
   [JoinLbl, EndLbl, SuccessLbl, SubLbl, OtherLbl, HeapLbl, REFCLbl] =
     Lbls = create_lbls(7),
-  [JoinLblName, EndLblName, SuccessLblName, SubLblName, 
+  [JoinLblName, EndLblName, SuccessLblName, SubLblName,
    OtherLblName, HeapLblName, REFCLblName] = get_label_names(Lbls),
-  [BitSize,BitOffset] = create_regs(2),
+  [BitSize, BitOffset] = create_regs(2),
   [Orig] = create_vars(1),
   [hipe_tagscheme:test_bitstr(Binary, SuccessLblName, FLName, 0.99),
    SuccessLbl,
-   get_field_from_term({sub_binary,binsize}, Binary, SrcSize),
+   hipe_tagscheme:get_field_from_term({sub_binary,binsize}, Binary, SrcSize),
    hipe_rtl:mk_alu(SrcSize, SrcSize, sll, ?BYTE_SHIFT),
    hipe_tagscheme:test_subbinary(Binary, SubLblName, OtherLblName),
    SubLbl,
-   get_field_from_term({sub_binary,bitsize}, Binary, BitSize),
-   get_field_from_term({sub_binary,offset}, Binary, SrcOffset),
+   hipe_tagscheme:get_field_from_term({sub_binary,bitsize}, Binary, BitSize),
+   hipe_tagscheme:get_field_from_term({sub_binary,offset}, Binary, SrcOffset),
    hipe_rtl:mk_alu(SrcSize, SrcSize, add, BitSize),
-   get_field_from_term({sub_binary,bitoffset}, Binary, BitOffset),
+   hipe_tagscheme:get_field_from_term({sub_binary,bitoffset}, Binary, BitOffset),
    hipe_rtl:mk_alu(SrcOffset, SrcOffset, sll, ?BYTE_SHIFT),
    hipe_rtl:mk_alu(SrcOffset, SrcOffset, add, BitOffset),
-   get_field_from_term({sub_binary,orig}, Binary, Orig),
+   hipe_tagscheme:get_field_from_term({sub_binary,orig}, Binary, Orig),
    hipe_rtl:mk_goto(JoinLblName),
-   OtherLbl, 
+   OtherLbl,
    hipe_rtl:mk_move(SrcOffset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_move(Orig, Binary),
    JoinLbl,
@@ -945,29 +943,29 @@ get_base_offset_size(Binary, SrcBase, SrcOffset, SrcSize, FLName) ->
    hipe_rtl:mk_alu(SrcBase, Orig, add, hipe_rtl:mk_imm(?HEAP_BIN_DATA-2)),
    hipe_rtl:mk_goto(EndLblName),
    REFCLbl,
-   get_field_from_term({proc_bin,bytes}, Orig, SrcBase),
+   hipe_tagscheme:get_field_from_term({proc_bin,bytes}, Orig, SrcBase),
    EndLbl].
 
 copy_aligned_bytes(CopyBase, CopyOffset, Size, Base, Offset, NewOffset, TrueLblName) ->
   [BaseDst, BaseSrc] = create_unsafe_regs(2),
   [Iter, Extra, BothOffset] = create_regs(3),
   initializations(BaseSrc, BaseDst, BothOffset, CopyOffset, Offset, CopyBase, Base) ++
-    [hipe_rtl:mk_alu(Extra, Size, 'and', ?LOW_BITS), 
-     hipe_rtl:mk_alu(Iter, Size, srl, ?BYTE_SHIFT), 
+    [hipe_rtl:mk_alu(Extra, Size, 'and', ?LOW_BITS),
+     hipe_rtl:mk_alu(Iter, Size, srl, ?BYTE_SHIFT),
      hipe_rtl:mk_alu(NewOffset, Offset, 'add', Size)] ++
     easy_loop(BaseSrc, BaseDst, BothOffset, Iter, Extra, TrueLblName).
 
 copy_string(StringBase, StringSize, BinBase, BinOffset, NewOffset, TrueLblName) ->
   [TmpOffset,BothOffset,InitOffs] = create_regs(3),
   [NewBinBase] = create_unsafe_regs(1),
-  [EasyLbl,HardLbl] = create_lbls(2), 
+  [EasyLbl, HardLbl] = create_lbls(2),
   [hipe_rtl:mk_alu(TmpOffset, BinOffset, srl, ?BYTE_SHIFT),
    hipe_rtl:mk_alu(NewBinBase, BinBase, add, TmpOffset),
    hipe_rtl:mk_move(BothOffset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_alub(InitOffs, BinOffset, 'and', ?LOW_BITS, eq,
 		    hipe_rtl:label_name(EasyLbl), hipe_rtl:label_name(HardLbl)),
    EasyLbl,
-   hipe_rtl:mk_alu(NewOffset, BinOffset, add, 
+   hipe_rtl:mk_alu(NewOffset, BinOffset, add,
 		   hipe_rtl:mk_imm(?bytes_to_bits(StringSize)))] ++
    easy_loop(StringBase, NewBinBase, BothOffset,
 	     hipe_rtl:mk_imm(StringSize), hipe_rtl:mk_imm(0), TrueLblName) ++
@@ -983,9 +981,9 @@ small_check(SizeVar, CopySize, FalseLblName) ->
 		      hipe_rtl:label_name(SuccessLbl), FalseLblName),
    SuccessLbl].
 
-easy_loop(BaseSrc, BaseDst, BothOffset, Iterations, Extra, TrueLblName) -> 
-  [Tmp1,Shift] = create_regs(2),
-  [LoopLbl,TopLbl,EndLbl,ExtraLbl] = create_lbls(4),
+easy_loop(BaseSrc, BaseDst, BothOffset, Iterations, Extra, TrueLblName) ->
+  [Tmp1, Shift] = create_regs(2),
+  [LoopLbl, TopLbl, EndLbl, ExtraLbl] = create_lbls(4),
   [TopLbl,
    hipe_rtl:mk_branch(BothOffset, ne, Iterations, hipe_rtl:label_name(LoopLbl),
 		      hipe_rtl:label_name(EndLbl), 0.99),
@@ -1005,17 +1003,17 @@ easy_loop(BaseSrc, BaseDst, BothOffset, Iterations, Extra, TrueLblName) ->
    hipe_rtl:mk_store(BaseDst, BothOffset, Tmp1, byte),
    hipe_rtl:mk_goto(TrueLblName)].
 
-hard_loop(BaseSrc, BaseDst, BothOffset, Iterations, 
+hard_loop(BaseSrc, BaseDst, BothOffset, Iterations,
 	  InitOffset, TrueLblName) ->
   [Tmp1, Tmp2, OldByte, NewByte, SaveByte] = create_regs(5),
-  [LoopLbl,EndLbl,TopLbl] = create_lbls(3),
+  [LoopLbl, EndLbl, TopLbl] = create_lbls(3),
   [hipe_rtl:mk_load(OldByte, BaseDst, BothOffset, byte, unsigned),
-   hipe_rtl:mk_alu(Tmp1, hipe_rtl:mk_imm(?BYTE_SIZE), sub, InitOffset), 
+   hipe_rtl:mk_alu(Tmp1, hipe_rtl:mk_imm(?BYTE_SIZE), sub, InitOffset),
    TopLbl,
-   hipe_rtl:mk_branch(BothOffset, ne, Iterations, 
-		      hipe_rtl:label_name(LoopLbl), 
+   hipe_rtl:mk_branch(BothOffset, ne, Iterations,
+		      hipe_rtl:label_name(LoopLbl),
 		      hipe_rtl:label_name(EndLbl)),
-   LoopLbl, 
+   LoopLbl,
    hipe_rtl:mk_load(NewByte, BaseSrc, BothOffset, byte, unsigned),
    hipe_rtl:mk_alu(Tmp2, NewByte, srl, InitOffset),
    hipe_rtl:mk_alu(SaveByte, OldByte, 'or', Tmp2),
@@ -1037,12 +1035,12 @@ initializations(BaseTmp1, BaseTmp2, BothOffset, CopyOffset, Offset, CopyBase, Ba
 
 copy_int_little(Base, Offset, NewOffset, Size, Tmp1) when is_integer(Size) ->
   [Tmp2,TmpOffset] = create_regs(2),
-  ByteSize = Size div ?BYTE_SIZE, 
-    [hipe_rtl:mk_alu(TmpOffset, Offset, srl, ?BYTE_SHIFT),
-     hipe_rtl:mk_alu(Tmp2, hipe_rtl:mk_imm(ByteSize), 'add', TmpOffset)] ++
-    
+  ByteSize = Size div ?BYTE_SIZE,
+  [hipe_rtl:mk_alu(TmpOffset, Offset, srl, ?BYTE_SHIFT),
+   hipe_rtl:mk_alu(Tmp2, hipe_rtl:mk_imm(ByteSize), 'add', TmpOffset)] ++
+
     little_loop(Tmp1, Tmp2, TmpOffset, Base) ++
-    
+
     case Size band 7 of
       0 ->
 	[hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(Size))];
@@ -1051,18 +1049,16 @@ copy_int_little(Base, Offset, NewOffset, Size, Tmp1) when is_integer(Size) ->
 	 hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
 	 hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(Size))]
     end;
-    
 copy_int_little(Base, Offset, NewOffset, Size, Tmp1) ->
   [Tmp2, Tmp3, Tmp4, TmpOffset] = create_regs(4), 
-  
   [hipe_rtl:mk_alu(Tmp2, Size, srl, ?BYTE_SHIFT),
    hipe_rtl:mk_alu(TmpOffset, Offset, srl, ?BYTE_SHIFT),
    hipe_rtl:mk_alu(Tmp3, Tmp2, 'add', TmpOffset)] ++
-    
+
     little_loop(Tmp1, Tmp3, TmpOffset, Base) ++
-  
+
     [hipe_rtl:mk_alu(Tmp4, Size, 'and', ?LOW_BITS),
-     hipe_rtl:mk_alu(Tmp4, hipe_rtl:mk_imm(?BYTE_SIZE), 'sub', Tmp4), 
+     hipe_rtl:mk_alu(Tmp4, hipe_rtl:mk_imm(?BYTE_SIZE), 'sub', Tmp4),
      hipe_rtl:mk_alu(Tmp1, Tmp1, sll, Tmp4),
      hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
      hipe_rtl:mk_alu(NewOffset, Offset, 'add', Size)].
@@ -1097,37 +1093,37 @@ copy_int_big(_Base, Offset, NewOffset, 0, _Tmp1) ->
   [hipe_rtl:mk_move(NewOffset, Offset)];
 copy_int_big(Base, Offset, NewOffset, ?BYTE_SIZE, Tmp1) ->
   TmpOffset = hipe_rtl:mk_new_reg(),
-    [hipe_rtl:mk_alu(TmpOffset, Offset, 'srl', hipe_rtl:mk_imm(3)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(8))];
+  [hipe_rtl:mk_alu(TmpOffset, Offset, 'srl', hipe_rtl:mk_imm(3)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(8))];
 copy_int_big(Base, Offset, NewOffset, 2*?BYTE_SIZE, Tmp1) ->
   TmpOffset = hipe_rtl:mk_new_reg(),
-    [hipe_rtl:mk_alu(TmpOffset, Offset, 'srl', hipe_rtl:mk_imm(3)),
-     hipe_rtl:mk_alu(TmpOffset, TmpOffset, 'add', hipe_rtl:mk_imm(1)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
-     hipe_rtl:mk_alu(Tmp1, Tmp1, 'sra', hipe_rtl:mk_imm(8)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(16))];
+  [hipe_rtl:mk_alu(TmpOffset, Offset, 'srl', hipe_rtl:mk_imm(3)),
+   hipe_rtl:mk_alu(TmpOffset, TmpOffset, 'add', hipe_rtl:mk_imm(1)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
+   hipe_rtl:mk_alu(Tmp1, Tmp1, 'sra', hipe_rtl:mk_imm(8)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(16))];
 copy_int_big(Base, Offset, NewOffset, 3*?BYTE_SIZE, Tmp1) ->
-  TmpOffset = hipe_rtl:mk_new_reg(), 
-    [hipe_rtl:mk_alu(TmpOffset, Offset, srl, hipe_rtl:mk_imm(3)),
-     hipe_rtl:mk_alu(TmpOffset, TmpOffset, add, hipe_rtl:mk_imm(2)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
-     hipe_rtl:mk_alu(Tmp1, Tmp1, sra, hipe_rtl:mk_imm(8)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
-     hipe_rtl:mk_alu(Tmp1, Tmp1, sra, hipe_rtl:mk_imm(8)),
-     hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
-     hipe_rtl:mk_alu(NewOffset, Offset, add, hipe_rtl:mk_imm(24))];
+  TmpOffset = hipe_rtl:mk_new_reg(),
+  [hipe_rtl:mk_alu(TmpOffset, Offset, srl, hipe_rtl:mk_imm(3)),
+   hipe_rtl:mk_alu(TmpOffset, TmpOffset, add, hipe_rtl:mk_imm(2)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
+   hipe_rtl:mk_alu(Tmp1, Tmp1, sra, hipe_rtl:mk_imm(8)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(TmpOffset, TmpOffset, sub, hipe_rtl:mk_imm(1)),
+   hipe_rtl:mk_alu(Tmp1, Tmp1, sra, hipe_rtl:mk_imm(8)),
+   hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
+   hipe_rtl:mk_alu(NewOffset, Offset, add, hipe_rtl:mk_imm(24))];
 copy_int_big(Base, Offset,NewOffset, 4*?BYTE_SIZE, Tmp1) ->
   copy_big_word(Base, Offset, NewOffset, Tmp1);
 copy_int_big(Base, Offset, NewOffset, Size, Tmp1) when is_integer(Size) ->
   [OldOffset, TmpOffset, Bits] = create_regs(3),
   ByteSize = (Size + 7) div ?BYTE_SIZE,
-  case Size band 7 of 
-    0 -> 
+  case Size band 7 of
+    0 ->
       [hipe_rtl:mk_alu(OldOffset, Offset, sra, hipe_rtl:mk_imm(3)),
        hipe_rtl:mk_alu(TmpOffset, OldOffset, add, hipe_rtl:mk_imm(ByteSize))];
     Rest ->
@@ -1138,7 +1134,7 @@ copy_int_big(Base, Offset, NewOffset, Size, Tmp1) when is_integer(Size) ->
        hipe_rtl:mk_alu(Tmp1, Tmp1, sra, hipe_rtl:mk_imm(Rest))]
   end ++
     big_loop(Tmp1, OldOffset, TmpOffset, Base) ++
-    [hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(Size))];  
+    [hipe_rtl:mk_alu(NewOffset, Offset, 'add', hipe_rtl:mk_imm(Size))];
 copy_int_big(Base, Offset, NewOffset, Size, Tmp1) ->
   Tmp2 = hipe_rtl:mk_new_reg(),
   Tmp3 = hipe_rtl:mk_new_reg(),
@@ -1151,7 +1147,7 @@ copy_int_big(Base, Offset, NewOffset, Size, Tmp1) ->
   [hipe_rtl:mk_alu(Tmp2, Size, 'srl', hipe_rtl:mk_imm(3)),
    hipe_rtl:mk_alu(Tmp3, Offset, 'srl', hipe_rtl:mk_imm(3)),
    hipe_rtl:mk_alu(TmpOffset, Tmp2, 'add', Tmp3),
-   hipe_rtl:mk_alub(Tmp4, Size, 'and', hipe_rtl:mk_imm(7), 'eq', 
+   hipe_rtl:mk_alub(Tmp4, Size, 'and', hipe_rtl:mk_imm(7), 'eq',
 		    hipe_rtl:label_name(EvenLbl), hipe_rtl:label_name(OddLbl)),
    OddLbl,
    hipe_rtl:mk_alu(Tmp6, hipe_rtl:mk_imm(8), 'sub', Tmp4),
@@ -1159,9 +1155,7 @@ copy_int_big(Base, Offset, NewOffset, Size, Tmp1) ->
    hipe_rtl:mk_store(Base, TmpOffset, Tmp5, byte),
    EvenLbl,
    hipe_rtl:mk_alu(Tmp1, Tmp1, srl, Tmp4)] ++
-    
     big_loop(Tmp1, Tmp3, TmpOffset, Base) ++
-    
     [hipe_rtl:mk_alu(NewOffset, Offset, 'add', Size)].
 
 copy_big_word(Base, Offset, NewOffset, Word) ->
@@ -1224,8 +1218,8 @@ copy_offset_int_big(Base, Offset, NewOffset, Size, Tmp1)
    hipe_rtl:mk_alu(Tmp6, Tmp6, 'and', ?LOW_BITS),
    hipe_rtl:mk_alu(Tmp4, hipe_rtl:mk_imm(?BYTE_SIZE), 'sub', Tmp6),
    hipe_rtl:mk_move(Tmp5, Tmp1),
-   hipe_rtl:mk_alu(Tmp1, Tmp1, 'sll', Tmp6), 
-   hipe_rtl:mk_branch(TmpOffset, 'ne', Tmp3, hipe_rtl:label_name(NextLbl), 
+   hipe_rtl:mk_alu(Tmp1, Tmp1, 'sll', Tmp6),
+   hipe_rtl:mk_branch(TmpOffset, 'ne', Tmp3, hipe_rtl:label_name(NextLbl),
 		      hipe_rtl:label_name(EndLbl)),
    NextLbl,
    hipe_rtl:mk_store(Base, TmpOffset, Tmp1, byte),
@@ -1272,7 +1266,7 @@ copy_float_big(_Base, _Offset, _NewOffset, _Src, FalseLblName, _TrueLblName, fai
 copy_float_big(Base, Offset, NewOffset, Src, _FalseLblName, TrueLblName,pass) ->
   FloatLo = hipe_rtl:mk_new_reg(),
   FloatHi = hipe_rtl:mk_new_reg(),
-  TmpOffset =hipe_rtl:mk_new_reg(),
+  TmpOffset = hipe_rtl:mk_new_reg(),
   hipe_tagscheme:unsafe_load_float(FloatLo, FloatHi, Src) ++
     copy_big_word(Base, Offset, TmpOffset, FloatHi) ++
     copy_big_word(Base, TmpOffset, NewOffset, FloatLo) ++
@@ -1285,7 +1279,7 @@ copy_float_big(Base, Offset, NewOffset, Src, FalseLblName, TrueLblName, var) ->
 is_divisible(_Dividend, 1, SuccLbl, _FailLbl) ->
   [hipe_rtl:mk_goto(SuccLbl)];
 is_divisible(Dividend, Divisor, SuccLbl, FailLbl) ->
-  Log2 = floorlog2(Divisor),
+  Log2 = hipe_rtl_binary:floorlog2(Divisor),
   case Divisor =:= 1 bsl Log2 of
     true -> %% Divisor is a power of 2
       %% Test that the Log2-1 lowest bits are clear
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index ef866d0843..71bd06c0df 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -63,10 +63,10 @@ rtl_lcm(CFG, Options) ->
   
   pp_debug("-------------------------------------------------~n",[]),
   %% pp_debug( "~w~n", [MFA]),
-  
+
   %% A check if we should pretty print the result.
   case proplists:get_bool(pp_rtl_lcm, Options) of
-    true->
+    true ->
       pp_debug("-------------------------------------------------~n",[]),
       %% pp_debug("AllExpr:  ~w~n", [AllExpr]),
       pp_debug("AllExpr:~n", []),
@@ -76,21 +76,21 @@ rtl_lcm(CFG, Options) ->
     _ ->
       ok
   end,
-  
+
   pp_debug("-------------------------------------------------~n",[]),
-  ?option_time({CFG1, MoveSet} = perform_lcm(CFG, NodeInfo, EdgeInfo, ExprMap, 
-					     IdMap, AllExpr, mk_edge_bb_map(), 
+  {CFG1, MoveSet} = ?option_time(perform_lcm(CFG, NodeInfo, EdgeInfo, ExprMap,
+					     IdMap, AllExpr, mk_edge_bb_map(),
 					     ?SETS:new(), Labels),
-	       "RTL LCM perform_lcm", Options),
+				 "RTL LCM perform_lcm", Options),
 
   %% Scan through list of moved expressions and replace their 
   %% assignments with the new temporary created for that expression
   MoveList = ?SETS:to_list(MoveSet),
-  ?option_time(CFG2 = moved_expr_replace_assignments(CFG1, ExprMap, IdMap, 
+  CFG2 = ?option_time(moved_expr_replace_assignments(CFG1, ExprMap, IdMap,
 						     MoveList),
-	       "RTL LCM moved_expr_replace_assignments", Options),
+		      "RTL LCM moved_expr_replace_assignments", Options),
   pp_debug("-------------------------------------------------~n~n",[]),
-  
+
   CFG2.
 
 %%=============================================================================
@@ -466,10 +466,10 @@ expr_clear_dst(I) ->
 %% easy access later.
 lcm_precalc(CFG, Options) ->
   %% Calculate use map and expression map.
-  ?option_time({ExprMap, IdMap} = mk_expr_map(CFG), 
-	       "RTL LCM mk_expr_map", Options),
-  ?option_time(UseMap = mk_use_map(CFG, ExprMap), 
-	       "RTL LCM mk_use_map", Options),
+  {ExprMap, IdMap} = ?option_time(mk_expr_map(CFG),
+				  "RTL LCM mk_expr_map", Options),
+  UseMap = ?option_time(mk_use_map(CFG, ExprMap),
+			"RTL LCM mk_use_map", Options),
   %% Labels = hipe_rtl_cfg:reverse_postorder(CFG),
   Labels = hipe_rtl_cfg:labels(CFG),
   %% StartLabel = hipe_rtl_cfg:start_label(CFG),
@@ -477,28 +477,28 @@ lcm_precalc(CFG, Options) ->
   AllExpr = ?SETS:from_list(gb_trees:keys(IdMap)),
 
   %% Calculate the data sets.
-  ?option_time(NodeInfo0 = mk_node_info(Labels), "RTL LCM mk_node_info", 
-	       Options),
+  NodeInfo0 = ?option_time(mk_node_info(Labels),
+			   "RTL LCM mk_node_info", Options),
   %% ?option_time(EdgeInfo0 = mk_edge_info(), "RTL LCM mk_edge_info", 
   %%  	          Options),
   EdgeInfo0 = mk_edge_info(),
-  ?option_time(NodeInfo1 = calc_up_exp(CFG, ExprMap, NodeInfo0, Labels), 
-	       "RTL LCM calc_up_exp", Options),
-  ?option_time(NodeInfo2 = calc_down_exp(CFG, ExprMap, NodeInfo1, Labels), 
-	       "RTL LCM calc_down_exp", Options),
-  ?option_time(NodeInfo3 = calc_killed_expr(CFG, NodeInfo2, UseMap, AllExpr, 
+  NodeInfo1 = ?option_time(calc_up_exp(CFG, ExprMap, NodeInfo0, Labels),
+			   "RTL LCM calc_up_exp", Options),
+  NodeInfo2 = ?option_time(calc_down_exp(CFG, ExprMap, NodeInfo1, Labels),
+			   "RTL LCM calc_down_exp", Options),
+  NodeInfo3 = ?option_time(calc_killed_expr(CFG, NodeInfo2, UseMap, AllExpr,
 					    IdMap, Labels), 
-	       "RTL LCM calc_killed_exp", Options),
-  ?option_time(NodeInfo4 = calc_avail(CFG, NodeInfo3), 
-	       "RTL LCM calc_avail", Options),
-  ?option_time(NodeInfo5 = calc_antic(CFG, NodeInfo4, AllExpr), 
-	       "RTL LCM calc_antic", Options),
-  ?option_time(EdgeInfo1 = calc_earliest(CFG, NodeInfo5, EdgeInfo0, Labels), 
-  	       "RTL LCM calc_earliest", Options),
-  ?option_time({NodeInfo6, EdgeInfo2} = calc_later(CFG, NodeInfo5, EdgeInfo1),
-	       "RTL LCM calc_later", Options),
-  ?option_time(NodeInfo7 = calc_delete(CFG, NodeInfo6, Labels), 
-	       "RTL LCM calc_delete", Options),
+			   "RTL LCM calc_killed_exp", Options),
+  NodeInfo4 = ?option_time(calc_avail(CFG, NodeInfo3),
+			   "RTL LCM calc_avail", Options),
+  NodeInfo5 = ?option_time(calc_antic(CFG, NodeInfo4, AllExpr),
+			   "RTL LCM calc_antic", Options),
+  EdgeInfo1 = ?option_time(calc_earliest(CFG, NodeInfo5, EdgeInfo0, Labels),
+			   "RTL LCM calc_earliest", Options),
+  {NodeInfo6, EdgeInfo2} = ?option_time(calc_later(CFG, NodeInfo5, EdgeInfo1),
+					"RTL LCM calc_later", Options),
+  NodeInfo7 = ?option_time(calc_delete(CFG, NodeInfo6, Labels),
+			   "RTL LCM calc_delete", Options),
   {NodeInfo7, EdgeInfo2, AllExpr, ExprMap, IdMap, Labels}.
 
 %%%%%%%%%%%%%%%%%%% AVAILABLE IN/OUT FLOW ANALYSIS %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -941,15 +941,16 @@ calc_insert_edge(NodeInfo, EdgeInfo, From, To) ->
 calc_delete(_, NodeInfo, []) ->
   NodeInfo;
 calc_delete(CFG, NodeInfo, [Label|Labels]) ->
-  case Label =:= hipe_rtl_cfg:start_label(CFG) of
-    true -> 
-      NewNodeInfo = set_delete(NodeInfo, Label, ?SETS:new());
-    false ->
-      UpExp = up_exp(NodeInfo, Label),
-      LaterIn = later_in(NodeInfo, Label),
-      Delete = ?SETS:subtract(UpExp, LaterIn),
-      NewNodeInfo = set_delete(NodeInfo, Label, Delete)
-  end,
+  NewNodeInfo =
+    case Label =:= hipe_rtl_cfg:start_label(CFG) of
+      true ->
+	set_delete(NodeInfo, Label, ?SETS:new());
+      false ->
+	UpExp = up_exp(NodeInfo, Label),
+	LaterIn = later_in(NodeInfo, Label),
+	Delete = ?SETS:subtract(UpExp, LaterIn),
+	set_delete(NodeInfo, Label, Delete)
+    end,
   calc_delete(CFG, NewNodeInfo, Labels).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/hipe/rtl/hipe_rtl_ssapre.erl b/lib/hipe/rtl/hipe_rtl_ssapre.erl
index e248457806..df1a4b9376 100644
--- a/lib/hipe/rtl/hipe_rtl_ssapre.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssapre.erl
@@ -107,7 +107,7 @@ rtl_ssapre(RtlSSACfg, Options) ->
   case XsiList of
     [] ->
       %% No Xsi
-      ?option_time(?pp_debug("~n~n################ No Xsi Inserted ################~n",[]),"RTL A-SSAPRE No Xsi inserted (skip Downsafety and Will Be Available)",Options),
+      ?pp_debug("~n~n################ No Xsi Inserted ################~n",[]),
       ok;
     _ ->
       ?pp_debug("~n############ Downsafety ##########~n",[]),
@@ -126,7 +126,7 @@ rtl_ssapre(RtlSSACfg, Options) ->
   ?pp_debug("~n~n################ Xsi CFG ################~n",[]),pp_cfg(CFG2,XsiGraph),
 
   init_redundancy_count(),
-  ?option_time(FinalCFG=perform_code_motion(Labels,CFG2,XsiGraph),"RTL A-SSAPRE Code Motion",Options),
+  FinalCFG = ?option_time(perform_code_motion(Labels,CFG2,XsiGraph),"RTL A-SSAPRE Code Motion",Options),
   
   ?pp_debug("\n############ No more need for the Xsi Graph....Deleting...",[]),?GRAPH:delete(XsiGraph),
 
@@ -146,7 +146,7 @@ perform_Xsi_insertion(Cfg, Options) ->
   init_counters(), %% Init counters for Bottoms and Temps
   DigraphOpts = [cyclic, private],
   XsiGraph = digraph:new(DigraphOpts),
-  %% Be carefull, the digraph component is NOT garbage collected,
+  %% Be careful, the digraph component is NOT garbage collected,
   %% so don't create 20 millions of instances!
   %% finds the longest depth
   %% Depth-first, preorder traversal over Basic Blocks.
@@ -154,13 +154,13 @@ perform_Xsi_insertion(Cfg, Options) ->
   Labels = ?CFG:preorder(Cfg), 
 
   ?pp_debug("~n~n############# Finding definitions for computation~n~n",[]),
-  ?option_time({Cfg2,XsiGraph} = find_definition_for_computations(Labels,Cfg,XsiGraph),"RTL A-SSAPRE Xsi Insertion, searching from instructions",Options),
+  {Cfg2,XsiGraph} = ?option_time(find_definition_for_computations(Labels,Cfg,XsiGraph),"RTL A-SSAPRE Xsi Insertion, searching from instructions",Options),
 
   %% Active List creation
   GeneratorXsiList = lists:sort(?GRAPH:vertices(XsiGraph)),
   ?pp_debug("~n~n############# Inserted Xsis ~w",[GeneratorXsiList]),
   ?pp_debug("~n~n############# Finding operands~n",[]),
-  ?option_time({Cfg3,XsiGraph} = find_operands(Cfg2,XsiGraph,GeneratorXsiList,0),"RTL A-SSAPRE Xsi Insertion, finding operands",Options),
+  {Cfg3,XsiGraph} = ?option_time(find_operands(Cfg2,XsiGraph,GeneratorXsiList,0),"RTL A-SSAPRE Xsi Insertion, finding operands",Options),
 
   %% Creating the CFGGraph
   ?pp_debug("~n~n############# Creating CFG Graph",[]),
@@ -170,9 +170,9 @@ perform_Xsi_insertion(Cfg, Options) ->
   ?pp_debug("~nAdding a vertex for the start label: ~w",[StartLabel]),
   ?GRAPH:add_vertex(CFGGraph, StartLabel, #block{type = top}),
                                                 % Doing the others
-  ?option_time(MPs=create_cfggraph(Others,Cfg3,CFGGraph,[],[],[],XsiGraph),"RTL A-SSAPRE Xsi Insertion, creating intermediate 'SSAPRE Graph'",Options),
+  MPs = ?option_time(create_cfggraph(Others,Cfg3,CFGGraph,[],[],[],XsiGraph),"RTL A-SSAPRE Xsi Insertion, creating intermediate 'SSAPRE Graph'",Options),
 
-  %% Return the bloody collected information
+  %% Return the collected information
   {Cfg3,XsiGraph,CFGGraph,MPs}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -221,22 +221,21 @@ find_definition_for_computations_in_block(BlockLabel,[Inst|Rest],Cfg,
  	  ?pp_debug(" Inserting Xsi: ",[]),pp_xsi(Xsi),
 
           Label = Xsi#xsi.label,
-          case BlockLabel =:= Label of
-            false ->
-              %% Insert the Xsi in the appropriate block
-              Code = hipe_bb:code(?CFG:bb(Cfg,Label)),
-              {BeforeCode,AfterCode} = split_for_xsi(lists:reverse(Code),[]),
-              NewCode = BeforeCode++[XsiLink|AfterCode],
-              NewBB = hipe_bb:mk_bb(NewCode),
-              NewCfg = ?CFG:bb_add(Cfg,Label,NewBB),
-              NewVisited = [NewInst|VisitedInstructions];
-            _->
-              {BeforeCode,AfterCode} = split_for_xsi(VisitedInstructions,[]),
-              TempVisited = BeforeCode++[XsiLink|AfterCode],
-              TempVisited2 = lists:reverse(TempVisited),
-              NewVisited = [NewInst|TempVisited2],
-              NewCfg = Cfg
-          end,
+	  {NewCfg, NewVisited} =
+	    case BlockLabel =:= Label of
+	      false ->
+		%% Insert the Xsi in the appropriate block
+		Code = hipe_bb:code(?CFG:bb(Cfg,Label)),
+		{BeforeCode,AfterCode} = split_for_xsi(lists:reverse(Code),[]),
+		NewCode = BeforeCode++[XsiLink|AfterCode],
+		NewBB = hipe_bb:mk_bb(NewCode),
+		{?CFG:bb_add(Cfg,Label,NewBB), [NewInst|VisitedInstructions]};
+	      _->
+		{BeforeCode,AfterCode} = split_for_xsi(VisitedInstructions,[]),
+		TempVisited = BeforeCode++[XsiLink|AfterCode],
+		TempVisited2 = lists:reverse(TempVisited),
+		{Cfg, [NewInst|TempVisited2]}
+	    end,
           find_definition_for_computations_in_block(BlockLabel, Rest, NewCfg,
 						    NewVisited, XsiGraph)
       end;
@@ -787,14 +786,15 @@ create_cfggraph([Label|Ls],Cfg,CFGGraph,ToBeFactorizedAcc,MPAcc,LateEdges,XsiGra
       Defs = get_defs_in_non_merge_block(Code, []),
       ?pp_debug("~nAdding a vertex for ~w", [Label]),
       Succs = ?CFG:succ(Cfg, Label),
-      case Succs of
-        [] -> %% Exit point
-          ?GRAPH:add_vertex(CFGGraph, Label, #block{type = exit}),
-          NewToBeFactorizedAcc = ToBeFactorizedAcc;
-        _ -> %% Split point
-          ?GRAPH:add_vertex(CFGGraph,Label,#block{type=not_mp,attributes={P,Succs}}),
-          NewToBeFactorizedAcc = [Label|ToBeFactorizedAcc]
-      end,
+      NewToBeFactorizedAcc =
+	case Succs of
+	  [] -> %% Exit point
+	    ?GRAPH:add_vertex(CFGGraph, Label, #block{type = exit}),
+	    ToBeFactorizedAcc;
+	  _ -> %% Split point
+	    ?GRAPH:add_vertex(CFGGraph,Label,#block{type=not_mp,attributes={P,Succs}}),
+	    [Label|ToBeFactorizedAcc]
+	end,
       ?pp_debug("~nAdding an edge ~w -> ~w (~w)",[P,Label,Defs]),
       case ?GRAPH:add_edge(CFGGraph,P,Label,Defs) of
         {error,Reason} ->
@@ -862,56 +862,53 @@ add_edges_for_mp([P|Ps], Label, LateEdges) ->
 
 %% Doesn't do anything so far
 add_map_and_uses([], _Key, Maps, Uses) ->
-  {Maps,Uses};
+  {Maps, Uses};
 add_map_and_uses([XsiOp|Ops], Key, Maps, Uses) ->
-  case XsiOp#xsi_op.op of
-    #bottom{} ->
-      Set = case gb_trees:lookup(XsiOp,Maps) of
-              {value, V} ->
-                ?SETS:add_element(Key,V);
-              none ->
-                ?SETS:from_list([Key])
-            end,
-      NewMaps = gb_trees:enter(XsiOp,Set,Maps),
-      NewUses = Uses;
-    #temp{} ->
-      Set = case gb_trees:lookup(XsiOp,Maps) of
-              {value, V} ->
-                ?SETS:add_element(Key,V);
-              none ->
-                ?SETS:from_list([Key])
-            end,
-      NewMaps = gb_trees:enter(XsiOp,Set,Maps),
-      Pred = XsiOp#xsi_op.pred,
-      OOP = XsiOp#xsi_op.op,
-      SSet = case gb_trees:lookup(Pred,Uses) of
-	       {value, VV} ->
-		 ?SETS:add_element(OOP#temp.key,VV);
-	       none ->
-		 ?SETS:from_list([OOP#temp.key])
-	     end,
-      NewUses = gb_trees:enter(Pred,SSet,Uses);
-    #eop{} ->
-      Set = case gb_trees:lookup(XsiOp,Maps) of
-              {value, V} ->
-                ?SETS:add_element(Key,V);
-              none ->
-                ?SETS:from_list([Key])
-            end,
-      NewMaps = gb_trees:enter(XsiOp,Set,Maps),
-      Pred = XsiOp#xsi_op.pred,
-      Op = XsiOp#xsi_op.op,
-      SSet = case gb_trees:lookup(Pred,Uses) of
-	       {value, VV} ->
-		 ?SETS:add_element(Op#eop.stopped_by,VV);
-	       none ->
-		 ?SETS:from_list([Op#eop.stopped_by])
-	     end,
-      NewUses = gb_trees:enter(Pred,SSet,Uses);
-    _->
-      NewMaps = Maps,
-      NewUses = Uses
-  end,
+  {NewMaps, NewUses} =
+    case XsiOp#xsi_op.op of
+      #bottom{} ->
+	Set = case gb_trees:lookup(XsiOp, Maps) of
+		{value, V} ->
+		  ?SETS:add_element(Key, V);
+		none ->
+		  ?SETS:from_list([Key])
+	      end,
+	{gb_trees:enter(XsiOp, Set, Maps), Uses};
+      #temp{} ->
+	Set = case gb_trees:lookup(XsiOp, Maps) of
+		{value, V} ->
+		  ?SETS:add_element(Key, V);
+		none ->
+		  ?SETS:from_list([Key])
+	      end,
+	Pred = XsiOp#xsi_op.pred,
+	OOP = XsiOp#xsi_op.op,
+	SSet = case gb_trees:lookup(Pred, Uses) of
+		 {value, VV} ->
+		   ?SETS:add_element(OOP#temp.key, VV);
+		 none ->
+		   ?SETS:from_list([OOP#temp.key])
+	       end,
+	{gb_trees:enter(XsiOp, Set, Maps), gb_trees:enter(Pred, SSet, Uses)};
+      #eop{} ->
+	Set = case gb_trees:lookup(XsiOp, Maps) of
+		{value, V} ->
+		  ?SETS:add_element(Key, V);
+		none ->
+		  ?SETS:from_list([Key])
+	      end,
+	Pred = XsiOp#xsi_op.pred,
+	Op = XsiOp#xsi_op.op,
+	SSet = case gb_trees:lookup(Pred, Uses) of
+		 {value, VV} ->
+		   ?SETS:add_element(Op#eop.stopped_by, VV);
+		 none ->
+		   ?SETS:from_list([Op#eop.stopped_by])
+	       end,
+	{gb_trees:enter(XsiOp, Set, Maps), gb_trees:enter(Pred, SSet, Uses)};
+      _->
+	{Maps, Uses}
+    end,
   add_map_and_uses(Ops, Key, NewMaps, NewUses).
 
 post_process([], _CFGGraph) -> ok;
@@ -1162,37 +1159,38 @@ code_motion_in_block(L,[Inst|Insts],Cfg,XsiG,Visited,InsertionsAcc) ->
     #pre_candidate{} ->
       Def = Inst#pre_candidate.def,
       Alu = Inst#pre_candidate.alu,
-      case Def of
-        bottom ->
-          InstToAdd = Alu;
-        #temp{} ->
-          Key = Def#temp.key,
-          {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
-          case Xsi#xsi.wba of
-            true ->
-              %% Turn into a move
-              Dst = ?RTL:alu_dst(Alu),
-              Move = ?RTL:mk_move(Dst,Def#temp.var),
-              pp_instr(Inst#pre_candidate.alu,nil), ?pp_debug(" ==> ",[]), pp_instr(Move,nil),
-              %% Counting redundancies
-              redundancy_add(),
-              InstToAdd = Move;
-            _ ->
-              InstToAdd = Alu
-          end;
-        _ -> %% Def is a real variable
-          %% Turn into a move
-          Dst = ?RTL:alu_dst(Alu),
-          Move = ?RTL:mk_move(Dst,Def),
-          pp_instr(Alu,nil), ?pp_debug(" ==> ",[]), pp_instr(Move,nil),
-          %% Counting redundancies
-          redundancy_add(),
-          InstToAdd = Move
-      end,
+      InstToAdd =
+	case Def of
+	  bottom ->
+	    Alu;
+	  #temp{} ->
+	    Key = Def#temp.key,
+	    {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
+	    case Xsi#xsi.wba of
+	      true ->
+		%% Turn into a move
+		Dst = ?RTL:alu_dst(Alu),
+		Move = ?RTL:mk_move(Dst,Def#temp.var),
+		pp_instr(Inst#pre_candidate.alu,nil), ?pp_debug(" ==> ",[]), pp_instr(Move,nil),
+		%% Counting redundancies
+		redundancy_add(),
+		Move;
+	      _ ->
+		Alu
+	    end;
+	  _ -> %% Def is a real variable
+	    %% Turn into a move
+	    Dst = ?RTL:alu_dst(Alu),
+	    Move = ?RTL:mk_move(Dst,Def),
+	    pp_instr(Alu,nil), ?pp_debug(" ==> ",[]), pp_instr(Move,nil),
+	    %% Counting redundancies
+	    redundancy_add(),
+	    Move
+	end,
       code_motion_in_block(L,Insts,Cfg,XsiG,[InstToAdd|Visited],InsertionsAcc);
     #xsi_link{} ->
       Key = Inst#xsi_link.num,
-      {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),      
+      {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
       case Xsi#xsi.wba of
         true ->
           %% Xsi is a WBA, it might trigger insertions
@@ -1235,139 +1233,133 @@ get_insertions([],OpAcc,InsertionsAcc,_Visited,_Expr,_XsiG) ->
 get_insertions([XsiOp|Ops],OpAcc,InsertionsAcc,Visited,Expr,XsiG) ->
   Pred = XsiOp#xsi_op.pred,
   Op = XsiOp#xsi_op.op,
-  case Op of
-    #bottom{} ->
-      case gb_trees:lookup(Pred,InsertionsAcc) of
-        {value,Insertion} ->
-          From = Insertion#insertion.from,
-          case lists:keyfind(Op, 1, From) of
-            false ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
-              Dst = Op#bottom.var,
-              Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-              Inst = manufacture_computation(Pred,Expr2,Visited),
-              Code = Insertion#insertion.code,
-              NewInsertion = Insertion#insertion{from=[{Op,Dst}|From],code=[Inst|Code]},
-              NewInsertionsAcc = gb_trees:update(Pred,NewInsertion,InsertionsAcc);
-            {_, Val} ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
-              Dst = Val,
-              NewInsertionsAcc = InsertionsAcc
-          end;
-        none ->
-          ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
-          Dst = Op#bottom.var,
-          Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-          Inst = manufacture_computation(Pred,Expr2,Visited),
-          NewInsertion = #insertion{from=[{Op,Dst}],code=[Inst]},
-          NewInsertionsAcc = gb_trees:insert(Pred,NewInsertion,InsertionsAcc)
-      end;
-    #const_expr{} ->
-      case gb_trees:lookup(Pred,InsertionsAcc) of
-        {value,Insertion} ->
-          From = Insertion#insertion.from,
-          case lists:keyfind(Op, 1, From) of
-            false ->
-              ?pp_debug("~nThere have been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
-              Dst = Op#const_expr.var,
-              Val = Op#const_expr.value,
-              Inst = ?RTL:mk_move(Dst,Val),
-              Code = Insertion#insertion.code,
-              NewInsertion = Insertion#insertion{from=[{Op,Dst}|From],code=[Inst|Code]},
-              NewInsertionsAcc = gb_trees:update(Pred,NewInsertion,InsertionsAcc);
-            {_, Val} ->
-              ?pp_debug("~nThere have been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
-              Dst = Val,
-              NewInsertionsAcc = InsertionsAcc
-          end;
-        none ->
-          ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
-          Dst = Op#const_expr.var,
-          Val = Op#const_expr.value,
-          Inst = ?RTL:mk_move(Dst,Val),
-          NewInsertion = #insertion{from=[{Op,Dst}],code=[Inst]},
-          NewInsertionsAcc = gb_trees:insert(Pred,NewInsertion,InsertionsAcc)
-      end;
-    #eop{} ->
-      %% We treat expressions like bottoms
-      %% The value must be recomputed, and therefore not available...
-      case gb_trees:lookup(Pred,InsertionsAcc) of
-        {value,Insertion} ->
-          From = Insertion#insertion.from,
-          case lists:keyfind(Op, 1, From) of
-            false ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
-              Dst = Op#eop.var,
-              Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-              Inst = manufacture_computation(Pred,Expr2,Visited),
-              Code = Insertion#insertion.code,
-              NewInsertion = Insertion#insertion{from=[{Op,Dst}|From],code=[Inst|Code]},
-              NewInsertionsAcc = gb_trees:update(Pred,NewInsertion,InsertionsAcc);
-            {_, Val} ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
-              Dst = Val,
-              NewInsertionsAcc = InsertionsAcc
-          end;
-        none ->
-          ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
-          Dst = Op#eop.var,
-          Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-          Inst = manufacture_computation(Pred,Expr2,Visited),
-          NewInsertion = #insertion{from=[{Op,Dst}],code=[Inst]},
-          NewInsertionsAcc = gb_trees:insert(Pred,NewInsertion,InsertionsAcc)
-      end;
-    #temp{} ->
-      case gb_trees:lookup(Pred,InsertionsAcc) of
-        {value,Insertion} ->
-          From = Insertion#insertion.from,
-          case lists:keyfind(Op, 1, From) of
-            false ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
-              Key = Op#temp.key,
-              {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),      
-              case Xsi#xsi.wba of
-                true ->
-                  ?pp_debug("~nBut the operand is a WBA Xsi: no need for insertion",[]),
-                  Dst = Op#temp.var,
-                  NewInsertionsAcc = InsertionsAcc;
-                _ ->
-                  ?pp_debug("~nBut the operand is a NOT WBA Xsi: we must make an insertion",[]),
-                  Dst = ?RTL:mk_new_var(),
-                  Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-                  Inst = manufacture_computation(Pred,Expr2,Visited),
-                  Code = Insertion#insertion.code,
-                  NewInsertion = Insertion#insertion{from=[{Op,Dst}|From],code=[Inst|Code]},
-                  NewInsertionsAcc = gb_trees:update(Pred,NewInsertion,InsertionsAcc)
-              end;
-            {_, Val} ->
-              ?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too (Op=~w)",[Pred,Op]),
-              ?pp_debug("~nThis means, this temp is a WBA Xsi's definition",[]),
-              Dst = Val,
-              NewInsertionsAcc = InsertionsAcc
-          end;
-        none ->
-          ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course | Op=",[Pred]),pp_arg(Op),
-          Key = Op#temp.key,
-          {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
-          case Xsi#xsi.wba of
-            true ->
-              ?pp_debug("~nBut the operand is a WBA Xsi: no need for insertion",[]),
-              Dst = Op#temp.var,
-              NewInsertionsAcc = InsertionsAcc;
-            _ ->
-              ?pp_debug("~nBut the operand is a NOT WBA Xsi: we must make an insertion",[]),
-              Dst = ?RTL:mk_new_var(),
-              Expr2 = ?RTL:alu_dst_update(Expr,Dst),
-              Inst = manufacture_computation(Pred,Expr2,Visited),
-              NewInsertion = #insertion{from=[{Op,Dst}],code=[Inst]},
-              NewInsertionsAcc = gb_trees:insert(Pred,NewInsertion,InsertionsAcc)
-          end
-      end;
-    _ ->
-      ?pp_debug("~nThe operand (Op=",[]),pp_arg(Op),?pp_debug(") is a real variable, no need for insertion along L~w",[Pred]),
-      Dst = Op,
-      NewInsertionsAcc = InsertionsAcc
-  end,
+  {Dst, NewInsertionsAcc} =
+    case Op of
+      #bottom{} ->
+	case gb_trees:lookup(Pred,InsertionsAcc) of
+	  {value,Insertion} ->
+	    From = Insertion#insertion.from,
+	    case lists:keyfind(Op, 1, From) of
+	      false ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
+		D = Op#bottom.var,
+		Expr2 = ?RTL:alu_dst_update(Expr,D),
+		Inst = manufacture_computation(Pred,Expr2,Visited),
+		Code = Insertion#insertion.code,
+		NewInsertion = Insertion#insertion{from=[{Op,D}|From],code=[Inst|Code]},
+		{D, gb_trees:update(Pred, NewInsertion, InsertionsAcc)};
+	      {_, Val} ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
+		{Val, InsertionsAcc}
+	    end;
+	  none ->
+	    ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
+	    D = Op#bottom.var,
+	    Expr2 = ?RTL:alu_dst_update(Expr, D),
+	    Inst = manufacture_computation(Pred,Expr2,Visited),
+	    NewInsertion = #insertion{from=[{Op,D}],code=[Inst]},
+	    {D, gb_trees:insert(Pred,NewInsertion, InsertionsAcc)}
+	end;
+      #const_expr{} ->
+	case gb_trees:lookup(Pred,InsertionsAcc) of
+	  {value,Insertion} ->
+	    From = Insertion#insertion.from,
+	    case lists:keyfind(Op, 1, From) of
+	      false ->
+		?pp_debug("~nThere have been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
+		D = Op#const_expr.var,
+		Val = Op#const_expr.value,
+		Inst = ?RTL:mk_move(D, Val),
+		Code = Insertion#insertion.code,
+		NewInsertion = Insertion#insertion{from=[{Op,D}|From],code=[Inst|Code]},
+		{D, gb_trees:update(Pred,NewInsertion,InsertionsAcc)};
+	      {_, Val} ->
+		?pp_debug("~nThere have been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
+		{Val, InsertionsAcc}
+	    end;
+	  none ->
+	    ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
+	    D = Op#const_expr.var,
+	    Val = Op#const_expr.value,
+	    Inst = ?RTL:mk_move(D, Val),
+	    NewInsertion = #insertion{from=[{Op,D}],code=[Inst]},
+	    {D, gb_trees:insert(Pred,NewInsertion, InsertionsAcc)}
+	end;
+      #eop{} ->
+	%% We treat expressions like bottoms
+	%% The value must be recomputed, and therefore not available...
+	case gb_trees:lookup(Pred,InsertionsAcc) of
+	  {value,Insertion} ->
+	    From = Insertion#insertion.from,
+	    case lists:keyfind(Op, 1, From) of
+	      false ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
+		D = Op#eop.var,
+		Expr2 = ?RTL:alu_dst_update(Expr, D),
+		Inst = manufacture_computation(Pred,Expr2,Visited),
+		Code = Insertion#insertion.code,
+		NewInsertion = Insertion#insertion{from=[{Op,D}|From],code=[Inst|Code]},
+		{D, gb_trees:update(Pred,NewInsertion, InsertionsAcc)};
+	      {_, Val} ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too | Op=",[Pred]),pp_arg(Op),
+		{Val, InsertionsAcc}
+	    end;
+	  none ->
+	    ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course)| Op=",[Pred]),pp_arg(Op),
+	    D = Op#eop.var,
+	    Expr2 = ?RTL:alu_dst_update(Expr, D),
+	    Inst = manufacture_computation(Pred,Expr2,Visited),
+	    NewInsertion = #insertion{from=[{Op,D}],code=[Inst]},
+	    {D, gb_trees:insert(Pred, NewInsertion, InsertionsAcc)}
+	end;
+      #temp{} ->
+	case gb_trees:lookup(Pred,InsertionsAcc) of
+	  {value,Insertion} ->
+	    From = Insertion#insertion.from,
+	    case lists:keyfind(Op, 1, From) of
+	      false ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, but not for that operand | Op=",[Pred]),pp_arg(Op),
+		Key = Op#temp.key,
+		{_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
+		case Xsi#xsi.wba of
+		  true ->
+		    ?pp_debug("~nBut the operand is a WBA Xsi: no need for insertion",[]),
+		    {Op#temp.var, InsertionsAcc};
+		  _ ->
+		    ?pp_debug("~nBut the operand is a NOT WBA Xsi: we must make an insertion",[]),
+		    D = ?RTL:mk_new_var(),
+		    Expr2 = ?RTL:alu_dst_update(Expr, D),
+		    Inst = manufacture_computation(Pred,Expr2,Visited),
+		    Code = Insertion#insertion.code,
+		    NewInsertion = Insertion#insertion{from=[{Op,D}|From],code=[Inst|Code]},
+		    {D, gb_trees:update(Pred, NewInsertion, InsertionsAcc)}
+		end;
+	      {_, Val} ->
+		?pp_debug("~nThere has been insertions along the edge L~w already, and for that operand too (Op=~w)",[Pred,Op]),
+		?pp_debug("~nThis means, this temp is a WBA Xsi's definition",[]),
+		{Val, InsertionsAcc}
+	    end;
+	  none ->
+	    ?pp_debug("~nThere has been no insertion along the edge L~w, (and not for that operand, of course | Op=",[Pred]),pp_arg(Op),
+	    Key = Op#temp.key,
+	    {_V,Xsi} = ?GRAPH:vertex(XsiG,Key),
+	    case Xsi#xsi.wba of
+	      true ->
+		?pp_debug("~nBut the operand is a WBA Xsi: no need for insertion",[]),
+		{Op#temp.var, InsertionsAcc};
+	      _ ->
+		?pp_debug("~nBut the operand is a NOT WBA Xsi: we must make an insertion",[]),
+		D = ?RTL:mk_new_var(),
+		Expr2 = ?RTL:alu_dst_update(Expr, D),
+		Inst = manufacture_computation(Pred,Expr2,Visited),
+		NewInsertion = #insertion{from=[{Op,D}],code=[Inst]},
+	        {D, gb_trees:insert(Pred, NewInsertion, InsertionsAcc)}
+	    end
+	end;
+      _ ->
+	?pp_debug("~nThe operand (Op=",[]),pp_arg(Op),?pp_debug(") is a real variable, no need for insertion along L~w",[Pred]),
+	{Op, InsertionsAcc}
+    end,
   NewXsiOp = XsiOp#xsi_op{op=Dst},
   get_insertions(Ops, [NewXsiOp|OpAcc], NewInsertionsAcc, Visited, Expr, XsiG).
 
diff --git a/lib/hipe/sparc/Makefile b/lib/hipe/sparc/Makefile
index 9fea887ebd..0e36a43d8e 100644
--- a/lib/hipe/sparc/Makefile
+++ b/lib/hipe/sparc/Makefile
@@ -76,7 +76,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/tools/Makefile b/lib/hipe/tools/Makefile
index 4e3b93d464..7a62896c31 100644
--- a/lib/hipe/tools/Makefile
+++ b/lib/hipe/tools/Makefile
@@ -65,7 +65,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
index 32135d60dd..66e9421c25 100644
--- a/lib/hipe/util/Makefile
+++ b/lib/hipe/util/Makefile
@@ -69,7 +69,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/x86/Makefile b/lib/hipe/x86/Makefile
index e8a73bbc42..93f8b955dd 100644
--- a/lib/hipe/x86/Makefile
+++ b/lib/hipe/x86/Makefile
@@ -84,7 +84,7 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +warn_exported_vars
+ERL_COMPILE_FLAGS += -Werror +warn_export_vars
 
 # ----------------------------------------------------
 # Targets
author	Sverker Eriksson <[email protected]>	2016-05-31 15:00:02 +0200
committer	Sverker Eriksson <[email protected]>	2016-05-31 15:00:02 +0200
commit	78b50b543395f9af748e2b00afb8c0266e708514 (patch)
tree	acf9bfb112d9c276c52d6ad7d460be1ff10d1b7e /lib
parent	17e95dd8dcb0149b771d4aafaeeebc715ee59d3d (diff)
parent	f2ef57d35c27e62f7df6de312ff613bd9afd3c1d (diff)
download	otp-78b50b543395f9af748e2b00afb8c0266e708514.tar.gz otp-78b50b543395f9af748e2b00afb8c0266e708514.tar.bz2 otp-78b50b543395f9af748e2b00afb8c0266e708514.zip