drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add _REENT_STDIN(ptr) 

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.
This commit is contained in:
Matt Joyce 2022-01-28 10:58:36 +01:00 committed by Sebastian Huber
parent f3b8138239
commit 627a5cb413
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/include/stdio.h
View File

@ -167,11 +167,11 @@ typedef _ssize_t ssize_t;
#define TMP_MAX 26 #define TMP_MAX 26
#define stdin (_REENT->_stdin) #define stdin _REENT_STDIN(_REENT)
#define stdout (_REENT->_stdout) #define stdout (_REENT->_stdout)
#define stderr (_REENT->_stderr) #define stderr (_REENT->_stderr)
#define _stdin_r(x) ((x)->_stdin) #define _stdin_r(x) _REENT_STDIN(x)
#define _stdout_r(x) ((x)->_stdout) #define _stdout_r(x) ((x)->_stdout)
#define _stderr_r(x) ((x)->_stderr) #define _stderr_r(x) ((x)->_stderr)

1
newlib/libc/include/sys/reent.h
View File

@ -720,6 +720,7 @@ struct _reent
#define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency) #define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency)
#define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_ERRNO(_ptr) ((_ptr)->_errno)
#define _REENT_STDIN(_ptr) ((_ptr)->_stdin)
#define _REENT_INIT_PTR(var) \ #define _REENT_INIT_PTR(var) \
{ memset((var), 0, sizeof(*(var))); \ { memset((var), 0, sizeof(*(var))); \

4
newlib/libc/include/wchar.h
View File

@ -320,13 +320,13 @@ int _wscanf_r (struct _reent *, const wchar_t *, ...);
#define getwc(fp) fgetwc(fp) #define getwc(fp) fgetwc(fp)
#define putwc(wc,fp) fputwc((wc), (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) #define putwchar(wc) fputwc((wc), _REENT->_stdout)
#if __GNU_VISIBLE #if __GNU_VISIBLE
#define getwc_unlocked(fp) fgetwc_unlocked(fp) #define getwc_unlocked(fp) fgetwc_unlocked(fp)
#define putwc_unlocked(wc,fp) fputwc_unlocked((wc), (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) #define putwchar_unlocked(wc) fputwc_unlocked((wc), _REENT->_stdout)
#endif #endif

4
newlib/libc/machine/spu/stdio.c
View File

@ -67,8 +67,8 @@ __sinit (struct _reent *s)
{ {
s->__cleanup = __cleanup; s->__cleanup = __cleanup;
s->_stdin = &s->__sf[0]; _REENT_STDIN(s) = &s->__sf[0];
s->_stdin->_fp = SPE_STDIN; _REENT_STDIN(s)->_fp = SPE_STDIN;
s->_stdout = &s->__sf[1]; s->_stdout = &s->__sf[1];
s->_stdout->_fp = SPE_STDOUT; s->_stdout->_fp = SPE_STDOUT;

4
newlib/libc/stdio/findfp.c
View File

@ -218,8 +218,8 @@ found:
static void static void
cleanup_stdio (struct _reent *ptr) cleanup_stdio (struct _reent *ptr)
{ {
if (ptr->_stdin != &__sf[0]) if (_REENT_STDIN(ptr) != &__sf[0])
CLEANUP_FILE (ptr, ptr->_stdin); CLEANUP_FILE (ptr, _REENT_STDIN(ptr));
if (ptr->_stdout != &__sf[1]) if (ptr->_stdout != &__sf[1])
CLEANUP_FILE (ptr, ptr->_stdout); CLEANUP_FILE (ptr, ptr->_stdout);
if (ptr->_stderr != &__sf[2]) if (ptr->_stderr != &__sf[2])