From b68e30f6fff31a25bc9e2c88998b6a917997be3a Mon Sep 17 00:00:00 2001 From: ceriel Date: Fri, 22 Apr 1988 14:11:55 +0000 Subject: [PATCH] avoid use of modf; not portable --- mach/i86/cg/mach.c | 27 ++++++++++++++++++--------- mach/m68020/ncg/mach.c | 26 +++++++++++++++++--------- mach/m68k2/cg/mach.c | 26 +++++++++++++++++--------- mach/m68k2/ncg/mach.c | 26 +++++++++++++++++--------- mach/m68k4/ncg/mach.c | 26 +++++++++++++++++--------- mach/moon3/ncg/mach.c | 26 +++++++++++++++++--------- mach/pdp/cg/mach.c | 20 +++++++++++++------- mach/pdp/ncg/mach.c | 25 ++++++++++++++++++------- 8 files changed, 134 insertions(+), 68 deletions(-) diff --git a/mach/i86/cg/mach.c b/mach/i86/cg/mach.c index 431a870f6..71e5a4fa4 100644 --- a/mach/i86/cg/mach.c +++ b/mach/i86/cg/mach.c @@ -64,8 +64,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -107,15 +106,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -123,16 +125,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { @@ -159,6 +167,7 @@ con_float() { putc('\n', codefile); } #endif + /* string holstr(n) word n; { diff --git a/mach/m68020/ncg/mach.c b/mach/m68020/ncg/mach.c index cf1056ece..1d5aa9c17 100644 --- a/mach/m68020/ncg/mach.c +++ b/mach/m68020/ncg/mach.c @@ -63,8 +63,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -106,15 +105,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -122,16 +124,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { diff --git a/mach/m68k2/cg/mach.c b/mach/m68k2/cg/mach.c index 2fefd3f22..9757e2a0e 100644 --- a/mach/m68k2/cg/mach.c +++ b/mach/m68k2/cg/mach.c @@ -62,8 +62,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -105,15 +104,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -121,16 +123,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { diff --git a/mach/m68k2/ncg/mach.c b/mach/m68k2/ncg/mach.c index cf1056ece..1d5aa9c17 100644 --- a/mach/m68k2/ncg/mach.c +++ b/mach/m68k2/ncg/mach.c @@ -63,8 +63,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -106,15 +105,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -122,16 +124,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { diff --git a/mach/m68k4/ncg/mach.c b/mach/m68k4/ncg/mach.c index cf1056ece..1d5aa9c17 100644 --- a/mach/m68k4/ncg/mach.c +++ b/mach/m68k4/ncg/mach.c @@ -63,8 +63,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -106,15 +105,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -122,16 +124,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { diff --git a/mach/moon3/ncg/mach.c b/mach/moon3/ncg/mach.c index cf1056ece..1d5aa9c17 100644 --- a/mach/moon3/ncg/mach.c +++ b/mach/moon3/ncg/mach.c @@ -63,8 +63,7 @@ con_float() { double atof(); int i; #ifndef OWNFLOAT - double f1; - double frexp(), modf(); + double frexp(); int j; int sign = 0; int fraction[4] ; @@ -106,15 +105,18 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ #ifdef IEEEFLOAT if (argval == 4) { #endif IEEEFLOAT i = (i + 128) & 0377; fraction[0] = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + f -= 1.0; + fraction[0] |= (1 << j); + } } #ifdef IEEEFLOAT } @@ -122,16 +124,22 @@ con_float() { i = (i + 1024) & 03777; fraction[0] = (sign << 15) | (i << 4); for (j = 3; j>= 0; j--) { - if (f >= 0.5) fraction[0] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[0] |= (1 << j); + f -= 1.0; + } } } #endif IEEEFLOAT for (i = 1; i < argval / 2; i++) { fraction[i] = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction[i] |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction[i] |= (1 << j); + f -= 1.0; + } } } if (f >= 0.5) { diff --git a/mach/pdp/cg/mach.c b/mach/pdp/cg/mach.c index e53e81275..65a428216 100644 --- a/mach/pdp/cg/mach.c +++ b/mach/pdp/cg/mach.c @@ -54,8 +54,8 @@ con_mult(sz) word sz; { con_float() { #ifdef ACK_ASS - double f, f1; - double atof(), frexp(), modf(); + double f; + double atof(), frexp(); int i, j; int sign = 0; int fraction ; @@ -77,19 +77,25 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ i = (i + 128) & 0377; fraction = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction |= (1 << j); + f -= 1.0; + } } fprintf(codefile, ".data2 0%o", fraction); for (i = argval / 2 - 1; i; i--) { fraction = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction |= (1 << j); + f -= 1.0; + } } fprintf(codefile, ", 0%o", fraction); } diff --git a/mach/pdp/ncg/mach.c b/mach/pdp/ncg/mach.c index b15dbfc93..65a428216 100644 --- a/mach/pdp/ncg/mach.c +++ b/mach/pdp/ncg/mach.c @@ -54,8 +54,8 @@ con_mult(sz) word sz; { con_float() { #ifdef ACK_ASS - double f, f1; - double atof(), frexp(), modf(); + double f; + double atof(), frexp(); int i, j; int sign = 0; int fraction ; @@ -63,6 +63,11 @@ con_float() { if (argval != 4 && argval != 8) fatal("bad fcon size"); f = atof(str); + if (f == 0) { + if (argval == 8) fprintf(codefile, ".data2 0, 0\n"); + fprintf(codefile, ".data2 0, 0\n"); + return; + } f = frexp(f, &i); if (f < 0) { f = -f; @@ -72,19 +77,25 @@ con_float() { f += f; i --; } - f = modf(2 * f, &f1); /* hidden bit */ + f = 2*f - 1.0; /* hidden bit */ i = (i + 128) & 0377; fraction = (sign << 15) | (i << 7); for (j = 6; j>= 0; j--) { - if (f >= 0.5) fraction |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction |= (1 << j); + f -= 1.0; + } } fprintf(codefile, ".data2 0%o", fraction); for (i = argval / 2 - 1; i; i--) { fraction = 0; for (j = 15; j>= 0; j--) { - if (f >= 0.5) fraction |= (1 << j); - f = modf(2*f, &f1); + f *= 2; + if (f >= 1.0) { + fraction |= (1 << j); + f -= 1.0; + } } fprintf(codefile, ", 0%o", fraction); } -- 2.34.1