[Ada] VxWorks inconsistent use of return type (BOOL)

gcc/ada/

	* libgnarl/s-vxwext.ads (BOOL): New int type.
	(Interrupt_Context): Change return type to BOOL.
	* libgnarl/s-vxwext__kernel.ads: Likewise.
	* libgnarl/s-vxwext__rtp-smp.adb: Likewise.
	* libgnarl/s-vxwext__rtp.adb: Likewise.
	* libgnarl/s-vxwext__rtp.ads: Likewise.
	* libgnarl/s-osinte__vxworks.adb (Interrupt_Context): Change
	return type to BOOL.
	* libgnarl/s-osinte__vxworks.ads (BOOL) New subtype.
	(taskIsSuspended): Change return type to BOOL.
	(Interrupt_Context): Change return type to BOOL. Adjust comments
	accordingly.
	* libgnarl/s-taprop__vxworks.adb (System.VxWorks.Ext.BOOL):
	use type.
	(Is_Task_Context): Test Interrupt_Context against 0.
	* libgnat/i-vxwork.ads (BOOL): New int.
	(intContext): Change return type to BOOL. Adjust comments.
	* libgnat/i-vxwork__x86.ads: Likewise.
This commit is contained in:
Doug Rupp 2021-07-12 13:21:45 -07:00 committed by Pierre-Marie de Rodat
parent 920e43ee21
commit 27534649ab
10 changed files with 35 additions and 18 deletions

View File

@ -203,7 +203,7 @@ package body System.OS_Interface is
-- Interrupt_Context --
-----------------------
function Interrupt_Context return int is
function Interrupt_Context return BOOL is
begin
return System.VxWorks.Ext.Interrupt_Context;
end Interrupt_Context;

View File

@ -57,6 +57,7 @@ package System.OS_Interface is
type unsigned_long_long is mod 2 ** long_long'Size;
type size_t is mod 2 ** Standard'Address_Size;
subtype BOOL is System.VxWorks.Ext.BOOL;
subtype vx_freq_t is System.VxWorks.Ext.vx_freq_t;
-----------
@ -307,7 +308,7 @@ package System.OS_Interface is
function taskResume (tid : t_id) return int;
pragma Import (C, taskResume, "taskResume");
function taskIsSuspended (tid : t_id) return int;
function taskIsSuspended (tid : t_id) return BOOL;
pragma Import (C, taskIsSuspended, "taskIsSuspended");
function taskDelay (ticks : int) return int;
@ -489,10 +490,10 @@ package System.OS_Interface is
-- 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;
function Interrupt_Context return BOOL;
pragma Inline (Interrupt_Context);
-- Return 1 if executing in an interrupt context; return 0 if executing in
-- a task context.
-- Return 1 (TRUE) if executing in an interrupt context;
-- return 0 (FALSE) if executing in a task context.
function Interrupt_Number_To_Vector (intNum : int) return Interrupt_Vector;
pragma Inline (Interrupt_Number_To_Vector);

View File

@ -62,9 +62,10 @@ package body System.Task_Primitives.Operations is
use System.Tasking;
use System.OS_Interface;
use System.Parameters;
use type System.VxWorks.Ext.t_id;
use type Interfaces.C.int;
use type System.OS_Interface.unsigned;
use type System.VxWorks.Ext.t_id;
use type System.VxWorks.Ext.BOOL;
subtype int is System.OS_Interface.int;
subtype unsigned is System.OS_Interface.unsigned;
@ -1304,7 +1305,7 @@ package body System.Task_Primitives.Operations is
function Is_Task_Context return Boolean is
begin
return System.OS_Interface.Interrupt_Context /= 1;
return System.OS_Interface.Interrupt_Context = 0;
end Is_Task_Context;
----------------

View File

