2002-03-29 09:22:41 +08:00
|
|
|
/* Dump-to-file commands, for GDB, the GNU debugger.
|
|
|
|
|
|
|
|
Copyright 2002 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
Contributed by Red Hat.
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include "cli/cli-decode.h"
|
|
|
|
#include "cli/cli-cmds.h"
|
|
|
|
#include "value.h"
|
|
|
|
#include "completer.h"
|
|
|
|
#include "cli/cli-dump.h"
|
|
|
|
#include "gdb_assert.h"
|
|
|
|
#include <ctype.h>
|
|
|
|
#include "target.h"
|
2004-02-28 Andrew Cagney <cagney@redhat.com>
* utils.c: Use "", instead of <>, to include readline.
tui/tui-win.c, tui/tui.c, tui/tui-hooks.c: Ditto.
* tracepoint.c, top.c, symmisc.c, symfile.c: Ditto.
* source.c, solib.c, exec.c, event-top.c: Ditto.
* corelow.c, completer.c, cli/cli-setshow.c: Ditto.
* cli/cli-dump.c, cli/cli-cmds.c: Ditto.
* Makefile.in: Update all dependencies.
(readline_tilde_h, readline_history_h): Define.
(readline_headers): Delete.
2004-02-29 02:04:37 +08:00
|
|
|
#include "readline/readline.h"
|
2002-03-29 09:22:41 +08:00
|
|
|
|
|
|
|
#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))
|
|
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
skip_spaces (char *chp)
|
|
|
|
{
|
|
|
|
if (chp == NULL)
|
|
|
|
return NULL;
|
|
|
|
while (isspace (*chp))
|
|
|
|
chp++;
|
|
|
|
return chp;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
scan_expression_with_cleanup (char **cmd, const char *def)
|
|
|
|
{
|
|
|
|
if ((*cmd) == NULL || (**cmd) == '\0')
|
|
|
|
{
|
|
|
|
char *exp = xstrdup (def);
|
|
|
|
make_cleanup (xfree, exp);
|
|
|
|
return exp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *exp;
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
end = (*cmd) + strcspn (*cmd, " \t");
|
|
|
|
exp = savestring ((*cmd), end - (*cmd));
|
|
|
|
make_cleanup (xfree, exp);
|
|
|
|
(*cmd) = skip_spaces (end);
|
|
|
|
return exp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_fclose_cleanup (void *arg)
|
|
|
|
{
|
|
|
|
FILE *file = arg;
|
|
|
|
fclose (arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct cleanup *
|
|
|
|
make_cleanup_fclose (FILE *file)
|
|
|
|
{
|
|
|
|
return make_cleanup (do_fclose_cleanup, file);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
|
|
|
scan_filename_with_cleanup (char **cmd, const char *defname)
|
|
|
|
{
|
|
|
|
char *filename;
|
|
|
|
char *fullname;
|
|
|
|
|
|
|
|
/* FIXME: Need to get the ``/a(ppend)'' flag from somewhere. */
|
|
|
|
|
|
|
|
/* File. */
|
|
|
|
if ((*cmd) == NULL)
|
|
|
|
{
|
|
|
|
if (defname == NULL)
|
|
|
|
error ("Missing filename.");
|
|
|
|
filename = xstrdup (defname);
|
|
|
|
make_cleanup (xfree, filename);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME: should parse a possibly quoted string. */
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
(*cmd) = skip_spaces (*cmd);
|
|
|
|
end = *cmd + strcspn (*cmd, " \t");
|
|
|
|
filename = savestring ((*cmd), end - (*cmd));
|
|
|
|
make_cleanup (xfree, filename);
|
|
|
|
(*cmd) = skip_spaces (end);
|
|
|
|
}
|
|
|
|
gdb_assert (filename != NULL);
|
|
|
|
|
|
|
|
fullname = tilde_expand (filename);
|
|
|
|
make_cleanup (xfree, fullname);
|
|
|
|
|
|
|
|
return fullname;
|
|
|
|
}
|
|
|
|
|
|
|
|
FILE *
|
|
|
|
fopen_with_cleanup (char *filename, const char *mode)
|
|
|
|
{
|
|
|
|
FILE *file = fopen (filename, mode);
|
|
|
|
if (file == NULL)
|
|
|
|
perror_with_name (filename);
|
|
|
|
make_cleanup_fclose (file);
|
|
|
|
return file;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd *
|
|
|
|
bfd_openr_with_cleanup (const char *filename, const char *target)
|
|
|
|
{
|
|
|
|
bfd *ibfd;
|
|
|
|
|
2003-02-07 08:27:31 +08:00
|
|
|
ibfd = bfd_openr (filename, target);
|
|
|
|
if (ibfd == NULL)
|
2002-03-29 09:22:41 +08:00
|
|
|
error ("Failed to open %s: %s.", filename,
|
|
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
|
|
|
|
make_cleanup_bfd_close (ibfd);
|
|
|
|
if (!bfd_check_format (ibfd, bfd_object))
|
|
|
|
error ("'%s' is not a recognized file format.", filename);
|
|
|
|
|
|
|
|
return ibfd;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd *
|
|
|
|
bfd_openw_with_cleanup (char *filename, const char *target, char *mode)
|
|
|
|
{
|
|
|
|
bfd *obfd;
|
|
|
|
|
|
|
|
if (*mode == 'w') /* Write: create new file */
|
|
|
|
{
|
2003-02-07 08:27:31 +08:00
|
|
|
obfd = bfd_openw (filename, target);
|
|
|
|
if (obfd == NULL)
|
2002-03-29 09:22:41 +08:00
|
|
|
error ("Failed to open %s: %s.", filename,
|
|
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
make_cleanup_bfd_close (obfd);
|
|
|
|
if (!bfd_set_format (obfd, bfd_object))
|
|
|
|
error ("bfd_openw_with_cleanup: %s.", bfd_errmsg (bfd_get_error ()));
|
|
|
|
}
|
|
|
|
else if (*mode == 'a') /* Append to existing file */
|
|
|
|
{ /* FIXME -- doesn't work... */
|
|
|
|
error ("bfd_openw does not work with append.");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
error ("bfd_openw_with_cleanup: unknown mode %s.", mode);
|
|
|
|
|
|
|
|
return obfd;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cmd_list_element *dump_cmdlist;
|
|
|
|
struct cmd_list_element *append_cmdlist;
|
|
|
|
struct cmd_list_element *srec_cmdlist;
|
|
|
|
struct cmd_list_element *ihex_cmdlist;
|
|
|
|
struct cmd_list_element *tekhex_cmdlist;
|
|
|
|
struct cmd_list_element *binary_dump_cmdlist;
|
|
|
|
struct cmd_list_element *binary_append_cmdlist;
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"dump\" must be followed by a subcommand.\n\n");
|
|
|
|
help_list (dump_cmdlist, "dump ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
append_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"append\" must be followed by a subcommand.\n\n");
|
|
|
|
help_list (dump_cmdlist, "append ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_binary_file (char *filename, char *mode,
|
|
|
|
char *buf, int len)
|
|
|
|
{
|
|
|
|
FILE *file;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
file = fopen_with_cleanup (filename, mode);
|
|
|
|
status = fwrite (buf, len, 1, file);
|
|
|
|
if (status != 1)
|
|
|
|
perror_with_name (filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_bfd_file (char *filename, char *mode,
|
|
|
|
char *target, CORE_ADDR vaddr,
|
|
|
|
char *buf, int len)
|
|
|
|
{
|
|
|
|
bfd *obfd;
|
|
|
|
asection *osection;
|
|
|
|
|
|
|
|
obfd = bfd_openw_with_cleanup (filename, target, mode);
|
|
|
|
osection = bfd_make_section_anyway (obfd, ".newsec");
|
|
|
|
bfd_set_section_size (obfd, osection, len);
|
|
|
|
bfd_set_section_vma (obfd, osection, vaddr);
|
|
|
|
bfd_set_section_alignment (obfd, osection, 0);
|
|
|
|
bfd_set_section_flags (obfd, osection, 0x203);
|
|
|
|
osection->entsize = 0;
|
|
|
|
bfd_set_section_contents (obfd, osection, buf, 0, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_memory_to_file (char *cmd, char *mode, char *file_format)
|
|
|
|
{
|
|
|
|
struct cleanup *old_cleanups = make_cleanup (null_cleanup, NULL);
|
|
|
|
CORE_ADDR lo;
|
|
|
|
CORE_ADDR hi;
|
|
|
|
ULONGEST count;
|
|
|
|
char *filename;
|
|
|
|
void *buf;
|
|
|
|
char *lo_exp;
|
|
|
|
char *hi_exp;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* Open the file. */
|
|
|
|
filename = scan_filename_with_cleanup (&cmd, NULL);
|
|
|
|
|
|
|
|
/* Find the low address. */
|
|
|
|
if (cmd == NULL || *cmd == '\0')
|
|
|
|
error ("Missing start address.");
|
|
|
|
lo_exp = scan_expression_with_cleanup (&cmd, NULL);
|
|
|
|
|
|
|
|
/* Find the second address - rest of line. */
|
|
|
|
if (cmd == NULL || *cmd == '\0')
|
|
|
|
error ("Missing stop address.");
|
|
|
|
hi_exp = cmd;
|
|
|
|
|
|
|
|
lo = parse_and_eval_address (lo_exp);
|
|
|
|
hi = parse_and_eval_address (hi_exp);
|
|
|
|
if (hi <= lo)
|
|
|
|
error ("Invalid memory address range (start >= end).");
|
|
|
|
count = hi - lo;
|
|
|
|
|
|
|
|
/* FIXME: Should use read_memory_partial() and a magic blocking
|
|
|
|
value. */
|
|
|
|
buf = xmalloc (count);
|
|
|
|
make_cleanup (xfree, buf);
|
|
|
|
target_read_memory (lo, buf, count);
|
|
|
|
|
|
|
|
/* Have everything. Open/write the data. */
|
|
|
|
if (file_format == NULL || strcmp (file_format, "binary") == 0)
|
|
|
|
{
|
|
|
|
dump_binary_file (filename, mode, buf, count);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dump_bfd_file (filename, mode, file_format, lo, buf, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_memory_command (char *cmd, char *mode)
|
|
|
|
{
|
|
|
|
dump_memory_to_file (cmd, mode, "binary");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_value_to_file (char *cmd, char *mode, char *file_format)
|
|
|
|
{
|
|
|
|
struct cleanup *old_cleanups = make_cleanup (null_cleanup, NULL);
|
|
|
|
struct value *val;
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
/* Open the file. */
|
|
|
|
filename = scan_filename_with_cleanup (&cmd, NULL);
|
|
|
|
|
|
|
|
/* Find the value. */
|
|
|
|
if (cmd == NULL || *cmd == '\0')
|
|
|
|
error ("No value to %s.", *mode == 'a' ? "append" : "dump");
|
|
|
|
val = parse_and_eval (cmd);
|
|
|
|
if (val == NULL)
|
|
|
|
error ("Invalid expression.");
|
|
|
|
|
|
|
|
/* Have everything. Open/write the data. */
|
|
|
|
if (file_format == NULL || strcmp (file_format, "binary") == 0)
|
|
|
|
{
|
|
|
|
dump_binary_file (filename, mode, VALUE_CONTENTS (val),
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-13 05:45:08 +08:00
|
|
|
TYPE_LENGTH (value_type (val)));
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
CORE_ADDR vaddr;
|
|
|
|
|
|
|
|
if (VALUE_LVAL (val))
|
|
|
|
{
|
|
|
|
vaddr = VALUE_ADDRESS (val);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
vaddr = 0;
|
|
|
|
warning ("value is not an lval: address assumed to be zero");
|
|
|
|
}
|
|
|
|
|
|
|
|
dump_bfd_file (filename, mode, file_format, vaddr,
|
|
|
|
VALUE_CONTENTS (val),
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* value.h (VALUE_TYPE, VALUE_NEXT, VALUE_OFFSET, VALUE_BITSIZE)
(VALUE_BITPOS): Delete.
(value_type, value_offset, value_bitsize, value_bitpos): Declare.
* value.c (value_type, value_offset, value_bitpos)
(value_bitsize): New functions. Update references.
* arm-tdep.c, gnu-v3-abi.c, hpacc-abi.c, gnu-v2-abi.c: Update.
* f-valprint.c, cp-valprint.c, c-valprint.c: Update.
* ada-valprint.c, typeprint.c, scm-valprint.c, scm-exp.c: Update.
* p-valprint.c, jv-valprint.c, jv-lang.c, varobj.c: Update.
* objc-lang.c, ada-lang.c, std-regs.c, stack.c: Update.
* infcall.c, linespec.c, printcmd.c, valarith.c: Update.
* valops.c, eval.c, findvar.c, breakpoint.c: Update.
* tracepoint.c, ax-gdb.c, mi/mi-main.c, cli/cli-dump.c:
* rs6000-tdep.c, ppc-sysv-tdep.c: Update.
2004-11-13 05:45:08 +08:00
|
|
|
TYPE_LENGTH (value_type (val)));
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_value_command (char *cmd, char *mode)
|
|
|
|
{
|
|
|
|
dump_value_to_file (cmd, mode, "binary");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_srec_memory (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_memory_to_file (args, FOPEN_WB, "srec");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_srec_value (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_value_to_file (args, FOPEN_WB, "srec");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_ihex_memory (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_memory_to_file (args, FOPEN_WB, "ihex");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_ihex_value (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_value_to_file (args, FOPEN_WB, "ihex");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_tekhex_memory (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_memory_to_file (args, FOPEN_WB, "tekhex");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_tekhex_value (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_value_to_file (args, FOPEN_WB, "tekhex");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_binary_memory (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_memory_to_file (args, FOPEN_WB, "binary");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_binary_value (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_value_to_file (args, FOPEN_WB, "binary");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
append_binary_memory (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_memory_to_file (args, FOPEN_AB, "binary");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
append_binary_value (char *args, int from_tty)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
dump_value_to_file (args, FOPEN_AB, "binary");
|
2002-03-29 09:22:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct dump_context
|
|
|
|
{
|
|
|
|
void (*func) (char *cmd, char *mode);
|
|
|
|
char *mode;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
call_dump_func (struct cmd_list_element *c, char *args, int from_tty)
|
|
|
|
{
|
|
|
|
struct dump_context *d = get_cmd_context (c);
|
|
|
|
d->func (args, d->mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
add_dump_command (char *name, void (*func) (char *args, char *mode),
|
|
|
|
char *descr)
|
|
|
|
|
|
|
|
{
|
|
|
|
struct cmd_list_element *c;
|
|
|
|
struct dump_context *d;
|
|
|
|
|
|
|
|
c = add_cmd (name, all_commands, NULL, descr, &dump_cmdlist);
|
|
|
|
c->completer = filename_completer;
|
|
|
|
d = XMALLOC (struct dump_context);
|
|
|
|
d->func = func;
|
2002-08-10 00:36:10 +08:00
|
|
|
d->mode = FOPEN_WB;
|
2002-03-29 09:22:41 +08:00
|
|
|
set_cmd_context (c, d);
|
|
|
|
c->func = call_dump_func;
|
|
|
|
|
|
|
|
c = add_cmd (name, all_commands, NULL, descr, &append_cmdlist);
|
|
|
|
c->completer = filename_completer;
|
|
|
|
d = XMALLOC (struct dump_context);
|
|
|
|
d->func = func;
|
2002-08-10 00:36:10 +08:00
|
|
|
d->mode = FOPEN_AB;
|
2002-03-29 09:22:41 +08:00
|
|
|
set_cmd_context (c, d);
|
|
|
|
c->func = call_dump_func;
|
|
|
|
|
2004-07-26 22:53:06 +08:00
|
|
|
/* Replace "Dump " at start of docstring with "Append " (borrowed
|
|
|
|
from deprecated_add_show_from_set). */
|
2002-03-29 09:22:41 +08:00
|
|
|
if ( c->doc[0] == 'W'
|
|
|
|
&& c->doc[1] == 'r'
|
|
|
|
&& c->doc[2] == 'i'
|
|
|
|
&& c->doc[3] == 't'
|
|
|
|
&& c->doc[4] == 'e'
|
|
|
|
&& c->doc[5] == ' ')
|
|
|
|
c->doc = concat ("Append ", c->doc + 6, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Opaque data for restore_section_callback. */
|
|
|
|
struct callback_data {
|
|
|
|
unsigned long load_offset;
|
|
|
|
CORE_ADDR load_start;
|
|
|
|
CORE_ADDR load_end;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Function: restore_section_callback.
|
|
|
|
|
|
|
|
Callback function for bfd_map_over_sections.
|
|
|
|
Selectively loads the sections into memory. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
restore_section_callback (bfd *ibfd, asection *isec, void *args)
|
|
|
|
{
|
|
|
|
struct callback_data *data = args;
|
|
|
|
bfd_vma sec_start = bfd_section_vma (ibfd, isec);
|
|
|
|
bfd_size_type size = bfd_section_size (ibfd, isec);
|
|
|
|
bfd_vma sec_end = sec_start + size;
|
|
|
|
bfd_size_type sec_offset = 0;
|
|
|
|
bfd_size_type sec_load_count = size;
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
char *buf;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Ignore non-loadable sections, eg. from elf files. */
|
|
|
|
if (!(bfd_get_section_flags (ibfd, isec) & SEC_LOAD))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Does the section overlap with the desired restore range? */
|
|
|
|
if (sec_end <= data->load_start
|
|
|
|
|| (data->load_end > 0 && sec_start >= data->load_end))
|
|
|
|
{
|
|
|
|
/* No, no useable data in this section. */
|
|
|
|
printf_filtered ("skipping section %s...\n",
|
|
|
|
bfd_section_name (ibfd, isec));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare section address range with user-requested
|
|
|
|
address range (if any). Compute where the actual
|
|
|
|
transfer should start and end. */
|
|
|
|
if (sec_start < data->load_start)
|
|
|
|
sec_offset = data->load_start - sec_start;
|
|
|
|
/* Size of a partial transfer: */
|
|
|
|
sec_load_count -= sec_offset;
|
|
|
|
if (data->load_end > 0 && sec_end > data->load_end)
|
|
|
|
sec_load_count -= sec_end - data->load_end;
|
|
|
|
|
|
|
|
/* Get the data. */
|
|
|
|
buf = xmalloc (size);
|
|
|
|
old_chain = make_cleanup (xfree, buf);
|
|
|
|
if (!bfd_get_section_contents (ibfd, isec, buf, 0, size))
|
|
|
|
error ("Failed to read bfd file %s: '%s'.", bfd_get_filename (ibfd),
|
|
|
|
bfd_errmsg (bfd_get_error ()));
|
|
|
|
|
|
|
|
printf_filtered ("Restoring section %s (0x%lx to 0x%lx)",
|
|
|
|
bfd_section_name (ibfd, isec),
|
|
|
|
(unsigned long) sec_start,
|
|
|
|
(unsigned long) sec_end);
|
|
|
|
|
|
|
|
if (data->load_offset != 0 || data->load_start != 0 || data->load_end != 0)
|
2002-04-06 09:52:34 +08:00
|
|
|
printf_filtered (" into memory (0x%s to 0x%s)\n",
|
|
|
|
paddr_nz ((unsigned long) sec_start
|
|
|
|
+ sec_offset + data->load_offset),
|
|
|
|
paddr_nz ((unsigned long) sec_start + sec_offset
|
|
|
|
+ data->load_offset + sec_load_count));
|
2002-03-29 09:22:41 +08:00
|
|
|
else
|
|
|
|
puts_filtered ("\n");
|
|
|
|
|
|
|
|
/* Write the data. */
|
|
|
|
ret = target_write_memory (sec_start + sec_offset + data->load_offset,
|
|
|
|
buf + sec_offset, sec_load_count);
|
|
|
|
if (ret != 0)
|
|
|
|
warning ("restore: memory write failed (%s).", safe_strerror (ret));
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
restore_binary_file (char *filename, struct callback_data *data)
|
|
|
|
{
|
2002-08-10 00:36:10 +08:00
|
|
|
FILE *file = fopen_with_cleanup (filename, FOPEN_RB);
|
2002-03-29 09:22:41 +08:00
|
|
|
int status;
|
|
|
|
char *buf;
|
|
|
|
long len;
|
|
|
|
|
|
|
|
/* Get the file size for reading. */
|
|
|
|
if (fseek (file, 0, SEEK_END) == 0)
|
|
|
|
len = ftell (file);
|
|
|
|
else
|
|
|
|
perror_with_name (filename);
|
|
|
|
|
|
|
|
if (len <= data->load_start)
|
|
|
|
error ("Start address is greater than length of binary file %s.",
|
|
|
|
filename);
|
|
|
|
|
|
|
|
/* Chop off "len" if it exceeds the requested load_end addr. */
|
|
|
|
if (data->load_end != 0 && data->load_end < len)
|
|
|
|
len = data->load_end;
|
|
|
|
/* Chop off "len" if the requested load_start addr skips some bytes. */
|
|
|
|
if (data->load_start > 0)
|
|
|
|
len -= data->load_start;
|
|
|
|
|
|
|
|
printf_filtered
|
|
|
|
("Restoring binary file %s into memory (0x%lx to 0x%lx)\n",
|
|
|
|
filename,
|
|
|
|
(unsigned long) data->load_start + data->load_offset,
|
|
|
|
(unsigned long) data->load_start + data->load_offset + len);
|
|
|
|
|
|
|
|
/* Now set the file pos to the requested load start pos. */
|
|
|
|
if (fseek (file, data->load_start, SEEK_SET) != 0)
|
|
|
|
perror_with_name (filename);
|
|
|
|
|
|
|
|
/* Now allocate a buffer and read the file contents. */
|
|
|
|
buf = xmalloc (len);
|
|
|
|
make_cleanup (xfree, buf);
|
|
|
|
if (fread (buf, 1, len, file) != len)
|
|
|
|
perror_with_name (filename);
|
|
|
|
|
|
|
|
/* Now write the buffer into target memory. */
|
|
|
|
len = target_write_memory (data->load_start + data->load_offset, buf, len);
|
|
|
|
if (len != 0)
|
|
|
|
warning ("restore: memory write failed (%s).", safe_strerror (len));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
restore_command (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
char *filename;
|
|
|
|
struct callback_data data;
|
|
|
|
bfd *ibfd;
|
|
|
|
int binary_flag = 0;
|
|
|
|
|
|
|
|
if (!target_has_execution)
|
|
|
|
noprocess ();
|
|
|
|
|
|
|
|
data.load_offset = 0;
|
|
|
|
data.load_start = 0;
|
|
|
|
data.load_end = 0;
|
|
|
|
|
|
|
|
/* Parse the input arguments. First is filename (required). */
|
|
|
|
filename = scan_filename_with_cleanup (&args, NULL);
|
|
|
|
if (args != NULL && *args != '\0')
|
|
|
|
{
|
|
|
|
char *binary_string = "binary";
|
|
|
|
|
|
|
|
/* Look for optional "binary" flag. */
|
|
|
|
if (strncmp (args, binary_string, strlen (binary_string)) == 0)
|
|
|
|
{
|
|
|
|
binary_flag = 1;
|
|
|
|
args += strlen (binary_string);
|
|
|
|
args = skip_spaces (args);
|
|
|
|
}
|
|
|
|
/* Parse offset (optional). */
|
|
|
|
if (args != NULL && *args != '\0')
|
|
|
|
data.load_offset =
|
2002-05-24 09:25:52 +08:00
|
|
|
parse_and_eval_long (scan_expression_with_cleanup (&args, NULL));
|
2002-03-29 09:22:41 +08:00
|
|
|
if (args != NULL && *args != '\0')
|
|
|
|
{
|
|
|
|
/* Parse start address (optional). */
|
|
|
|
data.load_start =
|
2002-05-24 09:25:52 +08:00
|
|
|
parse_and_eval_long (scan_expression_with_cleanup (&args, NULL));
|
2002-03-29 09:22:41 +08:00
|
|
|
if (args != NULL && *args != '\0')
|
|
|
|
{
|
|
|
|
/* Parse end address (optional). */
|
2002-05-24 09:25:52 +08:00
|
|
|
data.load_end = parse_and_eval_long (args);
|
2002-03-29 09:22:41 +08:00
|
|
|
if (data.load_end <= data.load_start)
|
|
|
|
error ("Start must be less than end.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info_verbose)
|
|
|
|
printf_filtered ("Restore file %s offset 0x%lx start 0x%lx end 0x%lx\n",
|
|
|
|
filename, (unsigned long) data.load_offset,
|
|
|
|
(unsigned long) data.load_start,
|
|
|
|
(unsigned long) data.load_end);
|
|
|
|
|
|
|
|
if (binary_flag)
|
|
|
|
{
|
|
|
|
restore_binary_file (filename, &data);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Open the file for loading. */
|
|
|
|
ibfd = bfd_openr_with_cleanup (filename, NULL);
|
|
|
|
|
|
|
|
/* Process the sections. */
|
|
|
|
bfd_map_over_sections (ibfd, restore_section_callback, &data);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
srec_dump_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"dump srec\" must be followed by a subcommand.\n");
|
|
|
|
help_list (srec_cmdlist, "dump srec ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ihex_dump_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"dump ihex\" must be followed by a subcommand.\n");
|
|
|
|
help_list (ihex_cmdlist, "dump ihex ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
tekhex_dump_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"dump tekhex\" must be followed by a subcommand.\n");
|
|
|
|
help_list (tekhex_cmdlist, "dump tekhex ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
binary_dump_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"dump binary\" must be followed by a subcommand.\n");
|
|
|
|
help_list (binary_dump_cmdlist, "dump binary ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
binary_append_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"append binary\" must be followed by a subcommand.\n");
|
|
|
|
help_list (binary_append_cmdlist, "append binary ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
2003-06-08 Andrew Cagney <cagney@redhat.com>
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen
from GCC's acinclude.m4.
* configure.in: Check for getopt's delcaration.
* aclocal.m4, config.in, configure: Re-generate.
* main.c (error_init): Delete declaration.
* defs.h (error_init): Declare.
* rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static.
(rs6000_convert_from_func_ptr_addr): Make static.
(_initialize_rs6000_tdep): Add declaration.
* cli/cli-cmds.c (dont_repeat): Delete declaration.
(show_commands, set_verbose, show_history): Delete declaration.
* top.h (set_verbose): Add declaration.
(show_history, set_history, show_commands): Add declaration.
(do_restore_instream_cleanup): Add declaration.
* objc-lang.c (specialcmp): Make static.
(print_object_command): Make static.
(find_objc_msgsend): Make static.
(find_objc_msgcall_submethod_helper): Make static.
(find_objc_msgcall_submethod): Make static.
(_initialize_objc_language): Add declaration.
(find_implementation_from_class): Make static.
(find_implementation): Make static.
* objc-exp.y (yylex): Delete lookup_struct_typedef declaration.
* objc-lang.h (lookup_struct_typedef): Add declaration.
* cli/cli-interp.c (_initialize_cli_interp): Add declaration.
* cli/cli-script.c (clear_hook_in_cleanup): Make static.
(do_restore_user_call_depth): Make static.
(do_restore_instream_cleanup): Delete declaration.
(dont_repeat): Delete declaration.
* cli/cli-decode.c (add_abbrev_cmd): Delete function.
* cli/cli-dump.c (_initialize_cli_dump): Add declaration.
* reggroups.c (_initialize_reggroup): Add declaration.
* cp-support.c (_initialize_cp_support): Add declaration.
* cp-abi.c (_initialize_cp_abi): Add declaration.
* hpacc-abi.c (_initialize_hpacc_abi): Add declaration.
* gnu-v3-abi.c (gnuv3_baseclass_offset): Make static.
(_initialize_gnu_v3_abi): Add declaration.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Make static.
(_initialize_gnu_v2_abi): Add declaration.
* frame-base.c (_initialize_frame_base): Add declaration.
* doublest.c (floatformat_from_length): Make static.
* frame-unwind.c (_initialize_frame_unwind): Add declaration.
* frame.c (create_sentinel_frame): Make static.
(_initialize_frame): Add declaration.
* top.c (do_catch_errors): Make static.
(gdb_rl_operate_and_get_next_completion): Make static.
* typeprint.c: Include "typeprint.h".
* sentinel-frame.c (sentinel_frame_prev_register): Make static.
(sentinel_frame_this_id): Make static.
* p-valprint.c (_initialize_pascal_valprint): Add declaration.
* ui-out.c (make_cleanup_ui_out_begin_end): Delete function.
* dwarf2-frame.c (dwarf2_frame_cache): Make static.
* p-exp.y (push_current_type, pop_current_type): ISO C declaration.
* dwarf2expr.h (dwarf_expr_context): ISO C declaration.
* maint.c (maintenance_print_architecture): Make static.
* signals/signals.c (_initialize_signals): Add declaration.
* std-regs.c (_initialize_frame_reg): Add declaration.
* jv-exp.y (push_variable): ISO C definition.
(push_qualified_expression_name): Ditto.
* memattr.c (_initialize_mem): Add declaration.
* remote.c (remote_check_watch_resources): Make static.
(remote_stopped_by_watchpoint): Make static.
(remote_stopped_data_address): Make static.
* d10v-tdep.c (nr_dmap_regs): Make static.
(a0_regnum): Make static.
(d10v_frame_unwind_cache): Make static.
(d10v_frame_p): Make static.
* osabi.c (show_osabi): Make static.
(_initialize_gdb_osabi): Add extern declaration.
* gdbtypes.c (make_qualified_type): Make static.
(safe_parse_type): Make static.
* macrocmd.c (_initialize_macrocmd): Add extern declaration.
* macrotab.c (macro_bcache_free): Make static.
* interps.c (interp_set_quiet): Make static.
(interpreter_exec_cmd): Make static.
* stack.h (select_frame_command): New file.
* stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete function.
(select_frame_command): Make global.
* infcall.c: Include "infcall.h".
* linespec.c: Include "linespec.h".
* symfile.c (sections_overlap): Make static.
* cp-support.h (cp_initialize_namespace): ISO C declaration.
* charset.c (_initialize_charset): Add missing prototype.
* regcache.c (init_legacy_regcache_descr): Make static.
(do_regcache_xfree): Make static.
(regcache_xfer_part): Make static.
(_initialize_regcache): Add missing prototype.
* breakpoint.c (parse_breakpoint_sals): Make static.
(breakpoint_sals_to_pc): Make static.
* interps.h (clear_interpreter_hooks): ISO C declaration.
* Makefile.in (stack_h): Define.
(stack.o, typeprint.o, mi-main.o): Update dependencies.
(mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies.
Index: mi/ChangeLog
2003-06-08 Andrew Cagney <cagney@redhat.com>
* mi-parse.c (_initialize_mi_parse): Delete function.
* mi-main.c: Include "mi-main.h".
* mi-interp.c (_initialize_mi_interp): Add declaration.
* mi-cmd-stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete extern declaration.
(mi_cmd_stack_select_frame): Replace select_frame_command_wrapper
with select_frame_command.
2003-06-09 02:27:14 +08:00
|
|
|
extern initialize_file_ftype _initialize_cli_dump; /* -Wmissing-prototypes */
|
|
|
|
|
2002-03-29 09:22:41 +08:00
|
|
|
void
|
|
|
|
_initialize_cli_dump (void)
|
|
|
|
{
|
|
|
|
struct cmd_list_element *c;
|
|
|
|
add_prefix_cmd ("dump", class_vars, dump_command, "\
|
|
|
|
Dump target code/data to a local file.",
|
|
|
|
&dump_cmdlist, "dump ",
|
|
|
|
0/*allow-unknown*/,
|
|
|
|
&cmdlist);
|
|
|
|
add_prefix_cmd ("append", class_vars, append_command, "\
|
|
|
|
Append target code/data to a local file.",
|
|
|
|
&append_cmdlist, "append ",
|
|
|
|
0/*allow-unknown*/,
|
|
|
|
&cmdlist);
|
|
|
|
|
|
|
|
add_dump_command ("memory", dump_memory_command, "\
|
|
|
|
Write contents of memory to a raw binary file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory within the\n\
|
|
|
|
range [START .. STOP) to the specifed FILE in raw target ordered bytes.");
|
|
|
|
|
|
|
|
add_dump_command ("value", dump_value_command, "\
|
|
|
|
Write the value of an expression to a raw binary file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION to\n\
|
|
|
|
the specified FILE in raw target ordered bytes.");
|
|
|
|
|
|
|
|
add_prefix_cmd ("srec", all_commands, srec_dump_command, "\
|
|
|
|
Write target code/data to an srec file.",
|
|
|
|
&srec_cmdlist, "dump srec ",
|
|
|
|
0 /*allow-unknown*/,
|
|
|
|
&dump_cmdlist);
|
|
|
|
|
|
|
|
add_prefix_cmd ("ihex", all_commands, ihex_dump_command, "\
|
|
|
|
Write target code/data to an intel hex file.",
|
|
|
|
&ihex_cmdlist, "dump ihex ",
|
|
|
|
0 /*allow-unknown*/,
|
|
|
|
&dump_cmdlist);
|
|
|
|
|
|
|
|
add_prefix_cmd ("tekhex", all_commands, tekhex_dump_command, "\
|
|
|
|
Write target code/data to a tekhex file.",
|
|
|
|
&tekhex_cmdlist, "dump tekhex ",
|
|
|
|
0 /*allow-unknown*/,
|
|
|
|
&dump_cmdlist);
|
|
|
|
|
|
|
|
add_prefix_cmd ("binary", all_commands, binary_dump_command, "\
|
|
|
|
Write target code/data to a raw binary file.",
|
|
|
|
&binary_dump_cmdlist, "dump binary ",
|
|
|
|
0 /*allow-unknown*/,
|
|
|
|
&dump_cmdlist);
|
|
|
|
|
|
|
|
add_prefix_cmd ("binary", all_commands, binary_append_command, "\
|
|
|
|
Append target code/data to a raw binary file.",
|
|
|
|
&binary_append_cmdlist, "append binary ",
|
|
|
|
0 /*allow-unknown*/,
|
|
|
|
&append_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("memory", all_commands, dump_srec_memory, "\
|
|
|
|
Write contents of memory to an srec file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
|
|
within the range [START .. STOP) to the specifed FILE in srec format.",
|
|
|
|
&srec_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("value", all_commands, dump_srec_value, "\
|
|
|
|
Write the value of an expression to an srec file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
|
|
to the specified FILE in srec format.",
|
|
|
|
&srec_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("memory", all_commands, dump_ihex_memory, "\
|
|
|
|
Write contents of memory to an ihex file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory within\n\
|
|
|
|
the range [START .. STOP) to the specifed FILE in intel hex format.",
|
|
|
|
&ihex_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("value", all_commands, dump_ihex_value, "\
|
|
|
|
Write the value of an expression to an ihex file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
|
|
to the specified FILE in intel hex format.",
|
|
|
|
&ihex_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("memory", all_commands, dump_tekhex_memory, "\
|
|
|
|
Write contents of memory to a tekhex file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
|
|
within the range [START .. STOP) to the specifed FILE in tekhex format.",
|
|
|
|
&tekhex_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("value", all_commands, dump_tekhex_value, "\
|
|
|
|
Write the value of an expression to a tekhex file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
|
|
to the specified FILE in tekhex format.",
|
|
|
|
&tekhex_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("memory", all_commands, dump_binary_memory, "\
|
|
|
|
Write contents of memory to a raw binary file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory\n\
|
|
|
|
within the range [START .. STOP) to the specifed FILE in binary format.",
|
|
|
|
&binary_dump_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("value", all_commands, dump_binary_value, "\
|
|
|
|
Write the value of an expression to a raw binary file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
|
|
to the specified FILE in raw target ordered bytes.",
|
|
|
|
&binary_dump_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("memory", all_commands, append_binary_memory, "\
|
|
|
|
Append contents of memory to a raw binary file.\n\
|
|
|
|
Arguments are FILE START STOP. Writes the contents of memory within the\n\
|
|
|
|
range [START .. STOP) to the specifed FILE in raw target ordered bytes.",
|
|
|
|
&binary_append_cmdlist);
|
|
|
|
|
|
|
|
add_cmd ("value", all_commands, append_binary_value, "\
|
|
|
|
Append the value of an expression to a raw binary file.\n\
|
|
|
|
Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n\
|
|
|
|
to the specified FILE in raw target ordered bytes.",
|
|
|
|
&binary_append_cmdlist);
|
|
|
|
|
|
|
|
c = add_com ("restore", class_vars, restore_command,
|
|
|
|
"Restore the contents of FILE to target memory.\n\
|
|
|
|
Arguments are FILE OFFSET START END where all except FILE are optional.\n\
|
|
|
|
OFFSET will be added to the base address of the file (default zero).\n\
|
2002-03-30 07:34:43 +08:00
|
|
|
If START and END are given, only the file contents within that range\n\
|
2002-03-29 09:22:41 +08:00
|
|
|
(file relative) will be restored to target memory.");
|
|
|
|
c->completer = filename_completer;
|
|
|
|
/* FIXME: completers for other commands. */
|
|
|
|
}
|