projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb/jit: return bool in jit_breakpoint_re_set_internal and jit_read_descriptor
[deliverable/binutils-gdb.git]
/
bfd
/
bfdwin.c
diff --git
a/bfd/bfdwin.c
b/bfd/bfdwin.c
index 00d1a146e0728677672456ff5030a47909c9268b..51b4faca76c09027b07edf329bd40199c16c9e9a 100644
(file)
--- a/
bfd/bfdwin.c
+++ b/
bfd/bfdwin.c
@@
-1,32
+1,31
@@
/* Support for memory-mapped windows into a BFD.
/* Support for memory-mapped windows into a BFD.
- Copyright
1995, 1996, 2001, 2002
Free Software Foundation, Inc.
+ Copyright
(C) 1995-2020
Free Software Foundation, Inc.
Written by Cygnus Support.
Written by Cygnus Support.
-This file is part of BFD, the Binary File Descriptor library.
+
This file is part of BFD, the Binary File Descriptor library.
-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 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 3
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.
+
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. */
+ 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., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
-/* Currently, if USE_MMAP is undefined, none if the window stuff is
- used. Okay, so it's mis-named. At least the command-line option
- "--without-mmap" is more obvious than "--without-windows" or some
- such. */
+/* Currently, if USE_MMAP is undefined, none of the window stuff is
+ used. Enabled by --with-mmap. */
#ifdef USE_MMAP
#ifdef USE_MMAP
@@
-78,7
+77,7
@@
bfd_free_window (bfd_window *windowp)
i->refcount--;
if (debug_windows)
fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n",
i->refcount--;
if (debug_windows)
fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n",
- windowp, windowp->data, windowp->size, windowp->i);
+ windowp, windowp->data,
(unsigned long)
windowp->size, windowp->i);
if (i->refcount != 0)
return;
if (i->refcount != 0)
return;
@@
-128,33
+127,38
@@
bfd_get_file_window (bfd *abfd,
if (pagesize == 0)
abort ();
if (pagesize == 0)
abort ();
- if (i ==
0
)
+ if (i ==
NULL
)
{
i = bfd_zmalloc (sizeof (bfd_window_internal));
{
i = bfd_zmalloc (sizeof (bfd_window_internal));
- windowp->i = i;
- if (i == 0)
+ if (i == NULL)
return FALSE;
return FALSE;
- i->data =
0
;
+ i->data =
NULL
;
}
#ifdef HAVE_MMAP
if (ok_to_map
}
#ifdef HAVE_MMAP
if (ok_to_map
- && (i->data ==
0
|| i->mapped == 1)
+ && (i->data ==
NULL
|| i->mapped == 1)
&& (abfd->flags & BFD_IN_MEMORY) == 0)
{
file_ptr file_offset, offset2;
size_t real_size;
int fd;
&& (abfd->flags & BFD_IN_MEMORY) == 0)
{
file_ptr file_offset, offset2;
size_t real_size;
int fd;
- FILE *f;
/* Find the real file and the real offset into it. */
/* Find the real file and the real offset into it. */
- while (abfd->my_archive != NULL)
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
{
offset += abfd->origin;
abfd = abfd->my_archive;
}
{
offset += abfd->origin;
abfd = abfd->my_archive;
}
- f = bfd_cache_lookup (abfd);
- fd = fileno (f);
+ offset += abfd->origin;
+
+ /* Seek into the file, to ensure it is open if cacheable. */
+ if (abfd->iostream == NULL
+ && (abfd->iovec == NULL
+ || abfd->iovec->bseek (abfd, offset, SEEK_SET) != 0))
+ goto free_and_fail;
+ fd = fileno ((FILE *) abfd->iostream);
/* Compute offsets and size for mmap and for the user's data. */
offset2 = offset % pagesize;
if (offset2 < 0)
/* Compute offsets and size for mmap and for the user's data. */
offset2 = offset % pagesize;
if (offset2 < 0)
@@
-165,10
+169,10
@@
bfd_get_file_window (bfd *abfd,
real_size -= real_size % pagesize;
/* If we're re-using a memory region, make sure it's big enough. */
real_size -= real_size % pagesize;
/* If we're re-using a memory region, make sure it's big enough. */
- if (i->data && i->size < size)
+ if (i->data
!= NULL
&& i->size < size)
{
munmap (i->data, i->size);
{
munmap (i->data, i->size);
- i->data =
0
;
+ i->data =
NULL
;
}
i->data = mmap (i->data, real_size,
writable ? PROT_WRITE | PROT_READ : PROT_READ,
}
i->data = mmap (i->data, real_size,
writable ? PROT_WRITE | PROT_READ : PROT_READ,
@@
-181,11
+185,10
@@
bfd_get_file_window (bfd *abfd,
/* An error happened. Report it, or try using malloc, or
something. */
bfd_set_error (bfd_error_system_call);
/* An error happened. Report it, or try using malloc, or
something. */
bfd_set_error (bfd_error_system_call);
- i->data = 0;
windowp->data = 0;
if (debug_windows)
fprintf (stderr, "\t\tmmap failed!\n");
windowp->data = 0;
if (debug_windows)
fprintf (stderr, "\t\tmmap failed!\n");
-
return FALSE
;
+
goto free_and_fail
;
}
if (debug_windows)
fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
}
if (debug_windows)
fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
@@
-194,6
+197,8
@@
bfd_get_file_window (bfd *abfd,
windowp->data = (bfd_byte *) i->data + offset2;
windowp->size = size;
i->mapped = 1;
windowp->data = (bfd_byte *) i->data + offset2;
windowp->size = size;
i->mapped = 1;
+ i->refcount = 1;
+ windowp->i = i;
return TRUE;
}
else if (debug_windows)
return TRUE;
}
else if (debug_windows)
@@
-218,21
+223,24
@@
bfd_get_file_window (bfd *abfd,
if (debug_windows)
fprintf (stderr, "\n\t%s(%6ld)",
i->data ? "realloc" : " malloc", (long) size_to_alloc);
if (debug_windows)
fprintf (stderr, "\n\t%s(%6ld)",
i->data ? "realloc" : " malloc", (long) size_to_alloc);
- i->data = bfd_realloc (i->data, size_to_alloc);
+ i->data = bfd_realloc
_or_free
(i->data, size_to_alloc);
if (debug_windows)
fprintf (stderr, "\t-> %p\n", i->data);
if (debug_windows)
fprintf (stderr, "\t-> %p\n", i->data);
- i->refcount = 1;
if (i->data == NULL)
{
if (size_to_alloc == 0)
if (i->data == NULL)
{
if (size_to_alloc == 0)
- return TRUE;
- return FALSE;
+ {
+ windowp->i = i;
+ return TRUE;
+ }
+ goto free_and_fail;
}
}
+ i->refcount = 1;
if (bfd_seek (abfd, offset, SEEK_SET) != 0)
if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-
return FALSE
;
+
goto free_and_fail
;
i->size = bfd_bread (i->data, size, abfd);
if (i->size != size)
i->size = bfd_bread (i->data, size, abfd);
if (i->size != size)
-
return FALSE
;
+
goto free_and_fail
;
i->mapped = 0;
#ifdef HAVE_MPROTECT
if (!writable)
i->mapped = 0;
#ifdef HAVE_MPROTECT
if (!writable)
@@
-245,7
+253,13
@@
bfd_get_file_window (bfd *abfd,
#endif
windowp->data = i->data;
windowp->size = i->size;
#endif
windowp->data = i->data;
windowp->size = i->size;
+ windowp->i = i;
return TRUE;
return TRUE;
+
+ free_and_fail:
+ /* We have a bfd_window_internal, but an error occurred. Free it. */
+ free (i);
+ return FALSE;
}
#endif /* USE_MMAP */
}
#endif /* USE_MMAP */
This page took
0.025911 seconds
and
4
git commands to generate.