diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/ada/fe.h | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 58 | ||||
| -rw-r--r-- | gcc/ada/repinfo.adb | 24 |
4 files changed, 56 insertions, 40 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0ea491e..5ebe69e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,15 @@ 2018-05-24 Eric Botcazou <ebotcazou@adacore.com> + * fe.h (Set_Normalized_First_Bit): Declare. + (Set_Normalized_Position): Likewise. + * repinfo.adb (List_Record_Layout): Do not use irregular output for a + variable position. Fix minor spacing issue. + * gcc-interface/decl.c (annotate_rep): If a field has a variable + offset, compute the normalized position and annotate it in addition to + the bit offset. + +2018-05-24 Eric Botcazou <ebotcazou@adacore.com> + * gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu): Constify and rename variables. Fix formatting. (gnat_to_gnu) <N_Exception_Handler>: Minor tweak. diff --git a/gcc/ada/fe.h b/gcc/ada/fe.h index 77faac9..1928609 100644 --- a/gcc/ada/fe.h +++ b/gcc/ada/fe.h @@ -68,6 +68,8 @@ extern Boolean Debug_Flag_NN; #define Set_Component_Size einfo__set_component_size #define Set_Esize einfo__set_esize #define Set_Mechanism einfo__set_mechanism +#define Set_Normalized_First_Bit einfo__set_normalized_first_bit +#define Set_Normalized_Position einfo__set_normalized_position #define Set_RM_Size einfo__set_rm_size extern void Set_Alignment (Entity_Id, Uint); @@ -75,6 +77,8 @@ extern void Set_Component_Bit_Offset (Entity_Id, Uint); extern void Set_Component_Size (Entity_Id, Uint); extern void Set_Esize (Entity_Id, Uint); extern void Set_Mechanism (Entity_Id, Mechanism_Type); +extern void Set_Normalized_First_Bit (Entity_Id, Uint); +extern void Set_Normalized_Position (Entity_Id, Uint); extern void Set_RM_Size (Entity_Id, Uint); #define Is_Entity_Name einfo__is_entity_name diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 7a827b7..a63cc18 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -8291,7 +8291,8 @@ annotate_rep (Entity_Id gnat_entity, tree gnu_type) gnu_list); if (t) { - tree parent_offset; + tree offset = TREE_VEC_ELT (TREE_VALUE (t), 0); + tree bit_offset = TREE_VEC_ELT (TREE_VALUE (t), 2); /* If we are just annotating types and the type is tagged, the tag and the parent components are not generated by the front-end so @@ -8301,31 +8302,46 @@ annotate_rep (Entity_Id gnat_entity, tree gnu_type) && Is_Tagged_Type (gnat_entity) && No (Component_Clause (gnat_field))) { + tree parent_bit_offset; + /* For a component appearing in the current extension, the offset is the size of the parent. */ if (Is_Derived_Type (gnat_entity) && Original_Record_Component (gnat_field) == gnat_field) - parent_offset + parent_bit_offset = UI_To_gnu (Esize (Etype (Base_Type (gnat_entity))), bitsizetype); else - parent_offset = bitsize_int (POINTER_SIZE); + parent_bit_offset = bitsize_int (POINTER_SIZE); if (TYPE_FIELDS (gnu_type)) - parent_offset - = round_up (parent_offset, + parent_bit_offset + = round_up (parent_bit_offset, DECL_ALIGN (TYPE_FIELDS (gnu_type))); + + offset + = size_binop (PLUS_EXPR, offset, + fold_convert (sizetype, + size_binop (TRUNC_DIV_EXPR, + parent_bit_offset, + bitsize_unit_node))); + } + + /* If the field has a variable offset, also compute the normalized + position since it's easier to do on trees here than to deduce + it from the annotated expression of Component_Bit_Offset. */ + if (TREE_CODE (offset) != INTEGER_CST) + { + normalize_offset (&offset, &bit_offset, BITS_PER_UNIT); + Set_Normalized_Position (gnat_field, + annotate_value (offset)); + Set_Normalized_First_Bit (gnat_field, + annotate_value (bit_offset)); } - else - parent_offset = bitsize_zero_node; Set_Component_Bit_Offset (gnat_field, - annotate_value - (size_binop (PLUS_EXPR, - bit_from_pos (TREE_VEC_ELT (TREE_VALUE (t), 0), - TREE_VEC_ELT (TREE_VALUE (t), 2)), - parent_offset))); + annotate_value (bit_from_pos (offset, bit_offset))); Set_Esize (gnat_field, annotate_value (DECL_SIZE (TREE_PURPOSE (t)))); @@ -8334,19 +8350,27 @@ annotate_rep (Entity_Id gnat_entity, tree gnu_type) { /* If there is no entry, this is an inherited component whose position is the same as in the parent type. */ - Entity_Id gnat_orig_field = Original_Record_Component (gnat_field); + Entity_Id gnat_orig = Original_Record_Component (gnat_field); /* If we are just annotating types, discriminants renaming those of the parent have no entry so deal with them specifically. */ if (type_annotate_only - && gnat_orig_field == gnat_field + && gnat_orig == gnat_field && Ekind (gnat_field) == E_Discriminant) - gnat_orig_field = Corresponding_Discriminant (gnat_field); + gnat_orig = Corresponding_Discriminant (gnat_field); + + if (Known_Normalized_Position (gnat_orig)) + { + Set_Normalized_Position (gnat_field, + Normalized_Position (gnat_orig)); + Set_Normalized_First_Bit (gnat_field, + Normalized_First_Bit (gnat_orig)); + } Set_Component_Bit_Offset (gnat_field, - Component_Bit_Offset (gnat_orig_field)); + Component_Bit_Offset (gnat_orig)); - Set_Esize (gnat_field, Esize (gnat_orig_field)); + Set_Esize (gnat_field, Esize (gnat_orig)); } } } diff --git a/gcc/ada/repinfo.adb b/gcc/ada/repinfo.adb index 7f7152d..fd7a931 100644 --- a/gcc/ada/repinfo.adb +++ b/gcc/ada/repinfo.adb @@ -992,7 +992,6 @@ package body Repinfo is declare Ctyp : constant Entity_Id := Underlying_Type (Etype (Comp)); Esiz : constant Uint := Esize (Comp); - Bofs : constant Uint := Component_Bit_Offset (Comp); Npos : constant Uint := Normalized_Position (Comp); Fbit : constant Uint := Normalized_First_Bit (Comp); Spos : Uint; @@ -1047,35 +1046,14 @@ package body Repinfo is Spaces (Max_Spos_Length - UI_Image_Length); Write_Str (UI_Image_Buffer (1 .. UI_Image_Length)); - elsif Known_Component_Bit_Offset (Comp) - and then List_Representation_Info = 3 - then - Spaces (Max_Spos_Length - 2); - Write_Str ("bit offset "); - - if Starting_Position /= Uint_0 - or else Starting_First_Bit /= Uint_0 - then - UI_Write (Starting_Position * SSU + Starting_First_Bit); - Write_Str (" + "); - end if; - - Write_Val (Bofs, Paren => True); - Write_Str (" size in bits = "); - Write_Val (Esiz, Paren => True); - Write_Eol; - - goto Continue; - elsif Known_Normalized_Position (Comp) and then List_Representation_Info = 3 then Spaces (Max_Spos_Length - 2); if Starting_Position /= Uint_0 then - Write_Char (' '); UI_Write (Starting_Position); - Write_Str (" +"); + Write_Str (" + "); end if; Write_Val (Npos); |