From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 4D9F03857B8C; Wed, 13 Jul 2022 08:19:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4D9F03857B8C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Add _REENT_CLEANUP(ptr) X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 50f078b48cea6664975b87cbacf2a7dfacb42fba X-Git-Newrev: f89ce35d83c705cfb9ae0564d1999f39c4e8fa83 Message-Id: <20220713081948.4D9F03857B8C@sourceware.org> Date: Wed, 13 Jul 2022 08:19:48 +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:48 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Df89ce35d83c= 705cfb9ae0564d1999f39c4e8fa83 commit f89ce35d83c705cfb9ae0564d1999f39c4e8fa83 Author: Matt Joyce Date: Thu Feb 3 10:18:53 2022 +0100 Add _REENT_CLEANUP(ptr) =20 Add a _REENT_CLEANUP() macro to encapsulate access to the __cleanup 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/sys/reent.h | 1 + newlib/libc/machine/spu/c99ppe.h | 2 +- newlib/libc/machine/spu/stdio.c | 2 +- newlib/libc/reent/reent.c | 4 ++-- newlib/libc/stdio/findfp.c | 4 ++-- newlib/libc/stdio/local.h | 2 +- newlib/libc/stdio/setvbuf.c | 2 +- newlib/libc/sys/arm/syscalls.c | 2 +- winsup/cygwin/cygtls.cc | 2 +- winsup/cygwin/dcrt0.cc | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 4296188f5..3d277638f 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -718,6 +718,7 @@ struct _reent =20 #endif /* !_REENT_SMALL */ =20 +#define _REENT_CLEANUP(_ptr) ((_ptr)->__cleanup) #define _REENT_EMERGENCY(_ptr) ((_ptr)->_emergency) #define _REENT_ERRNO(_ptr) ((_ptr)->_errno) #define _REENT_INC(_ptr) ((_ptr)->_inc) diff --git a/newlib/libc/machine/spu/c99ppe.h b/newlib/libc/machine/spu/c99= ppe.h index 263cf7fe0..7b3fcb6b7 100644 --- a/newlib/libc/machine/spu/c99ppe.h +++ b/newlib/libc/machine/spu/c99ppe.h @@ -104,6 +104,6 @@ FILE *__sfp (struct _reent *); #define __sfp_free(fp) ( (fp)->_fp =3D 0 ) =20 #define CHECK_INIT(ptr) \ - do { if ((ptr) && !(ptr)->__cleanup) __sinit (ptr); } while (0) + do { if ((ptr) && !_REENT_CLEANUP(ptr)) __sinit (ptr); } while (0) #define CHECK_STR_INIT(ptr) /* currently, do nothing */ #endif /* __ASSEMBLER__ */ diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdi= o.c index 83a60c06b..fd45b0014 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -65,7 +65,7 @@ __cleanup (struct _reent *s) void __sinit (struct _reent *s) { - s->__cleanup =3D __cleanup; + _REENT_CLEANUP(s) =3D __cleanup; =20 _REENT_STDIN(s) =3D &s->__sf[0]; _REENT_STDIN(s)->_fp =3D SPE_STDIN; diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c index a9d44b455..16ac04e22 100644 --- a/newlib/libc/reent/reent.c +++ b/newlib/libc/reent/reent.c @@ -86,11 +86,11 @@ _reclaim_reent (struct _reent *ptr) if (ptr->_sig_func) _free_r (ptr, ptr->_sig_func);*/ =20 - if (ptr->__cleanup) + if (_REENT_CLEANUP(ptr)) { /* cleanup won't reclaim memory 'coz usually it's run before the program exits, and who wants to wait for that? */ - ptr->__cleanup (ptr); + _REENT_CLEANUP(ptr) (ptr); } =20 /* Malloc memory not reclaimed; no good way to return memory anyway.= */ diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 3c888d03c..fbdb7f2f2 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -235,14 +235,14 @@ __sinit (struct _reent *s) { __sfp_lock_acquire (); =20 - if (s->__cleanup) + if (_REENT_CLEANUP(s)) { __sfp_lock_release (); return; } =20 /* make sure we clean up on exit */ - s->__cleanup =3D cleanup_stdio; /* conservative */ + _REENT_CLEANUP(s) =3D cleanup_stdio; /* conservative */ =20 global_stdio_init (); __sfp_lock_release (); diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index 9b355e3ac..24eaff351 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -197,7 +197,7 @@ extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reen= t *, void *, do \ { \ struct _reent *_check_init_ptr =3D (ptr); \ - if ((_check_init_ptr) && !(_check_init_ptr)->__cleanup) \ + if ((_check_init_ptr) && !_REENT_CLEANUP(_check_init_ptr))\ __sinit (_check_init_ptr); \ } \ while (0) diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c index 46c58a7b8..e27ea086c 100644 --- a/newlib/libc/stdio/setvbuf.c +++ b/newlib/libc/stdio/setvbuf.c @@ -174,7 +174,7 @@ nbf: * We're committed to buffering from here, so make sure we've * registered to flush buffers on exit. */ - if (!reent->__cleanup) + if (!_REENT_CLEANUP(reent)) __sinit(reent); =20 #ifdef _FSEEK_OPTIMIZATION diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c index 4b9be701a..325c0117f 100644 --- a/newlib/libc/sys/arm/syscalls.c +++ b/newlib/libc/sys/arm/syscalls.c @@ -60,7 +60,7 @@ extern void __sinit (struct _reent *); #define CHECK_INIT(ptr) \ do \ { \ - if ((ptr) && !(ptr)->__cleanup) \ + if ((ptr) && !_REENT_CLEANUP(ptr)) \ __sinit (ptr); \ } \ while (0) diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index 866342613..d0f4426c8 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -55,7 +55,7 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, voi= d *)) _REENT_INIT_PTR (&local_clib); stackptr =3D stack; altstack.ss_flags =3D SS_DISABLE; - if (_GLOBAL_REENT->__cleanup) + if (_REENT_CLEANUP(_GLOBAL_REENT)) local_clib.__cleanup =3D _cygtls::cleanup_early; } =20 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 9cbb8908f..897a2fba3 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -800,7 +800,7 @@ main_thread_sinit () read or written in the first stdio function call in the main thread. =20 To fix this issue we set __cleanup to _cygtls::cleanup_early here. */ - _REENT->__cleanup =3D _cygtls::cleanup_early; + _REENT_CLEANUP(_REENT) =3D _cygtls::cleanup_early; } =20 /* Take over from libc's crt0.o and start the application. Note the