Skip to content

R
riscv-gcc-1
Commit dbf2a2d3 by Tristan Gingold Committed by Arnaud Charlet
Options

exp_ch9.ads, [...] (Build_Entry_Names): Remove (unused). 

2017-01-06  Tristan Gingold  <gingold@adacore.com>

	* exp_ch9.ads, exp_ch9.adb (Build_Entry_Names): Remove (unused).
	* rtsfind.ads (RE_Task_Entry_Names_Array, RO_ST_Set_Entry_Names)
	(RE_Protected_Entry_Names_Array, RO_PE_Set_Entry_Names): Remove
	(unused).
	* s-taskin.ads, s-taskin.adb (Set_Entry_Names,
	Task_Entry_Names_Array, Task_Entry_Names_Access): Remove.
	* s-tpoben.ads, s-tpoben.adb (Set_Entry_Names,
	Protected_Entry_Names_Array, Protected_Entry_Names_Access): Remove.

From-SVN: r244142
parent 0789ef6f
Showing with 16 additions and 89 deletions
gcc/ada/ChangeLog
2017-01-06 Tristan Gingold <gingold@adacore.com>
* exp_ch9.ads, exp_ch9.adb (Build_Entry_Names): Remove (unused).
* rtsfind.ads (RE_Task_Entry_Names_Array, RO_ST_Set_Entry_Names)
(RE_Protected_Entry_Names_Array, RO_PE_Set_Entry_Names): Remove
(unused).
* s-taskin.ads, s-taskin.adb (Set_Entry_Names,
Task_Entry_Names_Array, Task_Entry_Names_Access): Remove.
* s-tpoben.ads, s-tpoben.adb (Set_Entry_Names,
Protected_Entry_Names_Array, Protected_Entry_Names_Access): Remove.
2017-01-06 Bob Duff <duff@adacore.com> 2017-01-06 Bob Duff <duff@adacore.com>
* sinfo.ads, sinfo.adb (Map_Pragma_Name): Preparation work, * sinfo.ads, sinfo.adb (Map_Pragma_Name): Preparation work,
......
gcc/ada/exp_ch9.ads
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2015, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2016, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -55,16 +55,6 @@ package Exp_Ch9 is ...@@ -55,16 +55,6 @@ package Exp_Ch9 is
-- interface, ensure that the designated type has a _master and generate -- interface, ensure that the designated type has a _master and generate
-- a renaming of the said master to service the access type. -- a renaming of the said master to service the access type.
procedure Build_Entry_Names
(Obj_Ref : Node_Id;
Obj_Typ : Entity_Id;
Stmts : List_Id);
-- Given a concurrent object, create static string names for all entries
-- and entry families. Associate each name with the Protection_Entries or
-- ATCB field of the object. Obj_Ref is a reference to the concurrent
-- object. Obj_Typ is the type of the object. Stmts is the list where all
-- generated code is attached.
procedure Build_Master_Entity (Obj_Or_Typ : Entity_Id); procedure Build_Master_Entity (Obj_Or_Typ : Entity_Id);
-- Given the name of an object or a type which is either a task, contains -- Given the name of an object or a type which is either a task, contains
-- tasks or designates tasks, create a _master in the appropriate scope -- tasks or designates tasks, create a _master in the appropriate scope
......
gcc/ada/rtsfind.ads
...@@ -1547,9 +1547,7 @@ package Rtsfind is ...@@ -1547,9 +1547,7 @@ package Rtsfind is
RE_Unspecified_Task_Info, -- System.Task_Info RE_Unspecified_Task_Info, -- System.Task_Info
RE_Task_Procedure_Access, -- System.Tasking RE_Task_Procedure_Access, -- System.Tasking
RE_Task_Entry_Names_Array, -- System.Tasking
RO_ST_Number_Of_Entries, -- System.Tasking RO_ST_Number_Of_Entries, -- System.Tasking
RO_ST_Set_Entry_Names, -- System.Tasking
RO_ST_Task_Id, -- System.Tasking RO_ST_Task_Id, -- System.Tasking
RO_ST_Null_Task, -- System.Tasking RO_ST_Null_Task, -- System.Tasking
...@@ -1683,7 +1681,6 @@ package Rtsfind is ...@@ -1683,7 +1681,6 @@ package Rtsfind is
RE_Dispatching_Domain, -- Multiprocessors.Dispatching_Domains RE_Dispatching_Domain, -- Multiprocessors.Dispatching_Domains
RE_Protected_Entry_Body_Array, -- Tasking.Protected_Objects.Entries RE_Protected_Entry_Body_Array, -- Tasking.Protected_Objects.Entries
RE_Protected_Entry_Names_Array, -- Tasking.Protected_Objects.Entries
RE_Protected_Entry_Queue_Max_Array, -- Tasking.Protected_Objects.Entries RE_Protected_Entry_Queue_Max_Array, -- Tasking.Protected_Objects.Entries
RE_Protection_Entries, -- Tasking.Protected_Objects.Entries RE_Protection_Entries, -- Tasking.Protected_Objects.Entries
RE_Protection_Entries_Access, -- Tasking.Protected_Objects.Entries RE_Protection_Entries_Access, -- Tasking.Protected_Objects.Entries
...@@ -1693,7 +1690,6 @@ package Rtsfind is ...@@ -1693,7 +1690,6 @@ package Rtsfind is
RO_PE_Get_Ceiling, -- Tasking.Protected_Objects.Entries RO_PE_Get_Ceiling, -- Tasking.Protected_Objects.Entries
RO_PE_Number_Of_Entries, -- Tasking.Protected_Objects.Entries RO_PE_Number_Of_Entries, -- Tasking.Protected_Objects.Entries
RO_PE_Set_Ceiling, -- Tasking.Protected_Objects.Entries RO_PE_Set_Ceiling, -- Tasking.Protected_Objects.Entries
RO_PE_Set_Entry_Names, -- Tasking.Protected_Objects.Entries
RE_Communication_Block, -- Protected_Objects.Operations RE_Communication_Block, -- Protected_Objects.Operations
RE_Protected_Entry_Call, -- Protected_Objects.Operations RE_Protected_Entry_Call, -- Protected_Objects.Operations
...@@ -2787,9 +2783,7 @@ package Rtsfind is ...@@ -2787,9 +2783,7 @@ package Rtsfind is
RE_Unspecified_Task_Info => System_Task_Info, RE_Unspecified_Task_Info => System_Task_Info,
RE_Task_Procedure_Access => System_Tasking, RE_Task_Procedure_Access => System_Tasking,
RE_Task_Entry_Names_Array => System_Tasking,
RO_ST_Number_Of_Entries => System_Tasking, RO_ST_Number_Of_Entries => System_Tasking,
RO_ST_Set_Entry_Names => System_Tasking,
RO_ST_Task_Id => System_Tasking, RO_ST_Task_Id => System_Tasking,
RO_ST_Null_Task => System_Tasking, RO_ST_Null_Task => System_Tasking,
...@@ -2926,8 +2920,6 @@ package Rtsfind is ...@@ -2926,8 +2920,6 @@ package Rtsfind is
RE_Protected_Entry_Body_Array => RE_Protected_Entry_Body_Array =>
System_Tasking_Protected_Objects_Entries, System_Tasking_Protected_Objects_Entries,
RE_Protected_Entry_Names_Array =>
System_Tasking_Protected_Objects_Entries,
RE_Protected_Entry_Queue_Max_Array => RE_Protected_Entry_Queue_Max_Array =>
System_Tasking_Protected_Objects_Entries, System_Tasking_Protected_Objects_Entries,
RE_Protection_Entries => RE_Protection_Entries =>
...@@ -2946,8 +2938,6 @@ package Rtsfind is ...@@ -2946,8 +2938,6 @@ package Rtsfind is
System_Tasking_Protected_Objects_Entries, System_Tasking_Protected_Objects_Entries,
RO_PE_Set_Ceiling => RO_PE_Set_Ceiling =>
System_Tasking_Protected_Objects_Entries, System_Tasking_Protected_Objects_Entries,
RO_PE_Set_Entry_Names =>
System_Tasking_Protected_Objects_Entries,
RE_Communication_Block => RE_Communication_Block =>
System_Tasking_Protected_Objects_Operations, System_Tasking_Protected_Objects_Operations,
......
gcc/ada/s-taskin.adb
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2016, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -272,17 +272,4 @@ package body System.Tasking is ...@@ -272,17 +272,4 @@ package body System.Tasking is
T.Entry_Calls (1).Self := T; T.Entry_Calls (1).Self := T;
end Initialize; end Initialize;
---------------------
-- Set_Entry_Names --
---------------------
procedure Set_Entry_Names
(Self_Id : Task_Id;
Names : Task_Entry_Names_Access)
is
begin
Self_Id.Entry_Names := Names;
end Set_Entry_Names;
end System.Tasking; end System.Tasking;
gcc/ada/s-taskin.ads
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1992-2015, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2016, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -254,11 +254,6 @@ package System.Tasking is ...@@ -254,11 +254,6 @@ package System.Tasking is
type String_Access is access all String; type String_Access is access all String;
type Task_Entry_Names_Array is
array (Entry_Index range <>) of String_Access;
type Task_Entry_Names_Access is access all Task_Entry_Names_Array;
---------------------------------- ----------------------------------
-- Entry_Call_Record definition -- -- Entry_Call_Record definition --
---------------------------------- ----------------------------------
...@@ -965,14 +960,6 @@ package System.Tasking is ...@@ -965,14 +960,6 @@ package System.Tasking is
-- associated with protected objects or task entries, and are protected -- associated with protected objects or task entries, and are protected
-- by the protected object lock or Acceptor.L, respectively. -- by the protected object lock or Acceptor.L, respectively.
Entry_Names : Task_Entry_Names_Access := null;
-- An array of string names which denotes entry [family member] names.
-- The structure is indexed by task entry index and contains Entry_Num
-- components.
--
-- Protection: The array is populated during task initialization, before
-- the task has been activated. No protection is required in this case.
New_Base_Priority : System.Any_Priority; New_Base_Priority : System.Any_Priority;
-- New value for Base_Priority (for dynamic priorities package) -- New value for Base_Priority (for dynamic priorities package)
-- --
...@@ -1202,10 +1189,4 @@ private ...@@ -1202,10 +1189,4 @@ private
function Number_Of_Entries (Self_Id : Task_Id) return Entry_Index; function Number_Of_Entries (Self_Id : Task_Id) return Entry_Index;
-- Given a task, return the number of entries it contains -- Given a task, return the number of entries it contains
procedure Set_Entry_Names
(Self_Id : Task_Id;
Names : Task_Entry_Names_Access);
-- Associate an array of strings denotinge entry [family] names with a task
end System.Tasking; end System.Tasking;
gcc/ada/s-tpoben.adb
...@@ -378,18 +378,6 @@ package body System.Tasking.Protected_Objects.Entries is ...@@ -378,18 +378,6 @@ package body System.Tasking.Protected_Objects.Entries is
Object.New_Ceiling := Prio; Object.New_Ceiling := Prio;
end Set_Ceiling; end Set_Ceiling;
---------------------
-- Set_Entry_Names --
---------------------
procedure Set_Entry_Names
(Object : Protection_Entries_Access;
Names : Protected_Entry_Names_Access)
is
begin
Object.Entry_Names := Names;
end Set_Entry_Names;
-------------------- --------------------
-- Unlock_Entries -- -- Unlock_Entries --
-------------------- --------------------
......
gcc/ada/s-tpoben.ads
...@@ -57,8 +57,8 @@ package System.Tasking.Protected_Objects.Entries is ...@@ -57,8 +57,8 @@ package System.Tasking.Protected_Objects.Entries is
(O : System.Address; (O : System.Address;
E : Protected_Entry_Index) E : Protected_Entry_Index)
return Protected_Entry_Index; return Protected_Entry_Index;
-- Convert a queue index to an entry index (an entries family has one entry -- Convert a queue index to an entry index (an entry family has one entry
-- index for several queue index). -- index for several queue indexes).
type Protected_Entry_Body_Array is type Protected_Entry_Body_Array is
array (Positive_Protected_Entry_Index range <>) of Entry_Body; array (Positive_Protected_Entry_Index range <>) of Entry_Body;
...@@ -76,15 +76,6 @@ package System.Tasking.Protected_Objects.Entries is ...@@ -76,15 +76,6 @@ package System.Tasking.Protected_Objects.Entries is
type Protected_Entry_Queue_Max_Access is type Protected_Entry_Queue_Max_Access is
access constant Protected_Entry_Queue_Max_Array; access constant Protected_Entry_Queue_Max_Array;
-- The following declarations define an array that contains the string
-- names of entries and entry family members, together with an associated
-- access type.
type Protected_Entry_Names_Array is
array (Entry_Index range <>) of String_Access;
type Protected_Entry_Names_Access is access all Protected_Entry_Names_Array;
-- The following type contains the GNARL state of a protected object. -- The following type contains the GNARL state of a protected object.
-- The application-defined portion of the state (i.e. private objects) -- The application-defined portion of the state (i.e. private objects)
-- is maintained by the compiler-generated code. Note that there is a -- is maintained by the compiler-generated code. Note that there is a
...@@ -156,11 +147,6 @@ package System.Tasking.Protected_Objects.Entries is ...@@ -156,11 +147,6 @@ package System.Tasking.Protected_Objects.Entries is
-- Access to an array of naturals representing the max value for each -- Access to an array of naturals representing the max value for each
-- entry's queue length. A value of 0 signifies no max. -- entry's queue length. A value of 0 signifies no max.
Entry_Names : Protected_Entry_Names_Access := null;
-- An array of string names which denotes entry [family member] names.
-- The structure is indexed by protected entry index and contains Num_
-- Entries components.
Entry_Queues : Protected_Entry_Queue_Array (1 .. Num_Entries); Entry_Queues : Protected_Entry_Queue_Array (1 .. Num_Entries);
-- Action and barrier subprograms for the protected type. -- Action and barrier subprograms for the protected type.
end record; end record;
...@@ -233,12 +219,6 @@ package System.Tasking.Protected_Objects.Entries is ...@@ -233,12 +219,6 @@ package System.Tasking.Protected_Objects.Entries is
Prio : System.Any_Priority); Prio : System.Any_Priority);
-- Sets the new ceiling priority of the protected object -- Sets the new ceiling priority of the protected object
procedure Set_Entry_Names
(Object : Protection_Entries_Access;
Names : Protected_Entry_Names_Access);
-- Associate an array of string that denote entry [family] names with a
-- protected object.
procedure Unlock_Entries (Object : Protection_Entries_Access); procedure Unlock_Entries (Object : Protection_Entries_Access);
-- Relinquish ownership of the lock for the object represented by the -- Relinquish ownership of the lock for the object represented by the
-- Object parameter. If this ownership was for write access, or if it was -- Object parameter. If this ownership was for write access, or if it was
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment