2005-10-03 Joel Brobecker <brobecker@adacore.com>

[deliverable/binutils-gdb.git] / gdb / corefile.c

diff --git a/gdb/corefile.c b/gdb/corefile.c
index facd2dae83bfcaff7b96393cc88fdf22c03300e1..591bb7ea2081bc6cacf074f70aab7858e9470a75 100644 (file)
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -1,7 +1,7 @@
 /* Core dump and executable file functions above target vector, for GDB.
 /* Core dump and executable file functions above target vector, for GDB.

-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
-   1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1996, 1997,
+   1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -35,23 +35,25 @@
 #include "dis-asm.h"
 #include "gdb_stat.h"
 #include "completer.h"
 #include "dis-asm.h"
 #include "gdb_stat.h"
 #include "completer.h"

+#include "exceptions.h"

 
 /* Local function declarations.  */
 
 extern void _initialize_core (void);
 static void call_extra_exec_file_hooks (char *filename);
 
 
 /* Local function declarations.  */
 
 extern void _initialize_core (void);
 static void call_extra_exec_file_hooks (char *filename);
 

-/* You can have any number of hooks for `exec_file_command' command to call.
-   If there's only one hook, it is set in exec_file_display hook.
-   If there are two or more hooks, they are set in exec_file_extra_hooks[],
-   and exec_file_display_hook is set to a function that calls all of them.
-   This extra complexity is needed to preserve compatibility with
-   old code that assumed that only one hook could be set, and which called
-   exec_file_display_hook directly.  */
+/* You can have any number of hooks for `exec_file_command' command to
+   call.  If there's only one hook, it is set in exec_file_display
+   hook.  If there are two or more hooks, they are set in
+   exec_file_extra_hooks[], and deprecated_exec_file_display_hook is
+   set to a function that calls all of them.  This extra complexity is
+   needed to preserve compatibility with old code that assumed that
+   only one hook could be set, and which called
+   deprecated_exec_file_display_hook directly.  */

 
 typedef void (*hook_type) (char *);
 
 
 typedef void (*hook_type) (char *);
 

-hook_type exec_file_display_hook;      /* the original hook */
+hook_type deprecated_exec_file_display_hook;   /* the original hook */

 static hook_type *exec_file_extra_hooks;       /* array of additional hooks */
 static int exec_file_hook_count = 0;   /* size of array */
 
 static hook_type *exec_file_extra_hooks;       /* array of additional hooks */
 static int exec_file_hook_count = 0;   /* size of array */
 


@@ -71,7 +73,7 @@ core_file_command (char *filename, int from_tty)
 
   t = find_core_target ();
   if (t == NULL)
 
   t = find_core_target ();
   if (t == NULL)

-    error ("GDB can't read core files on this machine.");
+    error (_("GDB can't read core files on this machine."));

 
   if (!filename)
     (t->to_detach) (filename, from_tty);
 
   if (!filename)
     (t->to_detach) (filename, from_tty);


@@ -80,8 +82,9 @@ core_file_command (char *filename, int from_tty)
 }
 \f
 
 }
 \f
 

-/* If there are two or more functions that wish to hook into exec_file_command,
- * this function will call all of the hook functions. */
+/* If there are two or more functions that wish to hook into
+   exec_file_command, this function will call all of the hook
+   functions.  */

 
 static void
 call_extra_exec_file_hooks (char *filename)
 
 static void
 call_extra_exec_file_hooks (char *filename)


