2004-04-17 Randolph Chung <tausq@debian.org>

	* Makefile.in (hppa-hpux-tdep.o): Add $(hppa_tdep_h).
	* hppa-hpux-tdep.c (hppa-tdep.h): Include.
 	(hppa_hpux_som_init_abi): Set is_elf to 0.
 	(hppa_hpux_elf_init_abi): Set is_elf to 1.
	* hppa-tdep.c (low_text_segment_address): Remove global.
	(record_text_segment_lowaddr): Pass in low address as parameter. Use
	section offset to calculate segment address.
	(internalize_unwinds): Define low_text_segment_address as local and
	pass to record_text_segment_lowaddr for ELF targets.
	(hppa_gdbarch_init): Zero fill tdep structure.
	(hppa_dump_tdep): Print tdep structure.
	* hppa-tdep.h (gdbarch_tdep): Add is_elf member to tdep structure.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b5a2f20c6396f28d383012d9ae980f50cb1a40f..d969160cdf128973e216931c5ae750780c1a7d2d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2004-04-17  Randolph Chung  <tausq@debian.org>
+
+       * Makefile.in (hppa-hpux-tdep.o): Add $(hppa_tdep_h).
+       * hppa-hpux-tdep.c (hppa-tdep.h): Include.
+       (hppa_hpux_som_init_abi): Set is_elf to 0.
+       (hppa_hpux_elf_init_abi): Set is_elf to 1.
+       * hppa-tdep.c (low_text_segment_address): Remove global.
+       (record_text_segment_lowaddr): Pass in low address as parameter. Use
+       section offset to calculate segment address.
+       (internalize_unwinds): Define low_text_segment_address as local and
+       pass to record_text_segment_lowaddr for ELF targets.
+       (hppa_gdbarch_init): Zero fill tdep structure.
+       (hppa_dump_tdep): Print tdep structure.
+       * hppa-tdep.h (gdbarch_tdep): Add is_elf member to tdep structure.
+
 2004-04-17  Randolph Chung  <tausq@debian.org>
 
        * hppa-tdep.c (hppa_pseudo_register_read): Define.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 41f1bdd0b5715569ff7c5ff81f5a3b18b0952e03..b9743ff6bbedba8696354359fafd539098c41568 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1826,7 +1826,7 @@ hpacc-abi.o: hpacc-abi.c $(defs_h) $(value_h) $(gdb_regex_h) $(gdb_string_h) \
 hppah-nat.o: hppah-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
        $(gdb_wait_h) $(regcache_h) $(gdb_string_h) $(infttrace_h)
 hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) \
-       $(osabi_h) $(gdb_string_h) $(frame_h)
+       $(osabi_h) $(gdb_string_h) $(frame_h) $(hppa_tdep_h)
 hppa-tdep.o: hppa-tdep.c $(defs_h) $(frame_h) $(bfd_h) $(inferior_h) \
        $(value_h) $(regcache_h) $(completer_h) $(language_h) $(osabi_h) \
        $(gdb_assert_h) $(infttrace_h) $(arch_utils_h) $(symtab_h) \

diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index ad066b25fb8331284433e69056be464e32ecac0a..cf5fccbb818c9f320aab3d1a6df3ca5024a25be0 100644 (file)
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "objfiles.h"
 #include "inferior.h"
 #include "infcall.h"
+#include "hppa-tdep.h"
 
 #include <dl.h>
 #include <machine/save_state.h>
@@ -721,12 +722,18 @@ hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 static void
 hppa_hpux_som_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+  tdep->is_elf = 0;
   hppa_hpux_init_abi (info, gdbarch);
 }
 
 static void
 hppa_hpux_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+  tdep->is_elf = 1;
   hppa_hpux_init_abi (info, gdbarch);
 }
 

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 40cb5b1b610bc0b252a4b968d08de718d9f08154..46a5d005b644ef2a8ffc8c4341931886b08336ca 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -351,15 +351,18 @@ compare_unwind_entries (const void *arg1, const void *arg2)
     return 0;
 }
 
