From: Olivier Hainque <hainque@adacore.com>
Date: Mon, 21 May 2018 14:50:33 +0000 (+0000)
Subject: [Ada] Rename Load_Slide internal runtime component as Load_Address
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b029cc6e6b65a4ee55fa2b8790092f6edaee2e71;p=gcc.git

[Ada] Rename Load_Slide internal runtime component as Load_Address

Load_Address is just more consistent with the overall use of the component.

2018-05-21  Olivier Hainque  <hainque@adacore.com>

gcc/ada/

	* libgnat/s-dwalin.ads (Dwarf_Context): Rename Load_Slide as
	Load_Address.
	* libgnat/s-dwalin.adb (Is_Inside): Adjust accordingly.
	(Set_Load_Address): Likewise.
	(Symbolic_Traceback): Likewise.

From-SVN: r260449
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6eadcf957fa..b14fbed476b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2018-04-04  Olivier Hainque  <hainque@adacore.com>
+
+	* libgnat/s-dwalin.ads (Dwarf_Context): Rename Load_Slide as
+	Load_Address.
+	* libgnat/s-dwalin.adb (Is_Inside): Adjust accordingly.
+	(Set_Load_Address): Likewise.
+	(Symbolic_Traceback): Likewise.
+
 2018-04-04  Olivier Hainque  <hainque@adacore.com>
 
 	* libgnat/s-trasym__dwarf.adb (Add_Module_To_Cache): Expect a
diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb
index a857b67132a..70f01255165 100644
--- a/gcc/ada/libgnat/s-dwalin.adb
+++ b/gcc/ada/libgnat/s-dwalin.adb
@@ -372,8 +372,8 @@ package body System.Dwarf_Lines is
 
    function Is_Inside (C : Dwarf_Context; Addr : Address) return Boolean is
    begin
-      return (Addr >= To_Address (To_Integer (C.Low) + C.Load_Slide)
-                and Addr <= To_Address (To_Integer (C.High) + C.Load_Slide));
+      return (Addr >= To_Address (To_Integer (C.Low) + C.Load_Address)
+                and Addr <= To_Address (To_Integer (C.High) + C.Load_Address));
    end Is_Inside;
 
    ---------
@@ -779,7 +779,7 @@ package body System.Dwarf_Lines is
 
    procedure Set_Load_Address (C : in out Dwarf_Context; Addr : Address) is
    begin
-      C.Load_Slide := To_Integer (Addr);
+      C.Load_Address := To_Integer (Addr);
    end Set_Load_Address;
 
    ------------------
@@ -1548,7 +1548,7 @@ package body System.Dwarf_Lines is
          Addr_In_Traceback := PC_For (Traceback (J));
 
          Addr_To_Lookup := To_Address
-           (To_Integer (Addr_In_Traceback) - C.Load_Slide);
+           (To_Integer (Addr_In_Traceback) - C.Load_Address);
 
          Symbolic_Address
            (C,
diff --git a/gcc/ada/libgnat/s-dwalin.ads b/gcc/ada/libgnat/s-dwalin.ads
index 8aaa8cdb59b..58cbf2cf4d0 100644
--- a/gcc/ada/libgnat/s-dwalin.ads
+++ b/gcc/ada/libgnat/s-dwalin.ads
@@ -163,7 +163,7 @@ private
    type Search_Array_Access is access Search_Array;
 
    type Dwarf_Context (In_Exception : Boolean := False) is record
-      Load_Slide : System.Storage_Elements.Integer_Address := 0;
+      Load_Address : System.Storage_Elements.Integer_Address := 0;
       Low, High  : Address;
       --  Bounds of the module, per the module object file