diff options
Diffstat (limited to 'libcr/coroutine.c')
| -rw-r--r-- | libcr/coroutine.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libcr/coroutine.c b/libcr/coroutine.c index 8bfdb86..be8d378 100644 --- a/libcr/coroutine.c +++ b/libcr/coroutine.c @@ -140,10 +140,10 @@ static ALWAYS_INLINE void cr_plat_wait_for_interrupt(void) { asm volatile ("wfi":::"memory"); } - static ALWAYS_INLINE void cr_plat_disable_interrupts(void) { + void _cr_plat_disable_interrupts(void) { asm volatile ("cpsid i":::"memory"); } - static ALWAYS_INLINE void cr_plat_enable_interrupts(void) { + void _cr_plat_enable_interrupts(void) { asm volatile ("cpsie i":::"memory"); } @@ -196,12 +196,12 @@ static inline void cr_plat_wait_for_interrupt(void) { pause(); } - static inline void cr_plat_disable_interrupts(void) { + void _cr_plat_disable_interrupts(void) { sigset_t all; sigfillset(&all); sigprocmask(SIG_BLOCK, &all, NULL); } - static inline void cr_plat_enable_interrupts(void) { + void _cr_plat_enable_interrupts(void) { sigset_t all; sigfillset(&all); sigprocmask(SIG_UNBLOCK, &all, NULL); @@ -450,12 +450,12 @@ static inline cid_t next_coroutine() { void coroutine_main(void) { debugf("coroutine_main()\n"); - cr_plat_disable_interrupts(); + cr_disable_interrupts(); coroutine_running = 0; for (;;) { cid_t next = next_coroutine(); if (!next) { - cr_plat_enable_interrupts(); + cr_enable_interrupts(); errorf("no coroutines\n"); return; } @@ -482,7 +482,7 @@ void cr_begin(void) { coroutine_table[coroutine_running-1].sp = cr_plat_get_sp(); if (!cr_plat_setjmp(coroutine_table[coroutine_running-1].env)) /* point=c1 */ cr_plat_longjmp(coroutine_add_env, 1); /* jump to point=a */ - cr_plat_enable_interrupts(); + cr_enable_interrupts(); } static inline void _cr_transition(enum coroutine_state state) { @@ -517,28 +517,28 @@ void cr_yield(void) { debugf("cid=%zu: cr_yield()\n", coroutine_running); assert_cid_state(coroutine_running, state == CR_RUNNING); - cr_plat_disable_interrupts(); + cr_disable_interrupts(); _cr_transition(CR_RUNNABLE); - cr_plat_enable_interrupts(); + cr_enable_interrupts(); } void cr_pause_and_yield(void) { debugf("cid=%zu: cr_pause_and_yield()\n", coroutine_running); assert_cid_state(coroutine_running, state == CR_RUNNING || state == CR_PRE_RUNNABLE); - cr_plat_disable_interrupts(); + cr_disable_interrupts(); if (coroutine_table[coroutine_running-1].state == CR_PRE_RUNNABLE) _cr_transition(CR_RUNNABLE); else _cr_transition(CR_PAUSED); - cr_plat_enable_interrupts(); + cr_enable_interrupts(); } void cr_exit(void) { debugf("cid=%zu: cr_exit()\n", coroutine_running); assert_cid_state(coroutine_running, state == CR_RUNNING); - cr_plat_disable_interrupts(); + cr_disable_interrupts(); coroutine_table[coroutine_running-1].state = CR_NONE; cr_plat_longjmp(coroutine_main_env, 1); /* jump to point=b */ } |