mirror of
https://github.com/zeldaret/st
synced 2026-07-04 13:20:04 -04:00
Make hex number case more consistent (#83)
* consistent hex in vfunc names * consistent hex in code * Actor_c4 -> Actor_C4, Actor_9c -> Actor_9C
This commit is contained in:
+5
-5
@@ -7,11 +7,11 @@ struct _loc_ctype_cmpt __ctype_cmpt = {
|
||||
};
|
||||
|
||||
unsigned short char_coll_table[0x60] = {
|
||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x21, 0x22, 0x23,
|
||||
0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x2b, 0x2d, 0x2f, 0x31, 0x33,
|
||||
0x35, 0x37, 0x39, 0x3b, 0x3d, 0x3f, 0x41, 0x43, 0x45, 0x47, 0x49, 0x4b, 0x4d, 0x4f, 0x51, 0x53, 0x55, 0x57, 0x59,
|
||||
0x5b, 0x5d, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x00, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e, 0x40,
|
||||
0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x1d, 0x1e, 0x1f, 0x20,
|
||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x21, 0x22, 0x23,
|
||||
0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x2B, 0x2D, 0x2F, 0x31, 0x33,
|
||||
0x35, 0x37, 0x39, 0x3B, 0x3D, 0x3F, 0x41, 0x43, 0x45, 0x47, 0x49, 0x4B, 0x4D, 0x4F, 0x51, 0x53, 0x55, 0x57, 0x59,
|
||||
0x5B, 0x5D, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x00, 0x2C, 0x2E, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3A, 0x3C, 0x3E, 0x40,
|
||||
0x42, 0x44, 0x46, 0x48, 0x4A, 0x4C, 0x4E, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5A, 0x5C, 0x5E, 0x1D, 0x1E, 0x1F, 0x20,
|
||||
};
|
||||
|
||||
struct _loc_coll_cmpt __coll_cmpt = {
|
||||
|
||||
@@ -97,7 +97,7 @@ double x;
|
||||
|
||||
k = 0;
|
||||
if (hx < 0x00100000) { /* x < 2**-1022 */
|
||||
if (((hx & 0x7fffffff) | lx) == 0) {
|
||||
if (((hx & 0x7FFFFFFF) | lx) == 0) {
|
||||
return -two54 / zero; /* log(+-0)=-inf */
|
||||
}
|
||||
if (hx < 0) {
|
||||
@@ -108,16 +108,16 @@ double x;
|
||||
x *= two54; /* subnormal number, scale up x */
|
||||
hx = __HI(x); /* high word of x */
|
||||
}
|
||||
if (hx >= 0x7ff00000) {
|
||||
if (hx >= 0x7FF00000) {
|
||||
return x + x;
|
||||
}
|
||||
k += (hx >> 20) - 1023;
|
||||
hx &= 0x000fffff;
|
||||
i = (hx + 0x95f64) & 0x100000;
|
||||
__HI(x) = hx | (i ^ 0x3ff00000); /* normalize x or x/2 */
|
||||
hx &= 0x000FFFFF;
|
||||
i = (hx + 0x95F64) & 0x100000;
|
||||
__HI(x) = hx | (i ^ 0x3FF00000); /* normalize x or x/2 */
|
||||
k += (i >> 20);
|
||||
f = x - 1.0;
|
||||
if ((0x000fffff & (2 + hx)) < 3) { /* |f| < 2**-20 */
|
||||
if ((0x000FFFFF & (2 + hx)) < 3) { /* |f| < 2**-20 */
|
||||
if (f == zero) {
|
||||
if (k == 0) {
|
||||
return zero;
|
||||
@@ -137,9 +137,9 @@ double x;
|
||||
s = f / (2.0 + f);
|
||||
dk = (double) k;
|
||||
z = s * s;
|
||||
i = hx - 0x6147a;
|
||||
i = hx - 0x6147A;
|
||||
w = z * z;
|
||||
j = 0x6b851 - hx;
|
||||
j = 0x6B851 - hx;
|
||||
t1 = w * (Lg2 + w * (Lg4 + w * Lg6));
|
||||
t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7)));
|
||||
i |= j;
|
||||
|
||||
@@ -74,7 +74,7 @@ double x;
|
||||
|
||||
k = 0;
|
||||
if (hx < 0x00100000) { /* x < 2**-1022 */
|
||||
if (((hx & 0x7fffffff) | lx) == 0) {
|
||||
if (((hx & 0x7FFFFFFF) | lx) == 0) {
|
||||
errno = EDOM;
|
||||
return -two54 / zero;
|
||||
} /* log(+-0)=-inf */
|
||||
@@ -86,12 +86,12 @@ double x;
|
||||
x *= two54; /* subnormal number, scale up x */
|
||||
hx = __HI(x); /* high word of x */
|
||||
}
|
||||
if (hx >= 0x7ff00000) {
|
||||
if (hx >= 0x7FF00000) {
|
||||
return x + x;
|
||||
}
|
||||
k += (hx >> 20) - 1023;
|
||||
i = ((unsigned) k & 0x80000000) >> 31;
|
||||
hx = (hx & 0x000fffff) | ((0x3ff - i) << 20);
|
||||
hx = (hx & 0x000FFFFF) | ((0x3FF - i) << 20);
|
||||
y = (double) (k + i);
|
||||
__HI(x) = hx;
|
||||
z = y * log10_2lo + ivln10 * log(x);
|
||||
|
||||
+29
-29
@@ -118,8 +118,8 @@ double x, y;
|
||||
lx = __LO(x);
|
||||
hy = __HI(y);
|
||||
ly = __LO(y);
|
||||
ix = hx & 0x7fffffff;
|
||||
iy = hy & 0x7fffffff;
|
||||
ix = hx & 0x7FFFFFFF;
|
||||
iy = hy & 0x7FFFFFFF;
|
||||
|
||||
/* y==zero: x**0 = 1 */
|
||||
if ((iy | ly) == 0) {
|
||||
@@ -127,7 +127,7 @@ double x, y;
|
||||
}
|
||||
|
||||
/* +-NaN return x+y */
|
||||
if (ix > 0x7ff00000 || ((ix == 0x7ff00000) && (lx != 0)) || iy > 0x7ff00000 || ((iy == 0x7ff00000) && (ly != 0))) {
|
||||
if (ix > 0x7FF00000 || ((ix == 0x7FF00000) && (lx != 0)) || iy > 0x7FF00000 || ((iy == 0x7FF00000) && (ly != 0))) {
|
||||
return x + y;
|
||||
#ifdef __STDC__
|
||||
errno = EDOM; /* mf-- added to conform to old ANSI standard */
|
||||
@@ -143,8 +143,8 @@ double x, y;
|
||||
if (hx < 0) {
|
||||
if (iy >= 0x43400000) {
|
||||
yisint = 2; /* even integer y */
|
||||
} else if (iy >= 0x3ff00000) {
|
||||
k = (iy >> 20) - 0x3ff; /* exponent */
|
||||
} else if (iy >= 0x3FF00000) {
|
||||
k = (iy >> 20) - 0x3FF; /* exponent */
|
||||
if (k > 20) {
|
||||
j = ly >> (52 - k);
|
||||
if ((j << (52 - k)) == ly) {
|
||||
@@ -161,18 +161,18 @@ double x, y;
|
||||
|
||||
/* special value of y */
|
||||
if (ly == 0) {
|
||||
if (iy == 0x7ff00000) {
|
||||
if (iy == 0x7FF00000) {
|
||||
|
||||
/* y is +-inf */
|
||||
if (((ix - 0x3ff00000) | lx) == 0) {
|
||||
if (((ix - 0x3FF00000) | lx) == 0) {
|
||||
return y - y; /* inf**+-1 is NaN */
|
||||
} else if (ix >= 0x3ff00000) { /* (|x|>1)**+-inf = inf,0 */
|
||||
} else if (ix >= 0x3FF00000) { /* (|x|>1)**+-inf = inf,0 */
|
||||
return (hy >= 0) ? y : zero;
|
||||
} else { /* (|x|<1)**-,+inf = inf,0 */
|
||||
return (hy < 0) ? -y : zero;
|
||||
}
|
||||
}
|
||||
if (iy == 0x3ff00000) {
|
||||
if (iy == 0x3FF00000) {
|
||||
/* y is +-1 */
|
||||
if (hy < 0) {
|
||||
return one / x;
|
||||
@@ -183,7 +183,7 @@ double x, y;
|
||||
if (hy == 0x40000000) {
|
||||
return x * x; /* y is 2 */
|
||||
}
|
||||
if (hy == 0x3fe00000) { /* y is 0.5 */
|
||||
if (hy == 0x3FE00000) { /* y is 0.5 */
|
||||
if (hx >= 0) { /* x >= +0 */
|
||||
return sqrt(x);
|
||||
}
|
||||
@@ -193,13 +193,13 @@ double x, y;
|
||||
ax = fabs(x);
|
||||
/* special value of x */
|
||||
if (lx == 0) {
|
||||
if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) {
|
||||
if (ix == 0x7FF00000 || ix == 0 || ix == 0x3FF00000) {
|
||||
z = ax; /*x is +-0,+-inf,+-1*/
|
||||
if (hy < 0) {
|
||||
z = one / z; /* z = (1/|x|) */
|
||||
}
|
||||
if (hx < 0) {
|
||||
if (((ix - 0x3ff00000) | yisint) == 0) {
|
||||
if (((ix - 0x3FF00000) | yisint) == 0) {
|
||||
z = (z - z) / (z - z); /* (-1)**non-int is NaN */
|
||||
} else if (yisint == 1) {
|
||||
z = -z; /* (x<0)**odd = -(|x|**odd) */
|
||||
@@ -218,20 +218,20 @@ double x, y;
|
||||
}
|
||||
|
||||
/* |y| is big */
|
||||
if (iy > 0x41e00000) { /* if |y| > 2**31 */
|
||||
if (iy > 0x43f00000) { /* if |y| > 2**64, must o/uflow */
|
||||
if (ix <= 0x3fefffff) {
|
||||
if (iy > 0x41E00000) { /* if |y| > 2**31 */
|
||||
if (iy > 0x43F00000) { /* if |y| > 2**64, must o/uflow */
|
||||
if (ix <= 0x3FEFFFFF) {
|
||||
return (hy < 0) ? big * big : tiny * tiny;
|
||||
}
|
||||
if (ix >= 0x3ff00000) {
|
||||
if (ix >= 0x3FF00000) {
|
||||
return (hy > 0) ? big * big : tiny * tiny;
|
||||
}
|
||||
}
|
||||
/* over/underflow if x is not close to one */
|
||||
if (ix < 0x3fefffff) {
|
||||
if (ix < 0x3FEFFFFF) {
|
||||
return (hy < 0) ? big * big : tiny * tiny;
|
||||
}
|
||||
if (ix > 0x3ff00000) {
|
||||
if (ix > 0x3FF00000) {
|
||||
return (hy > 0) ? big * big : tiny * tiny;
|
||||
}
|
||||
/* now |1-x| is tiny <= 2**-20, suffice to compute
|
||||
@@ -252,10 +252,10 @@ double x, y;
|
||||
n -= 53;
|
||||
ix = __HI(ax);
|
||||
}
|
||||
n += ((ix) >> 20) - 0x3ff;
|
||||
j = ix & 0x000fffff;
|
||||
n += ((ix) >> 20) - 0x3FF;
|
||||
j = ix & 0x000FFFFF;
|
||||
/* determine interval */
|
||||
ix = j | 0x3ff00000; /* normalize ix */
|
||||
ix = j | 0x3FF00000; /* normalize ix */
|
||||
if (j <= 0x3988E) {
|
||||
k = 0; /* |x|<sqrt(3/2) */
|
||||
} else if (j < 0xBB67A) {
|
||||
@@ -323,8 +323,8 @@ double x, y;
|
||||
return s * big * big; /* overflow */
|
||||
}
|
||||
}
|
||||
} else if ((j & 0x7fffffff) >= 0x4090cc00) { /* z <= -1075 */
|
||||
if (((j - 0xc090cc00) | i) != 0) { /* z < -1075 */
|
||||
} else if ((j & 0x7FFFFFFF) >= 0x4090CC00) { /* z <= -1075 */
|
||||
if (((j - 0xC090CC00) | i) != 0) { /* z < -1075 */
|
||||
return s * tiny * tiny; /* underflow */
|
||||
} else {
|
||||
if (p_l <= z - p_h) {
|
||||
@@ -335,15 +335,15 @@ double x, y;
|
||||
/*
|
||||
* compute 2**(p_h+p_l)
|
||||
*/
|
||||
i = j & 0x7fffffff;
|
||||
k = (i >> 20) - 0x3ff;
|
||||
i = j & 0x7FFFFFFF;
|
||||
k = (i >> 20) - 0x3FF;
|
||||
n = 0;
|
||||
if (i > 0x3fe00000) { /* if |z| > 0.5, set n = [z+0.5] */
|
||||
if (i > 0x3FE00000) { /* if |z| > 0.5, set n = [z+0.5] */
|
||||
n = j + (0x00100000 >> (k + 1));
|
||||
k = ((n & 0x7fffffff) >> 20) - 0x3ff; /* new k for n */
|
||||
k = ((n & 0x7FFFFFFF) >> 20) - 0x3FF; /* new k for n */
|
||||
t = zero;
|
||||
__HI(t) = (n & ~(0x000fffff >> k));
|
||||
n = ((n & 0x000fffff) | 0x00100000) >> (20 - k);
|
||||
__HI(t) = (n & ~(0x000FFFFF >> k));
|
||||
n = ((n & 0x000FFFFF) | 0x00100000) >> (20 - k);
|
||||
if (j < 0) {
|
||||
n = -n;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ double x;
|
||||
unsigned i, j;
|
||||
i0 = __HI(x);
|
||||
i1 = __LO(x);
|
||||
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
|
||||
j0 = ((i0 >> 20) & 0x7FF) - 0x3FF;
|
||||
if (j0 < 20) {
|
||||
if (j0 < 0) { /* raise inexact if x != 0 */
|
||||
if (huge + x > 0.0) { /* return 0*sign(x) if |x|<1 */
|
||||
@@ -47,12 +47,12 @@ double x;
|
||||
i0 = 0x80000000;
|
||||
i1 = 0;
|
||||
} else if ((i0 | i1) != 0) {
|
||||
i0 = 0x3ff00000;
|
||||
i0 = 0x3FF00000;
|
||||
i1 = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
i = (0x000fffff) >> j0;
|
||||
i = (0x000FFFFF) >> j0;
|
||||
if (((i0 & i) | i1) == 0) {
|
||||
return x; /* x is integral */
|
||||
}
|
||||
@@ -71,7 +71,7 @@ double x;
|
||||
return x; /* x is integral */
|
||||
}
|
||||
} else {
|
||||
i = ((unsigned) (0xffffffff)) >> (j0 - 20);
|
||||
i = ((unsigned) (0xFFFFFFFF)) >> (j0 - 20);
|
||||
if ((i1 & i) == 0) {
|
||||
return x; /* x is integral */
|
||||
}
|
||||
|
||||
@@ -26,6 +26,6 @@ double copysign(x, y)
|
||||
double x, y;
|
||||
#endif
|
||||
{
|
||||
__HI(x) = (__HI(x) & 0x7fffffff) | (__HI(y) & 0x80000000);
|
||||
__HI(x) = (__HI(x) & 0x7FFFFFFF) | (__HI(y) & 0x80000000);
|
||||
return x;
|
||||
}
|
||||
|
||||
@@ -24,6 +24,6 @@ double fabs(x)
|
||||
double x;
|
||||
#endif
|
||||
{
|
||||
__HI(x) &= 0x7fffffff;
|
||||
__HI(x) &= 0x7FFFFFFF;
|
||||
return x;
|
||||
}
|
||||
|
||||
@@ -40,20 +40,20 @@ int *eptr;
|
||||
{
|
||||
int hx, ix, lx;
|
||||
hx = __HI(x);
|
||||
ix = 0x7fffffff & hx;
|
||||
ix = 0x7FFFFFFF & hx;
|
||||
lx = __LO(x);
|
||||
*eptr = 0;
|
||||
if (ix >= 0x7ff00000 || ((ix | lx) == 0)) {
|
||||
if (ix >= 0x7FF00000 || ((ix | lx) == 0)) {
|
||||
return x; /* 0,inf,nan */
|
||||
}
|
||||
if (ix < 0x00100000) { /* subnormal */
|
||||
x *= two54;
|
||||
hx = __HI(x);
|
||||
ix = hx & 0x7fffffff;
|
||||
ix = hx & 0x7FFFFFFF;
|
||||
*eptr = -54;
|
||||
}
|
||||
*eptr += (ix >> 20) - 1022;
|
||||
hx = (hx & 0x800fffff) | 0x3fe00000;
|
||||
hx = (hx & 0x800FFFFF) | 0x3FE00000;
|
||||
__HI(x) = hx;
|
||||
return x;
|
||||
}
|
||||
|
||||
@@ -26,28 +26,28 @@ double ldexp(double x, int n) {
|
||||
|
||||
hx = __HI(x);
|
||||
lx = __LO(x);
|
||||
k = (hx & 0x7ff00000) >> 20; /* extract exponent */
|
||||
k = (hx & 0x7FF00000) >> 20; /* extract exponent */
|
||||
if (k == 0) { /* 0 or subnormal x */
|
||||
if ((lx | (hx & 0x7fffffff)) == 0) {
|
||||
if ((lx | (hx & 0x7FFFFFFF)) == 0) {
|
||||
return x; /* +-0 */
|
||||
}
|
||||
x *= two54;
|
||||
hx = __HI(x);
|
||||
k = ((hx & 0x7ff00000) >> 20) - 54;
|
||||
k = ((hx & 0x7FF00000) >> 20) - 54;
|
||||
if (n < -50000) {
|
||||
return tiny * x; /*underflow*/
|
||||
}
|
||||
}
|
||||
if (k == 0x7ff) {
|
||||
if (k == 0x7FF) {
|
||||
return x + x; /* NaN or Inf */
|
||||
}
|
||||
k = k + n;
|
||||
if (k > 0x7fe) {
|
||||
if (k > 0x7FE) {
|
||||
return big * copysign(big, x); /* overflow */
|
||||
}
|
||||
if (k > 0) /* normal result */
|
||||
{
|
||||
__HI(x) = (hx & 0x800fffff) | (k << 20);
|
||||
__HI(x) = (hx & 0x800FFFFF) | (k << 20);
|
||||
return x;
|
||||
}
|
||||
if (k <= -54) {
|
||||
@@ -58,7 +58,7 @@ double ldexp(double x, int n) {
|
||||
}
|
||||
}
|
||||
k += 54; /* subnormal result */
|
||||
__HI(x) = (hx & 0x800fffff) | (k << 20);
|
||||
__HI(x) = (hx & 0x800FFFFF) | (k << 20);
|
||||
return x * twom54;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ int __fpclassifyd(double x) {
|
||||
}
|
||||
break;
|
||||
case 0:
|
||||
if ((__HI(x) & 0x000FFFFf) || (__LO(x) & 0xFFFFFFFF)) {
|
||||
if ((__HI(x) & 0x000FFFFF) || (__LO(x) & 0xFFFFFFFF)) {
|
||||
return 5;
|
||||
} else {
|
||||
return 3;
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ void *memset(void *dest, int val, int n) {
|
||||
void *memchr(const void *src, int val, int n) {
|
||||
const unsigned char *p;
|
||||
|
||||
unsigned int v = (val & 0xff);
|
||||
unsigned int v = (val & 0xFF);
|
||||
|
||||
for (p = (unsigned char *) src, n++; --n;) {
|
||||
if (*p++ == v) {
|
||||
|
||||
Reference in New Issue
Block a user