@@ -100,16 +103,16 @@ specify_exec_file_hook (void (*hook) (char *))
 {
   hook_type *new_array;
 
 {
   hook_type *new_array;
 

-  if (exec_file_display_hook != NULL)
+  if (deprecated_exec_file_display_hook != NULL)

     {
       /* There's already a hook installed.  Arrange to have both it
        * and the subsequent hooks called. */
       if (exec_file_hook_count == 0)
        {
     {
       /* There's already a hook installed.  Arrange to have both it
        * and the subsequent hooks called. */
       if (exec_file_hook_count == 0)
        {

-         /* If this is the first extra hook, initialize the hook array. */
+         /* If this is the first extra hook, initialize the hook array.  */

          exec_file_extra_hooks = (hook_type *) xmalloc (sizeof (hook_type));
          exec_file_extra_hooks = (hook_type *) xmalloc (sizeof (hook_type));

-         exec_file_extra_hooks[0] = exec_file_display_hook;
-         exec_file_display_hook = call_extra_exec_file_hooks;
+         exec_file_extra_hooks[0] = deprecated_exec_file_display_hook;
+         deprecated_exec_file_display_hook = call_extra_exec_file_hooks;

          exec_file_hook_count = 1;
        }
 
          exec_file_hook_count = 1;
        }
 


@@ -124,7 +127,7 @@ specify_exec_file_hook (void (*hook) (char *))
       exec_file_extra_hooks[exec_file_hook_count - 1] = hook;
     }
   else
       exec_file_extra_hooks[exec_file_hook_count - 1] = hook;
     }
   else

-    exec_file_display_hook = hook;
+    deprecated_exec_file_display_hook = hook;

 }
 
 /* The exec file must be closed before running an inferior.
 }
 
 /* The exec file must be closed before running an inferior.


@@ -178,9 +181,9 @@ validate_files (void)
   if (exec_bfd && core_bfd)
     {
       if (!core_file_matches_executable_p (core_bfd, exec_bfd))
   if (exec_bfd && core_bfd)
     {
       if (!core_file_matches_executable_p (core_bfd, exec_bfd))

-       warning ("core file may not match specified executable file.");
+       warning (_("core file may not match specified executable file."));

       else if (bfd_get_mtime (exec_bfd) > bfd_get_mtime (core_bfd))
       else if (bfd_get_mtime (exec_bfd) > bfd_get_mtime (core_bfd))

-       warning ("exec file is newer than core file.");
+       warning (_("exec file is newer than core file."));

     }
 }
 
     }
 }
 


@@ -196,8 +199,8 @@ get_exec_file (int err)
   if (!err)
     return NULL;
 
   if (!err)
     return NULL;
 

-  error ("No executable file specified.\n\
-Use the \"file\" or \"exec-file\" command.");
+  error (_("No executable file specified.\n\
+Use the \"file\" or \"exec-file\" command."));

   return NULL;
 }
 \f
   return NULL;
 }
 \f


@@ -215,12 +218,12 @@ memory_error (int status, CORE_ADDR memaddr)
       /* Actually, address between memaddr and memaddr + len
          was out of bounds. */
       fprintf_unfiltered (tmp_stream, "Cannot access memory at address ");
       /* Actually, address between memaddr and memaddr + len
          was out of bounds. */
       fprintf_unfiltered (tmp_stream, "Cannot access memory at address ");

-      print_address_numeric (memaddr, 1, tmp_stream);
+      deprecated_print_address_numeric (memaddr, 1, tmp_stream);

     }
   else
     {
       fprintf_filtered (tmp_stream, "Error accessing memory address ");
     }
   else
     {
       fprintf_filtered (tmp_stream, "Error accessing memory address ");

-      print_address_numeric (memaddr, 1, tmp_stream);
+      deprecated_print_address_numeric (memaddr, 1, tmp_stream);

       fprintf_filtered (tmp_stream, ": %s.",
                       safe_strerror (status));
     }
       fprintf_filtered (tmp_stream, ": %s.",
                       safe_strerror (status));
     }


@@ -230,7 +233,7 @@ memory_error (int status, CORE_ADDR memaddr)
 
 /* Same as target_read_memory, but report an error if can't read.  */
 void
 
 /* Same as target_read_memory, but report an error if can't read.  */
 void

-read_memory (CORE_ADDR memaddr, char *myaddr, int len)
+read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)

 {
   int status;
   status = target_read_memory (memaddr, myaddr, len);
 {
   int status;
   status = target_read_memory (memaddr, myaddr, len);


@@ -238,29 +241,10 @@ read_memory (CORE_ADDR memaddr, char *myaddr, int len)
     memory_error (status, memaddr);
 }
 
     memory_error (status, memaddr);
 }
 

-/* Like target_read_memory, but slightly different parameters.  */
-int
-dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len,
-                    disassemble_info *info)
-{
-  return target_read_memory (memaddr, (char *) myaddr, len);
-}
-
-/* Like memory_error with slightly different parameters.  */
-void
-dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info)
-{
-  memory_error (status, memaddr);
-}
-
-/* Like print_address with slightly different parameters.  */
-void
-dis_asm_print_address (bfd_vma addr, struct disassemble_info *info)
-{
-  print_address (addr, info->stream);
-}
-
-/* Read an integer from debugged memory, given address and number of bytes.  */
+/* Argument / return result struct for use with
+   do_captured_read_memory_integer().  MEMADDR and LEN are filled in
+   by gdb_read_memory_integer().  RESULT is the contents that were
+   successfully read from MEMADDR of length LEN.  */

 
 struct captured_read_memory_integer_arguments
 {
 
 struct captured_read_memory_integer_arguments
 {


@@ -269,6 +253,13 @@ struct captured_read_memory_integer_arguments
   LONGEST result;
 };
 
   LONGEST result;
 };
 

+/* Helper function for gdb_read_memory_integer().  DATA must be a
+   pointer to a captured_read_memory_integer_arguments struct. 
+   Return 1 if successful.  Note that the catch_errors() interface
+   will return 0 if an error occurred while reading memory.  This
+   choice of return code is so that we can distinguish between
+   success and failure.  */
+

 static int
 do_captured_read_memory_integer (void *data)
 {
 static int
 do_captured_read_memory_integer (void *data)
 {


@@ -278,9 +269,13 @@ do_captured_read_memory_integer (void *data)
 
   args->result = read_memory_integer (memaddr, len);
 
 
   args->result = read_memory_integer (memaddr, len);
 

-  return 0;
+  return 1;

 }
 
 }
 

