1 files changed, 43 insertions, 19 deletions

diff --git a/mpfr/tests/tcmp2.c b/mpfr/tests/tcmp2.c
index f7e3f3599..4ddb16bea 100644
--- a/mpfr/tests/tcmp2.c
+++ b/mpfr/tests/tcmp2.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp2.
 
-Copyright (C) 1999 PolKA project, Inria Lorraine and Loria
+Copyright (C) 1999-2000 Free Software Foundation.
 
 This file is part of the MPFR Library.
 
@@ -23,18 +23,17 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <math.h>
 #include "gmp.h"
-#include "longlong.h"
 #include "mpfr.h"
 #include "mpfr-impl.h"
-#ifdef IRIX64
-#include <sys/fpu.h>
-#endif
+#include "mpfr-test.h"
 
-extern int isnan();
+void tcmp2 (double, double, int);
+void special (void);
 
-void tcmp2(x, y, i) double x, y; int i;
+void tcmp2 (double x, double y, int i)
 {
-  mpfr_t xx,yy; int j;
+  mpfr_t xx, yy;
+  int j;
 
   if (i==-1) {
     if (x==y) i=53;
@@ -43,27 +42,50 @@ void tcmp2(x, y, i) double x, y; int i;
   mpfr_init2(xx, 53); mpfr_init2(yy, 53);
   mpfr_set_d(xx, x, 0);
   mpfr_set_d(yy, y, 0);
-  if ((j=mpfr_cmp2(xx, yy)) != i) {
+  j = mpfr_cmp2(xx, yy);
+  if (j != i) {
     printf("Error in mpfr_cmp2: x=%1.20e y=%1.20e mpfr_cmp2(x,y)=%d instead of %d\n",x,y,j,i); 
     exit(1);
   }
-  mpfr_set_prec(xx, 127); mpfr_set_prec(yy, 127);
-  mpfr_set_str_raw(xx, "0.1011010000110111111000000101011110110001000101101011011110010010011110010000101101000010011001100110010000000010110000101000101E6");
-  mpfr_set_str_raw(yy, "0.1011010000110111111000000101011011111100011101000011001111000010100010100110110100110010011001100110010000110010010110000010110E6");
-  if ((j=mpfr_cmp2(xx, yy)) != 32) {
+  mpfr_clear(xx); mpfr_clear(yy);
+}
+
+void special ()
+{
+  mpfr_t x, y;
+  int j;
+
+  mpfr_init (x); mpfr_init (y);
+
+  mpfr_set_prec(x, 127); mpfr_set_prec(y, 127);
+  mpfr_set_str_raw(x, "0.1011010000110111111000000101011110110001000101101011011110010010011110010000101101000010011001100110010000000010110000101000101E6");
+  mpfr_set_str_raw(y, "0.1011010000110111111000000101011011111100011101000011001111000010100010100110110100110010011001100110010000110010010110000010110E6");
+  if ((j=mpfr_cmp2(x, y)) != 32) {
     printf("Error in mpfr_cmp2:\n");
-    printf("x="); mpfr_print_raw(xx); putchar('\n');
-    printf("y="); mpfr_print_raw(yy); putchar('\n');
+    printf("x="); mpfr_print_raw(x); putchar('\n');
+    printf("y="); mpfr_print_raw(y); putchar('\n');
     printf("got %d, expected 32\n", j);
     exit(1);
   }
-  mpfr_clear(xx); mpfr_clear(yy);
+
+  mpfr_set_prec (x, 128); mpfr_set_prec (y, 239);
+  mpfr_set_str_raw (x, "0.10001000110110000111011000101011111100110010010011001101000011111010010110001000000010100110100111111011011010101100100000000000E167");
+  mpfr_set_str_raw (y, "0.10001000110110000111011000101011111100110010010011001101000011111010010110001000000010100110100111111011011010101100011111111111111111111111111111111111111111111111011111100101011100011001101000100111000010000000000101100110000111111000101E167");
+  if ((j=mpfr_cmp2(x, y)) != 164) {
+    printf("Error in mpfr_cmp2:\n");
+    printf("x="); mpfr_print_raw(x); putchar('\n');
+    printf("y="); mpfr_print_raw(y); putchar('\n');
+    printf("got %d, expected 164\n", j);
+    exit(1);
+  }
+
+  mpfr_clear(x); mpfr_clear(y);
 }
 
 int main()
 {
   int i,j; double x=1.0, y, z;
-#ifdef IRIX64
+#ifdef __mips
     /* to get denormalized numbers on IRIX64 */
     union fpc_csr exp;
     exp.fc_word = get_fpc_csr();
@@ -71,18 +93,20 @@ int main()
     set_fpc_csr(exp.fc_word);
 #endif
 
+  special ();
+  tcmp2(5.43885304644369510000e+185, -1.87427265794105340000e-57, 1);
   tcmp2(1.06022698059744327881e+71, 1.05824655795525779205e+71, -1);
   tcmp2(1.0, 1.0, 53);
   for (i=0;i<54;i++) {
     tcmp2(1.0, 1.0-x, i);
     x /= 2.0;
   }
-  for (j=0;j<1000000;j++) {
+  for (j=0; j<100000; j++) {
     x = drand48();
     y = drand48();
     if (x<y) { z=x; x=y; y=z; }
     if (y != 0.0 && y != -0.0) tcmp2(x, y, -1);
   }
-  exit (0);
+  return 0;
 }