Re: [RFA] osfsolib.c: support Tru64 5.x

[Nick Duffek <nsd at redhat dot com>]

On 15-May-2001, Kevin Buettner wrote:

>On May 14,  9:44pm, Nick Duffek wrote:
[...]
>> Index: gdb/solist.h
[...]
>> +       current_sos must initialize these fields to 0.  */

>Good catch.  Please check this in.

Checked in.

>> 2. Because Tru64 doesn't use ELF binaries, "info sharedlibrary"
>> incorrectly infers the address size to be 32 bits
[...]
>> Some possible fixes:
>>   (a) Default to 64 instead of 32 bits.
>>   (b) Use something like bfd_arch_bits_per_address(exec_bfd) instead of
>>       or in addition to bfd_get_arch_size (exec_bfd).
>
>Option (b) sounds better to me.

The appended patch does that.

I ran into another problem: section name addresses in Tru64 shared module
lists refer to areas in /sbin/loader, which is the first element in the
shared module list.  Consequently, when the relocate_section_addresses()
callback tries to match BFD section names with those from the shared
module list, it can't read the latter.  (Actually, it can when debugging a
live process, because /sbin/loader is part of the address space viewable
from procfs, but not when debugging a core file.)

A solution is to reorganize update_solib_list() in solib.c to do this:

  for (each module) {
    call target_so_ops.relocate_section_addresses();
    add sections to lookup table using target_resize_to_sections();
  }

instead of this:

  for (each module) {
    call target_so_ops.relocate_section_addresses();
  }
  for (each module) {
    add sections to lookup table using target_resize_to_sections();
  }

That way, each relocate_section_addresses() callback can read addresses
from all objects earlier in the module list.

The appended patch makes that change as well.  With the patch and with the
new solib-osf.c backend that I'll post shortly, there are no regressions
(and several progressions) on Tru64 5.0 and Digital UNIX 4.0.

Okay to apply?

Nick

2001-05-24  Nick Duffek  <nsd@redhat.com>

	* solib.c (update_solib_list): Move target_resize_to_sections()
	into solib_map_sections() loop.
	(info_sharedlibrary_command): Try bfd_arch_bits_per_address() if
	bfd_get_arch_size() fails.

Index: gdb/solib.c
===================================================================
diff -up gdb/solib.c gdb/solib.c
--- gdb/solib.c	Thu May 24 21:22:28 2001
+++ gdb/solib.c	Thu May 24 21:22:12 2001
@@ -461,30 +461,20 @@ update_solib_list (int from_tty, struct 
 	  catch_errors (solib_map_sections, i,
 			"Error while mapping shared library sections:\n",
 			RETURN_MASK_ALL);
-	}
-
-      /* If requested, add the shared objects' sections to the the
-	 TARGET's section table.  */
-      if (target)
-	{
-	  int new_sections;
 
-	  /* Figure out how many sections we'll need to add in total.  */
-	  new_sections = 0;
-	  for (i = inferior; i; i = i->next)
-	    new_sections += (i->sections_end - i->sections);
-
-	  if (new_sections > 0)
+	  /* If requested, add the shared object's sections to the TARGET's
+	     section table.  Do this immediately after mapping the object so
+	     that later noes in the list can query this object, as is needed
+	     in solib-osf.c.  */
+	  if (target)
 	    {
-	      int space = target_resize_to_sections (target, new_sections);
-
-	      for (i = inferior; i; i = i->next)
+	      int count = (i->sections_end - i->sections);
+	      if (count > 0)
 		{
-		  int count = (i->sections_end - i->sections);
+		  int space = target_resize_to_sections (target, count);
 		  memcpy (target->to_sections + space,
 			  i->sections,
 			  count * sizeof (i->sections[0]));
-		  space += count;
 		}
 	    }
 	}
@@ -605,7 +595,10 @@ info_sharedlibrary_command (char *ignore
     }
 
   arch_size = bfd_get_arch_size (exec_bfd);
-  /* Default to 32-bit in case of failure (non-elf). */
+  if (arch_size == -1)
+    arch_size = bfd_arch_bits_per_address(exec_bfd);
+
+  /* Default to 32-bit in case of failure.  */
   if (arch_size == 32 || arch_size == -1)
     {
       addr_width = 8 + 4;