From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 2295C38560BC; Wed, 13 Jul 2022 08:19:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2295C38560BC 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_STDIN(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: f3b8138239d3ba34c4ecaa4305b0fbd7eb4e28a5 X-Git-Newrev: 627a5cb4133ece2a80dbca27c403d4ceb3139130 Message-Id: <20220713081923.2295C38560BC@sourceware.org> Date: Wed, 13 Jul 2022 08:19:23 +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:19:23 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D627a5cb4133= ece2a80dbca27c403d4ceb3139130 commit 627a5cb4133ece2a80dbca27c403d4ceb3139130 Author: Matt Joyce Date: Fri Jan 28 10:58:36 2022 +0100 Add _REENT_STDIN(ptr) =20 Add a _REENT_STDIN() macro to encapsulate access to the _stdin member of struct reent. This will help to replace the struct member with a thread-local storage object in a follow up patch. Diff: --- newlib/libc/include/stdio.h | 4 ++-- newlib/libc/include/sys/reent.h | 1 + newlib/libc/include/wchar.h | 4 ++-- newlib/libc/machine/spu/stdio.c | 4 ++-- newlib/libc/stdio/findfp.c | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index b995b56d2..c802b3737 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -167,11 +167,11 @@ typedef _ssize_t ssize_t; =20 #define TMP_MAX 26 =20 -#define stdin (_REENT->_stdin) +#define stdin _REENT_STDIN(_REENT) #define stdout (_REENT->_stdout) #define stderr (_REENT->_stderr) =20 -#define _stdin_r(x) ((x)->_stdin) +#define _stdin_r(x) _REENT_STDIN(x) #define _stdout_r(x) ((x)->_stdout) #define _stderr_r(x) ((x)->_stderr) =20 diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 70a987100..801fe20f4 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -720,6 +720,7 @@ struct _reent =20 #define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency) #define _REENT_ERRNO(_ptr) ((_ptr)->_errno) +#define _REENT_STDIN(_ptr) ((_ptr)->_stdin) =20 #define _REENT_INIT_PTR(var) \ { memset((var), 0, sizeof(*(var))); \ diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 0d3e636f9..5e9202820 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -320,13 +320,13 @@ int _wscanf_r (struct _reent *, const wchar_t *, ...); =20 #define getwc(fp) fgetwc(fp) #define putwc(wc,fp) fputwc((wc), (fp)) -#define getwchar() fgetwc(_REENT->_stdin) +#define getwchar() fgetwc(_REENT_STDIN(_REENT)) #define putwchar(wc) fputwc((wc), _REENT->_stdout) =20 #if __GNU_VISIBLE #define getwc_unlocked(fp) fgetwc_unlocked(fp) #define putwc_unlocked(wc,fp) fputwc_unlocked((wc), (fp)) -#define getwchar_unlocked() fgetwc_unlocked(_REENT->_stdin) +#define getwchar_unlocked() fgetwc_unlocked(_REENT_STDIN(_REENT)) #define putwchar_unlocked(wc) fputwc_unlocked((wc), _REENT->_stdout) #endif =20 diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdi= o.c index 1dcc88b60..756628303 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -67,8 +67,8 @@ __sinit (struct _reent *s) { s->__cleanup =3D __cleanup; =20 - s->_stdin =3D &s->__sf[0]; - s->_stdin->_fp =3D SPE_STDIN; + _REENT_STDIN(s) =3D &s->__sf[0]; + _REENT_STDIN(s)->_fp =3D SPE_STDIN; =20 s->_stdout =3D &s->__sf[1]; s->_stdout->_fp =3D SPE_STDOUT; diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index c7a4a941e..d2292d3e0 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -218,8 +218,8 @@ found: static void cleanup_stdio (struct _reent *ptr) { - if (ptr->_stdin !=3D &__sf[0]) - CLEANUP_FILE (ptr, ptr->_stdin); + if (_REENT_STDIN(ptr) !=3D &__sf[0]) + CLEANUP_FILE (ptr, _REENT_STDIN(ptr)); if (ptr->_stdout !=3D &__sf[1]) CLEANUP_FILE (ptr, ptr->_stdout); if (ptr->_stderr !=3D &__sf[2])