FPU: fix field names, compiler warning, long lines

diff --git a/include/minix/cpufeature.h b/include/minix/cpufeature.h
index 1f733f868727abf25c430fa2785a4a2721a15e07..94e77f81a9aae543863dd31ef40b7e14c39540a4 100644 (file)
--- a/include/minix/cpufeature.h
+++ b/include/minix/cpufeature.h
@@ -7,7 +7,9 @@
 #define _CPUF_I386_PGE                 2       /* Page Global Enable */
 #define _CPUF_I386_APIC_ON_CHIP        3       /* APIC is present on the chip */
 #define _CPUF_I386_TSC         4       /* Timestamp counter present */
-#define _CPUF_I386_SSEx                5       /* Support for SSE/SSE2/SSE3/SSSE3/SSE4 Extensions and FXSR */
+#define _CPUF_I386_SSEx                5       /* Support for SSE/SSE2/SSE3/SSSE3/SSE4
+                                        * Extensions and FXSR
+                                        */
 #define _CPUF_I386_FXSR                6
 #define _CPUF_I386_SSE         7
 #define _CPUF_I386_SSE2                8

diff --git a/include/sys/sigcontext.h b/include/sys/sigcontext.h
index 42fd1b9f10ec0c5acb5cda4767247ca5135a73e8..def987187a0fdf9ab511bc7248720a46b883f40a 100644 (file)
--- a/include/sys/sigcontext.h
+++ b/include/sys/sigcontext.h
@@ -42,11 +42,13 @@ struct sigframe {           /* stack frame created for signalled process */
 #endif /* _MINIX_CHIP == _CHIP_INTEL */
 
 struct sigcontext {
-  int sc_flags;                        /* sigstack state to restore (including MF_FPU_INITIALIZED) */
+  int sc_flags;                        /* sigstack state to restore (including
+                                * MF_FPU_INITIALIZED)
+                                */
   long sc_mask;                        /* signal mask to restore */
   sigregs sc_regs;              /* register set to restore */
 #if (_MINIX_CHIP == _CHIP_INTEL)
-  union fpu_state_u fpu_state;
+  union fpu_state_u sc_fpu_state;
 #endif
 };
 

diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c
index 0ca6a70925c2adbcf4f0c2462e079ee52ca9d042..d69b2af109795c3373bcdb68d5774a598c08f098 100644 (file)
--- a/kernel/arch/i386/system.c
+++ b/kernel/arch/i386/system.c
@@ -159,17 +159,19 @@ PUBLIC void arch_init(void)
                        osfxsr_feature = 1;
 
                        for (rp = BEG_PROC_ADDR; rp < END_PROC_ADDR; ++rp) {
-                               /* FXSR requires 16-byte alignment of memory image,
-                                * but unfortunately some old tools (probably linker)
-                                * ignores ".balign 16" applied to our memory image.
+                               /* FXSR requires 16-byte alignment of memory
+                                * image, but unfortunately some old tools
+                                * (probably linker) ignores ".balign 16"
+                                * applied to our memory image.
                                 * Thus we have to do manual alignment.
                                 */
-                               aligned_fp_area = (phys_bytes) &rp->fpu_state.fpu_image;
+                               aligned_fp_area =
+                                       (phys_bytes) &rp->p_fpu_state.fpu_image;
                                if(aligned_fp_area % FPUALIGN) {
                                    aligned_fp_area += FPUALIGN -
                                                   (aligned_fp_area % FPUALIGN);
                                }
-                               rp->fpu_state.fpu_save_area_p =
+                               rp->p_fpu_state.fpu_save_area_p =
                                                    (void *) aligned_fp_area;
                        }
                } else {

diff --git a/kernel/proc.h b/kernel/proc.h
index 0aa1ed2b2794d8dc9a6ba28b6e64c4805c1968ca..4606b571772d35d908b27ac52d2e95d3afd43b33 100644 (file)
--- a/kernel/proc.h
+++ b/kernel/proc.h
@@ -18,7 +18,7 @@
 
 struct proc {
   struct stackframe_s p_reg;   /* process' registers saved in stack frame */
-  struct fpu_state_s fpu_state; /* process' fpu_regs saved lazily */
+  struct fpu_state_s p_fpu_state;      /* process' fpu_regs saved lazily */
   struct segframe p_seg;       /* segment descriptors */
   proc_nr_t p_nr;              /* number of this process (for fast access) */
   struct priv *p_priv;         /* system privileges structure */

diff --git a/kernel/system/do_fork.c b/kernel/system/do_fork.c
index 69b3439de84c3c5157f3691369b487ca56a84fe5..6d9c39cb0da2eaf5dd9dc0dba4a8d97aae994a7f 100644 (file)
--- a/kernel/system/do_fork.c
+++ b/kernel/system/do_fork.c
@@ -11,6 +11,7 @@
 #include "../system.h"
 #include "../vm.h"
 #include <signal.h>
+#include <string.h>
 
 #include <minix/endpoint.h>
 
@@ -60,15 +61,15 @@ register message *m_ptr;    /* pointer to request message */
   gen = _ENDPOINT_G(rpc->p_endpoint);
 #if (_MINIX_CHIP == _CHIP_INTEL)
   old_ldt_sel = rpc->p_seg.p_ldt_sel;  /* backup local descriptors */
-  old_fpu_save_area_p = rpc->fpu_state.fpu_save_area_p;
+  old_fpu_save_area_p = rpc->p_fpu_state.fpu_save_area_p;
 #endif
   *rpc = *rpp;                         /* copy 'proc' struct */
 #if (_MINIX_CHIP == _CHIP_INTEL)
   rpc->p_seg.p_ldt_sel = old_ldt_sel;  /* restore descriptors */
-  rpc->fpu_state.fpu_save_area_p = old_fpu_save_area_p;
+  rpc->p_fpu_state.fpu_save_area_p = old_fpu_save_area_p;
   if(rpp->p_misc_flags & MF_FPU_INITIALIZED)
-       memcpy(rpc->fpu_state.fpu_save_area_p,
-              rpp->fpu_state.fpu_save_area_p,
+       memcpy(rpc->p_fpu_state.fpu_save_area_p,
+              rpp->p_fpu_state.fpu_save_area_p,
               FPU_XFP_SIZE);
 #endif
   if(++gen >= _ENDPOINT_MAX_GENERATION)        /* increase generation */

diff --git a/kernel/system/do_sigreturn.c b/kernel/system/do_sigreturn.c
index 086a9bd321f5f72e9e631f022b9dcc6278c98292..537a459906c6554a2b71a7218c94895a1b4e8aa9 100644 (file)
--- a/kernel/system/do_sigreturn.c
+++ b/kernel/system/do_sigreturn.c
@@ -58,7 +58,8 @@ message *m_ptr;                       /* pointer to request message */
 #if (_MINIX_CHIP == _CHIP_INTEL)
   if(sc.sc_flags & MF_FPU_INITIALIZED)
   {
-       memcpy(rp->fpu_state.fpu_save_area_p, &sc.fpu_state, FPU_XFP_SIZE);
+       memcpy(rp->p_fpu_state.fpu_save_area_p, &sc.sc_fpu_state,
+               FPU_XFP_SIZE);
        rp->p_misc_flags |=  MF_FPU_INITIALIZED; /* Restore math usage flag. */
   }
 #endif

diff --git a/kernel/system/do_sigsend.c b/kernel/system/do_sigsend.c
index 91706ac3a65ab4e9ea7dfe36a4561a6a4b20f284..7d5c6cef5cda97c48ac912c61d78689a4e130f6d 100644 (file)
--- a/kernel/system/do_sigsend.c
+++ b/kernel/system/do_sigsend.c
@@ -49,7 +49,8 @@ message *m_ptr;                       /* pointer to request message */
   memcpy(&sc.sc_regs, (char *) &rp->p_reg, sizeof(sigregs));
   #if (_MINIX_CHIP == _CHIP_INTEL)
     if(rp->p_misc_flags & MF_FPU_INITIALIZED)
-           memcpy(&sc.fpu_state, rp->fpu_state.fpu_save_area_p, FPU_XFP_SIZE);
+           memcpy(&sc.sc_fpu_state, rp->p_fpu_state.fpu_save_area_p,
+                FPU_XFP_SIZE);
   #endif
 
   /* Finish the sigcontext initialization. */
@@ -71,11 +72,11 @@ message *m_ptr;                     /* pointer to request message */
 
   #if (_MINIX_CHIP == _CHIP_INTEL)
     if (osfxsr_feature == 1) {
-       fp_error = sc.fpu_state.xfp_regs.fp_status &
-                       ~sc.fpu_state.xfp_regs.fp_control;
+       fp_error = sc.sc_fpu_state.xfp_regs.fp_status &
+                       ~sc.sc_fpu_state.xfp_regs.fp_control;
     } else {
-        fp_error = sc.fpu_state.fpu_regs.fp_status &
-                       ~sc.fpu_state.fpu_regs.fp_control;
+        fp_error = sc.sc_fpu_state.fpu_regs.fp_status &
+                       ~sc.sc_fpu_state.fpu_regs.fp_control;
     }
 
     if (fp_error & 0x001) {      /* Invalid op */