public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
From: Matthew Joyce <matthew.joyce@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH v2 04/11] Add two __sglue initialization macros
Date: Thu, 12 May 2022 14:11:36 +0200	[thread overview]
Message-ID: <20220512121143.21473-5-matthew.joyce@embedded-brains.de> (raw)
In-Reply-To: <20220512121143.21473-1-matthew.joyce@embedded-brains.de>

From: Matt Joyce <matthew.joyce@embedded-brains.de>

Added _REENT_INIT_SGLUE and _REENT_INIT_SGLUE_ZEROED macros
to initialize __sglue member of struct _reent. This allows
further simplification of __sinit() and facilitates the removal
of __sglue as a member of struct _reent for certain configurations
in a follow-on patch.
---
 newlib/libc/include/sys/reent.h | 9 ++++++++-
 newlib/libc/stdio/findfp.c      | 7 +------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index e0b0ccffb..4b0d68610 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -702,8 +702,14 @@ struct _reent
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
 #define _REENT_STDIO_STREAM(var, index) &__sf[index]
+#define _REENT_INIT_SGLUE(_ptr) { _NULL, 0, _NULL }
+#define _REENT_INIT_SGLUE_ZEROED(_ptr) /* nothing to set */
 #else
 #define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index]
+#define _REENT_INIT_SGLUE(_ptr) { _NULL, 3, &(_ptr)->__sf[0] }
+#define _REENT_INIT_SGLUE_ZEROED(_ptr) \
+  (_ptr)->__sglue._niobs = 3; \
+  (_ptr)->__sglue._iobs = &(_ptr)->__sf[0];
 #endif
 
 #define _REENT_INIT(var) \
@@ -751,7 +757,7 @@ struct _reent
     }, \
     _REENT_INIT_ATEXIT \
     _NULL, \
-    {_NULL, 0, _NULL} \
+    _REENT_INIT_SGLUE(&(var)) \
   }
 
 #define _REENT_INIT_PTR_ZEROED(var) \
@@ -766,6 +772,7 @@ struct _reent
     (var)->_new._reent._r48._mult[1] = _RAND48_MULT_1; \
     (var)->_new._reent._r48._mult[2] = _RAND48_MULT_2; \
     (var)->_new._reent._r48._add = _RAND48_ADD; \
+    _REENT_INIT_SGLUE_ZEROED(var) \
   }
 
 #define _REENT_CHECK_RAND48(ptr)	/* nothing */
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 8327b1992..66867e664 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -246,12 +246,7 @@ __sinit (struct _reent *s)
   /* make sure we clean up on exit */
   s->__cleanup = cleanup_stdio;	/* conservative */
 
-#ifndef _REENT_SMALL
-# ifndef _REENT_GLOBAL_STDIO_STREAMS
-  s->__sglue._niobs = 3;
-  s->__sglue._iobs = &s->__sf[0];
-# endif /* _REENT_GLOBAL_STDIO_STREAMS */
-#else
+#ifdef _REENT_SMALL
 # ifndef _REENT_GLOBAL_STDIO_STREAMS
   s->_stdin = __sfp(s);
   s->_stdout = __sfp(s);
-- 
2.31.1


  parent reply	other threads:[~2022-05-12 12:11 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-12 12:11 [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 01/11] Remove duplicate stdio initializations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 02/11] Remove duplicate sglue initializations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 03/11] Declare global __sf[] only once Matthew Joyce
2022-05-12 12:11 ` Matthew Joyce [this message]
2022-05-12 12:11 ` [PATCH v2 05/11] Remove __sinit_locks / __sinit_recursive_mutex Matthew Joyce
2022-05-12 13:25   ` Torbjorn SVENSSON
2022-05-12 13:51     ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 06/11] Move __sglue initializations to __sfp() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 07/11] Add CLEANUP_FILE define Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 08/11] Add stdio_exit_handler() Matthew Joyce
2022-05-12 19:11   ` Corinna Vinschen
2022-05-17  8:36   ` Takashi Yano
2022-05-17 10:13     ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 10/11] Add global __sglue object for all configurations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 11/11] Remove __sglue member for one configuration Matthew Joyce
2022-05-12 19:09   ` Corinna Vinschen
2022-05-12 19:14 ` [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Corinna Vinschen
2022-05-12 19:44   ` Corinna Vinschen
2022-05-13  5:44     ` Sebastian Huber
2022-05-13  7:53       ` Corinna Vinschen
2022-05-13 10:54     ` Sebastian Huber
2022-05-13 11:20       ` Corinna Vinschen
2022-05-13  8:03   ` Corinna Vinschen
2022-05-13 11:20     ` Sebastian Huber
2022-05-13 11:30       ` Corinna Vinschen

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=20220512121143.21473-5-matthew.joyce@embedded-brains.de \
    --to=matthew.joyce@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).