@ -46,6 +46,9 @@ package System.VxWorks.Ext is
subtype int is Interfaces.C.int;
subtype unsigned is Interfaces.C.unsigned;
type BOOL is new int;
-- Equivalent of the C type BOOL
type vx_freq_t is new unsigned;
-- Equivalent of the C type _Vx_freq_t
@ -66,7 +69,7 @@ package System.VxWorks.Ext is
Parameter : System.Address := System.Null_Address) return int;
pragma Import (C, Interrupt_Connect, "intConnect");
function Interrupt_Context return int;
function Interrupt_Context return BOOL;
pragma Import (C, Interrupt_Context, "intContext");
function Interrupt_Number_To_Vector

View File

@ -45,6 +45,9 @@ package System.VxWorks.Ext is
subtype int is Interfaces.C.int;
subtype unsigned is Interfaces.C.unsigned;
type BOOL is new int;
-- Equivalent of the C type BOOL
type vx_freq_t is new unsigned;
-- Equivalent of the C type _Vx_freq_t
@ -65,7 +68,7 @@ package System.VxWorks.Ext is
Parameter : System.Address := System.Null_Address) return int;
pragma Import (C, Interrupt_Connect, "intConnect");
function Interrupt_Context return int;
function Interrupt_Context return BOOL;
pragma Import (C, Interrupt_Context, "intContext");
function Interrupt_Number_To_Vector

View File

@ -72,7 +72,7 @@ package body System.VxWorks.Ext is
-- Interrupt_Context --
-----------------------
function Interrupt_Context return int is
function Interrupt_Context return BOOL is
begin
-- For RTPs, never in an interrupt context

View File

@ -72,7 +72,7 @@ package body System.VxWorks.Ext is
-- Interrupt_Context --
-----------------------
function Interrupt_Context return int is
function Interrupt_Context return BOOL is
begin
-- For RTPs, never in an interrupt context

View File

@ -45,6 +45,9 @@ package System.VxWorks.Ext is
subtype int is Interfaces.C.int;
subtype unsigned is Interfaces.C.unsigned;
type BOOL is new int;
-- Equivalent of the C type BOOL
type vx_freq_t is new unsigned;
-- Equivalent of the C type _Vx_freq_t
@ -65,7 +68,7 @@ package System.VxWorks.Ext is
Parameter : System.Address := System.Null_Address) return int;
pragma Convention (C, Interrupt_Connect);
function Interrupt_Context return int;
function Interrupt_Context return BOOL;
pragma Convention (C, Interrupt_Context);
function Interrupt_Number_To_Vector

View File

@ -133,6 +133,9 @@ package Interfaces.VxWorks is
OK : constant STATUS := 0;
ERROR : constant STATUS := -1;
type BOOL is new int;
-- Equivalent of the C type BOOL
type VOIDFUNCPTR is access procedure (parameter : System.Address);
type Interrupt_Vector is new System.Address;
type Exception_Vector is new System.Address;
@ -145,9 +148,9 @@ package Interfaces.VxWorks is
-- The routine generates a wrapper around the user handler to save and
-- restore context
function intContext return int;
-- Binding to the C routine intContext. This function returns 1 only if the
-- current execution state is in interrupt context.
function intContext return BOOL;
-- Binding to the C routine intContext. This function returns 1 (TRUE)
-- only if the current execution state is in interrupt context.
function intVecGet
(Vector : Interrupt_Vector) return VOIDFUNCPTR;

View File

@ -128,6 +128,9 @@ package Interfaces.VxWorks is
OK : constant STATUS := 0;
ERROR : constant STATUS := -1;
type BOOL is new int;
-- Equivalent of the C type BOOL
type VOIDFUNCPTR is access procedure (parameter : System.Address);
type Interrupt_Vector is new System.Address;
type Exception_Vector is new System.Address;
@ -140,9 +143,9 @@ package Interfaces.VxWorks is
-- The routine generates a wrapper around the user handler to save and
-- restore context
function intContext return int;
-- Binding to the C routine intContext. This function returns 1 only if the
-- current execution state is in interrupt context.
function intContext return BOOL;
-- Binding to the C routine intContext. This function returns 1 (TRUE)
-- only if the current execution state is in interrupt context.
function intVecGet
(Vector : Interrupt_Vector) return VOIDFUNCPTR;