conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some c99isms

This commit is contained in:
Doug Currie 2016-01-08 23:47:16 -05:00
parent 5fd8f8287f
commit 3f7c5034d7
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/10.roundtrip/emyg_dtoa.c
View File

@ -51,7 +51,7 @@ typedef struct DiyFp_s {
static const int kDiySignificandSize = 64; static const int kDiySignificandSize = 64;
static const int kDpSignificandSize = 52; static const int kDpSignificandSize = 52;
static const int kDpExponentBias = 0x3FF + kDpSignificandSize; static const int kDpExponentBias = 0x3FF + 52 /*kDpSignificandSize*/;
static const int kDpMinExponent = -kDpExponentBias; static const int kDpMinExponent = -kDpExponentBias;
static const uint64_t kDpExponentMask = UINT64_C2(0x7FF00000, 0x00000000); static const uint64_t kDpExponentMask = UINT64_C2(0x7FF00000, 0x00000000);
static const uint64_t kDpSignificandMask = UINT64_C2(0x000FFFFF, 0xFFFFFFFF); static const uint64_t kDpSignificandMask = UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
@ -96,14 +96,14 @@ static inline DiyFp DiyFp_multiply (const DiyFp lhs, const DiyFp rhs) {
uint64_t l = _umul128(lhs.f, rhs.f, &h); uint64_t l = _umul128(lhs.f, rhs.f, &h);
if (l & (uint64_t(1) << 63)) // rounding if (l & (uint64_t(1) << 63)) // rounding
h++; h++;
return DiyFp_fro_parts(h, e + rhs.e + 64); return DiyFp_fro_parts(h, lhs.e + rhs.e + 64);
#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__) #elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
unsigned __int128 p = (unsigned __int128 )(lhs.f) * (unsigned __int128 )(rhs.f); unsigned __int128 p = (unsigned __int128 )(lhs.f) * (unsigned __int128 )(rhs.f);
uint64_t h = p >> 64; uint64_t h = p >> 64;
uint64_t l = (uint64_t )(p); uint64_t l = (uint64_t )(p);
if (l & (uint64_t(1) << 63)) // rounding if (l & (((uint64_t )1) << 63)) // rounding
h++; h++;
return DiyFp_from_parts(h, e + rhs.e + 64); return DiyFp_from_parts(h, lhs.e + rhs.e + 64);
#else #else
const uint64_t M32 = 0xFFFFFFFF; const uint64_t M32 = 0xFFFFFFFF;
const uint64_t a = lhs.f >> 32; const uint64_t a = lhs.f >> 32;
@ -382,7 +382,8 @@ static inline void Prettify(char* buffer, int length, int k) {
if (length <= kk && kk <= 21) { if (length <= kk && kk <= 21) {
// 1234e7 -> 12340000000 // 1234e7 -> 12340000000
for (int i = length; i < kk; i++) int i;
for (i = length; i < kk; i++)
buffer[i] = '0'; buffer[i] = '0';
buffer[kk] = '.'; buffer[kk] = '.';
buffer[kk + 1] = '0'; buffer[kk + 1] = '0';
@ -396,11 +397,12 @@ static inline void Prettify(char* buffer, int length, int k) {
} }
else if (-6 < kk && kk <= 0) { else if (-6 < kk && kk <= 0) {
// 1234e-6 -> 0.001234 // 1234e-6 -> 0.001234
int i;
const int offset = 2 - kk; const int offset = 2 - kk;
memmove(&buffer[offset], &buffer[0], length); memmove(&buffer[offset], &buffer[0], length);
buffer[0] = '0'; buffer[0] = '0';
buffer[1] = '.'; buffer[1] = '.';
for (int i = 2; i < offset; i++) for (i = 2; i < offset; i++)
buffer[i] = '0'; buffer[i] = '0';
buffer[length + offset] = '\0'; buffer[length + offset] = '\0';
} }

8
extlib/benz/include/picrin/compat.h
View File

@ -282,16 +282,16 @@ atof(const char *nptr)
#if PIC_ENABLE_STDIO #if PIC_ENABLE_STDIO
# include <stdio.h> # include <stdio.h>
void PIC_INLINE void
PIC_INLINE pic_dtoa(double dval, char *buf) pic_dtoa(double dval, char *buf)
{ {
sprintf(buf, "%g", dval); sprintf(buf, "%g", dval);
} }
#else #else
void PIC_INLINE void
PIC_INLINE pic_dtoa(double dval, char *buf) pic_dtoa(double dval, char *buf)
{ {
# define fabs(x) ((x) >= 0 ? (x) : -(x)) # define fabs(x) ((x) >= 0 ? (x) : -(x))
long lval, tlval; long lval, tlval;