From 8d7c09b162cd1687e21549f9aaaa3d4a9b39735c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 20 Nov 2009 08:30:20 -0800 Subject: [PATCH] Properly recover from shorter read. (cherry picked from commit 66221417957963c1d2df8d79f43573e328df2275) --- ChangeLog | 6 ++++++ sysdeps/ia64/memchr.S | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34212ee6c8e..e0fd11c15e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-18 H.J. Lu + + [BZ #10162] + * sysdeps/ia64/memchr.S: Don't use a simple loop on data shorter + than software pipeline. Properly recover from shorter read. + 2009-11-16 Jakub Jelinek * sysdeps/unix/sysv/linux/sync_file_range.c (sync_file_range): diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S index cd062b2dd52..cdd71ca5a5a 100644 --- a/sysdeps/ia64/memchr.S +++ b/sysdeps/ia64/memchr.S @@ -126,7 +126,16 @@ ENTRY(__memchr) br.ret.sptk.many b0 .recovery: - adds ret0 = -((MEMLAT + 1) * 8), ret0;; +#if MEMLAT != 6 +# error "MEMLAT must be 6!" +#endif +(p[MEMLAT-6]) add ret0 = -8, ret0;; +(p[MEMLAT-5]) add ret0 = -8, ret0;; +(p[MEMLAT-4]) add ret0 = -8, ret0;; +(p[MEMLAT-3]) add ret0 = -8, ret0;; +(p[MEMLAT-2]) add ret0 = -8, ret0;; +(p[MEMLAT-1]) add ret0 = -8, ret0;; +(p[MEMLAT]) add ret0 = -8, ret0;; (p[MEMLAT+1]) add ret0 = -8, ret0;; (p[MEMLAT+2]) add ret0 = -8, ret0;; .l4: -- 2.47.2