From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 6C1D6385355D; Wed, 13 Jul 2022 08:20:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C1D6385355D 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] Add _REENT_IS_NULL() X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: db2123caf8501a6d2fe0a75a4d196492b68d99c6 X-Git-Newrev: 1a0908203606527b6ac0ed438669b5bcd247a5f9 Message-Id: <20220713082008.6C1D6385355D@sourceware.org> Date: Wed, 13 Jul 2022 08:20:08 +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: Wed, 13 Jul 2022 08:20:08 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D1a090820360= 6527b6ac0ed438669b5bcd247a5f9 commit 1a0908203606527b6ac0ed438669b5bcd247a5f9 Author: Matt Joyce Date: Mon May 23 11:29:57 2022 +0200 Add _REENT_IS_NULL() =20 In a follow up patch, struct _reent is optionally replaced by dedicated thread-local objects. In this case,_REENT is optionally defined to NUL= L. Add the _REENT_IS_NULL() macro to disable this check on demand. Diff: --- newlib/libc/include/sys/reent.h | 2 ++ newlib/libc/machine/spu/c99ppe.h | 8 +++++++- newlib/libc/stdio/local.h | 3 ++- newlib/libc/sys/arm/syscalls.c | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index fa9c6cf82..90f848180 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -763,6 +763,8 @@ extern struct _reent _impure_data __ATTRIBUTE_IMPURE_DA= TA__; # define _REENT _impure_ptr #endif /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */ =20 +#define _REENT_IS_NULL(_ptr) ((_ptr) =3D=3D NULL) + #define _GLOBAL_REENT (&_impure_data) =20 /* This value is used in stdlib/misc.c. reent/reent.c has to know it diff --git a/newlib/libc/machine/spu/c99ppe.h b/newlib/libc/machine/spu/c99= ppe.h index 7b3fcb6b7..6e03d2cb9 100644 --- a/newlib/libc/machine/spu/c99ppe.h +++ b/newlib/libc/machine/spu/c99ppe.h @@ -104,6 +104,12 @@ FILE *__sfp (struct _reent *); #define __sfp_free(fp) ( (fp)->_fp =3D 0 ) =20 #define CHECK_INIT(ptr) \ - do { if ((ptr) && !_REENT_CLEANUP(ptr)) __sinit (ptr); } while (0) + do \ + { \ + if (!_REENT_IS_NULL(ptr) && \ + !_REENT_CLEANUP(ptr)) \ + __sinit (ptr); \ + } \ + while (0) #define CHECK_STR_INIT(ptr) /* currently, do nothing */ #endif /* __ASSEMBLER__ */ diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 24eaff351..b34c7c9d8 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -197,7 +197,8 @@ extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reen= t *, void *, do \ { \ struct _reent *_check_init_ptr =3D (ptr); \ - if ((_check_init_ptr) && !_REENT_CLEANUP(_check_init_ptr))\ + if (!_REENT_IS_NULL(_check_init_ptr) && \ + !_REENT_CLEANUP(_check_init_ptr)) \ __sinit (_check_init_ptr); \ } \ while (0) diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c index 325c0117f..dd49ca061 100644 --- a/newlib/libc/sys/arm/syscalls.c +++ b/newlib/libc/sys/arm/syscalls.c @@ -60,7 +60,8 @@ extern void __sinit (struct _reent *); #define CHECK_INIT(ptr) \ do \ { \ - if ((ptr) && !_REENT_CLEANUP(ptr)) \ + if (!_REENT_IS_NULL(ptr) && \ + !_REENT_CLEANUP(ptr)) \ __sinit (ptr); \ } \ while (0)