picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use RAX_LP/RDX_LP on SAVE_PTR in x86_64 strtok.S

Browse source
This commit is contained in:
H.J. Lu 2012-06-14 09:58:43 -07:00
parent 834f9b8d3c
commit 49bdf4c19d
4 changed files with 55 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-06-14 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14229]
* string/Makefile (tests): Add tst-strtok_r.
* string/tst-strtok_r.c: New file.
* sysdeps/x86_64/strtok.S: Use LP_SIZE on save_ptr and use
RAX_LP/RDX_LP on SAVE_PTR.
2012-06-14 Roland McGrath <roland@hack.frob.com>
* manual/Makefile ($(objpfx)texis): Do $(make-target-directory).

2
string/Makefile
View file

@ -56,7 +56,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \
bug-strtok1 $(addprefix test-,$(strop-tests)) \
bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \
bug-strstr1 bug-strchr1
bug-strstr1 bug-strchr1 tst-strtok_r
include ../Rules

38
string/tst-strtok_r.c Normal file
View file

@ -0,0 +1,38 @@
/* Test strtok_r regression for BZ #14229.
Copyright (C) 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#define TEST_MAIN
#define BUF1PAGES 1
#include "test-string.h"
int
test_main (void)
{
char line[] = "udf 75868 1 - Live 0xffffffffa0bfb000\n";
char **saveptrp;
char *tok;
test_init ();
/* Check strtok_r won't write beyond the size of (*saveptrp). */
saveptrp = (char **) (buf1 + page_size - sizeof (*saveptrp));
tok = strtok_r (line, " \t", saveptrp);
return strcmp (tok, "udf") != 0;
}
#include "../test-skeleton.c"

17
sysdeps/x86_64/strtok.S
View file

@ -1,6 +1,6 @@
/* strtok (str, delim) -- Return next DELIM separated token from STR.
For AMD x86-64.
Copyright (C) 1998,2000-2003,2005,2006 Free Software Foundation, Inc.
Copyright (C) 1998-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on i686 version contributed by Ulrich Drepper
<drepper@cygnus.com>, 1998.
@ -45,9 +45,9 @@
.bss
.local save_ptr
ASM_TYPE_DIRECTIVE (save_ptr, @object)
.size save_ptr, 8
.size save_ptr, LP_SIZE
save_ptr:
.space 8
.space LP_SIZE
# ifdef PIC
# define SAVE_PTR save_ptr(%rip)
@ -79,13 +79,12 @@ ENTRY (BP_SYM (FUNCTION))
#ifdef USE_AS_STRTOK_R
/* The value is stored in the third argument. */
movq %rdx, %rax
movq %rdx, %r9 /* Save value - see def. of SAVE_PTR. */
movq (%rax), %rax
mov %RDX_LP, %R9_LP /* Save value - see def. of SAVE_PTR. */
mov (%rdx), %RAX_LP
#else
/* The value is in the local variable defined above. But
we have to take care for PIC code. */
movq SAVE_PTR, %rax
mov SAVE_PTR, %RAX_LP
#endif
movq %r8, %rdx /* Get start of string. */
@ -194,7 +193,7 @@ L(8): cmpq %rax, %rdx
cmovne %rcx, %rdx
/* Store the pointer to the next character. */
movq %rdx, SAVE_PTR
mov %RDX_LP, SAVE_PTR
L(epilogue):
/* Remove the stopset table. */
@ -205,7 +204,7 @@ L(epilogue):
L(returnNULL):
xorl %eax, %eax
/* Store the pointer to the next character. */
movq %rdx, SAVE_PTR
mov %RDX_LP, SAVE_PTR
jmp L(epilogue)
END (BP_SYM (FUNCTION))