From fdd72f950f09a3f553525cc54af622eb533d13d2 Mon Sep 17 00:00:00 2001 From: Randolph Chung Date: Sat, 17 Apr 2004 17:41:10 +0000 Subject: 2004-04-17 Randolph Chung * 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. --- gdb/hppa-tdep.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'gdb/hppa-tdep.c') diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 40cb5b1..46a5d00 100644 --- 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 -- cgit v1.1