From 1e2d79e2b3c249697931b6bd0ea93f0a4091c2e6 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 20 Nov 2014 16:43:06 +0100 Subject: [PATCH] [multiple changes] 2014-11-20 Robert Dewar * sem_ch12.adb: Minor reformatting. 2014-11-20 Jerome Lambourg * s-osinte-vxworks.ads: Add comments. Minor reformatting. 2014-11-20 Yannick Moy * sem_prag.adb, sem_elab.adb: Minor rewording of error message in SPARK mode, for consistency. From-SVN: r217876 --- gcc/ada/ChangeLog | 13 +++++++++++++ gcc/ada/s-osinte-vxworks.ads | 32 ++++++++++++++++++-------------- gcc/ada/sem_ch12.adb | 1 - gcc/ada/sem_elab.adb | 4 ++-- gcc/ada/sem_prag.adb | 2 +- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ecab635b0d1..a3639674a50 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,16 @@ +2014-11-20 Robert Dewar + + * sem_ch12.adb: Minor reformatting. + +2014-11-20 Jerome Lambourg + + * s-osinte-vxworks.ads: Add comments. Minor reformatting. + +2014-11-20 Yannick Moy + + * sem_prag.adb, sem_elab.adb: Minor rewording of error message in + SPARK mode, for consistency. + 2014-11-20 Vasiliy Fofanov * gnat_ugn.texi: New section on gnattest stubbing. Minor diff --git a/gcc/ada/s-osinte-vxworks.ads b/gcc/ada/s-osinte-vxworks.ads index 19976740463..3509ecd4d1a 100644 --- a/gcc/ada/s-osinte-vxworks.ads +++ b/gcc/ada/s-osinte-vxworks.ads @@ -7,7 +7,7 @@ -- S p e c -- -- -- -- Copyright (C) 1991-1994, Florida State University -- --- Copyright (C) 1995-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1995-2014, Free Software Foundation, Inc. -- -- -- -- 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- -- @@ -32,8 +32,8 @@ -- This is the VxWorks version of this package --- This package encapsulates all direct interfaces to OS services --- that are needed by the tasking run-time (libgnarl). +-- This package encapsulates all direct interfaces to OS services that are +-- needed by the tasking run-time (libgnarl). -- PLEASE DO NOT add any with-clauses to this package or remove the pragma -- Preelaborate. This package is designed to be a bottom-level (leaf) package. @@ -203,6 +203,10 @@ package System.OS_Interface is subtype t_id is System.VxWorks.Ext.t_id; subtype Thread_Id is t_id; + -- Thread_Id and t_id are VxWorks identifiers for tasks. This value, + -- although represented as a Long_Integer, is in fact an address. With + -- some BSPs, this address can have a value sufficiently high that the + -- Thread_Id becomes negative: this should not be considered as an error. function kill (pid : t_id; sig : Signal) return int; pragma Inline (kill); @@ -211,17 +215,16 @@ package System.OS_Interface is function Task_Stop (tid : t_id) return int renames System.VxWorks.Ext.Task_Stop; - -- If we are in the kernel space, stop the task whose t_id is - -- given in parameter in such a way that it can be examined by the - -- debugger. This typically maps to taskSuspend on VxWorks 5 and - -- to taskStop on VxWorks 6. + -- If we are in the kernel space, stop the task whose t_id is given in + -- parameter in such a way that it can be examined by the debugger. This + -- typically maps to taskSuspend on VxWorks 5 and to taskStop on VxWorks 6. function Task_Cont (tid : t_id) return int renames System.VxWorks.Ext.Task_Cont; - -- If we are in the kernel space, continue the task whose t_id is - -- given in parameter if it has been stopped previously to be examined - -- by the debugger (e.g. by taskStop). It typically maps to taskResume - -- on VxWorks 5 and to taskCont on VxWorks 6. + -- If we are in the kernel space, continue the task whose t_id is given + -- in parameter if it has been stopped previously to be examined by the + -- debugger (e.g. by taskStop). It typically maps to taskResume on VxWorks + -- 5 and to taskCont on VxWorks 6. function Int_Lock return int renames System.VxWorks.Ext.Int_Lock; -- If we are in the kernel space, lock interrupts. It typically maps to @@ -325,6 +328,7 @@ package System.OS_Interface is pragma Import (C, taskVarGet, "taskVarGet"); -- VxWorks 6.x specific functions + -- Can only be called from the VxWorks 6 run-time libary that supports -- tlsLib, and not by the VxWorks 6.6 SMP library @@ -469,9 +473,9 @@ package System.OS_Interface is Handler : Interrupt_Handler; Parameter : System.Address := System.Null_Address) return int; pragma Inline (Interrupt_Connect); - -- Use this to set up an user handler. The routine installs a user - -- handler which is invoked after the OS has saved enough context for a - -- high-level language routine to be safely invoked. + -- Use this to set up an user handler. The routine installs a user handler + -- which is invoked after the OS has saved enough context for a high-level + -- language routine to be safely invoked. function Interrupt_Context return int; pragma Inline (Interrupt_Context); diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 3ded01acf0e..44a91b6c516 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -10237,7 +10237,6 @@ package body Sem_Ch12 is and then Is_Constr_Subt_For_U_Nominal (Etype (Actual)) then Freeze_Before (Instantiation_Node, Etype (Actual)); - else Freeze_Before (Instantiation_Node, Typ); end if; diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb index 006e3201a0d..a57a477539d 100644 --- a/gcc/ada/sem_elab.adb +++ b/gcc/ada/sem_elab.adb @@ -924,7 +924,7 @@ package body Sem_Elab is if Inst_Case then if SPARK_Mode = On then Error_Msg_NE - ("instantiation of & during elaboration in SPARK mode", + ("instantiation of & during elaboration in SPARK", N, Ent); else @@ -955,7 +955,7 @@ package body Sem_Elab is elsif SPARK_Mode = On then Error_Msg_NE - ("call to & during elaboration in SPARK mode", N, Ent); + ("call to & during elaboration in SPARK", N, Ent); else Elab_Warning diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 18048bc5a35..1ea8de824c7 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -13126,7 +13126,7 @@ package body Sem_Prag is begin if SPARK_Mode = On then - Error_Msg_N ("pragma Elaborate not allowed in SPARK mode", N); + Error_Msg_N ("pragma Elaborate not allowed in SPARK", N); end if; -- Pragma must be in context items list of a compilation unit -- 2.30.2