-static CORE_ADDR low_text_segment_address;
-
 static void
-record_text_segment_lowaddr (bfd *abfd, asection *section, void *ignored)
+record_text_segment_lowaddr (bfd *abfd, asection *section, void *data)
 {
-  if (((section->flags & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
+  if ((section->flags & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
        == (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
-      && section->vma < low_text_segment_address)
-    low_text_segment_address = section->vma;
+    {
+      bfd_vma value = section->vma - section->filepos;
+      CORE_ADDR *low_text_segment_address = (CORE_ADDR *)data;
+
+      if (value < *low_text_segment_address)
+          *low_text_segment_address = value;
+    }
 }
 
 static void
@@ -369,30 +372,29 @@ internalize_unwinds (struct objfile *objfile, struct unwind_table_entry *table,
 {
   /* We will read the unwind entries into temporary memory, then
      fill in the actual unwind table.  */
+
   if (size > 0)
     {
       unsigned long tmp;
       unsigned i;
       char *buf = alloca (size);
+      CORE_ADDR low_text_segment_address;
 
-      low_text_segment_address = -1;
-
-      /* If addresses are 64 bits wide, then unwinds are supposed to
+      /* For ELF targets, then unwinds are supposed to
         be segment relative offsets instead of absolute addresses. 
 
         Note that when loading a shared library (text_offset != 0) the
         unwinds are already relative to the text_offset that will be
         passed in.  */
-      if (TARGET_PTR_BIT == 64 && text_offset == 0)
+      if (gdbarch_tdep (current_gdbarch)->is_elf && text_offset == 0)
        {
+          low_text_segment_address = -1;
+
          bfd_map_over_sections (objfile->obfd,
-                                record_text_segment_lowaddr, NULL);
+                                record_text_segment_lowaddr, 
+                                &low_text_segment_address);
 
-         /* ?!? Mask off some low bits.  Should this instead subtract
-            out the lowest section's filepos or something like that?
-            This looks very hokey to me.  */
-         low_text_segment_address &= ~0xfff;
-         text_offset += low_text_segment_address;
+         text_offset = low_text_segment_address;
        }
 
       bfd_get_section_contents (objfile->obfd, section, buf, 0, size);
@@ -2607,7 +2609,7 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     return (arches->gdbarch);
 
   /* If none found, then allocate and initialize one.  */
-  tdep = XMALLOC (struct gdbarch_tdep);
+  tdep = XZALLOC (struct gdbarch_tdep);
   gdbarch = gdbarch_alloc (&info, tdep);
 
   /* Determine from the bfd_arch_info structure if we are dealing with
@@ -2722,7 +2724,11 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 static void
 hppa_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
 {
-   /* Nothing to print for the moment.  */
+  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+
+  fprintf_unfiltered (file, "bytes_per_address = %d\n", 
+                      tdep->bytes_per_address);
+  fprintf_unfiltered (file, "elf = %s\n", tdep->is_elf ? "yes" : "no");
 }
 
 void

diff --git a/gdb/hppa-tdep.h b/gdb/hppa-tdep.h
index f41af2d957b24aadb73509eaec8e2a565610068d..80742f0f648ab8b4b6c56f4eab4ed5e221ea5464 100644 (file)
--- a/gdb/hppa-tdep.h
+++ b/gdb/hppa-tdep.h
@@ -29,6 +29,10 @@ struct gdbarch_tdep
   /* The number of bytes in an address.  For now, this field is designed
      to allow us to differentiate hppa32 from hppa64 targets.  */
   int bytes_per_address;
+
+  /* Is this an ELF target? This can be 64-bit HP-UX, or a 32/64-bit GNU/Linux
+     system.  */
+  int is_elf;
 };
 
 /*