* alpha-tdep.h (gdbarch_tdep): Add vm_min_address member.

* alpha-tdep.c (heuristic_proc_start): Use vm_min_address
from gdbarch_tdep rather than a constant.
(alpha_gdbarch_init): Initialize tdep->vm_min_address to
the default text address for all Alpha Unix ABIs.
(alpha_dump_tdep): Report the value of tdep->vm_min_address.
* config/alpha/tm-alpha.h (VM_MIN_ADDRESS): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1909f7572f75a874e93d1ba7cec379f11d20fdf2..4e6b9261e9e1f224867c511d10cdbe954768e3c5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-21  Jason Thorpe  <thorpej@wasabisystems.com>
+
+       * alpha-tdep.h (gdbarch_tdep): Add vm_min_address member.
+       * alpha-tdep.c (heuristic_proc_start): Use vm_min_address
+       from gdbarch_tdep rather than a constant.
+       (alpha_gdbarch_init): Initialize tdep->vm_min_address to
+       the default text address for all Alpha Unix ABIs.
+       (alpha_dump_tdep): Report the value of tdep->vm_min_address.
+       * config/alpha/tm-alpha.h (VM_MIN_ADDRESS): Delete.
+
 2002-04-21  Jason Thorpe  <thorpej@wasabisystems.com>
 
        * alpha-tdep.h: New file.  Includes several Alpha target constants

diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 7d99cf5f449f3106b54012725cba6f457cbf8a4a..dfefa46fde214a0ff8dee67d942091927f1bb8a9 100644 (file)
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -617,6 +617,7 @@ alpha_about_to_return (CORE_ADDR pc)
 static CORE_ADDR
 heuristic_proc_start (CORE_ADDR pc)
 {
+  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
   CORE_ADDR start_pc = pc;
   CORE_ADDR fence = start_pc - heuristic_fence_post;
 
@@ -624,8 +625,8 @@ heuristic_proc_start (CORE_ADDR pc)
     return 0;
 
   if (heuristic_fence_post == UINT_MAX
-      || fence < VM_MIN_ADDRESS)
-    fence = VM_MIN_ADDRESS;
+      || fence < tdep->vm_min_address)
+    fence = tdep->vm_min_address;
 
   /* search back for previous return */
   for (start_pc -= 4;; start_pc -= 4)
@@ -639,7 +640,7 @@ heuristic_proc_start (CORE_ADDR pc)
          {
            static int blurb_printed = 0;
 
-           if (fence == VM_MIN_ADDRESS)
+           if (fence == tdep->vm_min_address)
              warning ("Hit beginning of text section without finding");
            else
              warning ("Hit heuristic-fence-post without finding");
@@ -1960,6 +1961,10 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       tdep->abi_name = "<invalid>";
     }
 
+  /* Lowest text address.  This is used by heuristic_proc_start() to
+     decide when to stop looking.  */
+  tdep->vm_min_address = (CORE_ADDR) 0x120000000;
+
   /* Type sizes */
   set_gdbarch_short_bit (gdbarch, 16);
   set_gdbarch_int_bit (gdbarch, 32);
@@ -2073,6 +2078,10 @@ alpha_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
     internal_error (__FILE__, __LINE__,
                    "alpha_dump_tdep: illegal setting of tdep->alpha_abi (%d)",
                    (int) tdep->alpha_abi);
+
+  fprintf_unfiltered (file,
+                      "alpha_dump_tdep: vm_min_address = 0x%lx\n",
+                     (long) tdep->vm_min_address);
 }
 
 void

diff --git a/gdb/alpha-tdep.h b/gdb/alpha-tdep.h
index fe2716e002962599aedb66fd197f95081c0b8348..b5e721830cf0185f53a3694f55fb68658529b4b1 100644 (file)
--- a/gdb/alpha-tdep.h
+++ b/gdb/alpha-tdep.h
@@ -94,6 +94,8 @@ struct gdbarch_tdep
 {
   enum alpha_abi alpha_abi;    /* OS/ABI of inferior.  */
   const char *abi_name;                /* Name of the above.  */
+
+  CORE_ADDR vm_min_address;    /* used by heuristic_proc_start */
 };
 
 #endif /* ALPHA_TDEP_H */

diff --git a/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h
index 286f672dc0d577ff97adfdae01d2ed432899ffb9..450b2ec376bb4c67d78fbc7be0f4874140c60c8c 100644 (file)
--- a/gdb/config/alpha/tm-alpha.h
+++ b/gdb/config/alpha/tm-alpha.h
@@ -99,11 +99,6 @@ extern void alpha_print_extra_frame_info (struct frame_info *);
   alpha_setup_arbitrary_frame (argc, argv)
 extern struct frame_info *alpha_setup_arbitrary_frame (int, CORE_ADDR *);
 
-/* This is used by heuristic_proc_start.  It should be shot it the head.  */
-#ifndef VM_MIN_ADDRESS
-#define VM_MIN_ADDRESS (CORE_ADDR)0x120000000
-#endif
-
 /* If PC is in a shared library trampoline code, return the PC
    where the function itself actually starts.  If not, return 0.  */
 #define SKIP_TRAMPOLINE_CODE(pc)  find_solib_trampoline_target (pc)