aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe/misc/hipe_pack_constants.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-03-27 17:05:11 +0200
committerGitHub <[email protected]>2017-03-27 17:05:11 +0200
commit173cc4865cf0183242904283ea68626b5900ff08 (patch)
tree2ac8440d1e3881e61ef5c4a07e85c2704d722a96 /lib/hipe/misc/hipe_pack_constants.erl
parent236f2cecd0b0d8116c000187780f3981e6e9b388 (diff)
parent54d3e3ae0021f8277322ce51168829aa0dd67de1 (diff)
downloadotp-173cc4865cf0183242904283ea68626b5900ff08.tar.gz
otp-173cc4865cf0183242904283ea68626b5900ff08.tar.bz2
otp-173cc4865cf0183242904283ea68626b5900ff08.zip
Merge PR-1386 from kostis/hipe-const-alignment OTP-14302
hipe: Fix alignment of byte-sized constants
Diffstat (limited to 'lib/hipe/misc/hipe_pack_constants.erl')
-rw-r--r--lib/hipe/misc/hipe_pack_constants.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/hipe/misc/hipe_pack_constants.erl b/lib/hipe/misc/hipe_pack_constants.erl
index 9dd18bce0f..6736d1f503 100644
--- a/lib/hipe/misc/hipe_pack_constants.erl
+++ b/lib/hipe/misc/hipe_pack_constants.erl
@@ -13,7 +13,7 @@
%% limitations under the License.
-module(hipe_pack_constants).
--export([pack_constants/2, slim_refs/1, slim_constmap/1,
+-export([pack_constants/1, slim_refs/1, slim_constmap/1,
find_const/2, mk_data_relocs/2, slim_sorted_exportmap/3]).
-include("hipe_consttab.hrl").
@@ -37,8 +37,8 @@
-record(pcm_entry, {mfa :: mfa(),
label :: hipe_constlbl(),
- const_num :: const_num(),
- start :: addr(),
+ const_num :: const_num(),
+ start :: addr(),
type :: 0 | 1 | 2,
raw_data :: raw_data()}).
-type pcm_entry() :: #pcm_entry{}.
@@ -53,11 +53,11 @@
%%-----------------------------------------------------------------------------
--spec pack_constants([{mfa(),[_],hipe_consttab()}], ct_alignment()) ->
+-spec pack_constants([{mfa(),[_],hipe_consttab()}]) ->
{ct_alignment(), non_neg_integer(), packed_const_map(), mfa_refs_map()}.
-pack_constants(Data, Align) ->
- pack_constants(Data, 0, Align, 0, [], []).
+pack_constants(Data) ->
+ pack_constants(Data, 0, 1, 0, [], []). % 1 = byte alignment
pack_constants([{MFA,_,ConstTab}|Rest], Size, Align, ConstNo, Acc, Refs) ->
Labels = hipe_consttab:labels(ConstTab),