projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove tui_show_disassem
[deliverable/binutils-gdb.git]
/
gdb
/
gcore.c
diff --git
a/gdb/gcore.c
b/gdb/gcore.c
index d47b2baec4e9b424fb645e9fd6af033738534f6e..f283ed4580d9f2266dafeafcd09b88eca8a311fd 100644
(file)
--- a/
gdb/gcore.c
+++ b/
gdb/gcore.c
@@
-35,8
+35,9
@@
#include "gdb_bfd.h"
#include "readline/tilde.h"
#include <algorithm>
#include "gdb_bfd.h"
#include "readline/tilde.h"
#include <algorithm>
-#include "common/gdb_unlinker.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/scope-exit.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
/* 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
@@
-94,9
+95,9
@@
write_gcore_file_1 (bfd *obfd)
error (_("Failed to create 'note' section for corefile: %s"),
bfd_errmsg (bfd_get_error ()));
error (_("Failed to create 'note' section for corefile: %s"),
bfd_errmsg (bfd_get_error ()));
- bfd_set_section_vma (
obfd,
note_sec, 0);
- bfd_set_section_alignment (
obfd,
note_sec, 0);
- bfd_set_section_size (
obfd,
note_sec, note_size);
+ bfd_set_section_vma (note_sec, 0);
+ bfd_set_section_alignment (note_sec, 0);
+ bfd_set_section_size (note_sec, note_size);
/* Now create the memory/load sections. */
if (gcore_memory_sections (obfd) == 0)
/* Now create the memory/load sections. */
if (gcore_memory_sections (obfd) == 0)
@@
-114,24
+115,9
@@
write_gcore_file_1 (bfd *obfd)
void
write_gcore_file (bfd *obfd)
{
void
write_gcore_file (bfd *obfd)
{
- struct gdb_exception except = exception_none;
-
target_prepare_to_generate_core ();
target_prepare_to_generate_core ();
-
- TRY
- {
- write_gcore_file_1 (obfd);
- }
- CATCH (e, RETURN_MASK_ALL)
- {
- except = e;
- }
- END_CATCH
-
- target_done_generating_core ();
-
- if (except.reason < 0)
- throw_exception (except);
+ SCOPE_EXIT { target_done_generating_core (); };
+ write_gcore_file_1 (obfd);
}
/* gcore_command -- implements the 'gcore' command.
}
/* gcore_command -- implements the 'gcore' command.
@@
-346,11
+332,11
@@
derive_heap_segment (bfd *abfd, bfd_vma *bottom, bfd_vma *top)
for (sec = abfd->sections; sec; sec = sec->next)
{
for (sec = abfd->sections; sec; sec = sec->next)
{
- if (bfd_
get_section_flags (abfd,
sec) & SEC_DATA
- || strcmp (".bss", bfd_section_name (
abfd,
sec)) == 0)
+ if (bfd_
section_flags (
sec) & SEC_DATA
+ || strcmp (".bss", bfd_section_name (sec)) == 0)
{
{
- sec_vaddr = bfd_
get_section_vma (abfd,
sec);
- sec_size = bfd_
get_
section_size (sec);
+ sec_vaddr = bfd_
section_vma (
sec);
+ sec_size = bfd_section_size (sec);
if (sec_vaddr + sec_size > top_of_data_memory)
top_of_data_memory = sec_vaddr + sec_size;
}
if (sec_vaddr + sec_size > top_of_data_memory)
top_of_data_memory = sec_vaddr + sec_size;
}
@@
-379,17
+365,17
@@
make_output_phdrs (bfd *obfd, asection *osec, void *ignored)
int p_type = 0;
/* FIXME: these constants may only be applicable for ELF. */
int p_type = 0;
/* FIXME: these constants may only be applicable for ELF. */
- if (startswith (bfd_section_name (o
bfd, o
sec), "load"))
+ if (startswith (bfd_section_name (osec), "load"))
p_type = PT_LOAD;
p_type = PT_LOAD;
- else if (startswith (bfd_section_name (o
bfd, o
sec), "note"))
+ else if (startswith (bfd_section_name (osec), "note"))
p_type = PT_NOTE;
else
p_type = PT_NULL;
p_flags |= PF_R; /* Segment is readable. */
p_type = PT_NOTE;
else
p_type = PT_NULL;
p_flags |= PF_R; /* Segment is readable. */
- if (!(bfd_
get_section_flags (obfd,
osec) & SEC_READONLY))
+ if (!(bfd_
section_flags (
osec) & SEC_READONLY))
p_flags |= PF_W; /* Segment is writable. */
p_flags |= PF_W; /* Segment is writable. */
- if (bfd_
get_section_flags (obfd,
osec) & SEC_CODE)
+ if (bfd_
section_flags (
osec) & SEC_CODE)
p_flags |= PF_X; /* Segment is executable. */
bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec);
p_flags |= PF_X; /* Segment is executable. */
bfd_record_phdr (obfd, p_type, 1, p_flags, 0, 0, 0, 0, 1, &osec);
@@
-431,8
+417,7
@@
gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read,
{
bfd *abfd = objfile->obfd;
asection *asec = objsec->the_bfd_section;
{
bfd *abfd = objfile->obfd;
asection *asec = objsec->the_bfd_section;
- bfd_vma align = (bfd_vma) 1 << bfd_get_section_alignment (abfd,
- asec);
+ bfd_vma align = (bfd_vma) 1 << bfd_section_alignment (asec);
bfd_vma start = obj_section_addr (objsec) & -align;
bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align;
bfd_vma start = obj_section_addr (objsec) & -align;
bfd_vma end = (obj_section_endaddr (objsec) + align - 1) & -align;
@@
-478,9
+463,9
@@
gcore_create_callback (CORE_ADDR vaddr, unsigned long size, int read,
plongest (size), paddress (target_gdbarch (), vaddr));
}
plongest (size), paddress (target_gdbarch (), vaddr));
}
- bfd_set_section_size (o
bfd, o
sec, size);
- bfd_set_section_vma (o
bfd, o
sec, vaddr);
- bfd_se
ction_lma (obfd, osec) = 0; /* ??? bfd_set_section_lma? */
+ bfd_set_section_size (osec, size);
+ bfd_set_section_vma (osec, vaddr);
+ bfd_se
t_section_lma (osec, 0);
return 0;
}
return 0;
}
@@
-496,9
+481,8
@@
objfile_find_memory_regions (struct target_ops *self,
for (objfile *objfile : current_program_space->objfiles ())
ALL_OBJFILE_OSECTIONS (objfile, objsec)
{
for (objfile *objfile : current_program_space->objfiles ())
ALL_OBJFILE_OSECTIONS (objfile, objsec)
{
- bfd *ibfd = objfile->obfd;
asection *isec = objsec->the_bfd_section;
asection *isec = objsec->the_bfd_section;
- flagword flags = bfd_
get_section_flags (ibfd,
isec);
+ flagword flags = bfd_
section_flags (
isec);
/* Separate debug info files are irrelevant for gcore. */
if (objfile->separate_debug_objfile_backlink != NULL)
/* Separate debug info files are irrelevant for gcore. */
if (objfile->separate_debug_objfile_backlink != NULL)
@@
-506,7
+490,7
@@
objfile_find_memory_regions (struct target_ops *self,
if ((flags & SEC_ALLOC) || (flags & SEC_LOAD))
{
if ((flags & SEC_ALLOC) || (flags & SEC_LOAD))
{
- int size = bfd_section_size (i
bfd, i
sec);
+ int size = bfd_section_size (isec);
int ret;
ret = (*func) (obj_section_addr (objsec), size,
int ret;
ret = (*func) (obj_section_addr (objsec), size,
@@
-544,15
+528,15
@@
objfile_find_memory_regions (struct target_ops *self,
static void
gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
{
static void
gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
{
- bfd_size_type size, total_size = bfd_section_size (o
bfd, o
sec);
+ bfd_size_type size, total_size = bfd_section_size (osec);
file_ptr offset = 0;
/* Read-only sections are marked; we don't have to copy their contents. */
file_ptr offset = 0;
/* Read-only sections are marked; we don't have to copy their contents. */
- if ((bfd_
get_section_flags (obfd,
osec) & SEC_LOAD) == 0)
+ if ((bfd_
section_flags (
osec) & SEC_LOAD) == 0)
return;
/* Only interested in "load" sections. */
return;
/* Only interested in "load" sections. */
- if (!startswith (bfd_section_name (o
bfd, o
sec), "load"))
+ if (!startswith (bfd_section_name (osec), "load"))
return;
size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES);
return;
size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES);
@@
-563,13
+547,13
@@
gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
if (size > total_size)
size = total_size;
if (size > total_size)
size = total_size;
- if (target_read_memory (bfd_section_vma (o
bfd, o
sec) + offset,
+ if (target_read_memory (bfd_section_vma (osec) + offset,
memhunk.data (), size) != 0)
{
warning (_("Memory read failed for corefile "
"section, %s bytes at %s."),
plongest (size),
memhunk.data (), size) != 0)
{
warning (_("Memory read failed for corefile "
"section, %s bytes at %s."),
plongest (size),
- paddress (target_gdbarch (), bfd_section_vma (o
bfd, o
sec)));
+ paddress (target_gdbarch (), bfd_section_vma (osec)));
break;
}
if (!bfd_set_section_contents (obfd, osec, memhunk.data (),
break;
}
if (!bfd_set_section_contents (obfd, osec, memhunk.data (),
This page took
0.026663 seconds
and
4
git commands to generate.