patch-2.3.23 linux/arch/arm/nwfpe/single_cpdo.c

• Lines: 181
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/arch/arm/nwfpe/single_cpdo.c
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.22/linux/arch/arm/nwfpe/single_cpdo.c linux/arch/arm/nwfpe/single_cpdo.c
@@ -19,8 +19,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "config.h"
-#include "milieu.h"
 #include "softfloat.h"
 #include "fpopcode.h"
 #include "fpa11.h"
@@ -51,10 +49,10 @@
    }
    else
    {  
-     switch (fpa11->fpreg[Fm].fType)
+     switch (fpa11->fType[Fm])
      {
         case typeSingle:
-          rFm = fpa11->fpreg[Fm].fValue.fSingle;
+          rFm = fpa11->fpreg[Fm].fSingle;
         break;
         
         default: return 0;
@@ -64,10 +62,10 @@
    if (!MONADIC_INSTRUCTION(opcode))
    {
       Fn = getFn(opcode);
-      switch (fpa11->fpreg[Fn].fType)
+      switch (fpa11->fType[Fn])
       {
         case typeSingle:
-          rFn = fpa11->fpreg[Fn].fValue.fSingle;
+          rFn = fpa11->fpreg[Fn].fSingle;
         break;
 
         default: return 0;
@@ -79,112 +77,112 @@
    {
       /* dyadic opcodes */
       case ADF_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_add(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_add(rFn,rFm);
       break;
 
       case MUF_CODE:
       case FML_CODE:
-        fpa11->fpreg[Fd].fValue.fSingle = float32_mul(rFn,rFm);
+        fpa11->fpreg[Fd].fSingle = float32_mul(rFn,rFm);
       break;
 
       case SUF_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_sub(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_sub(rFn,rFm);
       break;
 
       case RSF_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_sub(rFm,rFn);
+         fpa11->fpreg[Fd].fSingle = float32_sub(rFm,rFn);
       break;
 
       case DVF_CODE:
       case FDV_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_div(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_div(rFn,rFm);
       break;
 
       case RDF_CODE:
       case FRD_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_div(rFm,rFn);
+         fpa11->fpreg[Fd].fSingle = float32_div(rFm,rFn);
       break;
 
 #if 0
       case POW_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_pow(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_pow(rFn,rFm);
       break;
 
       case RPW_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_pow(rFm,rFn);
+         fpa11->fpreg[Fd].fSingle = float32_pow(rFm,rFn);
       break;
 #endif
 
       case RMF_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_rem(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_rem(rFn,rFm);
       break;
 
 #if 0
       case POL_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_pol(rFn,rFm);
+         fpa11->fpreg[Fd].fSingle = float32_pol(rFn,rFm);
       break;
 #endif
 
       /* monadic opcodes */
       case MVF_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = rFm;
+         fpa11->fpreg[Fd].fSingle = rFm;
       break;
 
       case MNF_CODE:
          rFm ^= 0x80000000;
-         fpa11->fpreg[Fd].fValue.fSingle = rFm;
+         fpa11->fpreg[Fd].fSingle = rFm;
       break;
 
       case ABS_CODE:
          rFm &= 0x7fffffff;
-         fpa11->fpreg[Fd].fValue.fSingle = rFm;
+         fpa11->fpreg[Fd].fSingle = rFm;
       break;
 
       case RND_CODE:
       case URD_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = 
+         fpa11->fpreg[Fd].fSingle = 
              int32_to_float32(float32_to_int32(rFm));
       break;
 
       case SQT_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_sqrt(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_sqrt(rFm);
       break;
 
 #if 0
       case LOG_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_log(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_log(rFm);
       break;
 
       case LGN_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_ln(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_ln(rFm);
       break;
 
       case EXP_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_exp(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_exp(rFm);
       break;
 
       case SIN_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_sin(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_sin(rFm);
       break;
 
       case COS_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_cos(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_cos(rFm);
       break;
 
       case TAN_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_tan(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_tan(rFm);
       break;
 
       case ASN_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_arcsin(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_arcsin(rFm);
       break;
 
       case ACS_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_arccos(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_arccos(rFm);
       break;
 
       case ATN_CODE:
-         fpa11->fpreg[Fd].fValue.fSingle = float32_arctan(rFm);
+         fpa11->fpreg[Fd].fSingle = float32_arctan(rFm);
       break;
 #endif
 
@@ -197,7 +195,7 @@
       }
    }
 
-   if (0 != nRc) fpa11->fpreg[Fd].fType = typeSingle;
+   if (0 != nRc) fpa11->fType[Fd] = typeSingle;
    return nRc;
 }