From: Robert Dewar Date: Tue, 15 Mar 2005 15:51:53 +0000 (+0100) Subject: a-reatim.ads, [...]: Add functions Minutes and Seconds for AI-386. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f122ea71af3376a7d84f7a28a8fdb52b4111ad95;p=gcc.git a-reatim.ads, [...]: Add functions Minutes and Seconds for AI-386. 2005-03-08 Robert Dewar * a-reatim.ads, a-reatim.adb: Add functions Minutes and Seconds for AI-386. * a-retide.ads: Minor comment changes From-SVN: r96486 --- diff --git a/gcc/ada/a-reatim.adb b/gcc/ada/a-reatim.adb index 352119ac5f6..b09a54e4d3f 100644 --- a/gcc/ada/a-reatim.adb +++ b/gcc/ada/a-reatim.adb @@ -7,7 +7,7 @@ -- B o d y -- -- -- -- Copyright (C) 1991-1994, Florida State University -- --- Copyright (C) 1995-2003, Ada Core Technologies -- +-- Copyright (C) 1995-2005, Ada Core Technologies -- -- -- -- 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- -- @@ -154,6 +154,15 @@ package body Ada.Real_Time is return Time_Span_Unit * MS * 1_000_000; end Milliseconds; + ------------- + -- Minutes -- + ------------- + + function Minutes (M : Integer) return Time_Span is + begin + return Milliseconds (M) * Integer'(60_000); + end Minutes; + ----------------- -- Nanoseconds -- ----------------- @@ -163,6 +172,15 @@ package body Ada.Real_Time is return Time_Span_Unit * NS; end Nanoseconds; + ------------- + -- Seconds -- + ------------- + + function Seconds (S : Integer) return Time_Span is + begin + return Milliseconds (S) * Integer'(1000); + end Seconds; + ----------- -- Split -- ----------- diff --git a/gcc/ada/a-reatim.ads b/gcc/ada/a-reatim.ads index ae5249f457c..c8f9750e8c6 100644 --- a/gcc/ada/a-reatim.ads +++ b/gcc/ada/a-reatim.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2002 Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005 Free Software Foundation, Inc. -- -- -- -- This specification is derived from the Ada Reference Manual for use with -- -- GNAT. The copyright notice above, and the license provisions that follow -- @@ -86,6 +86,12 @@ package Ada.Real_Time is function Microseconds (US : Integer) return Time_Span; function Milliseconds (MS : Integer) return Time_Span; + function Seconds (S : Integer) return Time_Span; + pragma Ada_05 (Seconds); + + function Minutes (M : Integer) return Time_Span; + pragma Ada_05 (Minutes); + -- Seconds_Count needs 64 bits, since Time has the full range of -- Duration. The delta of Duration is 10 ** (-9), so the maximum -- number of seconds is 2**63/10**9 = 8*10**9 which does not quite @@ -126,4 +132,10 @@ private pragma Import (Intrinsic, ">="); pragma Import (Intrinsic, "abs"); + pragma Inline (Microseconds); + pragma Inline (Milliseconds); + pragma Inline (Nanoseconds); + pragma Inline (Seconds); + pragma Inline (Minutes); + end Ada.Real_Time; diff --git a/gcc/ada/a-retide.ads b/gcc/ada/a-retide.ads index 29e2e8d6c47..06e1548ab9d 100644 --- a/gcc/ada/a-retide.ads +++ b/gcc/ada/a-retide.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2003, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005, 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- -- @@ -39,11 +39,12 @@ package Ada.Real_Time.Delays is function To_Duration (T : Real_Time.Time) return Duration; + -- Convert Time to Duration procedure Delay_Until (T : Time); -- Delay until Clock has reached (at least) time T, -- or the task is aborted to at least the current ATC nesting level. -- The body of this procedure must perform all the processing - -- required for an abortion point. + -- required for an abort point. end Ada.Real_Time.Delays;