From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH 13/14] Add _REENT_IS_NULL()
Date: Tue, 21 Jun 2022 14:49:30 +0200 [thread overview]
Message-ID: <20220621124931.36450-14-sebastian.huber@embedded-brains.de> (raw)
In-Reply-To: <20220621124931.36450-1-sebastian.huber@embedded-brains.de>
From: Matt Joyce <matthew.joyce@embedded-brains.de>
In a follow up patch, struct _reent is optionally replaced by dedicated
thread-local objects. In this case,_REENT is optionally defined to NULL. Add
the _REENT_IS_NULL() macro to disable this check on demand.
---
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/reent.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_DATA__;
# define _REENT _impure_ptr
#endif /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
+#define _REENT_IS_NULL(_ptr) ((_ptr) == NULL)
+
#define _GLOBAL_REENT (&_impure_data)
/* 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/c99ppe.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 = 0 )
#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 _reent *, void *,
do \
{ \
struct _reent *_check_init_ptr = (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)
--
2.35.3
next prev parent reply other threads:[~2022-06-21 12:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 12:49 [PATCH 00/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 12:49 ` [PATCH 01/14] Move content in <sys/reent.h> Sebastian Huber
2022-06-21 12:49 ` [PATCH 02/14] Define _REENT_EMERGENCY(ptr) only once Sebastian Huber
2022-06-21 12:49 ` [PATCH 03/14] Add _REENT_ERRNO(ptr) Sebastian Huber
[not found] ` <BN2P110MB15447CD8C6DD815779AA7E4C9AB39@BN2P110MB1544.NAMP110.PROD.OUTLOOK.COM>
2022-06-21 14:41 ` Fw: " C Howland
2022-06-23 10:55 ` Sebastian Huber
2022-07-11 7:41 ` Sebastian Huber
2022-07-12 16:11 ` Corinna Vinschen
2022-07-12 16:38 ` Sebastian Huber
2022-07-12 18:25 ` Corinna Vinschen
2022-07-13 7:17 ` Sebastian Huber
2022-07-13 7:50 ` Corinna Vinschen
2022-07-13 8:19 ` Sebastian Huber
2022-07-13 11:13 ` Corinna Vinschen
2022-06-21 12:49 ` [PATCH 04/14] Add _REENT_STDIN(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 05/14] Add _REENT_STDOUT(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 06/14] Add _REENT_STDERR(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 07/14] Add _REENT_INC(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 08/14] Add _REENT_LOCALE(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 09/14] Add _REENT_CLEANUP(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 10/14] Add _REENT_CVTLEN(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 11/14] Add _REENT_CVTBUF(ptr) Sebastian Huber
2022-06-21 12:49 ` [PATCH 12/14] Add _REENT_SIG_FUNC(ptr) Sebastian Huber
2022-06-21 12:49 ` Sebastian Huber [this message]
2022-06-21 12:49 ` [PATCH 14/14] Add --enable-newlib-reent-thread-local option Sebastian Huber
2022-06-21 13:59 ` Torbjorn SVENSSON
2022-06-21 15:10 ` Sebastian Huber
2022-07-12 11:18 ` [PATCH 00/14] " Sebastian Huber
2022-07-12 14:45 ` Corinna Vinschen
2022-07-12 15:53 ` Sebastian Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621124931.36450-14-sebastian.huber@embedded-brains.de \
--to=sebastian.huber@embedded-brains.de \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).