diff options
| author | Daniel King <dmking@adacore.com> | 2023-08-23 13:00:57 +0100 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-09-26 13:43:17 +0200 |
| commit | 0787c56c48750156783bd5d3280579e9c68a8aa5 (patch) | |
| tree | f5334e30848eae9843b71de7d75b9bbca9e12a1c | |
| parent | 8e8e3a00db4e24df9468dde660587d3fb8b5cfee (diff) | |
| download | gcc-0787c56c48750156783bd5d3280579e9c68a8aa5.zip gcc-0787c56c48750156783bd5d3280579e9c68a8aa5.tar.gz gcc-0787c56c48750156783bd5d3280579e9c68a8aa5.tar.bz2 | |
ada: Fix conversions between addresses and integers
On CHERI targets the size of System.Address and Integer_Address
(or similar) are not the same. The operations in System.Storage_Elements
should be used to convert between integers and addresses.
gcc/ada/
* libgnat/a-tags.adb (To_Tag): Use System.Storage_Elements for
integer to address conversion.
* libgnat/s-putima.adb (Put_Image_Pointer): Likewise.
| -rw-r--r-- | gcc/ada/libgnat/a-tags.adb | 5 | ||||
| -rw-r--r-- | gcc/ada/libgnat/s-putima.adb | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gcc/ada/libgnat/a-tags.adb b/gcc/ada/libgnat/a-tags.adb index 3590785..1ffc78e 100644 --- a/gcc/ada/libgnat/a-tags.adb +++ b/gcc/ada/libgnat/a-tags.adb @@ -93,7 +93,10 @@ package body Ada.Tags is -- Disable warnings on possible aliasing problem function To_Tag is - new Unchecked_Conversion (Integer_Address, Tag); + new Unchecked_Conversion (System.Address, Tag); + + function To_Tag (S : Integer_Address) return Tag is + (To_Tag (To_Address (S))); function To_Dispatch_Table_Ptr is new Ada.Unchecked_Conversion (Tag, Dispatch_Table_Ptr); diff --git a/gcc/ada/libgnat/s-putima.adb b/gcc/ada/libgnat/s-putima.adb index 1d6e608..bcc7af2 100644 --- a/gcc/ada/libgnat/s-putima.adb +++ b/gcc/ada/libgnat/s-putima.adb @@ -32,7 +32,7 @@ with Ada.Strings.Text_Buffers.Utils; use Ada.Strings.Text_Buffers; use Ada.Strings.Text_Buffers.Utils; -with Ada.Unchecked_Conversion; +with System.Storage_Elements; use System.Storage_Elements; package body System.Put_Images is @@ -132,15 +132,13 @@ package body System.Put_Images is procedure Put_Image_Pointer (S : in out Sink'Class; X : Pointer; Type_Kind : String) is - function Cast is new Ada.Unchecked_Conversion - (System.Address, Unsigned_Address); begin if X = null then Put_UTF_8 (S, "null"); else Put_UTF_8 (S, "("); Put_UTF_8 (S, Type_Kind); - Hex.Put_Image (S, Cast (X.all'Address)); + Hex.Put_Image (S, Unsigned_Address (To_Integer (X.all'Address))); Put_UTF_8 (S, ")"); end if; end Put_Image_Pointer; |