d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify code, and in while loop, fix operator to match the unwinding

Browse Source 
direction.
This commit is contained in:
David Xu 2010-09-25 04:21:31 +00:00
parent f4213b9006
commit 6f066bb387
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=213154
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libthr/thread/thr_exit.c
View File

@ -140,17 +140,14 @@ thread_unwind_stop(int version, _Unwind_Action actions,
/* XXX assume stack grows down to lower address */
cfa = _Unwind_GetCFA(context);
if (actions & _UA_END_OF_STACK) {
done = 1;
} else if (cfa >= (uintptr_t)curthread->unwind_stackend) {
if (actions & _UA_END_OF_STACK ||
cfa >= (uintptr_t)curthread->unwind_stackend) {
done = 1;
}
while ((cur = curthread->cleanup) != NULL &&
(done ||
((uintptr_t)cur < (uintptr_t)curthread->unwind_stackend &&
(uintptr_t)cur >= cfa))) {
__pthread_cleanup_pop_imp(1);
(done || (uintptr_t)cur <= cfa)) {
__pthread_cleanup_pop_imp(1);
}
if (done)