From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa36.google.com (mail-vk1-xa36.google.com [IPv6:2607:f8b0:4864:20::a36]) by sourceware.org (Postfix) with ESMTPS id 96AA83886C48; Thu, 12 May 2022 19:48:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 96AA83886C48 Received: by mail-vk1-xa36.google.com with SMTP id h144so3213906vkh.3; Thu, 12 May 2022 12:48:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mQfNUjG1bi+uvPEh+Pb9e+E93tvMJQ5ne5dI07zrRAQ=; b=es8SfRPPQpSn3Cs0pxIdXAAwCQ6XnoWKshUwUCx4MrQUmLmksJ8iYogIiE52oyiM4M UxNvHuZFNFrR3KeyE39GpNU58VEZagzV5wcVeR4V52VxqCz8axE9pMoe3QnSG9d6Gepr ly5T6XaLkKPdnGv4bZPf1MmfSaO42Yzzrd9KwBETUIomaBLdP/3V8vOdSIXU2nWSha94 lc/7BhUaprHsiI7ygrcFkzkKjfqAH8WJjF72rstaYfAnw1zkCLlzisg+OSHzVt2CFUEf hlMZABCQs/xpR4sU9lQAI3CNEUAM1htFPb2sSQIIBdBlWJmiHGXJjZOlcXBHXXAhbObe eG4A== X-Gm-Message-State: AOAM530eB05r50U4iXPerOsBX91sHJSYphtbEY+Ii+gAs6ioA2MNUSGk WTj24NEm8mfsgbEfs/j0vxFzgdiiDV8hPNzESV4O+FIZCds= X-Google-Smtp-Source: ABdhPJxiyt1gkID3zdL5eP7URbgjDVZaHOPuCo1xk/nPfZk/Svxh9NWy/tD3T8QRVRJQbrtkR/V9p3v5L+AQ+suAgII= X-Received: by 2002:a1f:6003:0:b0:34d:3d07:5827 with SMTP id u3-20020a1f6003000000b0034d3d075827mr1089277vkb.30.1652384883691; Thu, 12 May 2022 12:48:03 -0700 (PDT) MIME-Version: 1.0 References: <20220323215734.3927131-21-goldstein.w.n@gmail.com> <20220324235613.2445581-1-goldstein.w.n@gmail.com> <20220324235613.2445581-2-goldstein.w.n@gmail.com> In-Reply-To: From: Sunil Pandey Date: Thu, 12 May 2022 12:47:27 -0700 Message-ID: Subject: Re: [PATCH v4 22/23] x86: Add EVEX optimized str{n}casecmp To: Noah Goldstein , Libc-stable Mailing List Cc: "H.J. Lu" , GNU C Library Content-Type: multipart/mixed; boundary="0000000000000665d405ded5d693" X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2022 19:48:09 -0000 --0000000000000665d405ded5d693 Content-Type: text/plain; charset="UTF-8" On Fri, Mar 25, 2022 at 11:20 AM Noah Goldstein via Libc-alpha wrote: > > On Fri, Mar 25, 2022 at 1:15 PM H.J. Lu wrote: > > > > On Thu, Mar 24, 2022 at 4:56 PM Noah Goldstein wrote: > > > > > > geometric_mean(N=40) of all benchmarks EVEX / SSE42: .621 > > > > > > All string/memory tests pass. > > > Reviewed-by: H.J. Lu > > > --- > > > sysdeps/x86_64/multiarch/Makefile | 2 + > > > sysdeps/x86_64/multiarch/ifunc-impl-list.c | 16 + > > > sysdeps/x86_64/multiarch/ifunc-strcasecmp.h | 5 + > > > sysdeps/x86_64/multiarch/strcasecmp_l-evex.S | 23 ++ > > > sysdeps/x86_64/multiarch/strcmp-evex.S | 290 ++++++++++++++++--- > > > sysdeps/x86_64/multiarch/strncase_l-evex.S | 25 ++ > > > 6 files changed, 321 insertions(+), 40 deletions(-) > > > create mode 100644 sysdeps/x86_64/multiarch/strcasecmp_l-evex.S > > > create mode 100644 sysdeps/x86_64/multiarch/strncase_l-evex.S > > > > > > diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile > > > index 06e1848823..35d80dc2ff 100644 > > > --- a/sysdeps/x86_64/multiarch/Makefile > > > +++ b/sysdeps/x86_64/multiarch/Makefile > > > @@ -57,6 +57,7 @@ sysdep_routines += \ > > > strcasecmp_l-avx \ > > > strcasecmp_l-avx2 \ > > > strcasecmp_l-avx2-rtm \ > > > + strcasecmp_l-evex \ > > > strcasecmp_l-sse2 \ > > > strcasecmp_l-sse4_2 \ > > > strcasecmp_l-ssse3 \ > > > @@ -97,6 +98,7 @@ sysdep_routines += \ > > > strncase_l-avx \ > > > strncase_l-avx2 \ > > > strncase_l-avx2-rtm \ > > > + strncase_l-evex \ > > > strncase_l-sse2 \ > > > strncase_l-sse4_2 \ > > > strncase_l-ssse3 \ > > > diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > index 3c556d07ac..f1a4d3dac2 100644 > > > --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > > > @@ -436,6 +436,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > > > > /* Support sysdeps/x86_64/multiarch/strcasecmp_l.c. */ > > > IFUNC_IMPL (i, name, strcasecmp, > > > + IFUNC_IMPL_ADD (array, i, strcasecmp, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW)), > > > + __strcasecmp_evex) > > > IFUNC_IMPL_ADD (array, i, strcasecmp, > > > CPU_FEATURE_USABLE (AVX2), > > > __strcasecmp_avx2) > > > @@ -456,6 +460,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > > > > /* Support sysdeps/x86_64/multiarch/strcasecmp_l.c. */ > > > IFUNC_IMPL (i, name, strcasecmp_l, > > > + IFUNC_IMPL_ADD (array, i, strcasecmp, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW)), > > > + __strcasecmp_l_evex) > > > IFUNC_IMPL_ADD (array, i, strcasecmp, > > > CPU_FEATURE_USABLE (AVX2), > > > __strcasecmp_l_avx2) > > > @@ -590,6 +598,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > > > > /* Support sysdeps/x86_64/multiarch/strncase_l.c. */ > > > IFUNC_IMPL (i, name, strncasecmp, > > > + IFUNC_IMPL_ADD (array, i, strncasecmp, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW)), > > > + __strncasecmp_evex) > > > IFUNC_IMPL_ADD (array, i, strncasecmp, > > > CPU_FEATURE_USABLE (AVX2), > > > __strncasecmp_avx2) > > > @@ -611,6 +623,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > > > > > > /* Support sysdeps/x86_64/multiarch/strncase_l.c. */ > > > IFUNC_IMPL (i, name, strncasecmp_l, > > > + IFUNC_IMPL_ADD (array, i, strncasecmp, > > > + (CPU_FEATURE_USABLE (AVX512VL) > > > + && CPU_FEATURE_USABLE (AVX512BW)), > > > + __strncasecmp_l_evex) > > > IFUNC_IMPL_ADD (array, i, strncasecmp, > > > CPU_FEATURE_USABLE (AVX2), > > > __strncasecmp_l_avx2) > > > diff --git a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h > > > index c4de111fd0..bf0d146e7f 100644 > > > --- a/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h > > > +++ b/sysdeps/x86_64/multiarch/ifunc-strcasecmp.h > > > @@ -25,6 +25,7 @@ extern __typeof (REDIRECT_NAME) OPTIMIZE (sse42) attribute_hidden; > > > extern __typeof (REDIRECT_NAME) OPTIMIZE (avx) attribute_hidden; > > > extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2) attribute_hidden; > > > extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_rtm) attribute_hidden; > > > +extern __typeof (REDIRECT_NAME) OPTIMIZE (evex) attribute_hidden; > > > > > > static inline void * > > > IFUNC_SELECTOR (void) > > > @@ -34,6 +35,10 @@ IFUNC_SELECTOR (void) > > > if (CPU_FEATURE_USABLE_P (cpu_features, AVX2) > > > && CPU_FEATURES_ARCH_P (cpu_features, AVX_Fast_Unaligned_Load)) > > > { > > > + if (CPU_FEATURE_USABLE_P (cpu_features, AVX512VL) > > > + && CPU_FEATURE_USABLE_P (cpu_features, AVX512BW)) > > > + return OPTIMIZE (evex); > > > + > > > if (CPU_FEATURE_USABLE_P (cpu_features, RTM)) > > > return OPTIMIZE (avx2_rtm); > > > > > > diff --git a/sysdeps/x86_64/multiarch/strcasecmp_l-evex.S b/sysdeps/x86_64/multiarch/strcasecmp_l-evex.S > > > new file mode 100644 > > > index 0000000000..58642db748 > > > --- /dev/null > > > +++ b/sysdeps/x86_64/multiarch/strcasecmp_l-evex.S > > > @@ -0,0 +1,23 @@ > > > +/* strcasecmp_l optimized with EVEX. > > > + Copyright (C) 2017-2022 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 > > > + . */ > > > + > > > +#ifndef STRCMP > > > +# define STRCMP __strcasecmp_l_evex > > > +#endif > > > +#define USE_AS_STRCASECMP_L > > > +#include "strcmp-evex.S" > > > diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S > > > index 56d8c118e4..2a5b3ce037 100644 > > > --- a/sysdeps/x86_64/multiarch/strcmp-evex.S > > > +++ b/sysdeps/x86_64/multiarch/strcmp-evex.S > > > @@ -19,6 +19,9 @@ > > > #if IS_IN (libc) > > > > > > # include > > > +# if defined USE_AS_STRCASECMP_L > > > +# include "locale-defines.h" > > > +# endif > > > > > > # ifndef STRCMP > > > # define STRCMP __strcmp_evex > > > @@ -34,19 +37,29 @@ > > > # define VMOVA vmovdqa64 > > > > > > # ifdef USE_AS_WCSCMP > > > -# define TESTEQ subl $0xff, > > > +# ifndef OVERFLOW_STRCMP > > > +# define OVERFLOW_STRCMP __wcscmp_evex > > > +# endif > > > + > > > +# define TESTEQ subl $0xff, > > > /* Compare packed dwords. */ > > > # define VPCMP vpcmpd > > > # define VPMINU vpminud > > > # define VPTESTM vptestmd > > > +# define VPTESTNM vptestnmd > > > /* 1 dword char == 4 bytes. */ > > > # define SIZE_OF_CHAR 4 > > > # else > > > +# ifndef OVERFLOW_STRCMP > > > +# define OVERFLOW_STRCMP __strcmp_evex > > > +# endif > > > + > > > # define TESTEQ incl > > > /* Compare packed bytes. */ > > > # define VPCMP vpcmpb > > > # define VPMINU vpminub > > > # define VPTESTM vptestmb > > > +# define VPTESTNM vptestnmb > > > /* 1 byte char == 1 byte. */ > > > # define SIZE_OF_CHAR 1 > > > # endif > > > @@ -73,11 +86,16 @@ > > > # define VEC_OFFSET (-VEC_SIZE) > > > # endif > > > > > > -# define XMMZERO xmm16 > > > # define XMM0 xmm17 > > > # define XMM1 xmm18 > > > > > > -# define YMMZERO ymm16 > > > +# define XMM10 xmm27 > > > +# define XMM11 xmm28 > > > +# define XMM12 xmm29 > > > +# define XMM13 xmm30 > > > +# define XMM14 xmm31 > > > + > > > + > > > # define YMM0 ymm17 > > > # define YMM1 ymm18 > > > # define YMM2 ymm19 > > > @@ -89,6 +107,87 @@ > > > # define YMM8 ymm25 > > > # define YMM9 ymm26 > > > # define YMM10 ymm27 > > > +# define YMM11 ymm28 > > > +# define YMM12 ymm29 > > > +# define YMM13 ymm30 > > > +# define YMM14 ymm31 > > > + > > > +# ifdef USE_AS_STRCASECMP_L > > > +# define BYTE_LOOP_REG OFFSET_REG > > > +# else > > > +# define BYTE_LOOP_REG ecx > > > +# endif > > > + > > > +# ifdef USE_AS_STRCASECMP_L > > > +# ifdef USE_AS_STRNCMP > > > +# define STRCASECMP __strncasecmp_evex > > > +# define LOCALE_REG rcx > > > +# define LOCALE_REG_LP RCX_LP > > > +# define STRCASECMP_NONASCII __strncasecmp_l_nonascii > > > +# else > > > +# define STRCASECMP __strcasecmp_evex > > > +# define LOCALE_REG rdx > > > +# define LOCALE_REG_LP RDX_LP > > > +# define STRCASECMP_NONASCII __strcasecmp_l_nonascii > > > +# endif > > > +# endif > > > + > > > +# define LCASE_MIN_YMM %YMM12 > > > +# define LCASE_MAX_YMM %YMM13 > > > +# define CASE_ADD_YMM %YMM14 > > > + > > > +# define LCASE_MIN_XMM %XMM12 > > > +# define LCASE_MAX_XMM %XMM13 > > > +# define CASE_ADD_XMM %XMM14 > > > + > > > + /* NB: wcsncmp uses r11 but strcasecmp is never used in > > > + conjunction with wcscmp. */ > > > +# define TOLOWER_BASE %r11 > > > + > > > +# ifdef USE_AS_STRCASECMP_L > > > +# define _REG(x, y) x ## y > > > +# define REG(x, y) _REG(x, y) > > > +# define TOLOWER(reg1, reg2, ext) \ > > > + vpsubb REG(LCASE_MIN_, ext), reg1, REG(%ext, 10); \ > > > + vpsubb REG(LCASE_MIN_, ext), reg2, REG(%ext, 11); \ > > > + vpcmpub $1, REG(LCASE_MAX_, ext), REG(%ext, 10), %k5; \ > > > + vpcmpub $1, REG(LCASE_MAX_, ext), REG(%ext, 11), %k6; \ > > > + vpaddb reg1, REG(CASE_ADD_, ext), reg1{%k5}; \ > > > + vpaddb reg2, REG(CASE_ADD_, ext), reg2{%k6} > > > + > > > +# define TOLOWER_gpr(src, dst) movl (TOLOWER_BASE, src, 4), dst > > > +# define TOLOWER_YMM(...) TOLOWER(__VA_ARGS__, YMM) > > > +# define TOLOWER_XMM(...) TOLOWER(__VA_ARGS__, XMM) > > > + > > > +# define CMP_R1_R2(s1_reg, s2_reg, reg_out, ext) \ > > > + TOLOWER (s1_reg, s2_reg, ext); \ > > > + VPCMP $0, s1_reg, s2_reg, reg_out > > > + > > > +# define CMP_R1_S2(s1_reg, s2_mem, s2_reg, reg_out, ext) \ > > > + VMOVU s2_mem, s2_reg; \ > > > + CMP_R1_R2(s1_reg, s2_reg, reg_out, ext) > > > + > > > +# define CMP_R1_R2_YMM(...) CMP_R1_R2(__VA_ARGS__, YMM) > > > +# define CMP_R1_R2_XMM(...) CMP_R1_R2(__VA_ARGS__, XMM) > > > + > > > +# define CMP_R1_S2_YMM(...) CMP_R1_S2(__VA_ARGS__, YMM) > > > +# define CMP_R1_S2_XMM(...) CMP_R1_S2(__VA_ARGS__, XMM) > > > + > > > +# else > > > +# define TOLOWER_gpr(...) > > > +# define TOLOWER_YMM(...) > > > +# define TOLOWER_XMM(...) > > > + > > > +# define CMP_R1_R2_YMM(s1_reg, s2_reg, reg_out) \ > > > + VPCMP $0, s2_reg, s1_reg, reg_out > > > + > > > +# define CMP_R1_R2_XMM(...) CMP_R1_R2_YMM(__VA_ARGS__) > > > + > > > +# define CMP_R1_S2_YMM(s1_reg, s2_mem, unused, reg_out) \ > > > + VPCMP $0, s2_mem, s1_reg, reg_out > > > + > > > +# define CMP_R1_S2_XMM(...) CMP_R1_S2_YMM(__VA_ARGS__) > > > +# endif > > > > > > /* Warning! > > > wcscmp/wcsncmp have to use SIGNED comparison for elements. > > > @@ -112,8 +211,45 @@ > > > returned. */ > > > > > > .section .text.evex, "ax", @progbits > > > -ENTRY(STRCMP) > > > + .align 16 > > > + .type STRCMP, @function > > > + .globl STRCMP > > > + .hidden STRCMP > > > + > > > +# ifdef USE_AS_STRCASECMP_L > > > +ENTRY (STRCASECMP) > > > + movq __libc_tsd_LOCALE@gottpoff(%rip), %rax > > > + mov %fs:(%rax), %LOCALE_REG_LP > > > + > > > + /* Either 1 or 5 bytes (dependeing if CET is enabled). */ > > > + .p2align 4 > > > +END (STRCASECMP) > > > + /* FALLTHROUGH to strcasecmp/strncasecmp_l. */ > > > +# endif > > > + > > > + .p2align 4 > > > +STRCMP: > > > + cfi_startproc > > > + _CET_ENDBR > > > + CALL_MCOUNT > > > + > > > +# if defined USE_AS_STRCASECMP_L > > > + /* We have to fall back on the C implementation for locales with > > > + encodings not matching ASCII for single bytes. */ > > > +# if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0 > > > + mov LOCALE_T___LOCALES + LC_CTYPE * LP_SIZE(%LOCALE_REG), %RAX_LP > > > +# else > > > + mov (%LOCALE_REG), %RAX_LP > > > +# endif > > > + testl $1, LOCALE_DATA_VALUES + _NL_CTYPE_NONASCII_CASE * SIZEOF_VALUES(%rax) > > > + jne STRCASECMP_NONASCII > > > + leaq _nl_C_LC_CTYPE_tolower + 128 * 4(%rip), TOLOWER_BASE > > > +# endif > > > + > > > # ifdef USE_AS_STRNCMP > > > + /* Don't overwrite LOCALE_REG (rcx) until we have pass > > > + L(one_or_less). Otherwise we might use the wrong locale in > > > + the OVERFLOW_STRCMP (strcasecmp_l). */ > > > # ifdef __ILP32__ > > > /* Clear the upper 32 bits. */ > > > movl %edx, %edx > > > @@ -125,6 +261,32 @@ ENTRY(STRCMP) > > > actually bound the buffer. */ > > > jle L(one_or_less) > > > # endif > > > + > > > +# if defined USE_AS_STRCASECMP_L > > > + .section .rodata.cst32, "aM", @progbits, 32 > > > + .align 32 > > > +L(lcase_min): > > > + .quad 0x4141414141414141 > > > + .quad 0x4141414141414141 > > > + .quad 0x4141414141414141 > > > + .quad 0x4141414141414141 > > > +L(lcase_max): > > > + .quad 0x1a1a1a1a1a1a1a1a > > > + .quad 0x1a1a1a1a1a1a1a1a > > > + .quad 0x1a1a1a1a1a1a1a1a > > > + .quad 0x1a1a1a1a1a1a1a1a > > > +L(case_add): > > > + .quad 0x2020202020202020 > > > + .quad 0x2020202020202020 > > > + .quad 0x2020202020202020 > > > + .quad 0x2020202020202020 > > > + .previous > > > + > > > + vmovdqa64 L(lcase_min)(%rip), LCASE_MIN_YMM > > > + vmovdqa64 L(lcase_max)(%rip), LCASE_MAX_YMM > > > + vmovdqa64 L(case_add)(%rip), CASE_ADD_YMM > > > +# endif > > > + > > > movl %edi, %eax > > > orl %esi, %eax > > > /* Shift out the bits irrelivant to page boundary ([63:12]). */ > > > @@ -139,7 +301,7 @@ L(no_page_cross): > > > VPTESTM %YMM0, %YMM0, %k2 > > > /* Each bit cleared in K1 represents a mismatch or a null CHAR > > > in YMM0 and 32 bytes at (%rsi). */ > > > - VPCMP $0, (%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > # ifdef USE_AS_STRNCMP > > > cmpq $CHAR_PER_VEC, %rdx > > > @@ -169,6 +331,8 @@ L(return_vec_0): > > > # else > > > movzbl (%rdi, %rcx), %eax > > > movzbl (%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > # endif > > > L(ret0): > > > @@ -188,11 +352,15 @@ L(ret_zero): > > > > > > .p2align 4,, 5 > > > L(one_or_less): > > > +# ifdef USE_AS_STRCASECMP_L > > > + /* Set locale argument for strcasecmp. */ > > > + movq %LOCALE_REG, %rdx > > > +# endif > > > jb L(ret_zero) > > > -# ifdef USE_AS_WCSCMP > > > /* 'nbe' covers the case where length is negative (large > > > unsigned). */ > > > - jnbe __wcscmp_evex > > > + jnbe OVERFLOW_STRCMP > > > +# ifdef USE_AS_WCSCMP > > > movl (%rdi), %edx > > > xorl %eax, %eax > > > cmpl (%rsi), %edx > > > @@ -201,11 +369,10 @@ L(one_or_less): > > > negl %eax > > > orl $1, %eax > > > # else > > > - /* 'nbe' covers the case where length is negative (large > > > - unsigned). */ > > > - jnbe __strcmp_evex > > > movzbl (%rdi), %eax > > > movzbl (%rsi), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > # endif > > > L(ret1): > > > @@ -233,6 +400,8 @@ L(return_vec_1): > > > # else > > > movzbl VEC_SIZE(%rdi, %rcx), %eax > > > movzbl VEC_SIZE(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > # endif > > > L(ret2): > > > @@ -270,6 +439,8 @@ L(return_vec_2): > > > # else > > > movzbl (VEC_SIZE * 2)(%rdi, %rcx), %eax > > > movzbl (VEC_SIZE * 2)(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > # endif > > > L(ret3): > > > @@ -290,6 +461,8 @@ L(return_vec_3): > > > # else > > > movzbl (VEC_SIZE * 3)(%rdi, %rcx), %eax > > > movzbl (VEC_SIZE * 3)(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > # endif > > > L(ret4): > > > @@ -303,7 +476,7 @@ L(more_3x_vec): > > > /* Safe to compare 4x vectors. */ > > > VMOVU (VEC_SIZE)(%rdi), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (VEC_SIZE)(%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, VEC_SIZE(%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_1) > > > @@ -315,14 +488,14 @@ L(more_3x_vec): > > > > > > VMOVU (VEC_SIZE * 2)(%rdi), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (VEC_SIZE * 2)(%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (VEC_SIZE * 2)(%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_2) > > > > > > VMOVU (VEC_SIZE * 3)(%rdi), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (VEC_SIZE * 3)(%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (VEC_SIZE * 3)(%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_3) > > > @@ -381,7 +554,6 @@ L(prepare_loop_aligned): > > > subl %esi, %eax > > > andl $(PAGE_SIZE - 1), %eax > > > > > > - vpxorq %YMMZERO, %YMMZERO, %YMMZERO > > > > > > /* Loop 4x comparisons at a time. */ > > > .p2align 4 > > > @@ -413,22 +585,35 @@ L(loop_skip_page_cross_check): > > > /* A zero CHAR in YMM9 means that there is a null CHAR. */ > > > VPMINU %YMM8, %YMM9, %YMM9 > > > > > > - /* Each bit set in K1 represents a non-null CHAR in YMM8. */ > > > + /* Each bit set in K1 represents a non-null CHAR in YMM9. */ > > > VPTESTM %YMM9, %YMM9, %k1 > > > - > > > +# ifndef USE_AS_STRCASECMP_L > > > vpxorq (VEC_SIZE * 0)(%rsi), %YMM0, %YMM1 > > > vpxorq (VEC_SIZE * 1)(%rsi), %YMM2, %YMM3 > > > vpxorq (VEC_SIZE * 2)(%rsi), %YMM4, %YMM5 > > > /* Ternary logic to xor (VEC_SIZE * 3)(%rsi) with YMM6 while > > > oring with YMM1. Result is stored in YMM6. */ > > > vpternlogd $0xde, (VEC_SIZE * 3)(%rsi), %YMM1, %YMM6 > > > - > > > +# else > > > + VMOVU (VEC_SIZE * 0)(%rsi), %YMM1 > > > + TOLOWER_YMM (%YMM0, %YMM1) > > > + VMOVU (VEC_SIZE * 1)(%rsi), %YMM3 > > > + TOLOWER_YMM (%YMM2, %YMM3) > > > + VMOVU (VEC_SIZE * 2)(%rsi), %YMM5 > > > + TOLOWER_YMM (%YMM4, %YMM5) > > > + VMOVU (VEC_SIZE * 3)(%rsi), %YMM7 > > > + TOLOWER_YMM (%YMM6, %YMM7) > > > + vpxorq %YMM0, %YMM1, %YMM1 > > > + vpxorq %YMM2, %YMM3, %YMM3 > > > + vpxorq %YMM4, %YMM5, %YMM5 > > > + vpternlogd $0xde, %YMM7, %YMM1, %YMM6 > > > +# endif > > > /* Or together YMM3, YMM5, and YMM6. */ > > > vpternlogd $0xfe, %YMM3, %YMM5, %YMM6 > > > > > > > > > /* A non-zero CHAR in YMM6 represents a mismatch. */ > > > - VPCMP $0, %YMMZERO, %YMM6, %k0{%k1} > > > + VPTESTNM %YMM6, %YMM6, %k0{%k1} > > > kmovd %k0, %LOOP_REG > > > > > > TESTEQ %LOOP_REG > > > @@ -437,13 +622,13 @@ L(loop_skip_page_cross_check): > > > > > > /* Find which VEC has the mismatch of end of string. */ > > > VPTESTM %YMM0, %YMM0, %k1 > > > - VPCMP $0, %YMMZERO, %YMM1, %k0{%k1} > > > + VPTESTNM %YMM1, %YMM1, %k0{%k1} > > > kmovd %k0, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_0_end) > > > > > > VPTESTM %YMM2, %YMM2, %k1 > > > - VPCMP $0, %YMMZERO, %YMM3, %k0{%k1} > > > + VPTESTNM %YMM3, %YMM3, %k0{%k1} > > > kmovd %k0, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_1_end) > > > @@ -457,7 +642,7 @@ L(return_vec_2_3_end): > > > # endif > > > > > > VPTESTM %YMM4, %YMM4, %k1 > > > - VPCMP $0, %YMMZERO, %YMM5, %k0{%k1} > > > + VPTESTNM %YMM5, %YMM5, %k0{%k1} > > > kmovd %k0, %ecx > > > TESTEQ %ecx > > > # if CHAR_PER_VEC <= 16 > > > @@ -493,6 +678,8 @@ L(return_vec_3_end): > > > # else > > > movzbl (VEC_SIZE * 2)(%rdi, %LOOP_REG64), %eax > > > movzbl (VEC_SIZE * 2)(%rsi, %LOOP_REG64), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > xorl %r8d, %eax > > > subl %r8d, %eax > > > @@ -545,6 +732,8 @@ L(return_vec_0_end): > > > # else > > > movzbl (%rdi, %rcx), %eax > > > movzbl (%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > /* Flip `eax` if `rdi` and `rsi` where swapped in page cross > > > logic. Subtract `r8d` after xor for zero case. */ > > > @@ -569,6 +758,8 @@ L(return_vec_1_end): > > > # else > > > movzbl VEC_SIZE(%rdi, %rcx), %eax > > > movzbl VEC_SIZE(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > xorl %r8d, %eax > > > subl %r8d, %eax > > > @@ -598,7 +789,7 @@ L(page_cross_during_loop): > > > > > > VMOVA (%rdi), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_0_end) > > > @@ -619,8 +810,7 @@ L(less_1x_vec_till_page_cross): > > > been loaded earlier so must be valid. */ > > > VMOVU -VEC_SIZE(%rdi, %rax), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, -VEC_SIZE(%rsi, %rax), %YMM0, %k1{%k2} > > > - > > > + CMP_R1_S2_YMM (%YMM0, -VEC_SIZE(%rsi, %rax), %YMM1, %k1){%k2} > > > /* Mask of potentially valid bits. The lower bits can be out of > > > range comparisons (but safe regarding page crosses). */ > > > > > > @@ -642,6 +832,8 @@ L(less_1x_vec_till_page_cross): > > > > > > # ifdef USE_AS_STRNCMP > > > # ifdef USE_AS_WCSCMP > > > + /* NB: strcasecmp not used with WCSCMP so this access to r11 is > > > + safe. */ > > > movl %eax, %r11d > > > shrl $2, %r11d > > > cmpq %r11, %rdx > > > @@ -679,6 +871,8 @@ L(return_page_cross_cmp_mem): > > > # else > > > movzbl VEC_OFFSET(%rdi, %rcx), %eax > > > movzbl VEC_OFFSET(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > xorl %r8d, %eax > > > subl %r8d, %eax > > > @@ -709,7 +903,7 @@ L(more_2x_vec_till_page_cross): > > > > > > VMOVA VEC_SIZE(%rdi), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, VEC_SIZE(%rsi), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, VEC_SIZE(%rsi), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_1_end) > > > @@ -724,14 +918,14 @@ L(more_2x_vec_till_page_cross): > > > /* Safe to include comparisons from lower bytes. */ > > > VMOVU -(VEC_SIZE * 2)(%rdi, %rax), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, -(VEC_SIZE * 2)(%rsi, %rax), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, -(VEC_SIZE * 2)(%rsi, %rax), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_page_cross_0) > > > > > > VMOVU -(VEC_SIZE * 1)(%rdi, %rax), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, -(VEC_SIZE * 1)(%rsi, %rax), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, -(VEC_SIZE * 1)(%rsi, %rax), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(return_vec_page_cross_1) > > > @@ -740,6 +934,8 @@ L(more_2x_vec_till_page_cross): > > > /* Must check length here as length might proclude reading next > > > page. */ > > > # ifdef USE_AS_WCSCMP > > > + /* NB: strcasecmp not used with WCSCMP so this access to r11 is > > > + safe. */ > > > movl %eax, %r11d > > > shrl $2, %r11d > > > cmpq %r11, %rdx > > > @@ -754,12 +950,19 @@ L(more_2x_vec_till_page_cross): > > > VMOVA (VEC_SIZE * 3)(%rdi), %YMM6 > > > VPMINU %YMM4, %YMM6, %YMM9 > > > VPTESTM %YMM9, %YMM9, %k1 > > > - > > > +# ifndef USE_AS_STRCASECMP_L > > > vpxorq (VEC_SIZE * 2)(%rsi), %YMM4, %YMM5 > > > /* YMM6 = YMM5 | ((VEC_SIZE * 3)(%rsi) ^ YMM6). */ > > > vpternlogd $0xde, (VEC_SIZE * 3)(%rsi), %YMM5, %YMM6 > > > - > > > - VPCMP $0, %YMMZERO, %YMM6, %k0{%k1} > > > +# else > > > + VMOVU (VEC_SIZE * 2)(%rsi), %YMM5 > > > + TOLOWER_YMM (%YMM4, %YMM5) > > > + VMOVU (VEC_SIZE * 3)(%rsi), %YMM7 > > > + TOLOWER_YMM (%YMM6, %YMM7) > > > + vpxorq %YMM4, %YMM5, %YMM5 > > > + vpternlogd $0xde, %YMM7, %YMM5, %YMM6 > > > +# endif > > > + VPTESTNM %YMM6, %YMM6, %k0{%k1} > > > kmovd %k0, %LOOP_REG > > > TESTEQ %LOOP_REG > > > jnz L(return_vec_2_3_end) > > > @@ -815,6 +1018,8 @@ L(return_vec_page_cross_1): > > > # else > > > movzbl VEC_OFFSET(%rdi, %rcx), %eax > > > movzbl VEC_OFFSET(%rsi, %rcx), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > xorl %r8d, %eax > > > subl %r8d, %eax > > > @@ -871,7 +1076,7 @@ L(page_cross): > > > L(page_cross_loop): > > > VMOVU (%rdi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM1, %k1){%k2} > > > kmovd %k1, %ecx > > > TESTEQ %ecx > > > jnz L(check_ret_vec_page_cross) > > > @@ -895,7 +1100,7 @@ L(page_cross_loop): > > > */ > > > VMOVU (%rdi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM0 > > > VPTESTM %YMM0, %YMM0, %k2 > > > - VPCMP $0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM0, %k1{%k2} > > > + CMP_R1_S2_YMM (%YMM0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %YMM1, %k1){%k2} > > > > > > kmovd %k1, %ecx > > > # ifdef USE_AS_STRNCMP > > > @@ -930,6 +1135,8 @@ L(ret_vec_page_cross_cont): > > > # else > > > movzbl (%rdi, %rcx, SIZE_OF_CHAR), %eax > > > movzbl (%rsi, %rcx, SIZE_OF_CHAR), %ecx > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %ecx) > > > subl %ecx, %eax > > > xorl %r8d, %eax > > > subl %r8d, %eax > > > @@ -989,7 +1196,7 @@ L(less_1x_vec_till_page): > > > /* Use 16 byte comparison. */ > > > vmovdqu (%rdi), %xmm0 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, (%rsi), %xmm0, %k1{%k2} > > > + CMP_R1_S2_XMM (%xmm0, (%rsi), %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > # ifdef USE_AS_WCSCMP > > > subl $0xf, %ecx > > > @@ -1009,7 +1216,7 @@ L(less_1x_vec_till_page): > > > # endif > > > vmovdqu (%rdi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm0 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm0, %k1{%k2} > > > + CMP_R1_S2_XMM (%xmm0, (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > # ifdef USE_AS_WCSCMP > > > subl $0xf, %ecx > > > @@ -1048,7 +1255,7 @@ L(less_16_till_page): > > > vmovq (%rdi), %xmm0 > > > vmovq (%rsi), %xmm1 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, %xmm1, %xmm0, %k1{%k2} > > > + CMP_R1_R2_XMM (%xmm0, %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > # ifdef USE_AS_WCSCMP > > > subl $0x3, %ecx > > > @@ -1068,7 +1275,7 @@ L(less_16_till_page): > > > vmovq (%rdi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm0 > > > vmovq (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm1 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, %xmm1, %xmm0, %k1{%k2} > > > + CMP_R1_R2_XMM (%xmm0, %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > # ifdef USE_AS_WCSCMP > > > subl $0x3, %ecx > > > @@ -1128,7 +1335,7 @@ L(ret_less_8_wcs): > > > vmovd (%rdi), %xmm0 > > > vmovd (%rsi), %xmm1 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, %xmm1, %xmm0, %k1{%k2} > > > + CMP_R1_R2_XMM (%xmm0, %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > subl $0xf, %ecx > > > jnz L(check_ret_vec_page_cross) > > > @@ -1143,7 +1350,7 @@ L(ret_less_8_wcs): > > > vmovd (%rdi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm0 > > > vmovd (%rsi, %OFFSET_REG64, SIZE_OF_CHAR), %xmm1 > > > VPTESTM %xmm0, %xmm0, %k2 > > > - VPCMP $0, %xmm1, %xmm0, %k1{%k2} > > > + CMP_R1_R2_XMM (%xmm0, %xmm1, %k1){%k2} > > > kmovd %k1, %ecx > > > subl $0xf, %ecx > > > jnz L(check_ret_vec_page_cross) > > > @@ -1176,7 +1383,9 @@ L(less_4_till_page): > > > L(less_4_loop): > > > movzbl (%rdi), %eax > > > movzbl (%rsi, %rdi), %ecx > > > - subl %ecx, %eax > > > + TOLOWER_gpr (%rax, %eax) > > > + TOLOWER_gpr (%rcx, %BYTE_LOOP_REG) > > > + subl %BYTE_LOOP_REG, %eax > > > jnz L(ret_less_4_loop) > > > testl %ecx, %ecx > > > jz L(ret_zero_4_loop) > > > @@ -1203,5 +1412,6 @@ L(ret_less_4_loop): > > > subl %r8d, %eax > > > ret > > > # endif > > > -END(STRCMP) > > > + cfi_endproc > > > + .size STRCMP, .-STRCMP > > > #endif > > > diff --git a/sysdeps/x86_64/multiarch/strncase_l-evex.S b/sysdeps/x86_64/multiarch/strncase_l-evex.S > > > new file mode 100644 > > > index 0000000000..8a5af3695c > > > --- /dev/null > > > +++ b/sysdeps/x86_64/multiarch/strncase_l-evex.S > > > @@ -0,0 +1,25 @@ > > > +/* strncasecmp_l optimized with EVEX. > > > + Copyright (C) 2017-2022 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 > > > + . */ > > > + > > > +#ifndef STRCMP > > > +# define STRCMP __strncasecmp_l_evex > > > +#endif > > > +#define OVERFLOW_STRCMP __strcasecmp_l_evex > > > +#define USE_AS_STRCASECMP_L > > > +#define USE_AS_STRNCMP > > > +#include "strcmp-evex.S" > > > -- > > > 2.25.1 > > > > > > > LGTM. > > > > Reviewed-by: H.J. Lu > > Thanks, pushed the patchset. > > > > Thanks. > > > > -- > > H.J. I would like to backport this patch to release branches. Any comments or objections? Conflict resolution patch attached. --Sunil --0000000000000665d405ded5d693 Content-Type: application/octet-stream; name="0015-x86-Add-AVX2-optimized-str-n-casecmp.patch" Content-Disposition: attachment; filename="0015-x86-Add-AVX2-optimized-str-n-casecmp.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l33f9dsc0 RnJvbSBiMzgyZTRjYWY1MGRmZWU2MmUxNzBmOWI2NjE3YjQ3MGIxMjg5ZGNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb2FoIEdvbGRzdGVpbiA8Z29sZHN0ZWluLncubkBnbWFpbC5j b20+CkRhdGU6IFRodSwgMjQgTWFyIDIwMjIgMTg6NTY6MTIgLTA1MDAKU3ViamVjdDogW1BBVENI IDE1LzI2XSB4ODY6IEFkZCBBVlgyIG9wdGltaXplZCBzdHJ7bn1jYXNlY21wCgpnZW9tZXRyaWNf bWVhbihOPTQwKSBvZiBhbGwgYmVuY2htYXJrcyBBVlgyIC8gU1NFNDI6IC43MDIKCkFsbCBzdHJp bmcvbWVtb3J5IHRlc3RzIHBhc3MuClJldmlld2VkLWJ5OiBILkouIEx1IDxoamwudG9vbHNAZ21h aWwuY29tPgoKKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgYmJmODEyMjIzNDNmZWQ1Y2Q3MDQw MDFhMmFlMGQ4NmM3MTU0NDE1MSkKLS0tCiBzeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvTWFrZWZp bGUgICAgICAgICAgICAgfCAgIDQgKwogc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL2lmdW5jLWlt cGwtbGlzdC5jICAgIHwgIDI4ICsrKwogc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL2lmdW5jLXN0 cmNhc2VjbXAuaCAgIHwgIDEyICsKIC4uLi94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1h dngyLXJ0bS5TICB8ICAxNSArKwogc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBf bC1hdngyLlMgIHwgIDIzICsrCiBzeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21wLWF2eDIu UyAgICAgICAgfCAyMzcgKysrKysrKysrKysrKysrLS0tCiAuLi4veDg2XzY0L211bHRpYXJjaC9z dHJuY2FzZV9sLWF2eDItcnRtLlMgICAgfCAgMTYgKysKIHN5c2RlcHMveDg2XzY0L211bHRpYXJj aC9zdHJuY2FzZV9sLWF2eDIuUyAgICB8ICAyNyArKwogOCBmaWxlcyBjaGFuZ2VkLCAzMzEgaW5z ZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3lzZGVwcy94 ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1hdngyLXJ0bS5TCiBjcmVhdGUgbW9kZSAxMDA2 NDQgc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1hdngyLlMKIGNyZWF0ZSBt b2RlIDEwMDY0NCBzeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RybmNhc2VfbC1hdngyLXJ0bS5T CiBjcmVhdGUgbW9kZSAxMDA2NDQgc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cm5jYXNlX2wt YXZ4Mi5TCgpkaWZmIC0tZ2l0IGEvc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL01ha2VmaWxlIGIv c3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL01ha2VmaWxlCmluZGV4IGU3YjQxM2VkYWQuLjA2ZTE4 NDg4MjMgMTAwNjQ0Ci0tLSBhL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9NYWtlZmlsZQorKysg Yi9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvTWFrZWZpbGUKQEAgLTU1LDYgKzU1LDggQEAgc3lz ZGVwX3JvdXRpbmVzICs9IFwKICAgc3RwbmNweS1zc2UyLXVuYWxpZ25lZCBcCiAgIHN0cG5jcHkt c3NzZTMgXAogICBzdHJjYXNlY21wX2wtYXZ4IFwKKyAgc3RyY2FzZWNtcF9sLWF2eDIgXAorICBz dHJjYXNlY21wX2wtYXZ4Mi1ydG0gXAogICBzdHJjYXNlY21wX2wtc3NlMiBcCiAgIHN0cmNhc2Vj bXBfbC1zc2U0XzIgXAogICBzdHJjYXNlY21wX2wtc3NzZTMgXApAQCAtOTMsNiArOTUsOCBAQCBz eXNkZXBfcm91dGluZXMgKz0gXAogICBzdHJsZW4tZXZleCBcCiAgIHN0cmxlbi1zc2UyIFwKICAg c3RybmNhc2VfbC1hdnggXAorICBzdHJuY2FzZV9sLWF2eDIgXAorICBzdHJuY2FzZV9sLWF2eDIt cnRtIFwKICAgc3RybmNhc2VfbC1zc2UyIFwKICAgc3RybmNhc2VfbC1zc2U0XzIgXAogICBzdHJu Y2FzZV9sLXNzc2UzIFwKZGlmZiAtLWdpdCBhL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9pZnVu Yy1pbXBsLWxpc3QuYyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9pZnVuYy1pbXBsLWxpc3Qu YwppbmRleCBhNTk0ZjQxNzZlLi4zYzU1NmQwN2FjIDEwMDY0NAotLS0gYS9zeXNkZXBzL3g4Nl82 NC9tdWx0aWFyY2gvaWZ1bmMtaW1wbC1saXN0LmMKKysrIGIvc3lzZGVwcy94ODZfNjQvbXVsdGlh cmNoL2lmdW5jLWltcGwtbGlzdC5jCkBAIC00MzYsNiArNDM2LDEzIEBAIF9fbGliY19pZnVuY19p bXBsX2xpc3QgKGNvbnN0IGNoYXIgKm5hbWUsIHN0cnVjdCBsaWJjX2lmdW5jX2ltcGwgKmFycmF5 LAogCiAgIC8qIFN1cHBvcnQgc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC5j LiAgKi8KICAgSUZVTkNfSU1QTCAoaSwgbmFtZSwgc3RyY2FzZWNtcCwKKwkgICAgICBJRlVOQ19J TVBMX0FERCAoYXJyYXksIGksIHN0cmNhc2VjbXAsCisJCQkgICAgICBDUFVfRkVBVFVSRV9VU0FC TEUgKEFWWDIpLAorCQkJICAgICAgX19zdHJjYXNlY21wX2F2eDIpCisJICAgICAgSUZVTkNfSU1Q TF9BREQgKGFycmF5LCBpLCBzdHJjYXNlY21wLAorCQkJICAgICAgKENQVV9GRUFUVVJFX1VTQUJM RSAoQVZYMikKKwkJCSAgICAgICAmJiBDUFVfRkVBVFVSRV9VU0FCTEUgKFJUTSkpLAorCQkJICAg ICAgX19zdHJjYXNlY21wX2F2eDJfcnRtKQogCSAgICAgIElGVU5DX0lNUExfQUREIChhcnJheSwg aSwgc3RyY2FzZWNtcCwKIAkJCSAgICAgIENQVV9GRUFUVVJFX1VTQUJMRSAoQVZYKSwKIAkJCSAg ICAgIF9fc3RyY2FzZWNtcF9hdngpCkBAIC00NDksNiArNDU2LDEzIEBAIF9fbGliY19pZnVuY19p bXBsX2xpc3QgKGNvbnN0IGNoYXIgKm5hbWUsIHN0cnVjdCBsaWJjX2lmdW5jX2ltcGwgKmFycmF5 LAogCiAgIC8qIFN1cHBvcnQgc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC5j LiAgKi8KICAgSUZVTkNfSU1QTCAoaSwgbmFtZSwgc3RyY2FzZWNtcF9sLAorCSAgICAgIElGVU5D X0lNUExfQUREIChhcnJheSwgaSwgc3RyY2FzZWNtcCwKKwkJCSAgICAgIENQVV9GRUFUVVJFX1VT QUJMRSAoQVZYMiksCisJCQkgICAgICBfX3N0cmNhc2VjbXBfbF9hdngyKQorCSAgICAgIElGVU5D X0lNUExfQUREIChhcnJheSwgaSwgc3RyY2FzZWNtcCwKKwkJCSAgICAgIChDUFVfRkVBVFVSRV9V U0FCTEUgKEFWWDIpCisJCQkgICAgICAgJiYgQ1BVX0ZFQVRVUkVfVVNBQkxFIChSVE0pKSwKKwkJ CSAgICAgIF9fc3RyY2FzZWNtcF9sX2F2eDJfcnRtKQogCSAgICAgIElGVU5DX0lNUExfQUREIChh cnJheSwgaSwgc3RyY2FzZWNtcF9sLAogCQkJICAgICAgQ1BVX0ZFQVRVUkVfVVNBQkxFIChBVlgp LAogCQkJICAgICAgX19zdHJjYXNlY21wX2xfYXZ4KQpAQCAtNTc2LDYgKzU5MCwxMyBAQCBfX2xp YmNfaWZ1bmNfaW1wbF9saXN0IChjb25zdCBjaGFyICpuYW1lLCBzdHJ1Y3QgbGliY19pZnVuY19p bXBsICphcnJheSwKIAogICAvKiBTdXBwb3J0IHN5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJu Y2FzZV9sLmMuICAqLwogICBJRlVOQ19JTVBMIChpLCBuYW1lLCBzdHJuY2FzZWNtcCwKKwkgICAg ICBJRlVOQ19JTVBMX0FERCAoYXJyYXksIGksIHN0cm5jYXNlY21wLAorCQkJICAgICAgQ1BVX0ZF QVRVUkVfVVNBQkxFIChBVlgyKSwKKwkJCSAgICAgIF9fc3RybmNhc2VjbXBfYXZ4MikKKwkgICAg ICBJRlVOQ19JTVBMX0FERCAoYXJyYXksIGksIHN0cm5jYXNlY21wLAorCQkJICAgICAgKENQVV9G RUFUVVJFX1VTQUJMRSAoQVZYMikKKwkJCSAgICAgICAmJiBDUFVfRkVBVFVSRV9VU0FCTEUgKFJU TSkpLAorCQkJICAgICAgX19zdHJuY2FzZWNtcF9hdngyX3J0bSkKIAkgICAgICBJRlVOQ19JTVBM X0FERCAoYXJyYXksIGksIHN0cm5jYXNlY21wLAogCQkJICAgICAgQ1BVX0ZFQVRVUkVfVVNBQkxF IChBVlgpLAogCQkJICAgICAgX19zdHJuY2FzZWNtcF9hdngpCkBAIC01OTAsNiArNjExLDEzIEBA IF9fbGliY19pZnVuY19pbXBsX2xpc3QgKGNvbnN0IGNoYXIgKm5hbWUsIHN0cnVjdCBsaWJjX2lm dW5jX2ltcGwgKmFycmF5LAogCiAgIC8qIFN1cHBvcnQgc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNo L3N0cm5jYXNlX2wuYy4gICovCiAgIElGVU5DX0lNUEwgKGksIG5hbWUsIHN0cm5jYXNlY21wX2ws CisJICAgICAgSUZVTkNfSU1QTF9BREQgKGFycmF5LCBpLCBzdHJuY2FzZWNtcCwKKwkJCSAgICAg IENQVV9GRUFUVVJFX1VTQUJMRSAoQVZYMiksCisJCQkgICAgICBfX3N0cm5jYXNlY21wX2xfYXZ4 MikKKwkgICAgICBJRlVOQ19JTVBMX0FERCAoYXJyYXksIGksIHN0cm5jYXNlY21wLAorCQkJICAg ICAgKENQVV9GRUFUVVJFX1VTQUJMRSAoQVZYMikKKwkJCSAgICAgICAmJiBDUFVfRkVBVFVSRV9V U0FCTEUgKFJUTSkpLAorCQkJICAgICAgX19zdHJuY2FzZWNtcF9sX2F2eDJfcnRtKQogCSAgICAg IElGVU5DX0lNUExfQUREIChhcnJheSwgaSwgc3RybmNhc2VjbXBfbCwKIAkJCSAgICAgIENQVV9G RUFUVVJFX1VTQUJMRSAoQVZYKSwKIAkJCSAgICAgIF9fc3RybmNhc2VjbXBfbF9hdngpCmRpZmYg LS1naXQgYS9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvaWZ1bmMtc3RyY2FzZWNtcC5oIGIvc3lz ZGVwcy94ODZfNjQvbXVsdGlhcmNoL2lmdW5jLXN0cmNhc2VjbXAuaAppbmRleCA5ZTNjYzYxYWMw Li5jNGRlMTExZmQwIDEwMDY0NAotLS0gYS9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvaWZ1bmMt c3RyY2FzZWNtcC5oCisrKyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9pZnVuYy1zdHJjYXNl Y21wLmgKQEAgLTIzLDEyICsyMywyNCBAQCBleHRlcm4gX190eXBlb2YgKFJFRElSRUNUX05BTUUp IE9QVElNSVpFIChzc2UyKSBhdHRyaWJ1dGVfaGlkZGVuOwogZXh0ZXJuIF9fdHlwZW9mIChSRURJ UkVDVF9OQU1FKSBPUFRJTUlaRSAoc3NzZTMpIGF0dHJpYnV0ZV9oaWRkZW47CiBleHRlcm4gX190 eXBlb2YgKFJFRElSRUNUX05BTUUpIE9QVElNSVpFIChzc2U0MikgYXR0cmlidXRlX2hpZGRlbjsK IGV4dGVybiBfX3R5cGVvZiAoUkVESVJFQ1RfTkFNRSkgT1BUSU1JWkUgKGF2eCkgYXR0cmlidXRl X2hpZGRlbjsKK2V4dGVybiBfX3R5cGVvZiAoUkVESVJFQ1RfTkFNRSkgT1BUSU1JWkUgKGF2eDIp IGF0dHJpYnV0ZV9oaWRkZW47CitleHRlcm4gX190eXBlb2YgKFJFRElSRUNUX05BTUUpIE9QVElN SVpFIChhdngyX3J0bSkgYXR0cmlidXRlX2hpZGRlbjsKIAogc3RhdGljIGlubGluZSB2b2lkICoK IElGVU5DX1NFTEVDVE9SICh2b2lkKQogewogICBjb25zdCBzdHJ1Y3QgY3B1X2ZlYXR1cmVzKiBj cHVfZmVhdHVyZXMgPSBfX2dldF9jcHVfZmVhdHVyZXMgKCk7CiAKKyAgaWYgKENQVV9GRUFUVVJF X1VTQUJMRV9QIChjcHVfZmVhdHVyZXMsIEFWWDIpCisgICAgICAmJiBDUFVfRkVBVFVSRVNfQVJD SF9QIChjcHVfZmVhdHVyZXMsIEFWWF9GYXN0X1VuYWxpZ25lZF9Mb2FkKSkKKyAgICB7CisgICAg ICBpZiAoQ1BVX0ZFQVRVUkVfVVNBQkxFX1AgKGNwdV9mZWF0dXJlcywgUlRNKSkKKyAgICAgICAg cmV0dXJuIE9QVElNSVpFIChhdngyX3J0bSk7CisKKyAgICAgIGlmICghQ1BVX0ZFQVRVUkVTX0FS Q0hfUCAoY3B1X2ZlYXR1cmVzLCBQcmVmZXJfTm9fVlpFUk9VUFBFUikpCisgICAgICAgIHJldHVy biBPUFRJTUlaRSAoYXZ4Mik7CisgICAgfQorCiAgIGlmIChDUFVfRkVBVFVSRV9VU0FCTEVfUCAo Y3B1X2ZlYXR1cmVzLCBBVlgpKQogICAgIHJldHVybiBPUFRJTUlaRSAoYXZ4KTsKIApkaWZmIC0t Z2l0IGEvc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1hdngyLXJ0bS5TIGIv c3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1hdngyLXJ0bS5TCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjA5OTU3ZmMzYzUKLS0tIC9kZXYvbnVsbAor KysgYi9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY2FzZWNtcF9sLWF2eDItcnRtLlMKQEAg LTAsMCArMSwxNSBAQAorI2lmbmRlZiBTVFJDTVAKKyMgZGVmaW5lIFNUUkNNUAlfX3N0cmNhc2Vj bXBfbF9hdngyX3J0bQorI2VuZGlmCisKKyNkZWZpbmUgX0dMQUJFTCh4KQl4ICMjIF9ydG0KKyNk ZWZpbmUgR0xBQkVMKHgpCV9HTEFCRUwoeCkKKworI2RlZmluZSBaRVJPX1VQUEVSX1ZFQ19SRUdJ U1RFUlNfUkVUVVJOCVwKKwlaRVJPX1VQUEVSX1ZFQ19SRUdJU1RFUlNfUkVUVVJOX1hURVNUCisK KyNkZWZpbmUgVlpFUk9VUFBFUl9SRVRVUk4Jam1wIEwocmV0dXJuX3Z6ZXJvdXBwZXIpCisKKyNk ZWZpbmUgU0VDVElPTihwKQlwIyMuYXZ4LnJ0bQorCisjaW5jbHVkZSAic3RyY2FzZWNtcF9sLWF2 eDIuUyIKZGlmZiAtLWdpdCBhL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJjYXNlY21wX2wt YXZ4Mi5TIGIvc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cmNhc2VjbXBfbC1hdngyLlMKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uZTI3NjJmMmEyMgotLS0gL2Rldi9u dWxsCisrKyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJjYXNlY21wX2wtYXZ4Mi5TCkBA IC0wLDAgKzEsMjMgQEAKKy8qIHN0cmNhc2VjbXBfbCBvcHRpbWl6ZWQgd2l0aCBBVlgyLgorICAg Q29weXJpZ2h0IChDKSAyMDE3LTIwMjIgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCisg ICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgR05VIEMgTGlicmFyeS4KKworICAgVGhlIEdOVSBD IExpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CisgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwg UHVibGljCisgICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uOyBlaXRoZXIKKyAgIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91 ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorCisgICBUaGUgR05VIEMgTGlicmFyeSBpcyBk aXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICAgYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YK KyAgIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUgR05VCisgICBMZXNzZXIgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBk ZXRhaWxzLgorCisgICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUg TGVzc2VyIEdlbmVyYWwgUHVibGljCisgICBMaWNlbnNlIGFsb25nIHdpdGggdGhlIEdOVSBDIExp YnJhcnk7IGlmIG5vdCwgc2VlCisgICA8aHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LiAg Ki8KKworI2lmbmRlZiBTVFJDTVAKKyMgZGVmaW5lIFNUUkNNUAlfX3N0cmNhc2VjbXBfbF9hdngy CisjZW5kaWYKKyNkZWZpbmUgVVNFX0FTX1NUUkNBU0VDTVBfTAorI2luY2x1ZGUgInN0cmNtcC1h dngyLlMiCmRpZmYgLS1naXQgYS9zeXNkZXBzL3g4Nl82NC9tdWx0aWFyY2gvc3RyY21wLWF2eDIu UyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJjbXAtYXZ4Mi5TCmluZGV4IGI5NGZjNWMz OWEuLjMzNjZkMGIwODMgMTAwNjQ0Ci0tLSBhL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJj bXAtYXZ4Mi5TCisrKyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJjbXAtYXZ4Mi5TCkBA IC0yMCw2ICsyMCwxMCBAQAogCiAjIGluY2x1ZGUgPHN5c2RlcC5oPgogCisjIGlmIGRlZmluZWQg VVNFX0FTX1NUUkNBU0VDTVBfTAorIyAgaW5jbHVkZSAibG9jYWxlLWRlZmluZXMuaCIKKyMgZW5k aWYKKwogIyBpZm5kZWYgU1RSQ01QCiAjICBkZWZpbmUgU1RSQ01QCV9fc3RyY21wX2F2eDIKICMg ZW5kaWYKQEAgLTc0LDEzICs3OCw4OCBAQAogIyAgZGVmaW5lIFZFQ19PRkZTRVQJKC1WRUNfU0la RSkKICMgZW5kaWYKIAorIyBpZmRlZiBVU0VfQVNfU1RSQ0FTRUNNUF9MCisjICBkZWZpbmUgQllU RV9MT09QX1JFRwlPRkZTRVRfUkVHCisjIGVsc2UKKyMgIGRlZmluZSBCWVRFX0xPT1BfUkVHCWVj eAorIyBlbmRpZgorCisjIGlmZGVmIFVTRV9BU19TVFJDQVNFQ01QX0wKKyMgIGlmZGVmIFVTRV9B U19TVFJOQ01QCisjICAgZGVmaW5lIFNUUkNBU0VDTVAJX19zdHJuY2FzZWNtcF9hdngyCisjICAg ZGVmaW5lIExPQ0FMRV9SRUcJcmN4CisjICAgZGVmaW5lIExPQ0FMRV9SRUdfTFAJUkNYX0xQCisj ICAgZGVmaW5lIFNUUkNBU0VDTVBfTk9OQVNDSUkJX19zdHJuY2FzZWNtcF9sX25vbmFzY2lpCisj ICBlbHNlCisjICAgZGVmaW5lIFNUUkNBU0VDTVAJX19zdHJjYXNlY21wX2F2eDIKKyMgICBkZWZp bmUgTE9DQUxFX1JFRwlyZHgKKyMgICBkZWZpbmUgTE9DQUxFX1JFR19MUAlSRFhfTFAKKyMgICBk ZWZpbmUgU1RSQ0FTRUNNUF9OT05BU0NJSQlfX3N0cmNhc2VjbXBfbF9ub25hc2NpaQorIyAgZW5k aWYKKyMgZW5kaWYKKwogIyBkZWZpbmUgeG1tWkVSTwl4bW0xNQogIyBkZWZpbmUgeW1tWkVSTwl5 bW0xNQogCisjIGRlZmluZSBMQ0FTRV9NSU5feW1tCSV5bW0xMAorIyBkZWZpbmUgTENBU0VfTUFY X3ltbQkleW1tMTEKKyMgZGVmaW5lIENBU0VfQUREX3ltbQkleW1tMTIKKworIyBkZWZpbmUgTENB U0VfTUlOX3htbQkleG1tMTAKKyMgZGVmaW5lIExDQVNFX01BWF94bW0JJXhtbTExCisjIGRlZmlu ZSBDQVNFX0FERF94bW0JJXhtbTEyCisKKwkvKiByMTEgaXMgbmV2ZXIgdXNlIGVsc2V3aGVyZSBz byB0aGlzIGlzIHNhZmUgdG8gbWFpbnRhaW4uICAqLworIyBkZWZpbmUgVE9MT1dFUl9CQVNFCSVy MTEKKwogIyBpZm5kZWYgU0VDVElPTgogIyAgZGVmaW5lIFNFQ1RJT04ocCkJcCMjLmF2eAogIyBl bmRpZgogCisjIGlmZGVmIFVTRV9BU19TVFJDQVNFQ01QX0wKKyMgIGRlZmluZSBSRUcoeCwgeSkg eCAjIyB5CisjICBkZWZpbmUgVE9MT1dFUihyZWcxX2luLCByZWcxX291dCwgcmVnMl9pbiwgcmVn Ml9vdXQsIGV4dCkJCQlcCisJdnBhZGRiCVJFRyhMQ0FTRV9NSU5fLCBleHQpLCByZWcxX2luLCBS RUcoJWV4dCwgOCk7CQkJCVwKKwl2cGFkZGIJUkVHKExDQVNFX01JTl8sIGV4dCksIHJlZzJfaW4s IFJFRyglZXh0LCA5KTsJCQkJXAorCXZwY21wZ3RiIFJFRyhMQ0FTRV9NQVhfLCBleHQpLCBSRUco JWV4dCwgOCksIFJFRyglZXh0LCA4KTsJCQlcCisJdnBjbXBndGIgUkVHKExDQVNFX01BWF8sIGV4 dCksIFJFRyglZXh0LCA5KSwgUkVHKCVleHQsIDkpOwkJCVwKKwl2cGFuZG4JUkVHKENBU0VfQURE XywgZXh0KSwgUkVHKCVleHQsIDgpLCBSRUcoJWV4dCwgOCk7CQkJXAorCXZwYW5kbglSRUcoQ0FT RV9BRERfLCBleHQpLCBSRUcoJWV4dCwgOSksIFJFRyglZXh0LCA5KTsJCQlcCisJdnBhZGRiCVJF RyglZXh0LCA4KSwgcmVnMV9pbiwgcmVnMV9vdXQ7CQkJCQkJCVwKKwl2cGFkZGIJUkVHKCVleHQs IDkpLCByZWcyX2luLCByZWcyX291dAorCisjICBkZWZpbmUgVE9MT1dFUl9ncHIoc3JjLCBkc3Qp CW1vdmwgKFRPTE9XRVJfQkFTRSwgc3JjLCA0KSwgZHN0CisjICBkZWZpbmUgVE9MT1dFUl95bW0o Li4uKQlUT0xPV0VSKF9fVkFfQVJHU19fLCB5bW0pCisjICBkZWZpbmUgVE9MT1dFUl94bW0oLi4u KQlUT0xPV0VSKF9fVkFfQVJHU19fLCB4bW0pCisKKyMgIGRlZmluZSBDTVBfUjFfUjIoczFfcmVn LCBzMl9yZWcsIHNjcmF0Y2hfcmVnLCByZWdfb3V0LCBleHQpCQkJXAorCVRPTE9XRVIJKHMxX3Jl Zywgc2NyYXRjaF9yZWcsIHMyX3JlZywgczJfcmVnLCBleHQpOwkJCQkJXAorCVZQQ01QRVEJc2Ny YXRjaF9yZWcsIHMyX3JlZywgcmVnX291dAorCisjICBkZWZpbmUgQ01QX1IxX1MyKHMxX3JlZywg czJfbWVtLCBzY3JhdGNoX3JlZywgcmVnX291dCwgZXh0KQkJCVwKKwlWTU9WVQlzMl9tZW0sIHJl Z19vdXQ7CQkJCQkJCQkJCQlcCisJQ01QX1IxX1IyKHMxX3JlZywgcmVnX291dCwgc2NyYXRjaF9y ZWcsIHJlZ19vdXQsIGV4dCkKKworIyAgZGVmaW5lIENNUF9SMV9SMl95bW0oLi4uKSBDTVBfUjFf UjIoX19WQV9BUkdTX18sIHltbSkKKyMgIGRlZmluZSBDTVBfUjFfUjJfeG1tKC4uLikgQ01QX1Ix X1IyKF9fVkFfQVJHU19fLCB4bW0pCisKKyMgIGRlZmluZSBDTVBfUjFfUzJfeW1tKC4uLikgQ01Q X1IxX1MyKF9fVkFfQVJHU19fLCB5bW0pCisjICBkZWZpbmUgQ01QX1IxX1MyX3htbSguLi4pIENN UF9SMV9TMihfX1ZBX0FSR1NfXywgeG1tKQorCisjIGVsc2UKKyMgIGRlZmluZSBUT0xPV0VSX2dw ciguLi4pCisjICBkZWZpbmUgVE9MT1dFUl95bW0oLi4uKQorIyAgZGVmaW5lIFRPTE9XRVJfeG1t KC4uLikKKworIyAgZGVmaW5lIENNUF9SMV9SMl95bW0oczFfcmVnLCBzMl9yZWcsIHNjcmF0Y2hf cmVnLCByZWdfb3V0KQkJCVwKKwlWUENNUEVRCXMyX3JlZywgczFfcmVnLCByZWdfb3V0CisKKyMg IGRlZmluZSBDTVBfUjFfUjJfeG1tKC4uLikgQ01QX1IxX1IyX3ltbShfX1ZBX0FSR1NfXykKKwor IyAgZGVmaW5lIENNUF9SMV9TMl95bW0oLi4uKSBDTVBfUjFfUjJfeW1tKF9fVkFfQVJHU19fKQor IyAgZGVmaW5lIENNUF9SMV9TMl94bW0oLi4uKSBDTVBfUjFfUjJfeG1tKF9fVkFfQVJHU19fKQor IyBlbmRpZgorCiAvKiBXYXJuaW5nIQogICAgICAgICAgICB3Y3NjbXAvd2NzbmNtcCBoYXZlIHRv IHVzZSBTSUdORUQgY29tcGFyaXNvbiBmb3IgZWxlbWVudHMuCiAgICAgICAgICAgIHN0cmNtcC9z dHJuY21wIGhhdmUgdG8gdXNlIFVOU0lHTkVEIGNvbXBhcmlzb24gZm9yIGVsZW1lbnRzLgpAQCAt MTAyLDggKzE4MSw0OSBAQAogICAgcmV0dXJuZWQuICAqLwogCiAJLnNlY3Rpb24gU0VDVElPTigu dGV4dCksICJheCIsIEBwcm9nYml0cwotRU5UUlkoU1RSQ01QKQorCS5hbGlnbgkxNgorCS50eXBl CVNUUkNNUCwgQGZ1bmN0aW9uCisJLmdsb2JsCVNUUkNNUAorCS5oaWRkZW4JU1RSQ01QCisKKyMg aWZuZGVmIEdMQUJFTAorIyAgZGVmaW5lIEdMQUJFTCguLi4pCV9fVkFfQVJHU19fCisjIGVuZGlm CisKKyMgaWZkZWYgVVNFX0FTX1NUUkNBU0VDTVBfTAorRU5UUlkgKEdMQUJFTChTVFJDQVNFQ01Q KSkKKwltb3ZxCV9fbGliY190c2RfTE9DQUxFQGdvdHRwb2ZmKCVyaXApLCAlcmF4CisJbW92CSVm czooJXJheCksICVMT0NBTEVfUkVHX0xQCisKKwkvKiBFaXRoZXIgMSBvciA1IGJ5dGVzIChkZXBl bmRlaW5nIGlmIENFVCBpcyBlbmFibGVkKS4gICovCisJLnAyYWxpZ24gNAorRU5EIChHTEFCRUwo U1RSQ0FTRUNNUCkpCisJLyogRkFMTFRIUk9VR0ggdG8gc3RyY2FzZWNtcC9zdHJuY2FzZWNtcF9s LiAgKi8KKyMgZW5kaWYKKworCS5wMmFsaWduIDQKK1NUUkNNUDoKKwljZmlfc3RhcnRwcm9jCisJ X0NFVF9FTkRCUgorCUNBTExfTUNPVU5UCisKKyMgaWYgZGVmaW5lZCBVU0VfQVNfU1RSQ0FTRUNN UF9MCisJLyogV2UgaGF2ZSB0byBmYWxsIGJhY2sgb24gdGhlIEMgaW1wbGVtZW50YXRpb24gZm9y IGxvY2FsZXMgd2l0aAorCSAgIGVuY29kaW5ncyBub3QgbWF0Y2hpbmcgQVNDSUkgZm9yIHNpbmds ZSBieXRlcy4gICovCisjICBpZiBMT0NBTEVfVF9fX0xPQ0FMRVMgIT0gMCB8fCBMQ19DVFlQRSAh PSAwCisJbW92CUxPQ0FMRV9UX19fTE9DQUxFUyArIExDX0NUWVBFICogTFBfU0laRSglTE9DQUxF X1JFRyksICVSQVhfTFAKKyMgIGVsc2UKKwltb3YJKCVMT0NBTEVfUkVHKSwgJVJBWF9MUAorIyAg ZW5kaWYKKwl0ZXN0bAkkMSwgTE9DQUxFX0RBVEFfVkFMVUVTICsgX05MX0NUWVBFX05PTkFTQ0lJ X0NBU0UgKiBTSVpFT0ZfVkFMVUVTKCVyYXgpCisJam5lCVNUUkNBU0VDTVBfTk9OQVNDSUkKKwls ZWFxCV9ubF9DX0xDX0NUWVBFX3RvbG93ZXIgKyAxMjggKiA0KCVyaXApLCBUT0xPV0VSX0JBU0UK KyMgZW5kaWYKKwogIyBpZmRlZiBVU0VfQVNfU1RSTkNNUAorCS8qIERvbid0IG92ZXJ3cml0ZSBM T0NBTEVfUkVHIChyY3gpIHVudGlsIHdlIGhhdmUgcGFzcworCSAgIEwob25lX29yX2xlc3MpLiBP dGhlcndpc2Ugd2UgbWlnaHQgdXNlIHRoZSB3cm9uZyBsb2NhbGUgaW4KKwkgICB0aGUgT1ZFUkZM T1dfU1RSQ01QIChzdHJjYXNlY21wX2wpLiAgKi8KICMgIGlmZGVmIF9fSUxQMzJfXwogCS8qIENs ZWFyIHRoZSB1cHBlciAzMiBiaXRzLiAgKi8KIAltb3ZsCSVlZHgsICVlZHgKQEAgLTEyOCw2ICsy NDgsMzAgQEAgRU5UUlkoU1RSQ01QKQogIyAgZW5kaWYKICMgZW5kaWYKIAl2cHhvcgkleG1tWkVS TywgJXhtbVpFUk8sICV4bW1aRVJPCisjIGlmIGRlZmluZWQgVVNFX0FTX1NUUkNBU0VDTVBfTAor CS5zZWN0aW9uIC5yb2RhdGEuY3N0MzIsICJhTSIsIEBwcm9nYml0cywgMzIKKwkuYWxpZ24JMzIK K0wobGNhc2VfbWluKToKKwkucXVhZAkweDNmM2YzZjNmM2YzZjNmM2YKKwkucXVhZAkweDNmM2Yz ZjNmM2YzZjNmM2YKKwkucXVhZAkweDNmM2YzZjNmM2YzZjNmM2YKKwkucXVhZAkweDNmM2YzZjNm M2YzZjNmM2YKK0wobGNhc2VfbWF4KToKKwkucXVhZAkweDk5OTk5OTk5OTk5OTk5OTkKKwkucXVh ZAkweDk5OTk5OTk5OTk5OTk5OTkKKwkucXVhZAkweDk5OTk5OTk5OTk5OTk5OTkKKwkucXVhZAkw eDk5OTk5OTk5OTk5OTk5OTkKK0woY2FzZV9hZGQpOgorCS5xdWFkCTB4MjAyMDIwMjAyMDIwMjAy MAorCS5xdWFkCTB4MjAyMDIwMjAyMDIwMjAyMAorCS5xdWFkCTB4MjAyMDIwMjAyMDIwMjAyMAor CS5xdWFkCTB4MjAyMDIwMjAyMDIwMjAyMAorCS5wcmV2aW91cworCisJdm1vdmRxYQlMKGxjYXNl X21pbikoJXJpcCksIExDQVNFX01JTl95bW0KKwl2bW92ZHFhCUwobGNhc2VfbWF4KSglcmlwKSwg TENBU0VfTUFYX3ltbQorCXZtb3ZkcWEJTChjYXNlX2FkZCkoJXJpcCksIENBU0VfQUREX3ltbQor IyBlbmRpZgogCW1vdmwJJWVkaSwgJWVheAogCW9ybAklZXNpLCAlZWF4CiAJc2FsbAkkMjAsICVl YXgKQEAgLTEzOCw4ICsyODIsMTAgQEAgRU5UUlkoU1RSQ01QKQogTChub19wYWdlX2Nyb3NzKToK IAkvKiBTYWZlIHRvIGNvbXBhcmUgNHggdmVjdG9ycy4gICovCiAJVk1PVlUJKCVyZGkpLCAleW1t MAotCS8qIDFzIHdoZXJlIHMxIGFuZCBzMiBlcXVhbC4gICovCi0JVlBDTVBFUQkoJXJzaSksICV5 bW0wLCAleW1tMQorCS8qIDFzIHdoZXJlIHMxIGFuZCBzMiBlcXVhbC4gSnVzdCBWUENNUEVRIGlm IGl0cyBub3Qgc3RyY2FzZWNtcC4KKwkgICBPdGhlcndpc2UgY29udmVydHMgeW1tMCBhbmQgbG9h ZCBmcm9tIHJzaSB0byBsb3dlci4geW1tMiBpcworCSAgIHNjcmF0Y2ggYW5kIHltbTEgaXMgdGhl IHJldHVybi4gICovCisJQ01QX1IxX1MyX3ltbSAoJXltbTAsICglcnNpKSwgJXltbTIsICV5bW0x KQogCS8qIDFzIGF0IG51bGwgQ0hBUi4gICovCiAJVlBDTVBFUQkleW1tMCwgJXltbVpFUk8sICV5 bW0yCiAJLyogMXMgd2hlcmUgczEgYW5kIHMyIGVxdWFsIEFORCBub3QgbnVsbCBDSEFSLiAgKi8K QEAgLTE3Miw2ICszMTgsOCBAQCBMKHJldHVybl92ZWNfMCk6CiAjIGVsc2UKIAltb3Z6YmwJKCVy ZGksICVyY3gpLCAlZWF4CiAJbW92emJsCSglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3By ICglcmF4LCAlZWF4KQorCVRPTE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVh eAogIyBlbmRpZgogTChyZXQwKToKQEAgLTE5Miw2ICszNDAsMTAgQEAgTChyZXRfemVybyk6CiAK IAkucDJhbGlnbiA0LCwgNQogTChvbmVfb3JfbGVzcyk6CisjICBpZmRlZiBVU0VfQVNfU1RSQ0FT RUNNUF9MCisJLyogU2V0IGxvY2FsZSBhcmd1bWVudCBmb3Igc3RyY2FzZWNtcC4gICovCisJbW92 cQklTE9DQUxFX1JFRywgJXJkeAorIyAgZW5kaWYKIAlqYglMKHJldF96ZXJvKQogIyAgaWZkZWYg VVNFX0FTX1dDU0NNUAogCS8qICduYmUnIGNvdmVycyB0aGUgY2FzZSB3aGVyZSBsZW5ndGggaXMg bmVnYXRpdmUgKGxhcmdlCkBAIC0yMTEsNiArMzYzLDggQEAgTChvbmVfb3JfbGVzcyk6CiAJam5i ZQlfX3N0cmNtcF9hdngyCiAJbW92emJsCSglcmRpKSwgJWVheAogCW1vdnpibAkoJXJzaSksICVl Y3gKKwlUT0xPV0VSX2dwciAoJXJheCwgJWVheCkKKwlUT0xPV0VSX2dwciAoJXJjeCwgJWVjeCkK IAlzdWJsCSVlY3gsICVlYXgKICMgIGVuZGlmCiBMKHJldDEpOgpAQCAtMjM4LDYgKzM5Miw4IEBA IEwocmV0dXJuX3ZlY18xKToKICMgZWxzZQogCW1vdnpibAlWRUNfU0laRSglcmRpLCAlcmN4KSwg JWVheAogCW1vdnpibAlWRUNfU0laRSglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3ByICgl cmF4LCAlZWF4KQorCVRPTE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAog IyBlbmRpZgogTChyZXQyKToKQEAgLTI2OSw2ICs0MjUsOCBAQCBMKHJldHVybl92ZWNfMik6CiAj IGVsc2UKIAltb3Z6YmwJKFZFQ19TSVpFICogMikoJXJkaSwgJXJjeCksICVlYXgKIAltb3Z6YmwJ KFZFQ19TSVpFICogMikoJXJzaSwgJXJjeCksICVlY3gKKwlUT0xPV0VSX2dwciAoJXJheCwgJWVh eCkKKwlUT0xPV0VSX2dwciAoJXJjeCwgJWVjeCkKIAlzdWJsCSVlY3gsICVlYXgKICMgZW5kaWYK IEwocmV0Myk6CkBAIC0yODksNiArNDQ3LDggQEAgTChyZXR1cm5fdmVjXzMpOgogIyAgZWxzZQog CW1vdnpibAkoVkVDX1NJWkUgKiAzKSglcmRpLCAlcmN4KSwgJWVheAogCW1vdnpibAkoVkVDX1NJ WkUgKiAzKSglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3ByICglcmF4LCAlZWF4KQorCVRP TE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAogIyAgZW5kaWYKIEwocmV0 NCk6CkBAIC0yOTksNyArNDU5LDcgQEAgTChyZXQ0KToKIEwobW9yZV8zeF92ZWMpOgogCS8qIFNh ZmUgdG8gY29tcGFyZSA0eCB2ZWN0b3JzLiAgKi8KIAlWTU9WVQlWRUNfU0laRSglcmRpKSwgJXlt bTAKLQlWUENNUEVRCVZFQ19TSVpFKCVyc2kpLCAleW1tMCwgJXltbTEKKwlDTVBfUjFfUzJfeW1t ICgleW1tMCwgVkVDX1NJWkUoJXJzaSksICV5bW0yLCAleW1tMSkKIAlWUENNUEVRCSV5bW0wLCAl eW1tWkVSTywgJXltbTIKIAl2cGFuZG4JJXltbTEsICV5bW0yLCAleW1tMQogCXZwbW92bXNrYiAl eW1tMSwgJWVjeApAQCAtMzEyLDcgKzQ3Miw3IEBAIEwobW9yZV8zeF92ZWMpOgogIyBlbmRpZgog CiAJVk1PVlUJKFZFQ19TSVpFICogMikoJXJkaSksICV5bW0wCi0JVlBDTVBFUQkoVkVDX1NJWkUg KiAyKSglcnNpKSwgJXltbTAsICV5bW0xCisJQ01QX1IxX1MyX3ltbSAoJXltbTAsIChWRUNfU0la RSAqIDIpKCVyc2kpLCAleW1tMiwgJXltbTEpCiAJVlBDTVBFUQkleW1tMCwgJXltbVpFUk8sICV5 bW0yCiAJdnBhbmRuCSV5bW0xLCAleW1tMiwgJXltbTEKIAl2cG1vdm1za2IgJXltbTEsICVlY3gK QEAgLTMyMCw3ICs0ODAsNyBAQCBMKG1vcmVfM3hfdmVjKToKIAlqbnoJTChyZXR1cm5fdmVjXzIp CiAKIAlWTU9WVQkoVkVDX1NJWkUgKiAzKSglcmRpKSwgJXltbTAKLQlWUENNUEVRCShWRUNfU0la RSAqIDMpKCVyc2kpLCAleW1tMCwgJXltbTEKKwlDTVBfUjFfUzJfeW1tICgleW1tMCwgKFZFQ19T SVpFICogMykoJXJzaSksICV5bW0yLCAleW1tMSkKIAlWUENNUEVRCSV5bW0wLCAleW1tWkVSTywg JXltbTIKIAl2cGFuZG4JJXltbTEsICV5bW0yLCAleW1tMQogCXZwbW92bXNrYiAleW1tMSwgJWVj eApAQCAtMzk1LDEyICs1NTUsMTAgQEAgTChsb29wX3NraXBfcGFnZV9jcm9zc19jaGVjayk6CiAJ Vk1PVkEJKFZFQ19TSVpFICogMykoJXJkaSksICV5bW02CiAKIAkvKiB5bW0xIGFsbCAxcyB3aGVy ZSBzMSBhbmQgczIgZXF1YWwuIEFsbCAwcyBvdGhlcndpc2UuICAqLwotCVZQQ01QRVEJKFZFQ19T SVpFICogMCkoJXJzaSksICV5bW0wLCAleW1tMQotCi0JVlBDTVBFUQkoVkVDX1NJWkUgKiAxKSgl cnNpKSwgJXltbTIsICV5bW0zCi0JVlBDTVBFUQkoVkVDX1NJWkUgKiAyKSglcnNpKSwgJXltbTQs ICV5bW01Ci0JVlBDTVBFUQkoVkVDX1NJWkUgKiAzKSglcnNpKSwgJXltbTYsICV5bW03Ci0KKwlD TVBfUjFfUzJfeW1tICgleW1tMCwgKFZFQ19TSVpFICogMCkoJXJzaSksICV5bW0zLCAleW1tMSkK KwlDTVBfUjFfUzJfeW1tICgleW1tMiwgKFZFQ19TSVpFICogMSkoJXJzaSksICV5bW01LCAleW1t MykKKwlDTVBfUjFfUzJfeW1tICgleW1tNCwgKFZFQ19TSVpFICogMikoJXJzaSksICV5bW03LCAl eW1tNSkKKwlDTVBfUjFfUzJfeW1tICgleW1tNiwgKFZFQ19TSVpFICogMykoJXJzaSksICV5bW0x MywgJXltbTcpCiAKIAkvKiBJZiBhbnkgbWlzbWF0Y2hlcyBvciBudWxsIENIQVIgdGhlbiAwIENI QVIsIG90aGVyd2lzZSBub24tCiAJICAgemVyby4gICovCkBAIC00NjksNiArNjI3LDggQEAgTChy ZXR1cm5fdmVjXzJfM19lbmQpOgogIyBlbHNlCiAJbW92emJsCShWRUNfU0laRSAqIDIgLSBWRUNf T0ZGU0VUKSglcmRpLCAlTE9PUF9SRUc2NCksICVlYXgKIAltb3Z6YmwJKFZFQ19TSVpFICogMiAt IFZFQ19PRkZTRVQpKCVyc2ksICVMT09QX1JFRzY0KSwgJWVjeAorCVRPTE9XRVJfZ3ByICglcmF4 LCAlZWF4KQorCVRPTE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAogCXhv cmwJJXI4ZCwgJWVheAogCXN1YmwJJXI4ZCwgJWVheApAQCAtNTEyLDYgKzY3Miw4IEBAIEwocmV0 dXJuX3ZlY18wX2VuZCk6CiAjIGVsc2UKIAltb3Z6YmwJKCVyZGksICVyY3gpLCAlZWF4CiAJbW92 emJsCSglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3ByICglcmF4LCAlZWF4KQorCVRPTE9X RVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAogCXhvcmwJJXI4ZCwgJWVheAog CXN1YmwJJXI4ZCwgJWVheApAQCAtNTM0LDYgKzY5Niw4IEBAIEwocmV0dXJuX3ZlY18xX2VuZCk6 CiAjICBlbHNlCiAJbW92emJsCVZFQ19TSVpFKCVyZGksICVyY3gpLCAlZWF4CiAJbW92emJsCVZF Q19TSVpFKCVyc2ksICVyY3gpLCAlZWN4CisJVE9MT1dFUl9ncHIgKCVyYXgsICVlYXgpCisJVE9M T1dFUl9ncHIgKCVyY3gsICVlY3gpCiAJc3VibAklZWN4LCAlZWF4CiAJeG9ybAklcjhkLCAlZWF4 CiAJc3VibAklcjhkLCAlZWF4CkBAIC01NjAsNiArNzI0LDggQEAgTChyZXR1cm5fdmVjXzJfZW5k KToKICMgZWxzZQogCW1vdnpibAkoVkVDX1NJWkUgKiAyKSglcmRpLCAlcmN4KSwgJWVheAogCW1v dnpibAkoVkVDX1NJWkUgKiAyKSglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3ByICglcmF4 LCAlZWF4KQorCVRPTE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAogCXhv cmwJJXI4ZCwgJWVheAogCXN1YmwJJXI4ZCwgJWVheApAQCAtNTg3LDcgKzc1Myw3IEBAIEwocGFn ZV9jcm9zc19kdXJpbmdfbG9vcCk6CiAJamxlCUwobGVzc18xeF92ZWNfdGlsbF9wYWdlX2Nyb3Nz KQogCiAJVk1PVkEJKCVyZGkpLCAleW1tMAotCVZQQ01QRVEJKCVyc2kpLCAleW1tMCwgJXltbTEK KwlDTVBfUjFfUzJfeW1tICgleW1tMCwgKCVyc2kpLCAleW1tMiwgJXltbTEpCiAJVlBDTVBFUQkl eW1tMCwgJXltbVpFUk8sICV5bW0yCiAJdnBhbmRuCSV5bW0xLCAleW1tMiwgJXltbTEKIAl2cG1v dm1za2IgJXltbTEsICVlY3gKQEAgLTYwOSw3ICs3NzUsNyBAQCBMKGxlc3NfMXhfdmVjX3RpbGxf cGFnZV9jcm9zcyk6CiAJICAgaGVyZSwgaXQgbWVhbnMgdGhlIHByZXZpb3VzIHBhZ2UgKHJkaSAt IFZFQ19TSVpFKSBoYXMgYWxyZWFkeQogCSAgIGJlZW4gbG9hZGVkIGVhcmxpZXIgc28gbXVzdCBi ZSB2YWxpZC4gICovCiAJVk1PVlUJLVZFQ19TSVpFKCVyZGksICVyYXgpLCAleW1tMAotCVZQQ01Q RVEJLVZFQ19TSVpFKCVyc2ksICVyYXgpLCAleW1tMCwgJXltbTEKKwlDTVBfUjFfUzJfeW1tICgl eW1tMCwgLVZFQ19TSVpFKCVyc2ksICVyYXgpLCAleW1tMiwgJXltbTEpCiAJVlBDTVBFUQkleW1t MCwgJXltbVpFUk8sICV5bW0yCiAJdnBhbmRuCSV5bW0xLCAleW1tMiwgJXltbTEKIAl2cG1vdm1z a2IgJXltbTEsICVlY3gKQEAgLTY1MSw2ICs4MTcsOCBAQCBMKHJldHVybl9wYWdlX2Nyb3NzX2Nt cF9tZW0pOgogIyBlbHNlCiAJbW92emJsCVZFQ19PRkZTRVQoJXJkaSwgJXJjeCksICVlYXgKIAlt b3Z6YmwJVkVDX09GRlNFVCglcnNpLCAlcmN4KSwgJWVjeAorCVRPTE9XRVJfZ3ByICglcmF4LCAl ZWF4KQorCVRPTE9XRVJfZ3ByICglcmN4LCAlZWN4KQogCXN1YmwJJWVjeCwgJWVheAogCXhvcmwJ JXI4ZCwgJWVheAogCXN1YmwJJXI4ZCwgJWVheApAQCAtNjc3LDcgKzg0NSw3IEBAIEwobW9yZV8y eF92ZWNfdGlsbF9wYWdlX2Nyb3NzKToKIAkgICBpdGVyYXRpb24gaGVyZS4gICovCiAKIAlWTU9W VQlWRUNfU0laRSglcmRpKSwgJXltbTAKLQlWUENNUEVRCVZFQ19TSVpFKCVyc2kpLCAleW1tMCwg JXltbTEKKwlDTVBfUjFfUzJfeW1tICgleW1tMCwgVkVDX1NJWkUoJXJzaSksICV5bW0yLCAleW1t MSkKIAlWUENNUEVRCSV5bW0wLCAleW1tWkVSTywgJXltbTIKIAl2cGFuZG4JJXltbTEsICV5bW0y LCAleW1tMQogCXZwbW92bXNrYiAleW1tMSwgJWVjeApAQCAtNjkzLDcgKzg2MSw3IEBAIEwobW9y ZV8yeF92ZWNfdGlsbF9wYWdlX2Nyb3NzKToKIAogCS8qIFNhZmUgdG8gaW5jbHVkZSBjb21wYXJp c29ucyBmcm9tIGxvd2VyIGJ5dGVzLiAgKi8KIAlWTU9WVQktKFZFQ19TSVpFICogMikoJXJkaSwg JXJheCksICV5bW0wCi0JVlBDTVBFUQktKFZFQ19TSVpFICogMikoJXJzaSwgJXJheCksICV5bW0w LCAleW1tMQorCUNNUF9SMV9TMl95bW0gKCV5bW0wLCAtKFZFQ19TSVpFICogMikoJXJzaSwgJXJh eCksICV5bW0yLCAleW1tMSkKIAlWUENNUEVRCSV5bW0wLCAleW1tWkVSTywgJXltbTIKIAl2cGFu ZG4JJXltbTEsICV5bW0yLCAleW1tMQogCXZwbW92bXNrYiAleW1tMSwgJWVjeApAQCAtNzAxLDcg Kzg2OSw3IEBAIEwobW9yZV8yeF92ZWNfdGlsbF9wYWdlX2Nyb3NzKToKIAlqbnoJTChyZXR1cm5f dmVjX3BhZ2VfY3Jvc3NfMCkKIAogCVZNT1ZVCS0oVkVDX1NJWkUgKiAxKSglcmRpLCAlcmF4KSwg JXltbTAKLQlWUENNUEVRCS0oVkVDX1NJWkUgKiAxKSglcnNpLCAlcmF4KSwgJXltbTAsICV5bW0x CisJQ01QX1IxX1MyX3ltbSAoJXltbTAsIC0oVkVDX1NJWkUgKiAxKSglcnNpLCAlcmF4KSwgJXlt bTIsICV5bW0xKQogCVZQQ01QRVEJJXltbTAsICV5bW1aRVJPLCAleW1tMgogCXZwYW5kbgkleW1t MSwgJXltbTIsICV5bW0xCiAJdnBtb3Ztc2tiICV5bW0xLCAlZWN4CkBAIC03MTksOCArODg3LDgg QEAgTChtb3JlXzJ4X3ZlY190aWxsX3BhZ2VfY3Jvc3MpOgogCVZNT1ZBCShWRUNfU0laRSAqIDIp KCVyZGkpLCAleW1tNAogCVZNT1ZBCShWRUNfU0laRSAqIDMpKCVyZGkpLCAleW1tNgogCi0JVlBD TVBFUQkoVkVDX1NJWkUgKiAyKSglcnNpKSwgJXltbTQsICV5bW01Ci0JVlBDTVBFUQkoVkVDX1NJ WkUgKiAzKSglcnNpKSwgJXltbTYsICV5bW03CisJQ01QX1IxX1MyX3ltbSAoJXltbTQsIChWRUNf U0laRSAqIDIpKCVyc2kpLCAleW1tNywgJXltbTUpCisJQ01QX1IxX1MyX3ltbSAoJXltbTYsIChW RUNfU0laRSAqIDMpKCVyc2kpLCAleW1tMTMsICV5bW03KQogCXZwYW5kCSV5bW00LCAleW1tNSwg JXltbTUKIAl2cGFuZAkleW1tNiwgJXltbTcsICV5bW03CiAJVlBNSU5VCSV5bW01LCAleW1tNywg JXltbTcKQEAgLTc3MSw2ICs5MzksOCBAQCBMKHJldHVybl92ZWNfcGFnZV9jcm9zc18xKToKICMg ZWxzZQogCW1vdnpibAlWRUNfT0ZGU0VUKCVyZGksICVyY3gpLCAlZWF4CiAJbW92emJsCVZFQ19P RkZTRVQoJXJzaSwgJXJjeCksICVlY3gKKwlUT0xPV0VSX2dwciAoJXJheCwgJWVheCkKKwlUT0xP V0VSX2dwciAoJXJjeCwgJWVjeCkKIAlzdWJsCSVlY3gsICVlYXgKIAl4b3JsCSVyOGQsICVlYXgK IAlzdWJsCSVyOGQsICVlYXgKQEAgLTgyNiw3ICs5OTYsNyBAQCBMKHBhZ2VfY3Jvc3MpOgogTChw YWdlX2Nyb3NzX2xvb3ApOgogCiAJVk1PVlUJKCVyZGksICVPRkZTRVRfUkVHNjQpLCAleW1tMAot CVZQQ01QRVEJKCVyc2ksICVPRkZTRVRfUkVHNjQpLCAleW1tMCwgJXltbTEKKwlDTVBfUjFfUzJf eW1tICgleW1tMCwgKCVyc2ksICVPRkZTRVRfUkVHNjQpLCAleW1tMiwgJXltbTEpCiAJVlBDTVBF UQkleW1tMCwgJXltbVpFUk8sICV5bW0yCiAJdnBhbmRuCSV5bW0xLCAleW1tMiwgJXltbTEKIAl2 cG1vdm1za2IgJXltbTEsICVlY3gKQEAgLTg0NCwxMSArMTAxNCwxMSBAQCBMKHBhZ2VfY3Jvc3Nf bG9vcCk6CiAJc3VibAklZWF4LCAlT0ZGU0VUX1JFRwogCS8qIE9GRlNFVF9SRUcgaGFzIGRpc3Rh bmNlIHRvIHBhZ2UgY3Jvc3MgLSBWRUNfU0laRS4gR3VyYW50ZWVkCiAJICAgdG8gbm90IGNyb3Nz IHBhZ2Ugc28gaXMgc2FmZSB0byBsb2FkLiBTaW5jZSB3ZSBoYXZlIGFscmVhZHkKLQkgICBsb2Fk ZWQgYXQgbGVhc3QgMSBWRUMgZnJvbSByc2kgaXQgaXMgYWxzbyBndXJhbnRlZWQgdG8gYmUgc2Fm ZS4KLQkgKi8KKwkgICBsb2FkZWQgYXQgbGVhc3QgMSBWRUMgZnJvbSByc2kgaXQgaXMgYWxzbyBn dXJhbnRlZWQgdG8gYmUKKwkgICBzYWZlLiAgKi8KIAogCVZNT1ZVCSglcmRpLCAlT0ZGU0VUX1JF RzY0KSwgJXltbTAKLQlWUENNUEVRCSglcnNpLCAlT0ZGU0VUX1JFRzY0KSwgJXltbTAsICV5bW0x CisJQ01QX1IxX1MyX3ltbSAoJXltbTAsICglcnNpLCAlT0ZGU0VUX1JFRzY0KSwgJXltbTIsICV5 bW0xKQogCVZQQ01QRVEJJXltbTAsICV5bW1aRVJPLCAleW1tMgogCXZwYW5kbgkleW1tMSwgJXlt bTIsICV5bW0xCiAJdnBtb3Ztc2tiICV5bW0xLCAlZWN4CkBAIC04ODEsNiArMTA1MSw4IEBAIEwo cmV0X3ZlY19wYWdlX2Nyb3NzX2NvbnQpOgogIyBlbHNlCiAJbW92emJsCSglcmRpLCAlcmN4KSwg JWVheAogCW1vdnpibAkoJXJzaSwgJXJjeCksICVlY3gKKwlUT0xPV0VSX2dwciAoJXJheCwgJWVh eCkKKwlUT0xPV0VSX2dwciAoJXJjeCwgJWVjeCkKIAlzdWJsCSVlY3gsICVlYXgKIAl4b3JsCSVy OGQsICVlYXgKIAlzdWJsCSVyOGQsICVlYXgKQEAgLTkzNCw3ICsxMTA2LDcgQEAgTChsZXNzXzF4 X3ZlY190aWxsX3BhZ2UpOgogCWphCUwobGVzc18xNl90aWxsX3BhZ2UpCiAKIAlWTU9WVQkoJXJk aSksICV4bW0wCi0JVlBDTVBFUQkoJXJzaSksICV4bW0wLCAleG1tMQorCUNNUF9SMV9TMl94bW0g KCV4bW0wLCAoJXJzaSksICV4bW0yLCAleG1tMSkKIAlWUENNUEVRCSV4bW0wLCAleG1tWkVSTywg JXhtbTIKIAl2cGFuZG4JJXhtbTEsICV4bW0yLCAleG1tMQogCXZwbW92bXNrYiAleW1tMSwgJWVj eApAQCAtOTUyLDcgKzExMjQsNyBAQCBMKGxlc3NfMXhfdmVjX3RpbGxfcGFnZSk6CiAjIGVuZGlm CiAKIAlWTU9WVQkoJXJkaSwgJU9GRlNFVF9SRUc2NCksICV4bW0wCi0JVlBDTVBFUQkoJXJzaSwg JU9GRlNFVF9SRUc2NCksICV4bW0wLCAleG1tMQorCUNNUF9SMV9TMl94bW0gKCV4bW0wLCAoJXJz aSwgJU9GRlNFVF9SRUc2NCksICV4bW0yLCAleG1tMSkKIAlWUENNUEVRCSV4bW0wLCAleG1tWkVS TywgJXhtbTIKIAl2cGFuZG4JJXhtbTEsICV4bW0yLCAleG1tMQogCXZwbW92bXNrYiAleW1tMSwg JWVjeApAQCAtOTkwLDcgKzExNjIsNyBAQCBMKGxlc3NfMTZfdGlsbF9wYWdlKToKIAl2bW92cQko JXJkaSksICV4bW0wCiAJdm1vdnEJKCVyc2kpLCAleG1tMQogCVZQQ01QRVEJJXhtbTAsICV4bW1a RVJPLCAleG1tMgotCVZQQ01QRVEJJXhtbTEsICV4bW0wLCAleG1tMQorCUNNUF9SMV9SMl94bW0g KCV4bW0wLCAleG1tMSwgJXhtbTMsICV4bW0xKQogCXZwYW5kbgkleG1tMSwgJXhtbTIsICV4bW0x CiAJdnBtb3Ztc2tiICV5bW0xLCAlZWN4CiAJaW5jYgklY2wKQEAgLTEwMTAsNyArMTE4Miw3IEBA IEwobGVzc18xNl90aWxsX3BhZ2UpOgogCXZtb3ZxCSglcmRpLCAlT0ZGU0VUX1JFRzY0KSwgJXht bTAKIAl2bW92cQkoJXJzaSwgJU9GRlNFVF9SRUc2NCksICV4bW0xCiAJVlBDTVBFUQkleG1tMCwg JXhtbVpFUk8sICV4bW0yCi0JVlBDTVBFUQkleG1tMSwgJXhtbTAsICV4bW0xCisJQ01QX1IxX1Iy X3htbSAoJXhtbTAsICV4bW0xLCAleG1tMywgJXhtbTEpCiAJdnBhbmRuCSV4bW0xLCAleG1tMiwg JXhtbTEKIAl2cG1vdm1za2IgJXltbTEsICVlY3gKIAlpbmNiCSVjbApAQCAtMTA2Niw3ICsxMjM4 LDcgQEAgTChyZXRfbGVzc184X3djcyk6CiAJdm1vdmQJKCVyZGkpLCAleG1tMAogCXZtb3ZkCSgl cnNpKSwgJXhtbTEKIAlWUENNUEVRCSV4bW0wLCAleG1tWkVSTywgJXhtbTIKLQlWUENNUEVRCSV4 bW0xLCAleG1tMCwgJXhtbTEKKwlDTVBfUjFfUjJfeG1tICgleG1tMCwgJXhtbTEsICV4bW0zLCAl eG1tMSkKIAl2cGFuZG4JJXhtbTEsICV4bW0yLCAleG1tMQogCXZwbW92bXNrYiAleW1tMSwgJWVj eAogCXN1YmwJJDB4ZiwgJWVjeApAQCAtMTA4NSw3ICsxMjU3LDcgQEAgTChyZXRfbGVzc184X3dj cyk6CiAJdm1vdmQJKCVyZGksICVPRkZTRVRfUkVHNjQpLCAleG1tMAogCXZtb3ZkCSglcnNpLCAl T0ZGU0VUX1JFRzY0KSwgJXhtbTEKIAlWUENNUEVRCSV4bW0wLCAleG1tWkVSTywgJXhtbTIKLQlW UENNUEVRCSV4bW0xLCAleG1tMCwgJXhtbTEKKwlDTVBfUjFfUjJfeG1tICgleG1tMCwgJXhtbTEs ICV4bW0zLCAleG1tMSkKIAl2cGFuZG4JJXhtbTEsICV4bW0yLCAleG1tMQogCXZwbW92bXNrYiAl eW1tMSwgJWVjeAogCXN1YmwJJDB4ZiwgJWVjeApAQCAtMTExOSw3ICsxMjkxLDkgQEAgTChsZXNz XzRfdGlsbF9wYWdlKToKIEwobGVzc180X2xvb3ApOgogCW1vdnpibAkoJXJkaSksICVlYXgKIAlt b3Z6YmwJKCVyc2ksICVyZGkpLCAlZWN4Ci0Jc3VibAklZWN4LCAlZWF4CisJVE9MT1dFUl9ncHIg KCVyYXgsICVlYXgpCisJVE9MT1dFUl9ncHIgKCVyY3gsICVCWVRFX0xPT1BfUkVHKQorCXN1YmwJ JUJZVEVfTE9PUF9SRUcsICVlYXgKIAlqbnoJTChyZXRfbGVzc180X2xvb3ApCiAJdGVzdGwJJWVj eCwgJWVjeAogCWp6CUwocmV0X3plcm9fNF9sb29wKQpAQCAtMTE0Niw1ICsxMzIwLDYgQEAgTChy ZXRfbGVzc180X2xvb3ApOgogCXN1YmwJJXI4ZCwgJWVheAogCXJldAogIyBlbmRpZgotRU5EKFNU UkNNUCkKKwljZmlfZW5kcHJvYworCS5zaXplCVNUUkNNUCwgLi1TVFJDTVAKICNlbmRpZgpkaWZm IC0tZ2l0IGEvc3lzZGVwcy94ODZfNjQvbXVsdGlhcmNoL3N0cm5jYXNlX2wtYXZ4Mi1ydG0uUyBi L3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJuY2FzZV9sLWF2eDItcnRtLlMKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uNThjMDVkY2ZiOAotLS0gL2Rldi9udWxsCisr KyBiL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJuY2FzZV9sLWF2eDItcnRtLlMKQEAgLTAs MCArMSwxNiBAQAorI2lmbmRlZiBTVFJDTVAKKyMgZGVmaW5lIFNUUkNNUAlfX3N0cm5jYXNlY21w X2xfYXZ4Ml9ydG0KKyNlbmRpZgorCisjZGVmaW5lIF9HTEFCRUwoeCkJeCAjIyBfcnRtCisjZGVm aW5lIEdMQUJFTCh4KQlfR0xBQkVMKHgpCisKKyNkZWZpbmUgWkVST19VUFBFUl9WRUNfUkVHSVNU RVJTX1JFVFVSTglcCisJWkVST19VUFBFUl9WRUNfUkVHSVNURVJTX1JFVFVSTl9YVEVTVAorCisj ZGVmaW5lIFZaRVJPVVBQRVJfUkVUVVJOCWptcCBMKHJldHVybl92emVyb3VwcGVyKQorCisjZGVm aW5lIFNFQ1RJT04ocCkJcCMjLmF2eC5ydG0KKyNkZWZpbmUgT1ZFUkZMT1dfU1RSQ01QCV9fc3Ry Y2FzZWNtcF9sX2F2eDJfcnRtCisKKyNpbmNsdWRlICJzdHJuY2FzZV9sLWF2eDIuUyIKZGlmZiAt LWdpdCBhL3N5c2RlcHMveDg2XzY0L211bHRpYXJjaC9zdHJuY2FzZV9sLWF2eDIuUyBiL3N5c2Rl cHMveDg2XzY0L211bHRpYXJjaC9zdHJuY2FzZV9sLWF2eDIuUwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwLi40OGMwYWEyMWY4Ci0tLSAvZGV2L251bGwKKysrIGIvc3lzZGVw cy94ODZfNjQvbXVsdGlhcmNoL3N0cm5jYXNlX2wtYXZ4Mi5TCkBAIC0wLDAgKzEsMjcgQEAKKy8q IHN0cm5jYXNlY21wX2wgb3B0aW1pemVkIHdpdGggQVZYMi4KKyAgIENvcHlyaWdodCAoQykgMjAx Ny0yMDIyIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorICAgVGhpcyBmaWxlIGlzIHBh cnQgb2YgdGhlIEdOVSBDIExpYnJhcnkuCisKKyAgIFRoZSBHTlUgQyBMaWJyYXJ5IGlzIGZyZWUg c29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICAgbW9kaWZ5IGl0IHVu ZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICAgTGljZW5z ZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisg ICB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0 ZXIgdmVyc2lvbi4KKworICAgVGhlIEdOVSBDIExpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhl IGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5U WTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICBNRVJDSEFOVEFCSUxJ VFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICAg TGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworICAgWW91 IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1 YmxpYworICAgTGljZW5zZSBhbG9uZyB3aXRoIHRoZSBHTlUgQyBMaWJyYXJ5OyBpZiBub3QsIHNl ZQorICAgPGh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4gICovCisKKyNpZm5kZWYgU1RS Q01QCisjIGRlZmluZSBTVFJDTVAJX19zdHJuY2FzZWNtcF9sX2F2eDIKKyNlbmRpZgorI2RlZmlu ZSBVU0VfQVNfU1RSQ0FTRUNNUF9MCisjZGVmaW5lIFVTRV9BU19TVFJOQ01QCisjaWZuZGVmIE9W RVJGTE9XX1NUUkNNUAorIyBkZWZpbmUgT1ZFUkZMT1dfU1RSQ01QCV9fc3RyY2FzZWNtcF9sX2F2 eDIKKyNlbmRpZgorI2luY2x1ZGUgInN0cmNtcC1hdngyLlMiCi0tIAoyLjM1LjEKCg== --0000000000000665d405ded5d693--