lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Update.

Browse Source 
* elf/dl-load.c: Fix typo in comment.  Add a few more __builtin_expect.
This commit is contained in:
Ulrich Drepper
2002-08-25 19:34:42 +00:00
parent b65d9522d4
commit fd77c3615d
5 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2002-08-25 Ulrich Drepper <drepper@redhat.com> 2002-08-25 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c: Fix typo in comment. Add a few more __builtin_expect.
* sysdeps/generic/dl-cache.h (_dl_cache_libcmp): Define as static * sysdeps/generic/dl-cache.h (_dl_cache_libcmp): Define as static
inline to avoid defining it in every file which includes this header. inline to avoid defining it in every file which includes this header.

23
elf/dl-load.c
View File

@ -902,12 +902,14 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
case PT_LOAD: case PT_LOAD:
/* A load command tells us to map in part of the file. /* A load command tells us to map in part of the file.
We record the load commands and process them all later. */ We record the load commands and process them all later. */
if ((ph->p_align & (GL(dl_pagesize) - 1)) != 0) if (__builtin_expect ((ph->p_align & (GL(dl_pagesize) - 1)) != 0,
0))
{ {
errstring = N_("ELF load command alignment not page-aligned"); errstring = N_("ELF load command alignment not page-aligned");
goto call_lose; goto call_lose;
} }
if (((ph->p_vaddr - ph->p_offset) & (ph->p_align - 1)) != 0) if (__builtin_expect (((ph->p_vaddr - ph->p_offset)
& (ph->p_align - 1)) != 0, 0))
{ {
errstring errstring
= N_("ELF load command address/offset not properly aligned"); = N_("ELF load command address/offset not properly aligned");
@ -988,7 +990,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
l->l_map_start = (ElfW(Addr)) __mmap ((void *) mappref, maplength, l->l_map_start = (ElfW(Addr)) __mmap ((void *) mappref, maplength,
c->prot, MAP_COPY | MAP_FILE, c->prot, MAP_COPY | MAP_FILE,
fd, c->mapoff); fd, c->mapoff);
if ((void *) l->l_map_start == MAP_FAILED) if (__builtin_expect ((void *) l->l_map_start == MAP_FAILED, 0))
{ {
map_error: map_error:
errstring = N_("failed to map segment from shared object"); errstring = N_("failed to map segment from shared object");
@ -1068,8 +1070,13 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
if ((c->prot & PROT_WRITE) == 0) if ((c->prot & PROT_WRITE) == 0)
{ {
/* Dag nab it. */ /* Dag nab it. */
if (__mprotect ((caddr_t) (zero & ~(GL(dl_pagesize) - 1)), if (__builtin_expect (__mprotect ((caddr_t)
GL(dl_pagesize), c->prot|PROT_WRITE) < 0) (zero
& ~(GL(dl_pagesize)
- 1)),
GL(dl_pagesize),
c->prot|PROT_WRITE) < 0,
0))
{ {
errstring = N_("cannot change memory protections"); errstring = N_("cannot change memory protections");
goto call_lose_errno; goto call_lose_errno;
@ -1088,7 +1095,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
mapat = __mmap ((caddr_t) zeropage, zeroend - zeropage, mapat = __mmap ((caddr_t) zeropage, zeroend - zeropage,
c->prot, MAP_ANON|MAP_PRIVATE|MAP_FIXED, c->prot, MAP_ANON|MAP_PRIVATE|MAP_FIXED,
ANONFD, 0); ANONFD, 0);
if (mapat == MAP_FAILED) if (__builtin_expect (mapat == MAP_FAILED, 0))
{ {
errstring = N_("cannot map zero-fill pages"); errstring = N_("cannot map zero-fill pages");
goto call_lose_errno; goto call_lose_errno;
@ -1137,7 +1144,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
if (l->l_ld == 0) if (l->l_ld == 0)
{ {
if (type == ET_DYN) if (__builtin_expect (type == ET_DYN, 0))
{ {
errstring = N_("object file has no dynamic section"); errstring = N_("object file has no dynamic section");
goto call_lose; goto call_lose;
@ -1811,7 +1818,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
fd = open_path (name, namelen, preloaded, &rtld_search_dirs, fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
&realname, &fb); &realname, &fb);
/* Add another newline when we a tracing the library loading. */ /* Add another newline when we are tracing the library loading. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_LIBS, 0))
INTUSE(_dl_debug_printf) ("\n"); INTUSE(_dl_debug_printf) ("\n");
} }

4
linuxthreads/ChangeLog
View File

@ -1,5 +1,9 @@
2002-08-25 Ulrich Drepper <drepper@redhat.com> 2002-08-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/timer_routines.c (thread_func): Make the
compiler happy by adding a return statement which will never be
reached.
* tst-context.c (main): Cast to long before casting to pointer. * tst-context.c (main): Cast to long before casting to pointer.
* Examples/ex17.c (main): Use correct format string. * Examples/ex17.c (main): Use correct format string.

2
linuxthreads/sysdeps/pthread/timer_routines.c
View File

@ -450,6 +450,8 @@ thread_func (void *arg)
forever - but we have to add it for proper nesting. */ forever - but we have to add it for proper nesting. */
pthread_cleanup_pop (1); pthread_cleanup_pop (1);
/* NOTREACHED */
return NULL;
} }

40
manual/lang.texi
View File

@ -93,7 +93,7 @@ The @code{assert_perror} macro makes this easy.
@deftypefn Macro void assert_perror (int @var{errnum}) @deftypefn Macro void assert_perror (int @var{errnum})
Similar to @code{assert}, but verifies that @var{errnum} is zero. Similar to @code{assert}, but verifies that @var{errnum} is zero.
If @code{NDEBUG} is defined, @code{assert_perror} tests the value of If @code{NDEBUG} is not defined, @code{assert_perror} tests the value of
@var{errnum}. If it is nonzero, @code{assert_perror} aborts the program @var{errnum}. If it is nonzero, @code{assert_perror} aborts the program
after printing a message of the form: after printing a message of the form:
@ -121,12 +121,12 @@ reporting invalid input or improper usage by the @emph{user} of the
program. program.
The information in the diagnostic messages printed by the @code{assert} The information in the diagnostic messages printed by the @code{assert}
and @code{assert_perror} macro is intended to help you, the programmer, and @code{assert_perror} macro is intended to help you, the programmer,
track down the cause of a bug, but is not really useful for telling a user track down the cause of a bug, but is not really useful for telling a user
of your program why his or her input was invalid or why a command could not of your program why his or her input was invalid or why a command could not
be carried out. What's more, your program should not abort when given be carried out. What's more, your program should not abort when given
invalid input, as @code{assert} would do---it should exit with nonzero invalid input, as @code{assert} would do---it should exit with nonzero
status (@pxref{Exit Status}) after printing its error messages, or perhaps status (@pxref{Exit Status}) after printing its error messages, or perhaps
read another command or move on to the next input file. read another command or move on to the next input file.
@xref{Error Messages}, for information on printing error messages for @xref{Error Messages}, for information on printing error messages for
@ -253,8 +253,8 @@ func (const char *a, int b, @dots{})
@end smallexample @end smallexample
@noindent @noindent
defines a function @code{func} which returns an @code{int} and takes two defines a function @code{func} which returns an @code{int} and takes two
required arguments, a @code{const char *} and an @code{int}. These are required arguments, a @code{const char *} and an @code{int}. These are
followed by any number of anonymous arguments. followed by any number of anonymous arguments.
@strong{Portability note:} For some C compilers, the last required @strong{Portability note:} For some C compilers, the last required
@ -299,9 +299,9 @@ values if you try to access too many arguments.
You indicate that you are finished with the argument pointer variable by You indicate that you are finished with the argument pointer variable by
calling @code{va_end}. calling @code{va_end}.
(In practice, with most C compilers, calling @code{va_end} does nothing. (In practice, with most C compilers, calling @code{va_end} does nothing.
This is always true in the GNU C compiler. But you might as well call This is always true in the GNU C compiler. But you might as well call
@code{va_end} just in case your program is someday compiled with a peculiar @code{va_end} just in case your program is someday compiled with a peculiar
compiler.) compiler.)
@end enumerate @end enumerate
@ -338,8 +338,8 @@ regardless.
There is no general way for a function to determine the number and type There is no general way for a function to determine the number and type
of the optional arguments it was called with. So whoever designs the of the optional arguments it was called with. So whoever designs the
function typically designs a convention for the caller to specify the number function typically designs a convention for the caller to specify the number
and type of arguments. It is up to you to define an appropriate calling and type of arguments. It is up to you to define an appropriate calling
convention for each variadic function, and write all calls accordingly. convention for each variadic function, and write all calls accordingly.
One kind of calling convention is to pass the number of optional One kind of calling convention is to pass the number of optional
@ -463,7 +463,7 @@ Sometimes it is necessary to parse the list of parameters more than once
or one wants to remember a certain position in the parameter list. To or one wants to remember a certain position in the parameter list. To
do this, one will have to make a copy of the current value of the do this, one will have to make a copy of the current value of the
argument. But @code{va_list} is an opaque type and one cannot necessarily argument. But @code{va_list} is an opaque type and one cannot necessarily
assign the value of one variable of type @code{va_list} to another variable assign the value of one variable of type @code{va_list} to another variable
of the same type. of the same type.
@comment stdarg.h @comment stdarg.h
@ -479,7 +479,7 @@ the next update of the ISO C standard.
@end deftypefn @end deftypefn
If you want to use @code{__va_copy} you should always be prepared for the If you want to use @code{__va_copy} you should always be prepared for the
possibility that this macro will not be available. On architectures where a possibility that this macro will not be available. On architectures where a
simple assignment is invalid, hopefully @code{__va_copy} @emph{will} be available, simple assignment is invalid, hopefully @code{__va_copy} @emph{will} be available,
so one should always write something like this: so one should always write something like this:
@ -952,10 +952,10 @@ low-level aspects of the representation.
@end itemize @end itemize
The mantissa of a floating point number represents an implicit fraction The mantissa of a floating point number represents an implicit fraction
whose denominator is the base raised to the power of the precision. Since whose denominator is the base raised to the power of the precision. Since
the largest representable mantissa is one less than this denominator, the the largest representable mantissa is one less than this denominator, the
value of the fraction is always strictly less than @code{1}. The value of the fraction is always strictly less than @code{1}. The
mathematical value of a floating point number is then the product of this mathematical value of a floating point number is then the product of this
fraction, the sign, and the base raised to the exponent. fraction, the sign, and the base raised to the exponent.
@cindex normalized floating point number @cindex normalized floating point number