From ba46ddd0cfad2b1e03163d32253e8f6f2c7427e6 Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Tue, 4 Jun 2002 16:17:20 +0000 Subject: [PATCH] 2002-06-04 Chris Demetriou Ed Satterthwaite * cp1.c (Infinity): Remove. * sim-main.h (Infinity): Likewise. * cp1.c (fp_unary, fp_binary): New functions. (fp_abs, fp_neg, fp_add, fp_sub, fp_mul, fp_div, fp_recip) (fp_sqrt): New functions, implemented in terms of the above. (AbsoluteValue, Negate, Add, Sub, Multiply, Divide) (Recip, SquareRoot): Remove (replaced by functions above). * sim-main.h (fp_abs, fp_neg, fp_add, fp_sub, fp_mul, fp_div) (fp_recip, fp_sqrt): New prototypes. (AbsoluteValue, Negate, Add, Sub, Multiply, Divide) (Recip, SquareRoot): Replace prototypes with #defines which invoke the functions above. --- sim/mips/ChangeLog | 17 ++ sim/mips/cp1.c | 505 +++++++++----------------------------------- sim/mips/sim-main.h | 25 ++- 3 files changed, 135 insertions(+), 412 deletions(-) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 399827d926..f26523d72b 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,20 @@ +2002-06-04 Chris Demetriou + Ed Satterthwaite + + * cp1.c (Infinity): Remove. + * sim-main.h (Infinity): Likewise. + + * cp1.c (fp_unary, fp_binary): New functions. + (fp_abs, fp_neg, fp_add, fp_sub, fp_mul, fp_div, fp_recip) + (fp_sqrt): New functions, implemented in terms of the above. + (AbsoluteValue, Negate, Add, Sub, Multiply, Divide) + (Recip, SquareRoot): Remove (replaced by functions above). + * sim-main.h (fp_abs, fp_neg, fp_add, fp_sub, fp_mul, fp_div) + (fp_recip, fp_sqrt): New prototypes. + (AbsoluteValue, Negate, Add, Sub, Multiply, Divide) + (Recip, SquareRoot): Replace prototypes with #defines which + invoke the functions above. + 2002-06-03 Chris Demetriou * sim-main.h (Nan, Infinity, Less, Equal, AbsoluteValue, Negate) diff --git a/sim/mips/cp1.c b/sim/mips/cp1.c index 7a3be11e06..1d46c0c8e4 100644 --- a/sim/mips/cp1.c +++ b/sim/mips/cp1.c @@ -327,48 +327,6 @@ NaN (op, fmt) return (boolean); } -int -Infinity (op, fmt) - uword64 op; - FP_formats fmt; -{ - int boolean = 0; - -#ifdef DEBUG - printf ("DBG: Infinity: format %s 0x%s\n", - fpu_format_name (fmt), pr_addr (op)); -#endif /* DEBUG */ - - switch (fmt) - { - case fmt_single: - { - sim_fpu wop; - sim_fpu_32to (&wop, op); - boolean = sim_fpu_is_infinity (&wop); - break; - } - case fmt_double: - { - sim_fpu wop; - sim_fpu_64to (&wop, op); - boolean = sim_fpu_is_infinity (&wop); - break; - } - default: - printf ("DBG: TODO: unrecognised format (%s) for Infinity check\n", - fpu_format_name (fmt)); - break; - } - -#ifdef DEBUG - printf ("DBG: Infinity: returning %d for 0x%s (format = %s)\n", - boolean, pr_addr (op), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (boolean); -} - int Less (op1, op2, fmt) uword64 op1; @@ -467,430 +425,171 @@ Equal (op1, op2, fmt) return (boolean); } -uword64 -AbsoluteValue (op, fmt) - uword64 op; - FP_formats fmt; + +/* Basic arithmetic operations. */ + +static unsigned64 +fp_unary(sim_cpu *cpu, + address_word cia, + int (*sim_fpu_op)(sim_fpu *, const sim_fpu *), + unsigned64 op, + FP_formats fmt) { - uword64 result = 0; + sim_fpu wop; + sim_fpu ans; + unsigned64 result = 0; -#ifdef DEBUG - printf ("DBG: AbsoluteValue: %s: op = 0x%s\n", - fpu_format_name (fmt), pr_addr (op)); -#endif /* DEBUG */ - - /* The format type should already have been checked: */ + /* The format type has already been checked: */ switch (fmt) { case fmt_single: { - sim_fpu wop; - unsigned32 ans; + unsigned32 res; sim_fpu_32to (&wop, op); - sim_fpu_abs (&wop, &wop); - sim_fpu_to32 (&ans, &wop); - result = ans; + (*sim_fpu_op) (&ans, &wop); + sim_fpu_to32 (&res, &ans); + result = res; break; } case fmt_double: { - sim_fpu wop; - unsigned64 ans; + unsigned64 res; sim_fpu_64to (&wop, op); - sim_fpu_abs (&wop, &wop); - sim_fpu_to64 (&ans, &wop); - result = ans; + (*sim_fpu_op) (&ans, &wop); + sim_fpu_to64 (&res, &ans); + result = res; break; } default: - fprintf (stderr, "Bad switch\n"); + sim_io_eprintf (SD, "Bad switch\n"); abort (); } - return (result); + return result; } -uword64 -Negate (op, fmt) - uword64 op; - FP_formats fmt; +static unsigned64 +fp_binary(sim_cpu *cpu, + address_word cia, + int (*sim_fpu_op)(sim_fpu *, const sim_fpu *, const sim_fpu *), + unsigned64 op1, + unsigned64 op2, + FP_formats fmt) { - uword64 result = 0; + sim_fpu wop1; + sim_fpu wop2; + sim_fpu ans; + unsigned64 result = 0; -#ifdef DEBUG - printf ("DBG: Negate: %s: op = 0x%s\n", - fpu_format_name (fmt), pr_addr (op)); -#endif /* DEBUG */ - - /* The format type should already have been checked: */ + /* The format type has already been checked: */ switch (fmt) { case fmt_single: { - sim_fpu wop; - unsigned32 ans; - sim_fpu_32to (&wop, op); - sim_fpu_neg (&wop, &wop); - sim_fpu_to32 (&ans, &wop); - result = ans; - break; - } - case fmt_double: - { - sim_fpu wop; - unsigned64 ans; - sim_fpu_64to (&wop, op); - sim_fpu_neg (&wop, &wop); - sim_fpu_to64 (&ans, &wop); - result = ans; - break; - } - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - - return (result); -} - -uword64 -Add (op1, op2, fmt) - uword64 op1; - uword64 op2; - FP_formats fmt; -{ - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: Add: %s: op1 = 0x%s : op2 = 0x%s\n", - fpu_format_name (fmt), pr_addr (op1), pr_addr (op2)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; unsigned32 res; sim_fpu_32to (&wop1, op1); sim_fpu_32to (&wop2, op2); - sim_fpu_add (&ans, &wop1, &wop2); + (*sim_fpu_op) (&ans, &wop1, &wop2); sim_fpu_to32 (&res, &ans); result = res; break; } case fmt_double: { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; unsigned64 res; sim_fpu_64to (&wop1, op1); sim_fpu_64to (&wop2, op2); - sim_fpu_add (&ans, &wop1, &wop2); + (*sim_fpu_op) (&ans, &wop1, &wop2); sim_fpu_to64 (&res, &ans); result = res; break; } default: - fprintf (stderr, "Bad switch\n"); + sim_io_eprintf (SD, "Bad switch\n"); abort (); } -#ifdef DEBUG - printf ("DBG: Add: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return result; } -uword64 -Sub (op1, op2, fmt) - uword64 op1; - uword64 op2; - FP_formats fmt; + +unsigned64 +fp_abs(sim_cpu *cpu, + address_word cia, + unsigned64 op, + FP_formats fmt) { - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: Sub: %s: op1 = 0x%s : op2 = 0x%s\n", - fpu_format_name (fmt), pr_addr (op1), pr_addr (op2)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned32 res; - sim_fpu_32to (&wop1, op1); - sim_fpu_32to (&wop2, op2); - sim_fpu_sub (&ans, &wop1, &wop2); - sim_fpu_to32 (&res, &ans); - result = res; - } - break; - case fmt_double: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned64 res; - sim_fpu_64to (&wop1, op1); - sim_fpu_64to (&wop2, op2); - sim_fpu_sub (&ans, &wop1, &wop2); - sim_fpu_to64 (&res, &ans); - result = res; - } - break; - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - -#ifdef DEBUG - printf ("DBG: Sub: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return fp_unary(cpu, cia, &sim_fpu_abs, op, fmt); } -uword64 -Multiply (op1, op2, fmt) - uword64 op1; - uword64 op2; - FP_formats fmt; +unsigned64 +fp_neg(sim_cpu *cpu, + address_word cia, + unsigned64 op, + FP_formats fmt) { - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: Multiply: %s: op1 = 0x%s : op2 = 0x%s\n", - fpu_format_name (fmt), pr_addr (op1), pr_addr (op2)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned32 res; - sim_fpu_32to (&wop1, op1); - sim_fpu_32to (&wop2, op2); - sim_fpu_mul (&ans, &wop1, &wop2); - sim_fpu_to32 (&res, &ans); - result = res; - break; - } - case fmt_double: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned64 res; - sim_fpu_64to (&wop1, op1); - sim_fpu_64to (&wop2, op2); - sim_fpu_mul (&ans, &wop1, &wop2); - sim_fpu_to64 (&res, &ans); - result = res; - break; - } - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - -#ifdef DEBUG - printf ("DBG: Multiply: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return fp_unary(cpu, cia, &sim_fpu_neg, op, fmt); } -uword64 -Divide (op1, op2, fmt) - uword64 op1; - uword64 op2; - FP_formats fmt; +unsigned64 +fp_add(sim_cpu *cpu, + address_word cia, + unsigned64 op1, + unsigned64 op2, + FP_formats fmt) { - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: Divide: %s: op1 = 0x%s : op2 = 0x%s\n", - fpu_format_name (fmt), pr_addr (op1), pr_addr (op2)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned32 res; - sim_fpu_32to (&wop1, op1); - sim_fpu_32to (&wop2, op2); - sim_fpu_div (&ans, &wop1, &wop2); - sim_fpu_to32 (&res, &ans); - result = res; - break; - } - case fmt_double: - { - sim_fpu wop1; - sim_fpu wop2; - sim_fpu ans; - unsigned64 res; - sim_fpu_64to (&wop1, op1); - sim_fpu_64to (&wop2, op2); - sim_fpu_div (&ans, &wop1, &wop2); - sim_fpu_to64 (&res, &ans); - result = res; - break; - } - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - -#ifdef DEBUG - printf ("DBG: Divide: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return fp_binary(cpu, cia, &sim_fpu_add, op1, op2, fmt); } -uword64 UNUSED -Recip (op, fmt) - uword64 op; - FP_formats fmt; +unsigned64 +fp_sub(sim_cpu *cpu, + address_word cia, + unsigned64 op1, + unsigned64 op2, + FP_formats fmt) { - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: Recip: %s: op = 0x%s\n", - fpu_format_name (fmt), pr_addr (op)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop; - sim_fpu ans; - unsigned32 res; - sim_fpu_32to (&wop, op); - sim_fpu_inv (&ans, &wop); - sim_fpu_to32 (&res, &ans); - result = res; - break; - } - case fmt_double: - { - sim_fpu wop; - sim_fpu ans; - unsigned64 res; - sim_fpu_64to (&wop, op); - sim_fpu_inv (&ans, &wop); - sim_fpu_to64 (&res, &ans); - result = res; - break; - } - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - -#ifdef DEBUG - printf ("DBG: Recip: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return fp_binary(cpu, cia, &sim_fpu_sub, op1, op2, fmt); } -uword64 -SquareRoot (op, fmt) - uword64 op; - FP_formats fmt; +unsigned64 +fp_mul(sim_cpu *cpu, + address_word cia, + unsigned64 op1, + unsigned64 op2, + FP_formats fmt) { - uword64 result = 0; - -#ifdef DEBUG - printf ("DBG: SquareRoot: %s: op = 0x%s\n", - fpu_format_name (fmt), pr_addr (op)); -#endif /* DEBUG */ - - /* The registers must specify FPRs valid for operands of type - "fmt". If they are not valid, the result is undefined. */ - - /* The format type should already have been checked: */ - switch (fmt) - { - case fmt_single: - { - sim_fpu wop; - sim_fpu ans; - unsigned32 res; - sim_fpu_32to (&wop, op); - sim_fpu_sqrt (&ans, &wop); - sim_fpu_to32 (&res, &ans); - result = res; - break; - } - case fmt_double: - { - sim_fpu wop; - sim_fpu ans; - unsigned64 res; - sim_fpu_64to (&wop, op); - sim_fpu_sqrt (&ans, &wop); - sim_fpu_to64 (&res, &ans); - result = res; - break; - } - default: - fprintf (stderr, "Bad switch\n"); - abort (); - } - -#ifdef DEBUG - printf ("DBG: SquareRoot: returning 0x%s (format = %s)\n", - pr_addr (result), fpu_format_name (fmt)); -#endif /* DEBUG */ - - return (result); + return fp_binary(cpu, cia, &sim_fpu_mul, op1, op2, fmt); } +unsigned64 +fp_div(sim_cpu *cpu, + address_word cia, + unsigned64 op1, + unsigned64 op2, + FP_formats fmt) +{ + return fp_binary(cpu, cia, &sim_fpu_div, op1, op2, fmt); +} + +unsigned64 +fp_recip(sim_cpu *cpu, + address_word cia, + unsigned64 op, + FP_formats fmt) +{ + return fp_unary(cpu, cia, &sim_fpu_inv, op, fmt); +} + +unsigned64 +fp_sqrt(sim_cpu *cpu, + address_word cia, + unsigned64 op, + FP_formats fmt) +{ + return fp_unary(cpu, cia, &sim_fpu_sqrt, op, fmt); +} + + uword64 convert (sim_cpu *cpu, address_word cia, diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h index 47b5feb0ff..8087a3a3f8 100644 --- a/sim/mips/sim-main.h +++ b/sim/mips/sim-main.h @@ -716,17 +716,24 @@ void store_fpr (SIM_STATE, int fpr, FP_formats fmt, unsigned64 value); /* FPU operations. */ int NaN (unsigned64 op, FP_formats fmt); -int Infinity (unsigned64 op, FP_formats fmt); int Less (unsigned64 op1, unsigned64 op2, FP_formats fmt); int Equal (unsigned64 op1, unsigned64 op2, FP_formats fmt); -unsigned64 AbsoluteValue (unsigned64 op, FP_formats fmt); -unsigned64 Negate (unsigned64 op, FP_formats fmt); -unsigned64 Add (unsigned64 op1, unsigned64 op2, FP_formats fmt); -unsigned64 Sub (unsigned64 op1, unsigned64 op2, FP_formats fmt); -unsigned64 Multiply (unsigned64 op1, unsigned64 op2, FP_formats fmt); -unsigned64 Divide (unsigned64 op1, unsigned64 op2, FP_formats fmt); -unsigned64 Recip (unsigned64 op, FP_formats fmt); -unsigned64 SquareRoot (unsigned64 op, FP_formats fmt); +unsigned64 fp_abs (SIM_STATE, unsigned64 op, FP_formats fmt); +#define AbsoluteValue(op,fmt) fp_abs(SIM_ARGS, op, fmt) +unsigned64 fp_neg (SIM_STATE, unsigned64 op, FP_formats fmt); +#define Negate(op,fmt) fp_neg(SIM_ARGS, op, fmt) +unsigned64 fp_add (SIM_STATE, unsigned64 op1, unsigned64 op2, FP_formats fmt); +#define Add(op1,op2,fmt) fp_add(SIM_ARGS, op1, op2, fmt) +unsigned64 fp_sub (SIM_STATE, unsigned64 op1, unsigned64 op2, FP_formats fmt); +#define Sub(op1,op2,fmt) fp_sub(SIM_ARGS, op1, op2, fmt) +unsigned64 fp_mul (SIM_STATE, unsigned64 op1, unsigned64 op2, FP_formats fmt); +#define Multiply(op1,op2,fmt) fp_mul(SIM_ARGS, op1, op2, fmt) +unsigned64 fp_div (SIM_STATE, unsigned64 op1, unsigned64 op2, FP_formats fmt); +#define Divide(op1,op2,fmt) fp_div(SIM_ARGS, op1, op2, fmt) +unsigned64 fp_recip (SIM_STATE, unsigned64 op, FP_formats fmt); +#define Recip(op,fmt) fp_recip(SIM_ARGS, op, fmt) +unsigned64 fp_sqrt (SIM_STATE, unsigned64 op, FP_formats fmt); +#define SquareRoot(op,fmt) fp_sqrt(SIM_ARGS, op, fmt) unsigned64 convert (SIM_STATE, int rm, unsigned64 op, FP_formats from, FP_formats to); #define Convert(rm,op,from,to) convert (SIM_ARGS, rm, op, from, to)