OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2009-04-10  Robert Dewar  <dewar@adacore.com>

	* make.adb: Add comment.
	Minor reformatting

2009-04-10  Nicolas Setton  <setton@adacore.com>

	* s-osprim-darwin.adb: New file.

	* s-osinte-darwin.adb, s-osinte-darwin.ads: Fix binding to timespec.

2009-04-10  Thomas Quinot  <quinot@adacore.com>

	* g-socket.ads: Add comment clarifying alignment requirement for Fd_Set

From-SVN: r145880
This commit is contained in:
Arnaud Charlet 2009-04-10 11:54:58 +02:00
parent 4dadda8fb0
commit 4f64abad80
6 changed files with 194 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/ada/ChangeLog
View File

@ -1,3 +1,18 @@
2009-04-10 Robert Dewar <dewar@adacore.com>
* make.adb: Add comment.
Minor reformatting
2009-04-10 Nicolas Setton <setton@adacore.com>
* s-osprim-darwin.adb: New file.
* s-osinte-darwin.adb, s-osinte-darwin.ads: Fix binding to timespec.
2009-04-10 Thomas Quinot <quinot@adacore.com>
* g-socket.ads: Add comment clarifying alignment requirement for Fd_Set
2009-04-09 Nick Clifton <nickc@redhat.com>
* adadecode.h: Change copyright header to refer to version

3
gcc/ada/g-socket.ads
View File

@ -1096,6 +1096,9 @@ private
type Fd_Set is
new System.Storage_Elements.Storage_Array (1 .. SOSC.SIZEOF_fd_set);
for Fd_Set'Alignment use Interfaces.C.long'Alignment;
-- Set conservative alignment so that our Fd_Sets are always adequately
-- aligned for the underlying data type (which is implementation defined
-- and may be an array of C long integers).
type Fd_Set_Access is access all Fd_Set;
pragma Convention (C, Fd_Set_Access);

7
gcc/ada/make.adb
View File

@ -6451,6 +6451,13 @@ package body Make is
then
Skip := True;
-- Here we capture and duplicate the linker argument. We
-- need to do the duplication since the arguments will
-- get normalized. Not doing so will result in calling
-- normalized two times for the same set of arguments if
-- gnatmake is passed multiple mains. This can result in
-- the wrong argument being passed to the linker.
else
Last_Arg := Last_Arg + 1;
Args (Last_Arg) :=

2
gcc/ada/s-osinte-darwin.adb
View File

@ -85,7 +85,7 @@ package body System.OS_Interface is
end if;
return timespec'(tv_sec => S,
tv_nsec => int32_t (Long_Long_Integer (F * 10#1#E9)));
tv_nsec => long (Long_Long_Integer (F * 10#1#E9)));
end To_Timespec;
----------------

4
gcc/ada/s-osinte-darwin.ads
View File

@ -517,7 +517,7 @@ private
type timespec is record
tv_sec : time_t;
tv_nsec : int32_t;
tv_nsec : long;
end record;
pragma Convention (C, timespec);
@ -565,8 +565,6 @@ private
--
type pthread_t is new System.Address;
type pthread_lock_t is new long;
type pthread_attr_t is record
sig : long;
opaque : padding (1 .. System.OS_Constants.PTHREAD_ATTR_SIZE);

167
gcc/ada/s-osprim-darwin.adb Normal file
View File

@ -0,0 +1,167 @@
------------------------------------------------------------------------------
-- --
-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-- --
-- S Y S T E M . O S _ P R I M I T I V E S --
-- --
-- B o d y --
-- --
-- Copyright (C) 1998-2008, 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- --
-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. --
-- --
-- As a special exception under Section 7 of GPL version 3, you are granted --
-- additional permissions described in the GCC Runtime Library Exception, --
-- version 3.1, as published by the Free Software Foundation. --
-- --
-- You should have received a copy of the GNU General Public License and --
-- a copy of the GCC Runtime Library Exception along with this program; --
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- <http://www.gnu.org/licenses/>. --
-- --
-- GNARL was developed by the GNARL team at Florida State University. --
-- Extensive contributions were provided by Ada Core Technologies, Inc. --
-- --
------------------------------------------------------------------------------
-- This version is for darwin
package body System.OS_Primitives is
-- ??? These definitions are duplicated from System.OS_Interface
-- because we don't want to depend on any package. Consider removing
-- these declarations in System.OS_Interface and move these ones in
-- the spec.
type struct_timezone is record
tz_minuteswest : Integer;
tz_dsttime : Integer;
end record;
pragma Convention (C, struct_timezone);
type struct_timezone_ptr is access all struct_timezone;
type time_t is new Long_Integer;
type struct_timeval is record
tv_sec : time_t;
tv_usec : Integer;
end record;
pragma Convention (C, struct_timeval);
function gettimeofday
(tv : not null access struct_timeval;
tz : struct_timezone_ptr) return Integer;
pragma Import (C, gettimeofday, "gettimeofday");
type timespec is record
tv_sec : time_t;
tv_nsec : Long_Integer;
end record;
pragma Convention (C, timespec);
function nanosleep (rqtp, rmtp : not null access timespec) return Integer;
pragma Import (C, nanosleep, "nanosleep");
-----------
-- Clock --
-----------
function Clock return Duration is
TV : aliased struct_timeval;
Result : Integer;
pragma Unreferenced (Result);
begin
Result := gettimeofday (TV'Access, null);
return Duration (TV.tv_sec) + Duration (TV.tv_usec) / 10#1#E6;
end Clock;
---------------------
-- Monotonic_Clock --
---------------------
function Monotonic_Clock return Duration renames Clock;
-----------------
-- To_Timespec --
-----------------
function To_Timespec (D : Duration) return timespec;
function To_Timespec (D : Duration) return timespec is
S : time_t;
F : Duration;
begin
S := time_t (Long_Long_Integer (D));
F := D - Duration (S);
-- If F has negative value due to a round-up, adjust for positive F
-- value.
if F < 0.0 then
S := S - 1;
F := F + 1.0;
end if;
return
timespec'(tv_sec => S,
tv_nsec => Long_Integer (Long_Long_Integer (F * 10#1#E9)));
end To_Timespec;
-----------------
-- Timed_Delay --
-----------------
procedure Timed_Delay
(Time : Duration;
Mode : Integer)
is
Request : aliased timespec;
Remaind : aliased timespec;
Rel_Time : Duration;
Abs_Time : Duration;
Base_Time : constant Duration := Clock;
Check_Time : Duration := Base_Time;
Result : Integer;
pragma Unreferenced (Result);
begin
if Mode = Relative then
Rel_Time := Time;
Abs_Time := Time + Check_Time;
else
Rel_Time := Time - Check_Time;
Abs_Time := Time;
end if;
if Rel_Time > 0.0 then
loop
Request := To_Timespec (Rel_Time);
Result := nanosleep (Request'Access, Remaind'Access);
Check_Time := Clock;
exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
Rel_Time := Abs_Time - Check_Time;
end loop;
end if;
end Timed_Delay;
----------------
-- Initialize --
----------------
procedure Initialize is
begin
null;
end Initialize;
end System.OS_Primitives;