From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 5AD29385021A; Fri, 24 Jun 2022 05:42:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AD29385021A Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] bitset: rename confusing macro NAND to ANDNOT X-Act-Checkin: newlib-cygwin X-Git-Author: Ryan Libby X-Git-Refname: refs/heads/master X-Git-Oldrev: 96c645a0b1e8c136f0d70106b8ab3d0acf621c12 X-Git-Newrev: de1380c36b9018f8f2f4f52de47939c75e26818f Message-Id: <20220624054219.5AD29385021A@sourceware.org> Date: Fri, 24 Jun 2022 05:42:19 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 05:42:19 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dde1380c36b9= 018f8f2f4f52de47939c75e26818f commit de1380c36b9018f8f2f4f52de47939c75e26818f Author: Ryan Libby Date: Fri Dec 13 09:32:16 2019 +0000 bitset: rename confusing macro NAND to ANDNOT =20 s/BIT_NAND/BIT_ANDNOT/, and for CPU and DOMAINSET too. The actual implementation is "and not" (or "but not"), i.e. A but not B. Fortunately this does appear to be what all existing callers want. =20 Don't supply a NAND (not (A and B)) operation at this time. =20 Discussed with: jeff Reviewed by: cem Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22791 Diff: --- newlib/libc/sys/rtems/include/sys/bitset.h | 4 ++-- newlib/libc/sys/rtems/include/sys/cpuset.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/newlib/libc/sys/rtems/include/sys/bitset.h b/newlib/libc/sys/r= tems/include/sys/bitset.h index 0334939c9..a1fd8b316 100644 --- a/newlib/libc/sys/rtems/include/sys/bitset.h +++ b/newlib/libc/sys/rtems/include/sys/bitset.h @@ -152,13 +152,13 @@ (d)->__bits[__i] =3D (s1)->__bits[__i] & (s2)->__bits[__i];\ } while (0) =20 -#define BIT_NAND(_s, d, s) do { \ +#define BIT_ANDNOT(_s, d, s) do { \ __size_t __i; \ for (__i =3D 0; __i < __bitset_words((_s)); __i++) \ (d)->__bits[__i] &=3D ~(s)->__bits[__i]; \ } while (0) =20 -#define BIT_NAND2(_s, d, s1, s2) do { \ +#define BIT_ANDNOT2(_s, d, s1, s2) do { \ __size_t __i; \ for (__i =3D 0; __i < __bitset_words((_s)); __i++) \ (d)->__bits[__i] =3D (s1)->__bits[__i] & ~(s2)->__bits[__i];\ diff --git a/newlib/libc/sys/rtems/include/sys/cpuset.h b/newlib/libc/sys/r= tems/include/sys/cpuset.h index 0d21f77fa..a8af67bac 100644 --- a/newlib/libc/sys/rtems/include/sys/cpuset.h +++ b/newlib/libc/sys/rtems/include/sys/cpuset.h @@ -177,16 +177,16 @@ static __inline void CPU_XOR(cpu_set_t *destset, cons= t cpu_set_t *srcset1, CPU_XOR_S(sizeof(*destset), destset, srcset1, srcset2); } =20 -static __inline void CPU_NAND_S(size_t setsize, cpu_set_t *destset, +static __inline void CPU_ANDNOT_S(size_t setsize, cpu_set_t *destset, const cpu_set_t *srcset1, const cpu_set_t *srcset2) { - BIT_NAND2(_cpu_set_bits(setsize), destset, srcset1, srcset2); + BIT_ANDNOT2(_cpu_set_bits(setsize), destset, srcset1, srcset2); } =20 -static __inline void CPU_NAND(cpu_set_t *destset, const cpu_set_t *srcset1, +static __inline void CPU_ANDNOT(cpu_set_t *destset, const cpu_set_t *srcse= t1, const cpu_set_t *srcset2) { - CPU_NAND_S(sizeof(*destset), destset, srcset1, srcset2); + CPU_ANDNOT_S(sizeof(*destset), destset, srcset1, srcset2); } =20 static __inline int CPU_COUNT_S(size_t setsize, const cpu_set_t *set)