diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-02-01 11:47:59 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-02-01 11:47:59 +0000 |
| commit | 30384dcf32866b5d1db7da6f511f4a132308951f (patch) | |
| tree | e4c4d0cc8bf232b7a9de28f0621b20029848ddd8 /gcc/expr.c | |
| parent | aabea9b5525462d79ecb9d1b67b96a187e85f4a4 (diff) | |
| download | gcc-30384dcf32866b5d1db7da6f511f4a132308951f.tar.gz | |
* expr.c (get_inner_reference): Use sbitsizetype for type sizes.
* fold-const.c (size_int): Replace with
(size_int_wide).
(make_bit_field_ref): Use bitsize_int for bit position.
* stor-layout.c (sizetype): Delete.
(sizetype_tab, sbitsizetype, ubitsizetype): Declare.
(layout_record, layout_union, layout_type):
Use bitsize_int for bit size.
(set_sizetype): New function.
(make_signed_type, make_unsigned_type): Use it.
* c-decl.c (init_decl_processing): Likewise.
* tree.h (size_int): Don't delcare, #define.
(size_int_wide, sizetype_tab, sbitsize, ubitsize): Declare.
(set_sizetype): Declare.
(bitsize_int, size_int_2, BITS_PER_UNIT_LOG, sizetype, bitsizetype):
Define.
* c-typeck.c (c_sizeof, c_sizeof_nowarn, c_size_in_bytes):
Convert result to sizetype.
(really_start_incremental_init, push_init_level):
Set type of constructor_bit_index to sbitsizetype.
(push_init_level): Use unsigned arithmetic to determine padding.
(output_init_element): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17577 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/expr.c')
| -rw-r--r-- | gcc/expr.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gcc/expr.c b/gcc/expr.c index de18bfd5949..0c107c0db76 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -4358,8 +4358,14 @@ get_inner_reference (exp, pbitsize, pbitpos, poffset, pmode, if (! integer_zerop (low_bound)) index = fold (build (MINUS_EXPR, index_type, index, low_bound)); - index = fold (build (MULT_EXPR, index_type, index, - convert (index_type, + if (TREE_CODE (index) == INTEGER_CST) + { + index = convert (sbitsizetype, index); + index_type = TREE_TYPE (index); + } + + index = fold (build (MULT_EXPR, sbitsizetype, index, + convert (sbitsizetype, TYPE_SIZE (TREE_TYPE (exp))))); if (TREE_CODE (index) == INTEGER_CST @@ -4368,9 +4374,9 @@ get_inner_reference (exp, pbitsize, pbitpos, poffset, pmode, else { offset = size_binop (PLUS_EXPR, offset, - size_binop (FLOOR_DIV_EXPR, index, - size_int (BITS_PER_UNIT))); - + convert (sizetype, + size_binop (FLOOR_DIV_EXPR, index, + size_int (BITS_PER_UNIT)))); if (contains_placeholder_p (offset)) offset = build (WITH_RECORD_EXPR, sizetype, offset, exp); } |