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

Add two __sglue initialization macros 

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.
This commit is contained in:
Matt Joyce 2022-04-05 11:40:19 +02:00 committed by Sebastian Huber
parent d041db3792
commit e5e36867f8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,8 +702,14 @@ struct _reent
#ifdef _REENT_GLOBAL_STDIO_STREAMS #ifdef _REENT_GLOBAL_STDIO_STREAMS
#define _REENT_STDIO_STREAM(var, index) &__sf[index] #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 #else
#define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index] #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 #endif
#define _REENT_INIT(var) \ #define _REENT_INIT(var) \
@ -751,7 +757,7 @@ struct _reent
}, \ }, \
_REENT_INIT_ATEXIT \ _REENT_INIT_ATEXIT \
_NULL, \ _NULL, \
{_NULL, 0, _NULL} \ _REENT_INIT_SGLUE(&(var)) \
} }
#define _REENT_INIT_PTR_ZEROED(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[1] = _RAND48_MULT_1; \
(var)->_new._reent._r48._mult[2] = _RAND48_MULT_2; \ (var)->_new._reent._r48._mult[2] = _RAND48_MULT_2; \
(var)->_new._reent._r48._add = _RAND48_ADD; \ (var)->_new._reent._r48._add = _RAND48_ADD; \
_REENT_INIT_SGLUE_ZEROED(var) \
} }
#define _REENT_CHECK_RAND48(ptr) /* nothing */ #define _REENT_CHECK_RAND48(ptr) /* nothing */

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

@ -246,12 +246,7 @@ __sinit (struct _reent *s)
/* make sure we clean up on exit */ /* make sure we clean up on exit */
s->__cleanup = cleanup_stdio; /* conservative */ s->__cleanup = cleanup_stdio; /* conservative */
#ifndef _REENT_SMALL #ifdef _REENT_SMALL
# ifndef _REENT_GLOBAL_STDIO_STREAMS
s->__sglue._niobs = 3;
s->__sglue._iobs = &s->__sf[0];
# endif /* _REENT_GLOBAL_STDIO_STREAMS */
#else
# ifndef _REENT_GLOBAL_STDIO_STREAMS # ifndef _REENT_GLOBAL_STDIO_STREAMS
s->_stdin = __sfp(s); s->_stdin = __sfp(s);
s->_stdout = __sfp(s); s->_stdout = __sfp(s);