Changeset 48f89683 in rtems

Timestamp:

05/14/02 17:45:36 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

19131e97

Parents:

06549dcf

Message:

2001-05-14 Till Straumann <strauman@…>

• src/threaddispatch.c, src/threadhandler.c: Per PR211 fix saving/restoring floating point context. The fpsave and fprestore routines are only used in a executing context which _is_ fp and hence has the FPU enabled. The current behavior required the FPU always to be on which is very dangerous if lazy context switching is used. [Joel Note: Some ports explicitly enabled the FPU in the FP save and restore routines to avoid this.]

The patch also makes sure (on powerpc only) that the FPU is disabled
for integer tasks. Note that this is crucial if deferred fp context
switching is used. Otherwise, fp context corruption may go undetected!
Also note that even tasks which merely push/pop FP registers to/from
the stack without modifying them still MUST be FP tasks - otherwise
(if lazy FP context switching is used), FP register corruption (of
other, FP, tasks may occur)!

Furthermore, (on PPC) by default, lazy FP context save/restore
is _disabled_.

Files:

• c/src/exec/score/ChangeLog (modified) (1 diff)
• c/src/exec/score/src/threaddispatch.c (modified) (1 diff)
• c/src/exec/score/src/threadhandler.c (modified) (1 diff)
• cpukit/score/ChangeLog (modified) (1 diff)
• cpukit/score/src/threaddispatch.c (modified) (1 diff)
• cpukit/score/src/threadhandler.c (modified) (1 diff)

c/src/exec/score/ChangeLog

@@ +1 @@
+2001-05-14      Till Straumann <strauman@slac.stanford.edu>
+
+        * src/threaddispatch.c, src/threadhandler.c: Per PR211 fix
+        saving/restoring floating point context.  The fpsave and fprestore
+        routines are only used in a executing context which _is_ fp and hence
+        has the FPU enabled. The current behavior required the FPU always to
+        be on which is very dangerous if lazy context switching is used.  
+        [Joel Note: Some ports explicitly enabled the FPU in the FP save and
+        restore routines to avoid this.]
+
+        The patch also makes sure (on powerpc only) that the FPU is disabled
+        for integer tasks. Note that this is crucial if deferred fp context
+        switching is used. Otherwise, fp context corruption may go undetected!
+        Also note that even tasks which merely push/pop FP registers to/from
+        the stack without modifying them still MUST be FP tasks - otherwise
+        (if lazy FP context switching is used), FP register corruption (of
+        other, FP, tasks may occur)!
+
+        Furthermore, (on PPC) by default, lazy FP context save/restore
+        is _disabled_.
+
 2001-04-26      Joel Sherrill <joel@OARcorp.com>
 

c/src/exec/score/src/threaddispatch.c

@@ -94 +94 @@
 
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-#if ( CPU_USE_DEFERRED_FP_SWITCH == TRUE )
-    if ( (heir->fp_context != NULL) && !_Thread_Is_allocated_fp( heir ) ) {
-      if ( _Thread_Allocated_fp != NULL )
-        _Context_Save_fp( &_Thread_Allocated_fp->fp_context );
-      _Context_Restore_fp( &heir->fp_context );
-      _Thread_Allocated_fp = heir;
-    }
-#else
+#if ( CPU_USE_DEFERRED_FP_SWITCH != TRUE )
     if ( executing->fp_context != NULL )
       _Context_Save_fp( &executing->fp_context );
-
-    if ( heir->fp_context != NULL )
-      _Context_Restore_fp( &heir->fp_context );
 #endif
 #endif
 
     _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
 
     executing = _Thread_Executing;

c/src/exec/score/src/threadhandler.c

@@ -79 +79 @@
 #endif
 
+#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 );
+    _Thread_Allocated_fp = executing;
+  }
+#endif
+#endif
+
+
   /*
    * Take care that 'begin' extensions get to complete before

cpukit/score/ChangeLog

@@ +1 @@
+2001-05-14      Till Straumann <strauman@slac.stanford.edu>
+
+        * src/threaddispatch.c, src/threadhandler.c: Per PR211 fix
+        saving/restoring floating point context.  The fpsave and fprestore
+        routines are only used in a executing context which _is_ fp and hence
+        has the FPU enabled. The current behavior required the FPU always to
+        be on which is very dangerous if lazy context switching is used.  
+        [Joel Note: Some ports explicitly enabled the FPU in the FP save and
+        restore routines to avoid this.]
+
+        The patch also makes sure (on powerpc only) that the FPU is disabled
+        for integer tasks. Note that this is crucial if deferred fp context
+        switching is used. Otherwise, fp context corruption may go undetected!
+        Also note that even tasks which merely push/pop FP registers to/from
+        the stack without modifying them still MUST be FP tasks - otherwise
+        (if lazy FP context switching is used), FP register corruption (of
+        other, FP, tasks may occur)!
+
+        Furthermore, (on PPC) by default, lazy FP context save/restore
+        is _disabled_.
+
 2001-04-26      Joel Sherrill <joel@OARcorp.com>
 

cpukit/score/src/threaddispatch.c

@@ -94 +94 @@
 
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
-#if ( CPU_USE_DEFERRED_FP_SWITCH == TRUE )
-    if ( (heir->fp_context != NULL) && !_Thread_Is_allocated_fp( heir ) ) {
-      if ( _Thread_Allocated_fp != NULL )
-        _Context_Save_fp( &_Thread_Allocated_fp->fp_context );
-      _Context_Restore_fp( &heir->fp_context );
-      _Thread_Allocated_fp = heir;
-    }
-#else
+#if ( CPU_USE_DEFERRED_FP_SWITCH != TRUE )
     if ( executing->fp_context != NULL )
       _Context_Save_fp( &executing->fp_context );
-
-    if ( heir->fp_context != NULL )
-      _Context_Restore_fp( &heir->fp_context );
 #endif
 #endif
 
     _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
 
     executing = _Thread_Executing;

cpukit/score/src/threadhandler.c

@@ -79 +79 @@
 #endif
 
+#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 );
+    _Thread_Allocated_fp = executing;
+  }
+#endif
+#endif
+
+
   /*
    * Take care that 'begin' extensions get to complete before