From 69db8baec7c3a4a133837c11dbab9f685b9f476f Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 8 Aug 2002 14:59:35 +0000 Subject: 2002-08-08 Andrew Cagney * gcore.c (override_derive_stack_segment): Delete variable. (preempt_derive_stack_segment): Delete function. (derive_stack_segment): Delete function. (default_derive_stack_segment): Renamed to derive_stack_segment. (override_derive_heap_segment): Delete variable. (preempt_derive_heap_segment): Delete function. (derive_heap_segment): Delete function. (default_derive_heap_segment): Rename to derive_heap_segment. --- gdb/ChangeLog | 11 +++++++++++ gdb/gcore.c | 49 ++++--------------------------------------------- 2 files changed, 15 insertions(+), 45 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a82edc9..392cceb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2002-08-08 Andrew Cagney + + * gcore.c (override_derive_stack_segment): Delete variable. + (preempt_derive_stack_segment): Delete function. + (derive_stack_segment): Delete function. + (default_derive_stack_segment): Renamed to derive_stack_segment. + (override_derive_heap_segment): Delete variable. + (preempt_derive_heap_segment): Delete function. + (derive_heap_segment): Delete function. + (default_derive_heap_segment): Rename to derive_heap_segment. + 2002-08-06 Michael Snyder * config/mips/tm-mips.h: Remove #define USE_STRUCT_CONVENTION. diff --git a/gdb/gcore.c b/gdb/gcore.c index 9532f14..155ebe0 100644 --- a/gdb/gcore.c +++ b/gdb/gcore.c @@ -157,25 +157,14 @@ default_gcore_target (void) return bfd_get_target (exec_bfd); } -/* - * Default method for stack segment (preemptable by target). - */ +/* Function: derive_stack_segment -static int (*override_derive_stack_segment) (bfd_vma *, bfd_vma *); - -extern void -preempt_derive_stack_segment (int (*override_func) (bfd_vma *, bfd_vma *)) -{ - override_derive_stack_segment = override_func; -} - -/* Function: default_derive_stack_segment Derive a reasonable stack segment by unwinding the target stack. Returns 0 for failure, 1 for success. */ static int -default_derive_stack_segment (bfd_vma *bottom, bfd_vma *top) +derive_stack_segment (bfd_vma *bottom, bfd_vma *top) { bfd_vma tmp_vma; struct frame_info *fi, *tmp_fi; @@ -214,36 +203,15 @@ default_derive_stack_segment (bfd_vma *bottom, bfd_vma *top) return 1; /* success */ } -static int -derive_stack_segment (bfd_vma *bottom, bfd_vma *top) -{ - if (override_derive_stack_segment) - return override_derive_stack_segment (bottom, top); - else - return default_derive_stack_segment (bottom, top); -} - -/* - * Default method for heap segment (preemptable by target). - */ +/* Function: derive_heap_segment -static int (*override_derive_heap_segment) (bfd *, bfd_vma *, bfd_vma *); - -extern void -preempt_derive_heap_segment (int (*override_func) (bfd *, - bfd_vma *, bfd_vma *)) -{ - override_derive_heap_segment = override_func; -} - -/* Function: default_derive_heap_segment Derive a reasonable heap segment by looking at sbrk and the static data sections. Returns 0 for failure, 1 for success. */ static int -default_derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) +derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) { bfd_vma top_of_data_memory = 0; bfd_vma top_of_heap = 0; @@ -307,15 +275,6 @@ default_derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) return 0; /* No additional heap space needs to be saved. */ } -static int -derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top) -{ - if (override_derive_heap_segment) - return override_derive_heap_segment (abfd, bottom, top); - else - return default_derive_heap_segment (abfd, bottom, top); -} - /* ARGSUSED */ static void make_output_phdrs (bfd *obfd, asection *osec, void *ignored) -- cgit v1.1