+/* Read memory at MEMADDR of length LEN and put the contents in
+   RETURN_VALUE.  Return 0 if MEMADDR couldn't be read and non-zero
+   if successful.  */
+

 int
 safe_read_memory_integer (CORE_ADDR memaddr, int len, LONGEST *return_value)
 {
 int
 safe_read_memory_integer (CORE_ADDR memaddr, int len, LONGEST *return_value)
 {


@@ -291,7 +286,7 @@ safe_read_memory_integer (CORE_ADDR memaddr, int len, LONGEST *return_value)
 
   status = catch_errors (do_captured_read_memory_integer, &args,
                         "", RETURN_MASK_ALL);
 
   status = catch_errors (do_captured_read_memory_integer, &args,
                         "", RETURN_MASK_ALL);

-  if (!status)
+  if (status)

     *return_value = args.result;
 
   return status;
     *return_value = args.result;
 
   return status;


@@ -318,8 +313,8 @@ read_memory_unsigned_integer (CORE_ADDR memaddr, int len)
 void
 read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len)
 {
 void
 read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len)
 {

-  register char *cp;
-  register int i;
+  char *cp;
+  int i;

   int cnt;
 
   cp = buffer;
   int cnt;
 
   cp = buffer;


@@ -342,13 +337,23 @@ read_memory_string (CORE_ADDR memaddr, char *buffer, int max_len)
     }
 }
 
     }
 }
 

+CORE_ADDR
+read_memory_typed_address (CORE_ADDR addr, struct type *type)
+{
+  char *buf = alloca (TYPE_LENGTH (type));
+  read_memory (addr, buf, TYPE_LENGTH (type));
+  return extract_typed_address (buf, type);
+}
+

 /* Same as target_write_memory, but report an error if can't write.  */
 void
 /* Same as target_write_memory, but report an error if can't write.  */
 void

-write_memory (CORE_ADDR memaddr, char *myaddr, int len)
+write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr, int len)

 {
   int status;
 {
   int status;

-
-  status = target_write_memory (memaddr, myaddr, len);
+  bfd_byte *bytes = alloca (len);
+  
+  memcpy (bytes, myaddr, len);
+  status = target_write_memory (memaddr, bytes, len);

   if (status != 0)
     memory_error (status, memaddr);
 }
   if (status != 0)
     memory_error (status, memaddr);
 }


@@ -411,13 +416,19 @@ char *gnutarget;
 
 /* Same thing, except it is "auto" not NULL for the default case.  */
 static char *gnutarget_string;
 
 /* Same thing, except it is "auto" not NULL for the default case.  */
 static char *gnutarget_string;

+static void
+show_gnutarget_string (struct ui_file *file, int from_tty,
+                      struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("The current BFD target is \"%s\".\n"), value);
+}

 
 static void set_gnutarget_command (char *, int, struct cmd_list_element *);
 
 static void
 set_gnutarget_command (char *ignore, int from_tty, struct cmd_list_element *c)
 {
 
 static void set_gnutarget_command (char *, int, struct cmd_list_element *);
 
 static void
 set_gnutarget_command (char *ignore, int from_tty, struct cmd_list_element *c)
 {

-  if (STREQ (gnutarget_string, "auto"))
+  if (strcmp (gnutarget_string, "auto") == 0)

     gnutarget = NULL;
   else
     gnutarget = gnutarget_string;
     gnutarget = NULL;
   else
     gnutarget = gnutarget_string;


@@ -437,19 +448,21 @@ void
 _initialize_core (void)
 {
   struct cmd_list_element *c;
 _initialize_core (void)
 {
   struct cmd_list_element *c;

-  c = add_cmd ("core-file", class_files, core_file_command,
-              "Use FILE as core dump for examining memory and registers.\n\
+  c = add_cmd ("core-file", class_files, core_file_command, _("\
+Use FILE as core dump for examining memory and registers.\n\

 No arg means have no core file.  This command has been superseded by the\n\
 No arg means have no core file.  This command has been superseded by the\n\

-`target core' and `detach' commands.", &cmdlist);
-  c->completer = filename_completer;
-
-  c = add_set_cmd ("gnutarget", class_files, var_string_noescape,
-                  (char *) &gnutarget_string,
-                  "Set the current BFD target.\n\
-Use `set gnutarget auto' to specify automatic detection.",
-                  &setlist);
-  c->function.sfunc = set_gnutarget_command;
-  add_show_from_set (c, &showlist);
+`target core' and `detach' commands."), &cmdlist);
+  set_cmd_completer (c, filename_completer);
+
+  
+  add_setshow_string_noescape_cmd ("gnutarget", class_files,
+                                  &gnutarget_string, _("(\
+Set the current BFD target."), _("\
+Show the current BFD target."), _("\
+Use `set gnutarget auto' to specify automatic detection."),
+                                  set_gnutarget_command,
+                                  show_gnutarget_string,
+                                  &setlist, &showlist);

 
   if (getenv ("GNUTARGET"))
     set_gnutarget (getenv ("GNUTARGET"));
 
   if (getenv ("GNUTARGET"))
     set_gnutarget (getenv ("GNUTARGET"));