diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-02-17 10:00:43 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-02-17 13:42:53 +0100 |
| commit | 8d6e6eebedc1b70d8ae6c1dac13393b9e9c1a3b1 (patch) | |
| tree | 3dc2d588f6bf8e0ea9c2725692e54f19f91f965a /cpukit/score/src/threaddispatch.c | |
| parent | score: Add _CPU_SMP_Prepare_start_multitasking() (diff) | |
| download | rtems-8d6e6eebedc1b70d8ae6c1dac13393b9e9c1a3b1.tar.bz2 | |
score: Fix FP context restore via _Thread_Handler
After a context switch we end up in the second part of
_Thread_Dispatch() or in _Thread_Handler() in case of new threads. Use
the same function _Thread_Restore_fp() to restore the floating-point
context. It makes no sense to do this in _Thread_Start_multitasking().
This fixes also a race condition in SMP configurations.
Update #2268.
Diffstat (limited to 'cpukit/score/src/threaddispatch.c')
| -rw-r--r-- | cpukit/score/src/threaddispatch.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 982bbc476a..cc023fc57f 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -142,43 +142,9 @@ void _Thread_Dispatch( void ) #endif _User_extensions_Thread_switch( executing, heir ); - - /* - * If the CPU has hardware floating point, then we must address saving - * and restoring it as part of the context switch. - * - * The second conditional compilation section selects the algorithm used - * to context switch between floating point tasks. The deferred algorithm - * can be significantly better in a system with few floating point tasks - * because it reduces the total number of save and restore FP context - * operations. However, this algorithm can not be used on all CPUs due - * to unpredictable use of FP registers by some compilers for integer - * operations. - */ - -#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE ) -#if ( CPU_USE_DEFERRED_FP_SWITCH != TRUE ) - if ( executing->fp_context != NULL ) - _Context_Save_fp( &executing->fp_context ); -#endif -#endif - + _Thread_Save_fp( executing ); _Context_Switch( &executing->Registers, &heir->Registers ); - -#if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE ) -#if ( CPU_USE_DEFERRED_FP_SWITCH == TRUE ) - if ( (executing->fp_context != NULL) && - !_Thread_Is_allocated_fp( executing ) ) { - if ( _Thread_Allocated_fp != NULL ) - _Context_Save_fp( &_Thread_Allocated_fp->fp_context ); - _Context_Restore_fp( &executing->fp_context ); - _Thread_Allocated_fp = executing; - } -#else - if ( executing->fp_context != NULL ) - _Context_Restore_fp( &executing->fp_context ); -#endif -#endif + _Thread_Restore_fp( executing ); /* * We have to obtain this value again after the context switch since the |