[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8908 - in /fsf/trunk/libc: ./ include/ libio/ sysdeps/powerpc/powerpc32/power6/ sysdeps/x86_64/fpu/bits/
- To: commits@xxxxxxxxxx
- Subject: [commits] r8908 - in /fsf/trunk/libc: ./ include/ libio/ sysdeps/powerpc/powerpc32/power6/ sysdeps/x86_64/fpu/bits/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 02 Sep 2009 07:04:37 -0000
Author: eglibc
Date: Wed Sep 2 00:04:35 2009
New Revision: 8908
Log:
Import glibc-mainline for 2009-09-02
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/include/stdio.h
fsf/trunk/libc/libio/iofflush.c
fsf/trunk/libc/libio/wfileops.c
fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/memcpy.S
fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Sep 2 00:04:35 2009
@@ -1,3 +1,24 @@
+2009-08-31 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * libio/wfileops.c (_IO_wfile_seekoff): Remove dead code and
+ reformulate in-buffer optimisation check to match code in
+ _IO_new_file_seekoff.
+
+2009-08-31 Joshua W. Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/powerpc/powerpc32/power6/memcpy.S: Change srdi instruction
+ to srwi in 32-bit memcpy for power6.
+
+2009-09-01 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * include/stdio.h: Declare hidden proto for fflush.
+ * libio/iofflush.c: Add hidden weak alias for fflush.
+
+2009-09-01 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/x86_64/fpu/bits/mathinline.h: Include bits/wordsize.h.
+ (__signbitf, __signbit): Only use SSE inline asm for 64-bit.
+
2009-08-31 Andreas Schwab <schwab@xxxxxxxxxx>
* sysdeps/x86_64/fpu/bits/mathinline.h: Use __asm instead of asm.
Modified: fsf/trunk/libc/include/stdio.h
==============================================================================
--- fsf/trunk/libc/include/stdio.h (original)
+++ fsf/trunk/libc/include/stdio.h Wed Sep 2 00:04:35 2009
@@ -148,6 +148,7 @@
libc_hidden_proto (fwrite)
libc_hidden_proto (fseek)
libc_hidden_proto (ftello)
+libc_hidden_proto (fflush)
libc_hidden_proto (fflush_unlocked)
libc_hidden_proto (fread_unlocked)
libc_hidden_proto (fwrite_unlocked)
Modified: fsf/trunk/libc/libio/iofflush.c
==============================================================================
--- fsf/trunk/libc/libio/iofflush.c (original)
+++ fsf/trunk/libc/libio/iofflush.c Wed Sep 2 00:04:35 2009
@@ -49,6 +49,7 @@
#ifdef weak_alias
weak_alias (_IO_fflush, fflush)
+libc_hidden_weak (fflush)
#ifndef _IO_MTSAFE_IO
weak_alias (_IO_fflush, fflush_unlocked)
Modified: fsf/trunk/libc/libio/wfileops.c
==============================================================================
--- fsf/trunk/libc/libio/wfileops.c (original)
+++ fsf/trunk/libc/libio/wfileops.c Wed Sep 2 00:04:35 2009
@@ -678,87 +678,55 @@
if (fp->_offset != _IO_pos_BAD && fp->_IO_read_base != NULL
&& !_IO_in_backup (fp))
{
- /* Offset relative to start of main get area. */
- _IO_off64_t rel_offset = (offset - fp->_offset
- + (fp->_IO_read_end - fp->_IO_read_base));
- if (rel_offset >= 0)
- {
-#if 0
- if (_IO_in_backup (fp))
- _IO_switch_to_main_get_area (fp);
-#endif
- if (rel_offset <= fp->_IO_read_end - fp->_IO_read_base)
+ _IO_off64_t start_offset = (fp->_offset
+ - (fp->_IO_read_end - fp->_IO_buf_base));
+ if (offset >= start_offset && offset < fp->_offset)
+ {
+ enum __codecvt_result status;
+ struct _IO_codecvt *cd = fp->_codecvt;
+ const char *read_ptr_copy;
+
+ _IO_setg (fp, fp->_IO_buf_base,
+ fp->_IO_buf_base + (offset - start_offset),
+ fp->_IO_read_end);
+ _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
+
+ /* Now set the pointer for the internal buffer. This
+ might be an iterative process. Though the read
+ pointer is somewhere in the current external buffer
+ this does not mean we can convert this whole buffer
+ at once fitting in the internal buffer. */
+ fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state;
+ read_ptr_copy = fp->_IO_read_base;
+ fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
+ do
{
- enum __codecvt_result status;
- struct _IO_codecvt *cd = fp->_codecvt;
- const char *read_ptr_copy;
-
- fp->_IO_read_ptr = fp->_IO_read_base + rel_offset;
- _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
-
- /* Now set the pointer for the internal buffer. This
- might be an iterative process. Though the read
- pointer is somewhere in the current external buffer
- this does not mean we can convert this whole buffer
- at once fitting in the internal buffer. */
- fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state;
- read_ptr_copy = fp->_IO_read_base;
- fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
- do
+ wchar_t buffer[1024];
+ wchar_t *ignore;
+ status = (*cd->__codecvt_do_in) (cd,
+ &fp->_wide_data->_IO_state,
+ read_ptr_copy,
+ fp->_IO_read_ptr,
+ &read_ptr_copy,
+ buffer,
+ buffer
+ + (sizeof (buffer)
+ / sizeof (buffer[0])),
+ &ignore);
+ if (status != __codecvt_ok && status != __codecvt_partial)
{
- wchar_t buffer[1024];
- wchar_t *ignore;
- status = (*cd->__codecvt_do_in) (cd,
- &fp->_wide_data->_IO_state,
- read_ptr_copy,
- fp->_IO_read_ptr,
- &read_ptr_copy,
- buffer,
- buffer
- + (sizeof (buffer)
- / sizeof (buffer[0])),
- &ignore);
- if (status != __codecvt_ok && status != __codecvt_partial)
- {
- fp->_flags |= _IO_ERR_SEEN;
- goto dumb;
- }
+ fp->_flags |= _IO_ERR_SEEN;
+ goto dumb;
}
- while (read_ptr_copy != fp->_IO_read_ptr);
-
- fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
-
- _IO_mask_flags (fp, 0, _IO_EOF_SEEN);
- goto resync;
}
-#ifdef TODO
- /* If we have streammarkers, seek forward by reading ahead. */
- if (_IO_have_markers (fp))
- {
- int to_skip = rel_offset
- - (fp->_IO_read_ptr - fp->_IO_read_base);
- if (ignore (to_skip) != to_skip)
- goto dumb;
- _IO_mask_flags (fp, 0, _IO_EOF_SEEN);
- goto resync;
- }
-#endif
- }
-#ifdef TODO
- if (rel_offset < 0 && rel_offset >= Bbase () - Bptr ())
- {
- if (!_IO_in_backup (fp))
- _IO_switch_to_backup_area (fp);
- gbump (fp->_IO_read_end + rel_offset - fp->_IO_read_ptr);
+ while (read_ptr_copy != fp->_IO_read_ptr);
+
+ fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
+
_IO_mask_flags (fp, 0, _IO_EOF_SEEN);
goto resync;
}
-#endif
- }
-
-#ifdef TODO
- INTUSE(_IO_unsave_markers) (fp);
-#endif
+ }
if (fp->_flags & _IO_NO_READS)
goto dumb;
Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/memcpy.S Wed Sep 2 00:04:35 2009
@@ -220,7 +220,7 @@
subf 10,0,5
add 12,4,0
blt cr6,5f
- srdi 7,6,16
+ srwi 7,6,16
bgt cr6,3f
sth 6,0(3)
b 7f
Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/bits/mathinline.h Wed Sep 2 00:04:35 2009
@@ -22,6 +22,8 @@
# error "Never use <bits/mathinline.h> directly; include <math.h> instead."
#endif
+#include <bits/wordsize.h>
+
#ifndef __extern_inline
# define __MATH_INLINE __inline
#else
@@ -35,16 +37,26 @@
__MATH_INLINE int
__NTH (__signbitf (float __x))
{
+#if __WORDSIZE == 32
+ __extension__ union { float __f; int __i; } __u = { __f: __x };
+ return __u.__i < 0;
+#else
int __m;
__asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x));
return __m & 0x8;
+#endif
}
__MATH_INLINE int
__NTH (__signbit (double __x))
{
+#if __WORDSIZE == 32
+ __extension__ union { double __d; int __i[2]; } __u = { __d: __x };
+ return __u.__i[1] < 0;
+#else
int __m;
__asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x));
return __m & 0x80;
+#endif
}
__MATH_INLINE int
__NTH (__signbitl (long double __x))