commit bac2da505ee174b7fb984b975c5938f88f0dbab2
author Petr Machata <pmachata@redhat.com> Tue May 29 00:42:59 2012 +0200
committer Petr Machata <pmachata@redhat.com> Wed Aug 29 19:03:17 2012 +0200
tree 8435ec7dae6d5cc5284822a2e2378f33f192d5d4
parent 26ef4cadd7d5ed7a525bd88cf9d0f05fc07f69de

Move target_address_t to arch.h, rename to arch_addr_t

Note that the placement under arch.h is currently conceptual only.  Since
no backend defines ARCH_HAVE_ADDRESS_TYPES, it's actually in sysdep.h in
all cases.

ltrace-elf.c

diff --git a/ltrace-elf.c b/ltrace-elf.c
index 99d06d6..76ba3ae 100644
--- a/ltrace-elf.c
+++ b/ltrace-elf.c
@@ -86,8 +86,8 @@
 		goto fail;
 
 	/* XXX The double cast should be removed when
-	 * target_address_t becomes integral type.  */
-	target_address_t taddr = (target_address_t)
+	 * arch_addr_t becomes integral type.  */
+	arch_addr_t taddr = (arch_addr_t)
 		(uintptr_t)(addr + lte->bias);
 
 	if (library_symbol_init(libsym, taddr, name, 1, LS_TOPLT_EXEC) < 0) {
@@ -575,7 +575,7 @@
  * each address, and replace name in libsym with a shorter variant if
  * we find it.  */
 struct unique_symbol {
-	target_address_t addr;
+	arch_addr_t addr;
 	struct library_symbol *libsym;
 };
 
@@ -644,9 +644,9 @@
 		if (!filter_matches_symbol(options.static_filter, name, lib))
 			continue;
 
-		target_address_t addr = (target_address_t)
+		arch_addr_t addr = (arch_addr_t)
 			(uintptr_t)(sym.st_value + lte->bias);
-		target_address_t naddr;
+		arch_addr_t naddr;
 
 		/* On arches that support OPD, the value of typical
 		 * function symbol will be a pointer to .opd, but some
@@ -766,18 +766,18 @@
 	}
 
 	/* XXX The double cast should be removed when
-	 * target_address_t becomes integral type.  */
-	target_address_t entry = (target_address_t)(uintptr_t)lte.entry_addr;
+	 * arch_addr_t becomes integral type.  */
+	arch_addr_t entry = (arch_addr_t)(uintptr_t)lte.entry_addr;
 	if (arch_translate_address(&lte, entry, &entry) < 0)
 		goto fail;
 
 	/* XXX The double cast should be removed when
-	 * target_address_t becomes integral type.  */
-	lib->base = (target_address_t)(uintptr_t)lte.base_addr;
+	 * arch_addr_t becomes integral type.  */
+	lib->base = (arch_addr_t)(uintptr_t)lte.base_addr;
 	lib->entry = entry;
 	/* XXX The double cast should be removed when
-	 * target_address_t becomes integral type.  */
-	lib->dyn_addr = (target_address_t)(uintptr_t)lte.dyn_addr;
+	 * arch_addr_t becomes integral type.  */
+	lib->dyn_addr = (arch_addr_t)(uintptr_t)lte.dyn_addr;
 
 	if (filter_matches_library(options.plt_filter, lib)
 	    && populate_plt(proc, filename, &lte, lib) < 0)