falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coroutine-ucontext: use helper for allocating stack memory 

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Peter Lieven 2016-09-27 11:58:43 +02:00 committed by Kevin Wolf
parent 8adcd6fb6d
commit ddba15919b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/coroutine-ucontext.c
View File

@ -34,6 +34,7 @@
typedef struct { typedef struct {
Coroutine base; Coroutine base;
void *stack; void *stack;
size_t stack_size;
sigjmp_buf env; sigjmp_buf env;
#ifdef CONFIG_VALGRIND_H #ifdef CONFIG_VALGRIND_H
@ -82,7 +83,6 @@ static void coroutine_trampoline(int i0, int i1)
Coroutine *qemu_coroutine_new(void) Coroutine *qemu_coroutine_new(void)
{ {
const size_t stack_size = COROUTINE_STACK_SIZE;
CoroutineUContext *co; CoroutineUContext *co;
ucontext_t old_uc, uc; ucontext_t old_uc, uc;
sigjmp_buf old_env; sigjmp_buf old_env;
@ -101,17 +101,18 @@ Coroutine *qemu_coroutine_new(void)
} }
co = g_malloc0(sizeof(*co)); co = g_malloc0(sizeof(*co));
co->stack = g_malloc(stack_size); co->stack_size = COROUTINE_STACK_SIZE;
co->stack = qemu_alloc_stack(&co->stack_size);
co->base.entry_arg = &old_env; /* stash away our jmp_buf */ co->base.entry_arg = &old_env; /* stash away our jmp_buf */
uc.uc_link = &old_uc; uc.uc_link = &old_uc;
uc.uc_stack.ss_sp = co->stack; uc.uc_stack.ss_sp = co->stack;
uc.uc_stack.ss_size = stack_size; uc.uc_stack.ss_size = co->stack_size;
uc.uc_stack.ss_flags = 0; uc.uc_stack.ss_flags = 0;
#ifdef CONFIG_VALGRIND_H #ifdef CONFIG_VALGRIND_H
co->valgrind_stack_id = co->valgrind_stack_id =
VALGRIND_STACK_REGISTER(co->stack, co->stack + stack_size); VALGRIND_STACK_REGISTER(co->stack, co->stack + co->stack_size);
#endif #endif
arg.p = co; arg.p = co;
@ -149,7 +150,7 @@ void qemu_coroutine_delete(Coroutine *co_)
valgrind_stack_deregister(co); valgrind_stack_deregister(co);
#endif #endif
g_free(co->stack); qemu_free_stack(co->stack, co->stack_size);
g_free(co); g_free(co);
} }