Commit 1e2d79e2 by Arnaud Charlet

[multiple changes]

2014-11-20  Robert Dewar  <dewar@adacore.com>

	* sem_ch12.adb: Minor reformatting.

2014-11-20  Jerome Lambourg  <lambourg@adacore.com>

	* s-osinte-vxworks.ads: Add comments. Minor reformatting.

2014-11-20  Yannick Moy  <moy@adacore.com>

	* sem_prag.adb, sem_elab.adb: Minor rewording of error message in
	SPARK mode, for consistency.

From-SVN: r217876
parent 0e290c54
2014-11-20 Robert Dewar <dewar@adacore.com>
* sem_ch12.adb: Minor reformatting.
2014-11-20 Jerome Lambourg <lambourg@adacore.com>
* s-osinte-vxworks.ads: Add comments. Minor reformatting.
2014-11-20 Yannick Moy <moy@adacore.com>
* sem_prag.adb, sem_elab.adb: Minor rewording of error message in
SPARK mode, for consistency.
2014-11-20 Vasiliy Fofanov <fofanov@adacore.com> 2014-11-20 Vasiliy Fofanov <fofanov@adacore.com>
* gnat_ugn.texi: New section on gnattest stubbing. Minor * gnat_ugn.texi: New section on gnattest stubbing. Minor
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1991-1994, Florida State University -- -- 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 -- -- 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- --
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
-- This is the VxWorks version of this package -- This is the VxWorks version of this package
-- This package encapsulates all direct interfaces to OS services -- This package encapsulates all direct interfaces to OS services that are
-- that are needed by the tasking run-time (libgnarl). -- needed by the tasking run-time (libgnarl).
-- PLEASE DO NOT add any with-clauses to this package or remove the pragma -- 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. -- Preelaborate. This package is designed to be a bottom-level (leaf) package.
...@@ -203,6 +203,10 @@ package System.OS_Interface is ...@@ -203,6 +203,10 @@ package System.OS_Interface is
subtype t_id is System.VxWorks.Ext.t_id; subtype t_id is System.VxWorks.Ext.t_id;
subtype Thread_Id is 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; function kill (pid : t_id; sig : Signal) return int;
pragma Inline (kill); pragma Inline (kill);
...@@ -211,17 +215,16 @@ package System.OS_Interface is ...@@ -211,17 +215,16 @@ package System.OS_Interface is
function Task_Stop (tid : t_id) return int function Task_Stop (tid : t_id) return int
renames System.VxWorks.Ext.Task_Stop; renames System.VxWorks.Ext.Task_Stop;
-- If we are in the kernel space, stop the task whose t_id is -- If we are in the kernel space, stop the task whose t_id is given in
-- given in parameter in such a way that it can be examined by the -- parameter in such a way that it can be examined by the debugger. This
-- debugger. This typically maps to taskSuspend on VxWorks 5 and -- typically maps to taskSuspend on VxWorks 5 and to taskStop on VxWorks 6.
-- to taskStop on VxWorks 6.
function Task_Cont (tid : t_id) return int function Task_Cont (tid : t_id) return int
renames System.VxWorks.Ext.Task_Cont; renames System.VxWorks.Ext.Task_Cont;
-- If we are in the kernel space, continue the task whose t_id is -- If we are in the kernel space, continue the task whose t_id is given
-- given in parameter if it has been stopped previously to be examined -- in parameter if it has been stopped previously to be examined by the
-- by the debugger (e.g. by taskStop). It typically maps to taskResume -- debugger (e.g. by taskStop). It typically maps to taskResume on VxWorks
-- on VxWorks 5 and to taskCont on VxWorks 6. -- 5 and to taskCont on VxWorks 6.
function Int_Lock return int renames System.VxWorks.Ext.Int_Lock; function Int_Lock return int renames System.VxWorks.Ext.Int_Lock;
-- If we are in the kernel space, lock interrupts. It typically maps to -- If we are in the kernel space, lock interrupts. It typically maps to
...@@ -325,6 +328,7 @@ package System.OS_Interface is ...@@ -325,6 +328,7 @@ package System.OS_Interface is
pragma Import (C, taskVarGet, "taskVarGet"); pragma Import (C, taskVarGet, "taskVarGet");
-- VxWorks 6.x specific functions -- VxWorks 6.x specific functions
-- Can only be called from the VxWorks 6 run-time libary that supports -- Can only be called from the VxWorks 6 run-time libary that supports
-- tlsLib, and not by the VxWorks 6.6 SMP library -- tlsLib, and not by the VxWorks 6.6 SMP library
...@@ -469,9 +473,9 @@ package System.OS_Interface is ...@@ -469,9 +473,9 @@ package System.OS_Interface is
Handler : Interrupt_Handler; Handler : Interrupt_Handler;
Parameter : System.Address := System.Null_Address) return int; Parameter : System.Address := System.Null_Address) return int;
pragma Inline (Interrupt_Connect); pragma Inline (Interrupt_Connect);
-- Use this to set up an user handler. The routine installs a user -- Use this to set up an user handler. The routine installs a user handler
-- handler which is invoked after the OS has saved enough context for a -- which is invoked after the OS has saved enough context for a high-level
-- high-level language routine to be safely invoked. -- language routine to be safely invoked.
function Interrupt_Context return int; function Interrupt_Context return int;
pragma Inline (Interrupt_Context); pragma Inline (Interrupt_Context);
......
...@@ -10237,7 +10237,6 @@ package body Sem_Ch12 is ...@@ -10237,7 +10237,6 @@ package body Sem_Ch12 is
and then Is_Constr_Subt_For_U_Nominal (Etype (Actual)) and then Is_Constr_Subt_For_U_Nominal (Etype (Actual))
then then
Freeze_Before (Instantiation_Node, Etype (Actual)); Freeze_Before (Instantiation_Node, Etype (Actual));
else else
Freeze_Before (Instantiation_Node, Typ); Freeze_Before (Instantiation_Node, Typ);
end if; end if;
......
...@@ -924,7 +924,7 @@ package body Sem_Elab is ...@@ -924,7 +924,7 @@ package body Sem_Elab is
if Inst_Case then if Inst_Case then
if SPARK_Mode = On then if SPARK_Mode = On then
Error_Msg_NE Error_Msg_NE
("instantiation of & during elaboration in SPARK mode", ("instantiation of & during elaboration in SPARK",
N, Ent); N, Ent);
else else
...@@ -955,7 +955,7 @@ package body Sem_Elab is ...@@ -955,7 +955,7 @@ package body Sem_Elab is
elsif SPARK_Mode = On then elsif SPARK_Mode = On then
Error_Msg_NE Error_Msg_NE
("call to & during elaboration in SPARK mode", N, Ent); ("call to & during elaboration in SPARK", N, Ent);
else else
Elab_Warning Elab_Warning
......
...@@ -13126,7 +13126,7 @@ package body Sem_Prag is ...@@ -13126,7 +13126,7 @@ package body Sem_Prag is
begin begin
if SPARK_Mode = On then 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; end if;
-- Pragma must be in context items list of a compilation unit -- Pragma must be in context items list of a compilation unit
......
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