Fcalva/OpenLibm
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/OpenLibm.git synced 2024-12-29 13:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

uint64_t -> u_int64_t

Browse source
This commit is contained in:
Viral B. Shah 2011-08-13 10:43:52 +05:30
parent b38406550b
commit db4db9cf35
12 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fpmath.h
View file

@ -28,11 +28,13 @@
*/ */
// Currently assumes Intel platform // Currently assumes Intel platform
#if defined (__i386__) || defined(__x86_64__)
#ifdef __LP64__ #ifdef __LP64__
#include "amd64_fpmath.h" #include "amd64_fpmath.h"
#else #else
#include "i386_fpmath.h" #include "i386_fpmath.h"
#endif #endif
#endif
#ifdef __linux #ifdef __linux
#include <features.h> #include <features.h>

4
src/e_fmodl.c
View file

@ -23,13 +23,13 @@
#define BIAS (LDBL_MAX_EXP - 1) #define BIAS (LDBL_MAX_EXP - 1)
#if LDBL_MANL_SIZE > 32 #if LDBL_MANL_SIZE > 32
typedef uint64_t manl_t; typedef u_int64_t manl_t;
#else #else
typedef uint32_t manl_t; typedef uint32_t manl_t;
#endif #endif
#if LDBL_MANH_SIZE > 32 #if LDBL_MANH_SIZE > 32
typedef uint64_t manh_t; typedef u_int64_t manh_t;
#else #else
typedef uint32_t manh_t; typedef uint32_t manh_t;
#endif #endif

2
src/e_hypotl.c
View file

@ -55,7 +55,7 @@
#define MAX_EXP LDBL_MAX_EXP #define MAX_EXP LDBL_MAX_EXP
#if LDBL_MANL_SIZE > 32 #if LDBL_MANL_SIZE > 32
typedef uint64_t man_t; typedef u_int64_t man_t;
#else #else
typedef uint32_t man_t; typedef uint32_t man_t;
#endif #endif

1
src/k_log.h
View file

@ -12,7 +12,6 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/msun/src/k_log.h,v 1.1.2.2 2011/03/06 08:49:44 das Exp $");
/* __kernel_log(x) /* __kernel_log(x)
* Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)]. * Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)].

1
src/k_logf.h
View file

@ -10,7 +10,6 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/msun/src/k_logf.h,v 1.2.2.2 2011/03/06 08:49:44 das Exp $");
/* __kernel_logf(x) /* __kernel_logf(x)
* Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)]. * Return log(x) - (x-1) for x in ~[sqrt(2)/2, sqrt(2)].

8
src/openlibm.h
View file

@ -18,8 +18,8 @@
#define _MATH_H_ #define _MATH_H_
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/_types.h> #include <sys/types.h>
#include <machine/_limits.h> #include <machine/limits.h>
/* /*
* ANSI/POSIX * ANSI/POSIX
@ -134,7 +134,7 @@ typedef __float_t float_t;
/* /*
* XOPEN/SVID * XOPEN/SVID
*/ */
#if __BSD_VISIBLE || __XSI_VISIBLE //#if __BSD_VISIBLE || __XSI_VISIBLE
#define M_E 2.7182818284590452354 /* e */ #define M_E 2.7182818284590452354 /* e */
#define M_LOG2E 1.4426950408889634074 /* log 2e */ #define M_LOG2E 1.4426950408889634074 /* log 2e */
#define M_LOG10E 0.43429448190325182765 /* log 10e */ #define M_LOG10E 0.43429448190325182765 /* log 10e */
@ -151,7 +151,7 @@ typedef __float_t float_t;
#define MAXFLOAT ((float)3.40282346638528860e+38) #define MAXFLOAT ((float)3.40282346638528860e+38)
extern int signgam; extern int signgam;
#endif /* __BSD_VISIBLE || __XSI_VISIBLE */ //#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
#if __BSD_VISIBLE #if __BSD_VISIBLE
#if 0 #if 0

