aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/types.ads
diff options
context:
space:
mode:
authorBob Duff <duff@adacore.com>2021-02-03 05:31:16 -0500
committerPierre-Marie de Rodat <derodat@adacore.com>2021-05-07 05:29:09 -0400
commit76f9c7f44fffb0b03266730b137313fe79f1c99e (patch)
tree8c77fa6bd5661f0ffb427f7003a21b9a46dc30d6 /gcc/ada/types.ads
parent476ed6bf66ab20e22ae4b3da0fd7fd94753f2334 (diff)
downloadgcc-76f9c7f44fffb0b03266730b137313fe79f1c99e.zip
gcc-76f9c7f44fffb0b03266730b137313fe79f1c99e.tar.gz
gcc-76f9c7f44fffb0b03266730b137313fe79f1c99e.tar.bz2
[Ada] Variable-sized node types
gcc/ada/ * atree.ads, atree.adb: Major rewrite to support variable-sized node types. Add pragmas Suppress and Assertion_Policy. We now have an extra level of indirection: Node_Offsets is a table mapping Node_Ids to the offset of the start of each node in Slots. Slots is a table containing one or more contiguous slots for each node. Each slot is a 32-bit unchecked union that can contain any mixture of 1, 2, 4, 8, and 32-bit fields that fits. The old low-level getters and setters (e.g. Flag123) are removed. * gen_il-fields.ads, gen_il-gen-gen_entities.adb, gen_il-gen-gen_nodes.adb, gen_il-gen.adb, gen_il-gen.ads, gen_il-main.adb, gen_il-types.ads, gen_il-utils.adb, gen_il-utils.ads, gen_il.adb, gen_il.ads: New gen_il program that generates various Ada and C++ files. In particular, the following files are generated by gen_il: einfo-entities.adb einfo-entities.ads, gnatvsn.ads, nmake.adb, nmake.ads, seinfo.ads, seinfo_tables.adb, seinfo_tables.ads, sinfo-nodes.adb, sinfo-nodes.ads, einfo.h, and sinfo.h. * sinfo-utils.adb, sinfo-utils.ads, einfo-utils.adb, einfo-utils.ads: New files containing code that needs to refer to Sinfo.Nodes and Einfo.Entities. This code is mostly moved here from Sinfo and Einfo to break cycles. * back_end.adb: Pass node_offsets_ptr and slots_ptr to gigi, instead of nodes_ptr and flags_ptr. The Nodes and Flags tables no longer exist. (Note that gigi never used the Flags table.) * sinfo-cn.ads (Change_Identifier_To_Defining_Identifier, Change_Character_Literal_To_Defining_Character_Literal, Change_Operator_Symbol_To_Defining_Operator_Symbol): Turn N into an IN formal. * sinfo-cn.adb: Update. Add assertions, which can be removed at some point. Rewrite to use higher-level facilities. Make sure vanishing fields are zeroed out. Add with/use for new packages. * sem_util.adb: Remove "Assert(False)" immediately followed by "raise Program_Error". Use higher-level facilities such as Walk_Sinfo_Fields instead of depending on low-level Set_FieldN routines that no longer exist. Use Get_Comes_From_Source_Default instead of Default_Node.Comes_From_Source (Default_Node no longer exists). Use Set_Basic_Convention instead of Basic_Set_Convention. Add with/use for new packages. * sem_util.ads: The Convention field had getter Convention and setter Basic_Set_Convention. Make that more uniform: there is now a field called Basic_Convention, with Basic_Convention and Set_Basic_Convention as getter/setter, and write Convention and Set_Convention here. * nlists.adb: Rewrite to use abstractions, rather then depending on low-level implementation details of Atree. Necessary because those details have changed. Add with/use for new packages. * sem_ch12.adb: Use higher-level facilities such as Walk_Sinfo_Fields instead of depending on low-level Set_FieldN routines that no longer exist. Add with/use for new packages. * exp_cg.adb, sem_ch10.adb, sem_ch4.adb, sem_eval.adb, sem_prag.adb, sem_warn.adb: Change expanded names to refer to the new packages for things that moved. Add with/use for new packages. * sem_ch3.adb: Likewise. Reinitialize vanishing fields. * exp_disp.adb: Likewise. Remove failing assertion. * sinfo.ads, einfo.ads: Remove code that is now generated into Sinfo.Nodes and Einfo.Entities. * sinfo.adb, einfo.adb: Replace bodies with "pragma No_Body;". We should delete these at some point, but No_Body makes make files easier. Some code is moved to Sinfo.Nodes, Einfo.Entities, Sinfo.Utils, and Einfo.Utils. Some is no longer necessary. * treepr.adb: Rewrite to use new tables. We no longer need treeprs.ads. * treepr.ads: Add comment. * types.ads: Move types Component_Alignment_Kind and Float_Rep_Kind here. * atree.h: Major update to match atree.ads changes. Add slot types, for use by getters/setters. * types.h: Move types Component_Alignment_Kind and Float_Rep_Kind here. * fe.h: Rewrite to deal with code that has changed or moved from Atree, Sinfo, Einfo. * nlists.h: Move some code to fe.h. * alloc.ads: Split Nodes_* constants into Node_Offsets and Slots, because Atree has two separate tables. Increase values. Remove Nodes_Release_Threshold. Improve comment. * debug.adb, gnat1drv.adb: Remove obsolete gnatd.A and gnatd.N switches. Add with/use for new packages. * opt.ads: Minor comment fix. * aspects.adb, checks.adb, comperr.adb, contracts.adb, cstand.adb, debug_a.adb, errout.adb, eval_fat.adb, exp_aggr.adb, exp_atag.adb, exp_attr.adb, exp_ch11.adb, exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch8.adb, exp_ch9.adb, exp_code.adb, exp_dbug.adb, exp_dist.adb, exp_fixd.adb, exp_imgv.adb, exp_intr.adb, exp_pakd.adb, exp_prag.adb, exp_put_image.adb, exp_sel.adb, exp_smem.adb, exp_spark.adb, exp_strm.adb, exp_tss.adb, exp_unst.adb, exp_util.adb, exp_util.ads, expander.adb, freeze.adb, frontend.adb, get_targ.ads, ghost.adb, gnat_cuda.adb, impunit.adb, inline.adb, itypes.adb, itypes.ads, layout.adb, lib.adb, lib-load.adb, lib-writ.adb, lib-xref.adb, lib-xref.ads, lib-xref-spark_specific.adb, live.adb, par.adb, par_sco.adb, pprint.adb, repinfo.adb, restrict.adb, rtsfind.adb, scil_ll.adb, scn.adb, sem.adb, sem.ads, sem_aggr.adb, sem_attr.adb, sem_aux.adb, sem_case.adb, sem_cat.adb, sem_ch11.adb, sem_ch13.adb, sem_ch2.adb, sem_ch5.adb, sem_ch6.adb, sem_ch7.adb, sem_ch8.adb, sem_ch9.adb, sem_dim.adb, sem_disp.adb, sem_dist.adb, sem_elab.adb, sem_elim.adb, sem_intr.adb, sem_mech.adb, sem_res.adb, sem_scil.adb, sem_smem.adb, sem_type.adb, set_targ.ads, sinput.adb, sinput-l.adb, sprint.adb, style.adb, styleg.adb, tbuild.adb, tbuild.ads, uname.adb: Add with/use for new packages. * libgnat/a-stoubu.adb, libgnat/a-stouut.adb: Simplify to ease bootstrap. * libgnat/a-stobfi.adb, libgnat/a-stoufi.adb (Create_File, Create_New_File): Create file in binary format, to avoid introducing unwanted text conversions on Windows. Simplify to ease bootstrap. * libgnat/a-stteou__bootstrap.ads: New. * ceinfo.adb, csinfo.adb, nmake.adt, treeprs.adt, xeinfo.adb, xnmake.adb, xsinfo.adb, xtreeprs.adb: Delete. * Make-generated.in: Build and run the gen_il program to generate files. The files are generated in the ada/gen_il subdirectory, and then moved up to ada. We rely on gnatmake (as opposed to make) to build the gen_il program efficiently (i.e. don't do anything if the sources didn't change). * gcc-interface/Makefile.in (ADAFLAGS): Add -gnatU. (GNATMAKE_OBJS): Add new object files. (GENERATED_FILES_FOR_TOOLS): New variable. (../stamp-tools): Create a link for all GENERATED_FILES_FOR_TOOLS. * gcc-interface/Make-lang.in (GNAT_ADA_OBJS): Add new object files. Remove ada/treeprs.o. (GNATBIND_OBJS): Add new object files. (ada.mostlyclean): Remove ada/sdefault.adb and add ada/stamp-gen_il. (ada.maintainer-clean): Remove ada/treeprs.ads. (update-sources): Remove obsolete target. (ada_generated_files): Rename to... (ADA_GENERATED_FILES): ... this. Add new source files. Add comment. * gcc-interface/trans.c: Remove obsolete Nodes_Ptr and Flags_ptr. Add Node_Offsets_Ptr and Slots_Ptr, which point to the corresponding tables in Atree. * gcc-interface/gigi.h (gigi): New parameters for initializing Node_Offsets_Ptr and Slots_Ptr. * gcc-interface/decl.c: Numeric_Kind, Discrete_Or_Fixed_Point_Kind, and Record_Kind were nonhierarchical, and were therefore removed for simplicity. Replace uses with calls to Is_In_... functions. gnattools/ * Makefile.in (GENERATED_FILES_FOR_TOOLS): New variable. ($(GCC_DIR)/stamp-tools): Walk it for the first copy operation.
Diffstat (limited to 'gcc/ada/types.ads')
-rw-r--r--gcc/ada/types.ads61
1 files changed, 55 insertions, 6 deletions
diff --git a/gcc/ada/types.ads b/gcc/ada/types.ads
index 17665f0..f6c420a 100644
--- a/gcc/ada/types.ads
+++ b/gcc/ada/types.ads
@@ -312,8 +312,7 @@ package Types is
-- The tree Id values start at zero, because we use zero for Empty (to
-- allow a zero test for Empty).
- Node_High_Bound : constant :=
- (if Standard'Address_Size = 32 then 299_999_999 else 1_999_999_999);
+ Node_High_Bound : constant := 1_999_999_999;
Elist_Low_Bound : constant := -199_999_999;
-- The Elist_Id values are subscripts into an array of elist headers which
@@ -387,7 +386,7 @@ package Types is
-- the special values Empty and Error are subscripts into this table.
-- See package Atree for further details.
- type Node_Id is range Node_Low_Bound .. Node_High_Bound;
+ type Node_Id is range Node_Low_Bound .. Node_High_Bound with Size => 32;
-- Type used to identify nodes in the tree
subtype Entity_Id is Node_Id;
@@ -436,7 +435,7 @@ package Types is
-- attempt to apply list operations to No_List will cause a (detected)
-- error.
- type List_Id is range List_Low_Bound .. List_High_Bound;
+ type List_Id is range List_Low_Bound .. List_High_Bound with Size => 32;
-- Type used to identify a node list
No_List : constant List_Id := List_High_Bound;
@@ -461,7 +460,7 @@ package Types is
-- of the tree, allowing nodes to be members of more than one such list
-- (see package Elists for further details).
- type Elist_Id is range Elist_Low_Bound .. Elist_High_Bound;
+ type Elist_Id is range Elist_Low_Bound .. Elist_High_Bound with Size => 32;
-- Type used to identify an element list (Elist header table subscript)
No_Elist : constant Elist_Id := Elist_Low_Bound;
@@ -491,7 +490,8 @@ package Types is
-- String_Id values are used to identify entries in the strings table. They
-- are subscripts into the Strings table defined in package Stringt.
- type String_Id is range Strings_Low_Bound .. Strings_High_Bound;
+ type String_Id is range Strings_Low_Bound .. Strings_High_Bound
+ with Size => 32;
-- Type used to identify entries in the strings table
No_String : constant String_Id := Strings_Low_Bound;
@@ -817,6 +817,38 @@ package Types is
-- then Default_C_Record_Mechanism is set to 32, and the meaning is to use
-- By_Reference if the size is greater than 32, and By_Copy otherwise.
+ ---------------------------------
+ -- Component_Alignment Control --
+ ---------------------------------
+
+ -- There are four types of alignment possible for array and record
+ -- types, and a field in the type entities contains a value of the
+ -- following type indicating which alignment choice applies. For full
+ -- details of the meaning of these alignment types, see description
+ -- of the Component_Alignment pragma.
+
+ type Component_Alignment_Kind is (
+ Calign_Default, -- default alignment
+ Calign_Component_Size, -- natural alignment for component size
+ Calign_Component_Size_4, -- natural for size <= 4, 4 for size >= 4
+ Calign_Storage_Unit); -- all components byte aligned
+
+ -----------------------------------
+ -- Floating Point Representation --
+ -----------------------------------
+
+ type Float_Rep_Kind is (
+ IEEE_Binary, -- IEEE 754p conforming binary format
+ AAMP); -- AAMP format
+
+ ----------------------------
+ -- Small_Paren_Count_Type --
+ ----------------------------
+
+ -- See Paren_Count in Atree for documentation
+
+ subtype Small_Paren_Count_Type is Nat range 0 .. 3;
+
------------------------------
-- Run-Time Exception Codes --
------------------------------
@@ -948,4 +980,21 @@ package Types is
SE_Infinite_Recursion => SE_Reason,
SE_Object_Too_Large => SE_Reason);
+ -- Types for field offsets/sizes used in Seinfo, Sinfo.Nodes and
+ -- Einfo.Entities:
+
+ type Field_Offset is new Nat;
+ -- Offset of a node field, in units of the size of the field, which is
+ -- always a power of 2.
+
+ subtype Field_Size_In_Bits is Field_Offset with Predicate =>
+ Field_Size_In_Bits in 1 | 2 | 4 | 8 | 32;
+
+ subtype Opt_Field_Offset is Field_Offset'Base range -1 .. Field_Offset'Last;
+ No_Field_Offset : constant Opt_Field_Offset := Opt_Field_Offset'First;
+
+ type Offset_Array_Index is new Nat;
+ type Offset_Array is
+ array (Offset_Array_Index range <>) of Opt_Field_Offset;
+
end Types;