diff options
Diffstat (limited to 'c/src/lib/libcpu/powerpc')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/new-exceptions/cpu.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/new-exceptions/cpu_asm.S | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c b/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c index 32c0489308..c12a04e6d1 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c +++ b/c/src/lib/libcpu/powerpc/new-exceptions/cpu.c @@ -123,17 +123,11 @@ void _CPU_Context_Initialize( else msr_value &= ~PPC_MSR_FP; - memset( the_context, 0, sizeof( *the_context ) ); - the_ppc_context = ppc_get_context( the_context ); the_ppc_context->gpr1 = sp; the_ppc_context->msr = msr_value; the_ppc_context->lr = (uint32_t) entry_point; -#ifdef RTEMS_SMP - the_ppc_context->is_executing = false; -#endif - #ifdef __ALTIVEC__ _CPU_Context_initialize_altivec( the_ppc_context ); #endif diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/cpu_asm.S b/c/src/lib/libcpu/powerpc/new-exceptions/cpu_asm.S index 4e74996d4c..6bde8bd11e 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/cpu_asm.S +++ b/c/src/lib/libcpu/powerpc/new-exceptions/cpu_asm.S @@ -327,28 +327,26 @@ PROC (_CPU_Context_switch): stw r2, PPC_CONTEXT_OFFSET_GPR2(r3) #ifdef RTEMS_SMP - /* Indicate that this context is no longer executing */ + /* The executing context no longer executes on this processor */ msync li r5, 0 stb r5, PPC_CONTEXT_OFFSET_IS_EXECUTING(r3) -#endif - - /* Restore context from r4 */ -restore_context: -#ifdef RTEMS_SMP - /* Wait for context to stop execution if necessary */ + /* Wait for heir context to stop execution */ 1: lbz r5, PPC_CONTEXT_OFFSET_IS_EXECUTING(r4) cmpwi r5, 0 bne 1b - /* Indicate that this context is executing */ + /* The heir context executes now on this processor */ li r5, 1 stb r5, PPC_CONTEXT_OFFSET_IS_EXECUTING(r4) isync #endif + /* Restore context from r4 */ +restore_context: + #ifdef __ALTIVEC__ mr r14, r4 .extern _CPU_Context_switch_altivec |