3
src/s_cbrt.c
View file

@ -14,7 +14,6 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include "openlibm.h" #include "openlibm.h"
#include "math_private.h" #include "math_private.h"
@ -39,7 +38,7 @@ cbrt(double x)
int32_t hx; int32_t hx;
union { union {
double value; double value;
uint64_t bits; u_int64_t bits;
} u; } u;
double r,s,t=0.0,w; double r,s,t=0.0,w;
u_int32_t sign; u_int32_t sign;

10
src/s_ceill.c
View file

@ -32,7 +32,7 @@
#ifdef LDBL_IMPLICIT_NBIT #ifdef LDBL_IMPLICIT_NBIT
#define MANH_SIZE (LDBL_MANH_SIZE + 1) #define MANH_SIZE (LDBL_MANH_SIZE + 1)
#define INC_MANH(u, c) do { \ #define INC_MANH(u, c) do { \
uint64_t o = u.bits.manh; \ u_int64_t o = u.bits.manh; \
u.bits.manh += (c); \ u.bits.manh += (c); \
if (u.bits.manh < o) \ if (u.bits.manh < o) \
u.bits.exp++; \ u.bits.exp++; \
@ -40,7 +40,7 @@
#else #else
#define MANH_SIZE LDBL_MANH_SIZE #define MANH_SIZE LDBL_MANH_SIZE
#define INC_MANH(u, c) do { \ #define INC_MANH(u, c) do { \
uint64_t o = u.bits.manh; \ u_int64_t o = u.bits.manh; \
u.bits.manh += (c); \ u.bits.manh += (c); \
if (u.bits.manh < o) { \ if (u.bits.manh < o) { \
u.bits.exp++; \ u.bits.exp++; \
@ -64,7 +64,7 @@ ceill(long double x)
(u.bits.manh | u.bits.manl) != 0) (u.bits.manh | u.bits.manl) != 0)
u.e = u.bits.sign ? -0.0 : 1.0; u.e = u.bits.sign ? -0.0 : 1.0;
} else { } else {
uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
if (((u.bits.manh & m) | u.bits.manl) == 0) if (((u.bits.manh & m) | u.bits.manl) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (!u.bits.sign) { if (!u.bits.sign) {
@ -81,14 +81,14 @@ ceill(long double x)
} }
} }
} else if (e < LDBL_MANT_DIG - 1) { } else if (e < LDBL_MANT_DIG - 1) {
uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); u_int64_t m = (u_int64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
if ((u.bits.manl & m) == 0) if ((u.bits.manl & m) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (!u.bits.sign) { if (!u.bits.sign) {
if (e == MANH_SIZE - 1) if (e == MANH_SIZE - 1)
INC_MANH(u, 1); INC_MANH(u, 1);
else { else {
uint64_t o = u.bits.manl; u_int64_t o = u.bits.manl;
u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1); u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1);
if (u.bits.manl < o) /* got a carry */ if (u.bits.manl < o) /* got a carry */
INC_MANH(u, 1); INC_MANH(u, 1);

10
src/s_floorl.c
View file

@ -32,7 +32,7 @@
#ifdef LDBL_IMPLICIT_NBIT #ifdef LDBL_IMPLICIT_NBIT
#define MANH_SIZE (LDBL_MANH_SIZE + 1) #define MANH_SIZE (LDBL_MANH_SIZE + 1)
#define INC_MANH(u, c) do { \ #define INC_MANH(u, c) do { \
uint64_t o = u.bits.manh; \ u_int64_t o = u.bits.manh; \
u.bits.manh += (c); \ u.bits.manh += (c); \
if (u.bits.manh < o) \ if (u.bits.manh < o) \
u.bits.exp++; \ u.bits.exp++; \
@ -40,7 +40,7 @@
#else #else
#define MANH_SIZE LDBL_MANH_SIZE #define MANH_SIZE LDBL_MANH_SIZE
#define INC_MANH(u, c) do { \ #define INC_MANH(u, c) do { \
uint64_t o = u.bits.manh; \ u_int64_t o = u.bits.manh; \
u.bits.manh += (c); \ u.bits.manh += (c); \
if (u.bits.manh < o) { \ if (u.bits.manh < o) { \
u.bits.exp++; \ u.bits.exp++; \
@ -64,7 +64,7 @@ floorl(long double x)
(u.bits.manh | u.bits.manl) != 0) (u.bits.manh | u.bits.manl) != 0)
u.e = u.bits.sign ? -1.0 : 0.0; u.e = u.bits.sign ? -1.0 : 0.0;
} else { } else {
uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
if (((u.bits.manh & m) | u.bits.manl) == 0) if (((u.bits.manh & m) | u.bits.manl) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (u.bits.sign) { if (u.bits.sign) {
@ -81,14 +81,14 @@ floorl(long double x)
} }
} }
} else if (e < LDBL_MANT_DIG - 1) { } else if (e < LDBL_MANT_DIG - 1) {
uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); u_int64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
if ((u.bits.manl & m) == 0) if ((u.bits.manl & m) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (u.bits.sign) { if (u.bits.sign) {
if (e == MANH_SIZE - 1) if (e == MANH_SIZE - 1)
INC_MANH(u, 1); INC_MANH(u, 1);
else { else {
uint64_t o = u.bits.manl; u_int64_t o = u.bits.manl;
u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1); u.bits.manl += 1llu << (LDBL_MANT_DIG - e - 1);
if (u.bits.manl < o) /* got a carry */ if (u.bits.manl < o) /* got a carry */
INC_MANH(u, 1); INC_MANH(u, 1);

2
src/s_modfl.c
View file

@ -43,7 +43,7 @@
#include "fpmath.h" #include "fpmath.h"
#if LDBL_MANL_SIZE > 32 #if LDBL_MANL_SIZE > 32
#define MASK ((uint64_t)-1) #define MASK ((u_int64_t)-1)
#else #else
#define MASK ((uint32_t)-1) #define MASK ((uint32_t)-1)
#endif #endif

4
src/s_remquol.c
View file

@ -23,13 +23,13 @@
#define BIAS (LDBL_MAX_EXP - 1) #define BIAS (LDBL_MAX_EXP - 1)
#if LDBL_MANL_SIZE > 32 #if LDBL_MANL_SIZE > 32
typedef uint64_t manl_t; typedef u_int64_t manl_t;
#else #else
typedef uint32_t manl_t; typedef uint32_t manl_t;
#endif #endif
#if LDBL_MANH_SIZE > 32 #if LDBL_MANH_SIZE > 32
typedef uint64_t manh_t; typedef u_int64_t manh_t;
#else #else
typedef uint32_t manh_t; typedef uint32_t manh_t;
#endif #endif

4
src/s_truncl.c
View file

@ -49,7 +49,7 @@ truncl(long double x)
if (huge + x > 0.0) if (huge + x > 0.0)
u.e = zero[u.bits.sign]; u.e = zero[u.bits.sign];
} else { } else {
uint64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1); u_int64_t m = ((1llu << MANH_SIZE) - 1) >> (e + 1);
if (((u.bits.manh & m) | u.bits.manl) == 0) if (((u.bits.manh & m) | u.bits.manl) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (huge + x > 0.0) { /* raise inexact flag */ if (huge + x > 0.0) { /* raise inexact flag */
@ -58,7 +58,7 @@ truncl(long double x)
} }
} }
} else if (e < LDBL_MANT_DIG - 1) { } else if (e < LDBL_MANT_DIG - 1) {
uint64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1); u_int64_t m = (uint64_t)-1 >> (64 - LDBL_MANT_DIG + e + 1);
if ((u.bits.manl & m) == 0) if ((u.bits.manl & m) == 0)
return (x); /* x is integral */ return (x); /* x is integral */
if (huge + x > 0.0) /* raise inexact flag */ if (huge + x > 0.0) /* raise inexact flag */