/* Generate a core file for the inferior process.
- Copyright (C) 2001-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "regset.h"
#include "gdb_bfd.h"
#include "readline/tilde.h"
+#include <algorithm>
+#include "common/gdb_unlinker.h"
+#include "byte-vector.h"
/* The largest amount of memory to read from the target at once. We
must throttle it to limit the amount of memory used by GDB during
/* create_gcore_bfd -- helper for gcore_command (exported).
Open a new bfd core file for output, and return the handle. */
-bfd *
+gdb_bfd_ref_ptr
create_gcore_bfd (const char *filename)
{
- bfd *obfd = gdb_bfd_openw (filename, default_gcore_target ());
+ gdb_bfd_ref_ptr obfd (gdb_bfd_openw (filename, default_gcore_target ()));
- if (!obfd)
+ if (obfd == NULL)
error (_("Failed to open '%s' for output."), filename);
- bfd_set_format (obfd, bfd_core);
- bfd_set_arch_mach (obfd, default_gcore_arch (), default_gcore_mach ());
+ bfd_set_format (obfd.get (), bfd_core);
+ bfd_set_arch_mach (obfd.get (), default_gcore_arch (), default_gcore_mach ());
return obfd;
}
void
write_gcore_file (bfd *obfd)
{
- volatile struct gdb_exception except;
+ struct gdb_exception except = exception_none;
target_prepare_to_generate_core ();
- TRY_CATCH (except, RETURN_MASK_ALL)
- write_gcore_file_1 (obfd);
+ TRY
+ {
+ write_gcore_file_1 (obfd);
+ }
+ CATCH (e, RETURN_MASK_ALL)
+ {
+ except = e;
+ }
+ END_CATCH
target_done_generating_core ();
throw_exception (except);
}
-static void
-do_bfd_delete_cleanup (void *arg)
-{
- bfd *obfd = arg;
- const char *filename = obfd->filename;
-
- gdb_bfd_unref (arg);
- unlink (filename);
-}
-
/* gcore_command -- implements the 'gcore' command.
Generate a core file from the inferior process. */
static void
gcore_command (char *args, int from_tty)
{
- struct cleanup *filename_chain;
- struct cleanup *bfd_chain;
- char *corefilename;
- bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> corefilename;
/* No use generating a corefile without a target process. */
if (!target_has_execution)
noprocess ();
if (args && *args)
- corefilename = tilde_expand (args);
+ corefilename.reset (tilde_expand (args));
else
{
/* Default corefile name is "core.PID". */
- corefilename = xstrprintf ("core.%d", ptid_get_pid (inferior_ptid));
+ corefilename.reset (xstrprintf ("core.%d", ptid_get_pid (inferior_ptid)));
}
- filename_chain = make_cleanup (xfree, corefilename);
if (info_verbose)
fprintf_filtered (gdb_stdout,
- "Opening corefile '%s' for output.\n", corefilename);
+ "Opening corefile '%s' for output.\n",
+ corefilename.get ());
/* Open the output file. */
- obfd = create_gcore_bfd (corefilename);
+ gdb_bfd_ref_ptr obfd (create_gcore_bfd (corefilename.get ()));
- /* Need a cleanup that will close and delete the file. */
- bfd_chain = make_cleanup (do_bfd_delete_cleanup, obfd);
+ /* Arrange to unlink the file on failure. */
+ gdb::unlinker unlink_file (corefilename.get ());
/* Call worker function. */
- write_gcore_file (obfd);
+ write_gcore_file (obfd.get ());
/* Succeeded. */
- discard_cleanups (bfd_chain);
- gdb_bfd_unref (obfd);
+ unlink_file.keep ();
- fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
- do_cleanups (filename_chain);
+ fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename.get ());
}
static unsigned long
target_sbrk_arg = value_from_longest (builtin_type (gdbarch)->builtin_int,
sbrk_arg);
gdb_assert (target_sbrk_arg);
- ret = call_function_by_hand (sbrk_fn, 1, &target_sbrk_arg);
+ ret = call_function_by_hand (sbrk_fn, NULL, 1, &target_sbrk_arg);
if (ret == NULL)
return (bfd_vma) 0;
gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read,
int write, int exec, int modified, void *data)
{
- bfd *obfd = data;
+ bfd *obfd = (bfd *) data;
asection *osec;
flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD;
{
bfd_size_type size, total_size = bfd_section_size (obfd, osec);
file_ptr offset = 0;
- struct cleanup *old_chain = NULL;
- void *memhunk;
/* Read-only sections are marked; we don't have to copy their contents. */
if ((bfd_get_section_flags (obfd, osec) & SEC_LOAD) == 0)
if (!startswith (bfd_section_name (obfd, osec), "load"))
return;
- size = min (total_size, MAX_COPY_BYTES);
- memhunk = xmalloc (size);
- old_chain = make_cleanup (xfree, memhunk);
+ size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES);
+ gdb::byte_vector memhunk (size);
while (total_size > 0)
{
size = total_size;
if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
- memhunk, size) != 0)
+ memhunk.data (), size) != 0)
{
warning (_("Memory read failed for corefile "
"section, %s bytes at %s."),
paddress (target_gdbarch (), bfd_section_vma (obfd, osec)));
break;
}
- if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size))
+ if (!bfd_set_section_contents (obfd, osec, memhunk.data (),
+ offset, size))
{
warning (_("Failed to write corefile contents (%s)."),
bfd_errmsg (bfd_get_error ()));
total_size -= size;
offset += size;
}
-
- do_cleanups (old_chain); /* Frees MEMHUNK. */
}
static int
return 1;
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_gcore;
-
void
_initialize_gcore (void)
{
projects / deliverable / binutils-gdb.git / blobdiff