GNATcov_RTS: remove dependencies on Interfaces/Interfaces.C

Author: pmderodat

tools/gnatcov/rts/gnatcov_rts-buffers.ads

@@ -28,12 +28,9 @@
 --
 --  This unit needs to be compilable with Ada 95 compilers.
 
-with Interfaces;
-with Interfaces.C; use Interfaces.C;
-
 with System;
-with System.Storage_Elements;
 
+with GNATcov_RTS.Types;   use GNATcov_RTS.Types;
 with GNATcov_RTS.Strings; use GNATcov_RTS.Strings;
 
 package GNATcov_RTS.Buffers is
@@ -68,8 +65,10 @@ package GNATcov_RTS.Buffers is
    type Any_Language_Kind is (Unit_Based_Language, File_Based_Language);
    pragma Convention (C, Any_Language_Kind);
 
-   type Fingerprint_Type is
-     new System.Storage_Elements.Storage_Array (1 .. 20);
+   type Fingerprint_Type is array (1 .. 20) of Unsigned_8;
+   for Fingerprint_Type'Component_Size use 8;
+   for Fingerprint_Type'Size use 20 * 8;
+
    --  Hash type to perform consistency checks over Source Coverage
    --  Obligations. 20-byte to hold a SHA-1.
 

tools/gnatcov/rts/gnatcov_rts-strings.ads

@@ -26,7 +26,7 @@
 --
 --  This unit needs to be compilable with Ada 95 compilers
 
-with Interfaces.C; use Interfaces.C;
+with GNATcov_RTS.Types; use GNATcov_RTS.Types;
 
 package GNATcov_RTS.Strings is
 

tools/gnatcov/rts/gnatcov_rts-traces-output-base64.ads

@@ -24,9 +24,8 @@
 
 --  This unit needs to be compilable with Ada 95 compilers
 
-with Interfaces; use Interfaces;
-
 with GNATcov_RTS.Buffers.Lists; use GNATcov_RTS.Buffers.Lists;
+with GNATcov_RTS.Types;         use GNATcov_RTS.Types;
 
 package GNATcov_RTS.Traces.Output.Base64 is
 

tools/gnatcov/rts/gnatcov_rts-types.ads

@@ -0,0 +1,47 @@
+------------------------------------------------------------------------------
+--                                                                          --
+--                   GNATcoverage Instrumentation Runtime                   --
+--                                                                          --
+--                     Copyright (C) 2021-2023, AdaCore                     --
+--                                                                          --
+-- GNATcoverage is free software; you can redistribute it and/or modify it  --
+-- under terms of the GNU General Public License as published by the  Free  --
+-- Software  Foundation;  either version 3,  or (at your option) any later  --
+-- version. This software is distributed in the hope that it will be useful --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY 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/>.                                          --
+--                                                                          --
+------------------------------------------------------------------------------
+
+--  Basic types to use in source trace buffers. We try to avoid using types
+--  from Interfaces and Interfaces.C, and in general to minimize the set of
+--  dependencies of GNATcov_RTS on the Ada runtime, so that we can compute code
+--  coverage for these runtime units.
+--
+--  This unit needs to be compilable with Ada 95 compilers
+
+with System;
+
+package GNATcov_RTS.Types is
+
+   pragma Pure;
+
+   type Unsigned_8 is mod 2 ** 8;
+   type Unsigned_64 is mod 2 ** 64;
+
+   --  We assume here that Integer (Ada) is a correct mapping for int (C)
+
+   type int is new Integer;
+   type unsigned is mod 2 ** int'Size;
+   type size_t is mod System.Memory_Size;
+
+end GNATcov_RTS.Types;