diff options
Diffstat (limited to 'native')
130 files changed, 7510 insertions, 8728 deletions
diff --git a/native/fdlibm/dtoa.c b/native/fdlibm/dtoa.c index 52ba2d8da..9a398b43d 100644 --- a/native/fdlibm/dtoa.c +++ b/native/fdlibm/dtoa.c @@ -30,7 +30,9 @@ #include <string.h> static int -_DEFUN (quorem, (b, S), _Jv_Bigint * b _AND _Jv_Bigint * S) +_DEFUN (quorem, + (b, S), + _Jv_Bigint * b _AND _Jv_Bigint * S) { int n; long borrow, y; @@ -43,8 +45,8 @@ _DEFUN (quorem, (b, S), _Jv_Bigint * b _AND _Jv_Bigint * S) n = S->_wds; #ifdef DEBUG - /*debug */ if (b->_wds > n) - /*debug */ Bug ("oversize b in quorem"); + /*debug*/ if (b->_wds > n) + /*debug*/ Bug ("oversize b in quorem"); #endif if (b->_wds < n) return 0; @@ -54,8 +56,8 @@ _DEFUN (quorem, (b, S), _Jv_Bigint * b _AND _Jv_Bigint * S) bxe = bx + n; q = *bxe / (*sxe + 1); /* ensure q <= true quotient */ #ifdef DEBUG - /*debug */ if (q > 9) - /*debug */ Bug ("oversized quotient in quorem"); + /*debug*/ if (q > 9) + /*debug*/ Bug ("oversized quotient in quorem"); #endif if (q) { @@ -145,7 +147,7 @@ print (_Jv_Bigint * b) int i, wds; unsigned long *x, y; wds = b->_wds; - x = b->_x + wds; + x = b->_x+wds; i = 0; do { @@ -199,46 +201,49 @@ _DEFUN (_dtoa_r, double _d _AND int mode _AND int ndigits _AND - int *decpt _AND int *sign _AND char **rve _AND int float_type) + int *decpt _AND + int *sign _AND + char **rve _AND + int float_type) { /* - float_type == 0 for double precision, 1 for float. - - Arguments ndigits, decpt, sign are similar to those - of ecvt and fcvt; trailing zeros are suppressed from - the returned string. If not null, *rve is set to point - to the end of the return value. If d is +-Infinity or NaN, - then *decpt is set to 9999. - - mode: - 0 ==> shortest string that yields d when read in - and rounded to nearest. - 1 ==> like 0, but with Steele & White stopping rule; - e.g. with IEEE P754 arithmetic , mode 0 gives - 1e23 whereas mode 1 gives 9.999999999999999e22. - 2 ==> max(1,ndigits) significant digits. This gives a - return value similar to that of ecvt, except - that trailing zeros are suppressed. - 3 ==> through ndigits past the decimal point. This - gives a return value similar to that from fcvt, - except that trailing zeros are suppressed, and - ndigits can be negative. - 4-9 should give the same return values as 2-3, i.e., - 4 <= mode <= 9 ==> same return as mode - 2 + (mode & 1). These modes are mainly for - debugging; often they run slower but sometimes - faster than modes 2-3. - 4,5,8,9 ==> left-to-right digit generation. - 6-9 ==> don't try fast floating-point estimate - (if applicable). - - > 16 ==> Floating-point arg is treated as single precision. - - Values of mode other than 0-9 are treated as mode 0. - - Sufficient space is allocated to the return value - to hold the suppressed trailing zeros. - */ + float_type == 0 for double precision, 1 for float. + + Arguments ndigits, decpt, sign are similar to those + of ecvt and fcvt; trailing zeros are suppressed from + the returned string. If not null, *rve is set to point + to the end of the return value. If d is +-Infinity or NaN, + then *decpt is set to 9999. + + mode: + 0 ==> shortest string that yields d when read in + and rounded to nearest. + 1 ==> like 0, but with Steele & White stopping rule; + e.g. with IEEE P754 arithmetic , mode 0 gives + 1e23 whereas mode 1 gives 9.999999999999999e22. + 2 ==> max(1,ndigits) significant digits. This gives a + return value similar to that of ecvt, except + that trailing zeros are suppressed. + 3 ==> through ndigits past the decimal point. This + gives a return value similar to that from fcvt, + except that trailing zeros are suppressed, and + ndigits can be negative. + 4-9 should give the same return values as 2-3, i.e., + 4 <= mode <= 9 ==> same return as mode + 2 + (mode & 1). These modes are mainly for + debugging; often they run slower but sometimes + faster than modes 2-3. + 4,5,8,9 ==> left-to-right digit generation. + 6-9 ==> don't try fast floating-point estimate + (if applicable). + + > 16 ==> Floating-point arg is treated as single precision. + + Values of mode other than 0-9 are treated as mode 0. + + Sufficient space is allocated to the return value + to hold the suppressed trailing zeros. + */ int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1, j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, spec_case, try_quick; @@ -321,27 +326,27 @@ _DEFUN (_dtoa_r, d2.d /= 1 << j; #endif - /* log(x) ~=~ log(1.5) + (x-1.5)/1.5 - * log10(x) = log(x) / log(10) - * ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10)) - * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2) - * - * This suggests computing an approximation k to log10(d) by - * - * k = (i - Bias)*0.301029995663981 - * + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 ); - * - * We want k to be too large rather than too small. - * The error in the first-order Taylor series approximation - * is in our favor, so we just round up the constant enough - * to compensate for any error in the multiplication of - * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077, - * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14, - * adding 1e-13 to the constant term more than suffices. - * Hence we adjust the constant term to 0.1760912590558. - * (We could get a more accurate k by invoking log10, - * but this is probably not worthwhile.) - */ + /* log(x) ~=~ log(1.5) + (x-1.5)/1.5 + * log10(x) = log(x) / log(10) + * ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10)) + * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2) + * + * This suggests computing an approximation k to log10(d) by + * + * k = (i - Bias)*0.301029995663981 + * + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 ); + * + * We want k to be too large rather than too small. + * The error in the first-order Taylor series approximation + * is in our favor, so we just round up the constant enough + * to compensate for any error in the multiplication of + * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077, + * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14, + * adding 1e-13 to the constant term more than suffices. + * Hence we adjust the constant term to 0.1760912590558. + * (We could get a more accurate k by invoking log10, + * but this is probably not worthwhile.) + */ i -= Bias; #ifdef IBM @@ -364,9 +369,7 @@ _DEFUN (_dtoa_r, denorm = 1; } #endif - ds = - (d2.d - 1.5) * 0.289529654602168 + 0.1760912590558 + - i * 0.301029995663981; + ds = (d2.d - 1.5) * 0.289529654602168 + 0.1760912590558 + i * 0.301029995663981; k = (int) ds; if (ds < 0. && ds != k) k--; /* want k = floor(ds) */ @@ -436,8 +439,8 @@ _DEFUN (_dtoa_r, i = 1; } j = sizeof (unsigned long); - for (ptr->_result_k = 0; - (int) (sizeof (_Jv_Bigint) - sizeof (unsigned long)) + j <= i; j <<= 1) + for (ptr->_result_k = 0; (int) (sizeof (_Jv_Bigint) - sizeof (unsigned long)) + j <= i; + j <<= 1) ptr->_result_k++; ptr->_result = Balloc (ptr, ptr->_result_k); s = s0 = (char *) ptr->_result; @@ -677,7 +680,7 @@ _DEFUN (_dtoa_r, { if (!word1 (d) && !(word0 (d) & Bndry_mask) #ifndef Sudden_Underflow - && word0 (d) & Exp_mask + && word0(d) & Exp_mask #endif ) { @@ -792,15 +795,16 @@ _DEFUN (_dtoa_r, #endif if (j < 0 || (j == 0 && !mode #ifndef ROUND_BIASED - && !(word1 (d) & 1) + && !(word1 (d) & 1) #endif - )) + )) { if (j1 > 0) { b = lshift (ptr, b, 1); j1 = cmp (b, S); - if ((j1 > 0 || (j1 == 0 && dig & 1)) && dig++ == '9') + if ((j1 > 0 || (j1 == 0 && dig & 1)) + && dig++ == '9') goto round_9_up; } *s++ = dig; @@ -885,7 +889,10 @@ _DEFUN (_dtoa, int mode _AND int ndigits _AND int *decpt _AND - int *sign _AND char **rve _AND char *buf _AND int float_type) + int *sign _AND + char **rve _AND + char *buf _AND + int float_type) { struct _Jv_reent reent; char *p; diff --git a/native/fdlibm/e_acos.c b/native/fdlibm/e_acos.c index a09d84337..ee6b168a1 100644 --- a/native/fdlibm/e_acos.c +++ b/native/fdlibm/e_acos.c @@ -44,80 +44,68 @@ static const double #else static double #endif - one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ - pi = 3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */ - pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ - pio2_lo = 6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */ - pS0 = 1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */ - pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */ - pS2 = 2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */ - pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */ - pS4 = 7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */ - pS5 = 3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */ - qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */ - qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ - qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ - qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ +one= 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ +pi = 3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */ +pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ +pio2_lo = 6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */ +pS0 = 1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */ +pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */ +pS2 = 2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */ +pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */ +pS4 = 7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */ +pS5 = 3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */ +qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */ +qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ +qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ +qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ #ifdef __STDC__ -double -__ieee754_acos (double x) + double __ieee754_acos(double x) #else -double -__ieee754_acos (x) - double x; + double __ieee754_acos(x) + double x; #endif { - double z, p, q, r, w, s, c, df; - int32_t hx, ix; - GET_HIGH_WORD (hx, x); - ix = hx & 0x7fffffff; - if (ix >= 0x3ff00000) - { /* |x| >= 1 */ - uint32_t lx; - GET_LOW_WORD (lx, x); - if (((ix - 0x3ff00000) | lx) == 0) - { /* |x|==1 */ - if (hx > 0) - return 0.0; /* acos(1) = 0 */ - else - return pi + 2.0 * pio2_lo; /* acos(-1)= pi */ + double z,p,q,r,w,s,c,df; + int32_t hx,ix; + GET_HIGH_WORD(hx,x); + ix = hx&0x7fffffff; + if(ix>=0x3ff00000) { /* |x| >= 1 */ + uint32_t lx; + GET_LOW_WORD(lx,x); + if(((ix-0x3ff00000)|lx)==0) { /* |x|==1 */ + if(hx>0) return 0.0; /* acos(1) = 0 */ + else return pi+2.0*pio2_lo; /* acos(-1)= pi */ + } + return (x-x)/(x-x); /* acos(|x|>1) is NaN */ + } + if(ix<0x3fe00000) { /* |x| < 0.5 */ + if(ix<=0x3c600000) return pio2_hi+pio2_lo;/*if|x|<2**-57*/ + z = x*x; + p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5))))); + q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4))); + r = p/q; + return pio2_hi - (x - (pio2_lo-x*r)); + } else if (hx<0) { /* x < -0.5 */ + z = (one+x)*0.5; + p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5))))); + q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4))); + s = __ieee754_sqrt(z); + r = p/q; + w = r*s-pio2_lo; + return pi - 2.0*(s+w); + } else { /* x > 0.5 */ + z = (one-x)*0.5; + s = __ieee754_sqrt(z); + df = s; + SET_LOW_WORD(df,0); + c = (z-df*df)/(s+df); + p = z*(pS0+z*(pS1+z*(pS2+z*(pS3+z*(pS4+z*pS5))))); + q = one+z*(qS1+z*(qS2+z*(qS3+z*qS4))); + r = p/q; + w = r*s+c; + return 2.0*(df+w); } - return (x - x) / (x - x); /* acos(|x|>1) is NaN */ - } - if (ix < 0x3fe00000) - { /* |x| < 0.5 */ - if (ix <= 0x3c600000) - return pio2_hi + pio2_lo; /*if|x|<2**-57 */ - z = x * x; - p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); - q = one + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); - r = p / q; - return pio2_hi - (x - (pio2_lo - x * r)); - } - else if (hx < 0) - { /* x < -0.5 */ - z = (one + x) * 0.5; - p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); - q = one + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); - s = __ieee754_sqrt (z); - r = p / q; - w = r * s - pio2_lo; - return pi - 2.0 * (s + w); - } - else - { /* x > 0.5 */ - z = (one - x) * 0.5; - s = __ieee754_sqrt (z); - df = s; - SET_LOW_WORD (df, 0); - c = (z - df * df) / (s + df); - p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5))))); - q = one + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4))); - r = p / q; - w = r * s + c; - return 2.0 * (df + w); - } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_asin.c b/native/fdlibm/e_asin.c index 6af9e9096..6b131e65a 100644 --- a/native/fdlibm/e_asin.c +++ b/native/fdlibm/e_asin.c @@ -47,87 +47,74 @@ #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -static const double +static const double #else -static double +static double #endif - one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ - huge = 1.000e+300, pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ - pio2_lo = 6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */ - pio4_hi = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ - /* coefficient for R(x^2) */ - pS0 = 1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */ - pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */ - pS2 = 2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */ - pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */ - pS4 = 7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */ - pS5 = 3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */ - qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */ - qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ - qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ - qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ +one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ +huge = 1.000e+300, +pio2_hi = 1.57079632679489655800e+00, /* 0x3FF921FB, 0x54442D18 */ +pio2_lo = 6.12323399573676603587e-17, /* 0x3C91A626, 0x33145C07 */ +pio4_hi = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ + /* coefficient for R(x^2) */ +pS0 = 1.66666666666666657415e-01, /* 0x3FC55555, 0x55555555 */ +pS1 = -3.25565818622400915405e-01, /* 0xBFD4D612, 0x03EB6F7D */ +pS2 = 2.01212532134862925881e-01, /* 0x3FC9C155, 0x0E884455 */ +pS3 = -4.00555345006794114027e-02, /* 0xBFA48228, 0xB5688F3B */ +pS4 = 7.91534994289814532176e-04, /* 0x3F49EFE0, 0x7501B288 */ +pS5 = 3.47933107596021167570e-05, /* 0x3F023DE1, 0x0DFDF709 */ +qS1 = -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */ +qS2 = 2.02094576023350569471e+00, /* 0x40002AE5, 0x9C598AC8 */ +qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ +qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ #ifdef __STDC__ -double -__ieee754_asin (double x) + double __ieee754_asin(double x) #else -double -__ieee754_asin (x) - double x; + double __ieee754_asin(x) + double x; #endif { - double t, w, p, q, c, r, s; - int32_t hx, ix; - GET_HIGH_WORD (hx, x); - ix = hx & 0x7fffffff; - if (ix >= 0x3ff00000) - { /* |x|>= 1 */ - uint32_t lx; - GET_LOW_WORD (lx, x); - if (((ix - 0x3ff00000) | lx) == 0) - /* asin(1)=+-pi/2 with inexact */ - return x * pio2_hi + x * pio2_lo; - return (x - x) / (x - x); /* asin(|x|>1) is NaN */ - } - else if (ix < 0x3fe00000) - { /* |x|<0.5 */ - if (ix < 0x3e400000) - { /* if |x| < 2**-27 */ - if (huge + x > one) - return x; /* return x with inexact if x!=0 */ + double t,w,p,q,c,r,s; + int32_t hx,ix; + GET_HIGH_WORD(hx,x); + ix = hx&0x7fffffff; + if(ix>= 0x3ff00000) { /* |x|>= 1 */ + uint32_t lx; + GET_LOW_WORD(lx,x); + if(((ix-0x3ff00000)|lx)==0) + /* asin(1)=+-pi/2 with inexact */ + return x*pio2_hi+x*pio2_lo; + return (x-x)/(x-x); /* asin(|x|>1) is NaN */ + } else if (ix<0x3fe00000) { /* |x|<0.5 */ + if(ix<0x3e400000) { /* if |x| < 2**-27 */ + if(huge+x>one) return x;/* return x with inexact if x!=0*/ + } else + t = x*x; + p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5))))); + q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4))); + w = p/q; + return x+x*w; } - else - t = x * x; - p = t * (pS0 + t * (pS1 + t * (pS2 + t * (pS3 + t * (pS4 + t * pS5))))); - q = one + t * (qS1 + t * (qS2 + t * (qS3 + t * qS4))); - w = p / q; - return x + x * w; - } - /* 1> |x|>= 0.5 */ - w = one - fabs (x); - t = w * 0.5; - p = t * (pS0 + t * (pS1 + t * (pS2 + t * (pS3 + t * (pS4 + t * pS5))))); - q = one + t * (qS1 + t * (qS2 + t * (qS3 + t * qS4))); - s = __ieee754_sqrt (t); - if (ix >= 0x3FEF3333) - { /* if |x| > 0.975 */ - w = p / q; - t = pio2_hi - (2.0 * (s + s * w) - pio2_lo); - } - else - { - w = s; - SET_LOW_WORD (w, 0); - c = (t - w * w) / (s + w); - r = p / q; - p = 2.0 * s * r - (pio2_lo - 2.0 * c); - q = pio4_hi - 2.0 * w; - t = pio4_hi - (p - q); - } - if (hx > 0) - return t; - else - return -t; + /* 1> |x|>= 0.5 */ + w = one-fabs(x); + t = w*0.5; + p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5))))); + q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4))); + s = __ieee754_sqrt(t); + if(ix>=0x3FEF3333) { /* if |x| > 0.975 */ + w = p/q; + t = pio2_hi-(2.0*(s+s*w)-pio2_lo); + } else { + w = s; + SET_LOW_WORD(w,0); + c = (t-w*w)/(s+w); + r = p/q; + p = 2.0*s*r-(pio2_lo-2.0*c); + q = pio4_hi-2.0*w; + t = pio4_hi-(p-q); + } + if(hx>0) return t; else return -t; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_atan2.c b/native/fdlibm/e_atan2.c index a8269bd7a..c75448db2 100644 --- a/native/fdlibm/e_atan2.c +++ b/native/fdlibm/e_atan2.c @@ -48,112 +48,84 @@ static const double #else static double #endif - tiny = 1.0e-300, zero = 0.0, pi_o_4 = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */ - pi_o_2 = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */ - pi = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */ - pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ +tiny = 1.0e-300, +zero = 0.0, +pi_o_4 = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */ +pi_o_2 = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */ +pi = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */ +pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ #ifdef __STDC__ -double -__ieee754_atan2 (double y, double x) + double __ieee754_atan2(double y, double x) #else -double -__ieee754_atan2 (y, x) - double y, x; + double __ieee754_atan2(y,x) + double y,x; #endif { - double z; - int32_t k, m, hx, hy, ix, iy; - uint32_t lx, ly; + double z; + int32_t k,m,hx,hy,ix,iy; + uint32_t lx,ly; - EXTRACT_WORDS (hx, lx, x); - ix = hx & 0x7fffffff; - EXTRACT_WORDS (hy, ly, y); - iy = hy & 0x7fffffff; - if (((ix | ((lx | -lx) >> 31)) > 0x7ff00000) || ((iy | ((ly | -ly) >> 31)) > 0x7ff00000)) /* x or y is NaN */ - return x + y; - if (((hx - 0x3ff00000) | lx) == 0) - return atan (y); /* x=1.0 */ - m = ((hy >> 31) & 1) | ((hx >> 30) & 2); /* 2*sign(x)+sign(y) */ + EXTRACT_WORDS(hx,lx,x); + ix = hx&0x7fffffff; + EXTRACT_WORDS(hy,ly,y); + iy = hy&0x7fffffff; + if(((ix|((lx|-lx)>>31))>0x7ff00000)|| + ((iy|((ly|-ly)>>31))>0x7ff00000)) /* x or y is NaN */ + return x+y; + if(((hx-0x3ff00000)|lx)==0) return atan(y); /* x=1.0 */ + m = ((hy>>31)&1)|((hx>>30)&2); /* 2*sign(x)+sign(y) */ - /* when y = 0 */ - if ((iy | ly) == 0) - { - switch (m) - { - case 0: - case 1: - return y; /* atan(+-0,+anything)=+-0 */ - case 2: - return pi + tiny; /* atan(+0,-anything) = pi */ - case 3: - return -pi - tiny; /* atan(-0,-anything) =-pi */ - } - } - /* when x = 0 */ - if ((ix | lx) == 0) - return (hy < 0) ? -pi_o_2 - tiny : pi_o_2 + tiny; - - /* when x is INF */ - if (ix == 0x7ff00000) - { - if (iy == 0x7ff00000) - { - switch (m) - { - case 0: - return pi_o_4 + tiny; /* atan(+INF,+INF) */ - case 1: - return -pi_o_4 - tiny; /* atan(-INF,+INF) */ - case 2: - return 3.0 * pi_o_4 + tiny; /*atan(+INF,-INF) */ - case 3: - return -3.0 * pi_o_4 - tiny; /*atan(-INF,-INF) */ + /* when y = 0 */ + if((iy|ly)==0) { + switch(m) { + case 0: + case 1: return y; /* atan(+-0,+anything)=+-0 */ + case 2: return pi+tiny;/* atan(+0,-anything) = pi */ + case 3: return -pi-tiny;/* atan(-0,-anything) =-pi */ } } - else - { - switch (m) - { - case 0: - return zero; /* atan(+...,+INF) */ - case 1: - return -zero; /* atan(-...,+INF) */ - case 2: - return pi + tiny; /* atan(+...,-INF) */ - case 3: - return -pi - tiny; /* atan(-...,-INF) */ + /* when x = 0 */ + if((ix|lx)==0) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny; + + /* when x is INF */ + if(ix==0x7ff00000) { + if(iy==0x7ff00000) { + switch(m) { + case 0: return pi_o_4+tiny;/* atan(+INF,+INF) */ + case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */ + case 2: return 3.0*pi_o_4+tiny;/*atan(+INF,-INF)*/ + case 3: return -3.0*pi_o_4-tiny;/*atan(-INF,-INF)*/ + } + } else { + switch(m) { + case 0: return zero ; /* atan(+...,+INF) */ + case 1: return -zero ; /* atan(-...,+INF) */ + case 2: return pi+tiny ; /* atan(+...,-INF) */ + case 3: return -pi-tiny ; /* atan(-...,-INF) */ + } } } - } - /* when y is INF */ - if (iy == 0x7ff00000) - return (hy < 0) ? -pi_o_2 - tiny : pi_o_2 + tiny; + /* when y is INF */ + if(iy==0x7ff00000) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny; - /* compute y/x */ - k = (iy - ix) >> 20; - if (k > 60) - z = pi_o_2 + 0.5 * pi_lo; /* |y/x| > 2**60 */ - else if (hx < 0 && k < -60) - z = 0.0; /* |y|/x < -2**60 */ - else - z = atan (fabs (y / x)); /* safe to do y/x */ - switch (m) - { - case 0: - return z; /* atan(+,+) */ - case 1: - { - uint32_t zh; - GET_HIGH_WORD (zh, z); - SET_HIGH_WORD (z, zh ^ 0x80000000); - } - return z; /* atan(-,+) */ - case 2: - return pi - (z - pi_lo); /* atan(+,-) */ - default: /* case 3 */ - return (z - pi_lo) - pi; /* atan(-,-) */ - } + /* compute y/x */ + k = (iy-ix)>>20; + if(k > 60) z=pi_o_2+0.5*pi_lo; /* |y/x| > 2**60 */ + else if(hx<0&&k<-60) z=0.0; /* |y|/x < -2**60 */ + else z=atan(fabs(y/x)); /* safe to do y/x */ + switch (m) { + case 0: return z ; /* atan(+,+) */ + case 1: { + uint32_t zh; + GET_HIGH_WORD(zh,z); + SET_HIGH_WORD(z,zh ^ 0x80000000); + } + return z ; /* atan(-,+) */ + case 2: return pi-(z-pi_lo);/* atan(+,-) */ + default: /* case 3 */ + return (z-pi_lo)-pi;/* atan(-,-) */ + } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_exp.c b/native/fdlibm/e_exp.c index 47e6c666a..e11ca8b38 100644 --- a/native/fdlibm/e_exp.c +++ b/native/fdlibm/e_exp.c @@ -83,110 +83,85 @@ static const double #else static double #endif - one = 1.0, halF[2] = { 0.5, -0.5, }, huge = 1.0e+300, twom1000 = 9.33263618503218878990e-302, /* 2**-1000=0x01700000,0 */ - - o_threshold = 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ - u_threshold = -7.45133219101941108420e+02, /* 0xc0874910, 0xD52D3051 */ - ln2HI[2] = -{ - 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ --6.93147180369123816490e-01,}, /* 0xbfe62e42, 0xfee00000 */ - - ln2LO[2] = -{ - 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */ --1.90821492927058770002e-10,}, /* 0xbdea39ef, 0x35793c76 */ - - invln2 = 1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */ - P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ - P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ - P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ - P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ - P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ +one = 1.0, +halF[2] = {0.5,-0.5,}, +huge = 1.0e+300, +twom1000= 9.33263618503218878990e-302, /* 2**-1000=0x01700000,0*/ +o_threshold= 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ +u_threshold= -7.45133219101941108420e+02, /* 0xc0874910, 0xD52D3051 */ +ln2HI[2] ={ 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ + -6.93147180369123816490e-01,},/* 0xbfe62e42, 0xfee00000 */ +ln2LO[2] ={ 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */ + -1.90821492927058770002e-10,},/* 0xbdea39ef, 0x35793c76 */ +invln2 = 1.44269504088896338700e+00, /* 0x3ff71547, 0x652b82fe */ +P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ +P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ +P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ +P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ +P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ #ifdef __STDC__ -double -__ieee754_exp (double x) /* default IEEE double exp */ + double __ieee754_exp(double x) /* default IEEE double exp */ #else -double -__ieee754_exp (x) /* default IEEE double exp */ - double x; + double __ieee754_exp(x) /* default IEEE double exp */ + double x; #endif { - double y, hi, lo, c, t; - int32_t k, xsb; - uint32_t hx; + double y,hi,lo,c,t; + int32_t k,xsb; + uint32_t hx; - GET_HIGH_WORD (hx, x); - xsb = (hx >> 31) & 1; /* sign bit of x */ - hx &= 0x7fffffff; /* high word of |x| */ + GET_HIGH_WORD(hx,x); + xsb = (hx>>31)&1; /* sign bit of x */ + hx &= 0x7fffffff; /* high word of |x| */ - /* filter out non-finite argument */ - if (hx >= 0x40862E42) - { /* if |x|>=709.78... */ - if (hx >= 0x7ff00000) - { - uint32_t lx; - GET_LOW_WORD (lx, x); - if (((hx & 0xfffff) | lx) != 0) - return x + x; /* NaN */ - else - return (xsb == 0) ? x : 0.0; /* exp(+-inf)={inf,0} */ + /* filter out non-finite argument */ + if(hx >= 0x40862E42) { /* if |x|>=709.78... */ + if(hx>=0x7ff00000) { + uint32_t lx; + GET_LOW_WORD(lx,x); + if(((hx&0xfffff)|lx)!=0) + return x+x; /* NaN */ + else return (xsb==0)? x:0.0; /* exp(+-inf)={inf,0} */ + } + if(x > o_threshold) return huge*huge; /* overflow */ + if(x < u_threshold) return twom1000*twom1000; /* underflow */ } - if (x > o_threshold) - return huge * huge; /* overflow */ - if (x < u_threshold) - return twom1000 * twom1000; /* underflow */ - } - /* argument reduction */ - if (hx > 0x3fd62e42) - { /* if |x| > 0.5 ln2 */ - if (hx < 0x3FF0A2B2) - { /* and |x| < 1.5 ln2 */ - hi = x - ln2HI[xsb]; - lo = ln2LO[xsb]; - k = 1 - xsb - xsb; + /* argument reduction */ + if(hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ + if(hx < 0x3FF0A2B2) { /* and |x| < 1.5 ln2 */ + hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb; + } else { + k = invln2*x+halF[xsb]; + t = k; + hi = x - t*ln2HI[0]; /* t*ln2HI is exact here */ + lo = t*ln2LO[0]; + } + x = hi - lo; } - else - { - k = invln2 * x + halF[xsb]; - t = k; - hi = x - t * ln2HI[0]; /* t*ln2HI is exact here */ - lo = t * ln2LO[0]; + else if(hx < 0x3e300000) { /* when |x|<2**-28 */ + if(huge+x>one) return one+x;/* trigger inexact */ } - x = hi - lo; - } - else if (hx < 0x3e300000) - { /* when |x|<2**-28 */ - if (huge + x > one) - return one + x; /* trigger inexact */ - } - else - k = 0; + else k = 0; - /* x is now in primary range */ - t = x * x; - c = x - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5)))); - if (k == 0) - return one - ((x * c) / (c - 2.0) - x); - else - y = one - ((lo - (x * c) / (2.0 - c)) - hi); - if (k >= -1021) - { - uint32_t hy; - GET_HIGH_WORD (hy, y); - SET_HIGH_WORD (y, hy + (k << 20)); /* add k to y's exponent */ - return y; - } - else - { - uint32_t hy; - GET_HIGH_WORD (hy, y); - SET_HIGH_WORD (y, hy + ((k + 1000) << 20)); /* add k to y's exponent */ - return y * twom1000; - } + /* x is now in primary range */ + t = x*x; + c = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); + if(k==0) return one-((x*c)/(c-2.0)-x); + else y = one-((lo-(x*c)/(2.0-c))-hi); + if(k >= -1021) { + uint32_t hy; + GET_HIGH_WORD(hy,y); + SET_HIGH_WORD(y,hy+(k<<20)); /* add k to y's exponent */ + return y; + } else { + uint32_t hy; + GET_HIGH_WORD(hy,y); + SET_HIGH_WORD(y,hy+((k+1000)<<20)); /* add k to y's exponent */ + return y*twom1000; + } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_fmod.c b/native/fdlibm/e_fmod.c index 5a8ad989d..1cf099076 100644 --- a/native/fdlibm/e_fmod.c +++ b/native/fdlibm/e_fmod.c @@ -22,176 +22,119 @@ #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -static const double one = 1.0, Zero[] = { 0.0, -0.0, }; +static const double one = 1.0, Zero[] = {0.0, -0.0,}; #else -static double one = 1.0, Zero[] = { 0.0, -0.0, }; +static double one = 1.0, Zero[] = {0.0, -0.0,}; #endif #ifdef __STDC__ -double -__ieee754_fmod (double x, double y) + double __ieee754_fmod(double x, double y) #else -double -__ieee754_fmod (x, y) - double x, y; + double __ieee754_fmod(x,y) + double x,y ; #endif { - int32_t n, hx, hy, hz, ix, iy, sx, i; - uint32_t lx, ly, lz; + int32_t n,hx,hy,hz,ix,iy,sx,i; + uint32_t lx,ly,lz; - EXTRACT_WORDS (hx, lx, x); - EXTRACT_WORDS (hy, ly, y); - sx = hx & 0x80000000; /* sign of x */ - hx ^= sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ + EXTRACT_WORDS(hx,lx,x); + EXTRACT_WORDS(hy,ly,y); + sx = hx&0x80000000; /* sign of x */ + hx ^=sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ - /* purge off exception values */ - if ((hy | ly) == 0 || (hx >= 0x7ff00000) || /* y=0,or x not finite */ - ((hy | ((ly | -ly) >> 31)) > 0x7ff00000)) /* or y is NaN */ - return (x * y) / (x * y); - if (hx <= hy) - { - if ((hx < hy) || (lx < ly)) - return x; /* |x|<|y| return x */ - if (lx == ly) - return Zero[(uint32_t) sx >> 31]; /* |x|=|y| return x*0 */ - } - - /* determine ix = ilogb(x) */ - if (hx < 0x00100000) - { /* subnormal x */ - if (hx == 0) - { - for (ix = -1043, i = lx; i > 0; i <<= 1) - ix -= 1; - } - else - { - for (ix = -1022, i = (hx << 11); i > 0; i <<= 1) - ix -= 1; + /* purge off exception values */ + if((hy|ly)==0||(hx>=0x7ff00000)|| /* y=0,or x not finite */ + ((hy|((ly|-ly)>>31))>0x7ff00000)) /* or y is NaN */ + return (x*y)/(x*y); + if(hx<=hy) { + if((hx<hy)||(lx<ly)) return x; /* |x|<|y| return x */ + if(lx==ly) + return Zero[(uint32_t)sx>>31]; /* |x|=|y| return x*0*/ } - } - else - ix = (hx >> 20) - 1023; - /* determine iy = ilogb(y) */ - if (hy < 0x00100000) - { /* subnormal y */ - if (hy == 0) - { - for (iy = -1043, i = ly; i > 0; i <<= 1) - iy -= 1; - } - else - { - for (iy = -1022, i = (hy << 11); i > 0; i <<= 1) - iy -= 1; - } - } - else - iy = (hy >> 20) - 1023; + /* determine ix = ilogb(x) */ + if(hx<0x00100000) { /* subnormal x */ + if(hx==0) { + for (ix = -1043, i=lx; i>0; i<<=1) ix -=1; + } else { + for (ix = -1022,i=(hx<<11); i>0; i<<=1) ix -=1; + } + } else ix = (hx>>20)-1023; - /* set up {hx,lx}, {hy,ly} and align y to x */ - if (ix >= -1022) - hx = 0x00100000 | (0x000fffff & hx); - else - { /* subnormal x, shift x to normal */ - n = -1022 - ix; - if (n <= 31) - { - hx = (hx << n) | (lx >> (32 - n)); - lx <<= n; - } - else - { - hx = lx << (n - 32); - lx = 0; - } - } - if (iy >= -1022) - hy = 0x00100000 | (0x000fffff & hy); - else - { /* subnormal y, shift y to normal */ - n = -1022 - iy; - if (n <= 31) - { - hy = (hy << n) | (ly >> (32 - n)); - ly <<= n; - } - else - { - hy = ly << (n - 32); - ly = 0; - } - } + /* determine iy = ilogb(y) */ + if(hy<0x00100000) { /* subnormal y */ + if(hy==0) { + for (iy = -1043, i=ly; i>0; i<<=1) iy -=1; + } else { + for (iy = -1022,i=(hy<<11); i>0; i<<=1) iy -=1; + } + } else iy = (hy>>20)-1023; - /* fix point fmod */ - n = ix - iy; - while (n--) - { - hz = hx - hy; - lz = lx - ly; - if (lx < ly) - hz -= 1; - if (hz < 0) - { - hx = hx + hx + (lx >> 31); - lx = lx + lx; + /* set up {hx,lx}, {hy,ly} and align y to x */ + if(ix >= -1022) + hx = 0x00100000|(0x000fffff&hx); + else { /* subnormal x, shift x to normal */ + n = -1022-ix; + if(n<=31) { + hx = (hx<<n)|(lx>>(32-n)); + lx <<= n; + } else { + hx = lx<<(n-32); + lx = 0; + } } - else - { - if ((hz | lz) == 0) /* return sign(x)*0 */ - return Zero[(uint32_t) sx >> 31]; - hx = hz + hz + (lz >> 31); - lx = lz + lz; + if(iy >= -1022) + hy = 0x00100000|(0x000fffff&hy); + else { /* subnormal y, shift y to normal */ + n = -1022-iy; + if(n<=31) { + hy = (hy<<n)|(ly>>(32-n)); + ly <<= n; + } else { + hy = ly<<(n-32); + ly = 0; + } } - } - hz = hx - hy; - lz = lx - ly; - if (lx < ly) - hz -= 1; - if (hz >= 0) - { - hx = hz; - lx = lz; - } - /* convert back to floating value and restore the sign */ - if ((hx | lx) == 0) /* return sign(x)*0 */ - return Zero[(uint32_t) sx >> 31]; - while (hx < 0x00100000) - { /* normalize x */ - hx = hx + hx + (lx >> 31); - lx = lx + lx; - iy -= 1; - } - if (iy >= -1022) - { /* normalize output */ - hx = ((hx - 0x00100000) | ((iy + 1023) << 20)); - INSERT_WORDS (x, hx | sx, lx); - } - else - { /* subnormal output */ - n = -1022 - iy; - if (n <= 20) - { - lx = (lx >> n) | ((uint32_t) hx << (32 - n)); - hx >>= n; + /* fix point fmod */ + n = ix - iy; + while(n--) { + hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1; + if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;} + else { + if((hz|lz)==0) /* return sign(x)*0 */ + return Zero[(uint32_t)sx>>31]; + hx = hz+hz+(lz>>31); lx = lz+lz; + } } - else if (n <= 31) - { - lx = (hx << (32 - n)) | (lx >> n); - hx = sx; + hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1; + if(hz>=0) {hx=hz;lx=lz;} + + /* convert back to floating value and restore the sign */ + if((hx|lx)==0) /* return sign(x)*0 */ + return Zero[(uint32_t)sx>>31]; + while(hx<0x00100000) { /* normalize x */ + hx = hx+hx+(lx>>31); lx = lx+lx; + iy -= 1; } - else - { - lx = hx >> (n - 32); - hx = sx; + if(iy>= -1022) { /* normalize output */ + hx = ((hx-0x00100000)|((iy+1023)<<20)); + INSERT_WORDS(x,hx|sx,lx); + } else { /* subnormal output */ + n = -1022 - iy; + if(n<=20) { + lx = (lx>>n)|((uint32_t)hx<<(32-n)); + hx >>= n; + } else if (n<=31) { + lx = (hx<<(32-n))|(lx>>n); hx = sx; + } else { + lx = hx>>(n-32); hx = sx; + } + INSERT_WORDS(x,hx|sx,lx); + x *= one; /* create necessary signal */ } - INSERT_WORDS (x, hx | sx, lx); - x *= one; /* create necessary signal */ - } - return x; /* exact output */ + return x; /* exact output */ } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_log.c b/native/fdlibm/e_log.c index e0cb6316d..093473e10 100644 --- a/native/fdlibm/e_log.c +++ b/native/fdlibm/e_log.c @@ -71,103 +71,82 @@ static const double #else static double #endif - ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ - ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ - two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ - Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ - Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ - Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ - Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ - Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ - Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ - Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ +ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ +ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ +two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ +Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ +Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ +Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ +Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ +Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ +Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ +Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ #ifdef __STDC__ -static const double zero = 0.0; +static const double zero = 0.0; #else -static double zero = 0.0; +static double zero = 0.0; #endif #ifdef __STDC__ -double -__ieee754_log (double x) + double __ieee754_log(double x) #else -double -__ieee754_log (x) - double x; + double __ieee754_log(x) + double x; #endif { - double hfsq, f, s, z, R, w, t1, t2, dk; - int32_t k, hx, i, j; - uint32_t lx; + double hfsq,f,s,z,R,w,t1,t2,dk; + int32_t k,hx,i,j; + uint32_t lx; - EXTRACT_WORDS (hx, lx, x); + EXTRACT_WORDS(hx,lx,x); - k = 0; - if (hx < 0x00100000) - { /* x < 2**-1022 */ - if (((hx & 0x7fffffff) | lx) == 0) - return -two54 / zero; /* log(+-0)=-inf */ - if (hx < 0) - return (x - x) / zero; /* log(-#) = NaN */ - k -= 54; - x *= two54; /* subnormal number, scale up x */ - GET_HIGH_WORD (hx, x); - } - if (hx >= 0x7ff00000) - return x + x; - k += (hx >> 20) - 1023; - hx &= 0x000fffff; - i = (hx + 0x95f64) & 0x100000; - SET_HIGH_WORD (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 (f == zero) - { - if (k == 0) - return zero; - else - { - dk = (double) k; - return dk * ln2_hi + dk * ln2_lo; + k=0; + if (hx < 0x00100000) { /* x < 2**-1022 */ + if (((hx&0x7fffffff)|lx)==0) + return -two54/zero; /* log(+-0)=-inf */ + if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ + k -= 54; x *= two54; /* subnormal number, scale up x */ + GET_HIGH_WORD(hx,x); + } + if (hx >= 0x7ff00000) return x+x; + k += (hx>>20)-1023; + hx &= 0x000fffff; + i = (hx+0x95f64)&0x100000; + SET_HIGH_WORD(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(f==zero) { + if(k==0) + return zero; + else { + dk=(double)k; + return dk*ln2_hi+dk*ln2_lo; + } } + R = f*f*(0.5-0.33333333333333333*f); + if(k==0) return f-R; else {dk=(double)k; + return dk*ln2_hi-((R-dk*ln2_lo)-f);} } - R = f * f * (0.5 - 0.33333333333333333 * f); - if (k == 0) - return f - R; - else - { - dk = (double) k; - return dk * ln2_hi - ((R - dk * ln2_lo) - f); + s = f/(2.0+f); + dk = (double)k; + z = s*s; + i = hx-0x6147a; + w = z*z; + j = 0x6b851-hx; + t1= w*(Lg2+w*(Lg4+w*Lg6)); + t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); + i |= j; + R = t2+t1; + if(i>0) { + hfsq=0.5*f*f; + if(k==0) return f-(hfsq-s*(hfsq+R)); else + return dk*ln2_hi-((hfsq-(s*(hfsq+R)+dk*ln2_lo))-f); + } else { + if(k==0) return f-s*(f-R); else + return dk*ln2_hi-((s*(f-R)-dk*ln2_lo)-f); } - } - s = f / (2.0 + f); - dk = (double) k; - z = s * s; - i = hx - 0x6147a; - w = z * z; - j = 0x6b851 - hx; - t1 = w * (Lg2 + w * (Lg4 + w * Lg6)); - t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7))); - i |= j; - R = t2 + t1; - if (i > 0) - { - hfsq = 0.5 * f * f; - if (k == 0) - return f - (hfsq - s * (hfsq + R)); - else - return dk * ln2_hi - ((hfsq - (s * (hfsq + R) + dk * ln2_lo)) - f); - } - else - { - if (k == 0) - return f - s * (f - R); - else - return dk * ln2_hi - ((s * (f - R) - dk * ln2_lo) - f); - } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_pow.c b/native/fdlibm/e_pow.c index 78f33cd8a..e53a8a287 100644 --- a/native/fdlibm/e_pow.c +++ b/native/fdlibm/e_pow.c @@ -65,309 +65,248 @@ static const double #else static double #endif - bp[] = { 1.0, 1.5, }, dp_h[] = - -{ -0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ - - dp_l[] = -{ -0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ - - zero = 0.0, one = 1.0, two = 2.0, two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ - huge = 1.0e300, tiny = 1.0e-300, - /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ - L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ - L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ - L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ - L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ - L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ - L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ - P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ - P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ - P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ - P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ - P5 = 4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */ - lg2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ - lg2_h = 6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */ - lg2_l = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */ - ovt = 8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */ - cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ - cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ - cp_l = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h */ - ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ - ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2 */ - ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail */ +bp[] = {1.0, 1.5,}, +dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ +dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ +zero = 0.0, +one = 1.0, +two = 2.0, +two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ +huge = 1.0e300, +tiny = 1.0e-300, + /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ +L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ +L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ +L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ +L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ +L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ +L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ +P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ +P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ +P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ +P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ +P5 = 4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */ +lg2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ +lg2_h = 6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */ +lg2_l = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */ +ovt = 8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */ +cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ +cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ +cp_l = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/ +ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ +ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/ +ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ #ifdef __STDC__ -double -__ieee754_pow (double x, double y) + double __ieee754_pow(double x, double y) #else -double -__ieee754_pow (x, y) - double x, y; + double __ieee754_pow(x,y) + double x, y; #endif { - double z, ax, z_h, z_l, p_h, p_l; - double y1, t1, t2, r, s, t, u, v, w; - int32_t i, j, k, yisint, n; - int32_t hx, hy, ix, iy; - uint32_t lx, ly; + double z,ax,z_h,z_l,p_h,p_l; + double y1,t1,t2,r,s,t,u,v,w; + int32_t i,j,k,yisint,n; + int32_t hx,hy,ix,iy; + uint32_t lx,ly; - EXTRACT_WORDS (hx, lx, x); - EXTRACT_WORDS (hy, ly, y); - ix = hx & 0x7fffffff; - iy = hy & 0x7fffffff; + EXTRACT_WORDS(hx,lx,x); + EXTRACT_WORDS(hy,ly,y); + ix = hx&0x7fffffff; iy = hy&0x7fffffff; - /* y==zero: x**0 = 1 */ - if ((iy | ly) == 0) - return one; + /* y==zero: x**0 = 1 */ + if((iy|ly)==0) return one; - /* +-NaN return x+y */ - if (ix > 0x7ff00000 || ((ix == 0x7ff00000) && (lx != 0)) || - iy > 0x7ff00000 || ((iy == 0x7ff00000) && (ly != 0))) - return x + y; + /* +-NaN return x+y */ + if(ix > 0x7ff00000 || ((ix==0x7ff00000)&&(lx!=0)) || + iy > 0x7ff00000 || ((iy==0x7ff00000)&&(ly!=0))) + return x+y; - /* determine if y is an odd int when x < 0 - * yisint = 0 ... y is not an integer - * yisint = 1 ... y is an odd int - * yisint = 2 ... y is an even int - */ - yisint = 0; - if (hx < 0) - { - if (iy >= 0x43400000) - yisint = 2; /* even integer y */ - else if (iy >= 0x3ff00000) - { - k = (iy >> 20) - 0x3ff; /* exponent */ - if (k > 20) - { - j = ly >> (52 - k); - if ((uint32_t) (j << (52 - k)) == ly) - yisint = 2 - (j & 1); - } - else if (ly == 0) - { - j = iy >> (20 - k); - if ((j << (20 - k)) == iy) - yisint = 2 - (j & 1); + /* determine if y is an odd int when x < 0 + * yisint = 0 ... y is not an integer + * yisint = 1 ... y is an odd int + * yisint = 2 ... y is an even int + */ + yisint = 0; + if(hx<0) { + if(iy>=0x43400000) yisint = 2; /* even integer y */ + else if(iy>=0x3ff00000) { + k = (iy>>20)-0x3ff; /* exponent */ + if(k>20) { + j = ly>>(52-k); + if((uint32_t)(j<<(52-k))==ly) yisint = 2-(j&1); + } else if(ly==0) { + j = iy>>(20-k); + if((j<<(20-k))==iy) yisint = 2-(j&1); + } } } - } - /* special value of y */ - if (ly == 0) - { - if (iy == 0x7ff00000) - { /* y is +-inf */ - if (((ix - 0x3ff00000) | lx) == 0) - return y - y; /* inf**+-1 is NaN */ - 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) - { /* y is +-1 */ - if (hy < 0) - return one / x; - else - return x; - } - if (hy == 0x40000000) - return x * x; /* y is 2 */ - if (hy == 0x3fe00000) - { /* y is 0.5 */ - if (hx >= 0) /* x >= +0 */ - return __ieee754_sqrt (x); + /* special value of y */ + if(ly==0) { + if (iy==0x7ff00000) { /* y is +-inf */ + if(((ix-0x3ff00000)|lx)==0) + return y - y; /* inf**+-1 is NaN */ + 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) { /* y is +-1 */ + if(hy<0) return one/x; else return x; + } + if(hy==0x40000000) return x*x; /* y is 2 */ + if(hy==0x3fe00000) { /* y is 0.5 */ + if(hx>=0) /* x >= +0 */ + return __ieee754_sqrt(x); + } } - } - ax = fabs (x); - /* special value of x */ - if (lx == 0) - { - 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) - { - z = (z - z) / (z - z); /* (-1)**non-int is NaN */ + ax = fabs(x); + /* special value of x */ + if(lx==0) { + 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) { + z = (z-z)/(z-z); /* (-1)**non-int is NaN */ + } else if(yisint==1) + z = -z; /* (x<0)**odd = -(|x|**odd) */ } - else if (yisint == 1) - z = -z; /* (x<0)**odd = -(|x|**odd) */ + return z; } - return z; } - } - /* (x<0)**(non-int) is NaN */ - /* CYGNUS LOCAL: This used to be - if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x); - but ANSI C says a right shift of a signed negative quantity is - implementation defined. */ - if (((((uint32_t) hx >> 31) - 1) | yisint) == 0) - return (x - x) / (x - x); + /* (x<0)**(non-int) is NaN */ + /* CYGNUS LOCAL: This used to be + if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x); + but ANSI C says a right shift of a signed negative quantity is + implementation defined. */ + if(((((uint32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x); - /* |y| is huge */ - if (iy > 0x41e00000) - { /* if |y| > 2**31 */ - if (iy > 0x43f00000) - { /* if |y| > 2**64, must o/uflow */ - if (ix <= 0x3fefffff) - return (hy < 0) ? huge * huge : tiny * tiny; - if (ix >= 0x3ff00000) - return (hy > 0) ? huge * huge : tiny * tiny; - } - /* over/underflow if x is not close to one */ - if (ix < 0x3fefffff) - return (hy < 0) ? huge * huge : tiny * tiny; - if (ix > 0x3ff00000) - return (hy > 0) ? huge * huge : tiny * tiny; - /* now |1-x| is tiny <= 2**-20, suffice to compute - log(x) by x-x^2/2+x^3/3-x^4/4 */ - t = x - 1; /* t has 20 trailing zeros */ - w = (t * t) * (0.5 - t * (0.3333333333333333333333 - t * 0.25)); - u = ivln2_h * t; /* ivln2_h has 21 sig. bits */ - v = t * ivln2_l - w * ivln2; - t1 = u + v; - SET_LOW_WORD (t1, 0); - t2 = v - (t1 - u); - } - else - { - double s2, s_h, s_l, t_h, t_l; - n = 0; - /* take care subnormal number */ - if (ix < 0x00100000) - { - ax *= two53; - n -= 53; - GET_HIGH_WORD (ix, ax); - } - n += ((ix) >> 20) - 0x3ff; - j = ix & 0x000fffff; - /* determine interval */ - ix = j | 0x3ff00000; /* normalize ix */ - if (j <= 0x3988E) - k = 0; /* |x|<sqrt(3/2) */ - else if (j < 0xBB67A) - k = 1; /* |x|<sqrt(3) */ - else - { - k = 0; - n += 1; - ix -= 0x00100000; - } - SET_HIGH_WORD (ax, ix); + /* |y| is huge */ + if(iy>0x41e00000) { /* if |y| > 2**31 */ + if(iy>0x43f00000){ /* if |y| > 2**64, must o/uflow */ + if(ix<=0x3fefffff) return (hy<0)? huge*huge:tiny*tiny; + if(ix>=0x3ff00000) return (hy>0)? huge*huge:tiny*tiny; + } + /* over/underflow if x is not close to one */ + if(ix<0x3fefffff) return (hy<0)? huge*huge:tiny*tiny; + if(ix>0x3ff00000) return (hy>0)? huge*huge:tiny*tiny; + /* now |1-x| is tiny <= 2**-20, suffice to compute + log(x) by x-x^2/2+x^3/3-x^4/4 */ + t = x-1; /* t has 20 trailing zeros */ + w = (t*t)*(0.5-t*(0.3333333333333333333333-t*0.25)); + u = ivln2_h*t; /* ivln2_h has 21 sig. bits */ + v = t*ivln2_l-w*ivln2; + t1 = u+v; + SET_LOW_WORD(t1,0); + t2 = v-(t1-u); + } else { + double s2,s_h,s_l,t_h,t_l; + n = 0; + /* take care subnormal number */ + if(ix<0x00100000) + {ax *= two53; n -= 53; GET_HIGH_WORD(ix,ax); } + n += ((ix)>>20)-0x3ff; + j = ix&0x000fffff; + /* determine interval */ + ix = j|0x3ff00000; /* normalize ix */ + if(j<=0x3988E) k=0; /* |x|<sqrt(3/2) */ + else if(j<0xBB67A) k=1; /* |x|<sqrt(3) */ + else {k=0;n+=1;ix -= 0x00100000;} + SET_HIGH_WORD(ax,ix); - /* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */ - u = ax - bp[k]; /* bp[0]=1.0, bp[1]=1.5 */ - v = one / (ax + bp[k]); - s = u * v; - s_h = s; - SET_LOW_WORD (s_h, 0); - /* t_h=ax+bp[k] High */ - t_h = zero; - SET_HIGH_WORD (t_h, ((ix >> 1) | 0x20000000) + 0x00080000 + (k << 18)); - t_l = ax - (t_h - bp[k]); - s_l = v * ((u - s_h * t_h) - s_h * t_l); - /* compute log(ax) */ - s2 = s * s; - r = - s2 * s2 * (L1 + - s2 * (L2 + s2 * (L3 + s2 * (L4 + s2 * (L5 + s2 * L6))))); - r += s_l * (s_h + s); - s2 = s_h * s_h; - t_h = 3.0 + s2 + r; - SET_LOW_WORD (t_h, 0); - t_l = r - ((t_h - 3.0) - s2); - /* u+v = s*(1+...) */ - u = s_h * t_h; - v = s_l * t_h + t_l * s; - /* 2/(3log2)*(s+...) */ - p_h = u + v; - SET_LOW_WORD (p_h, 0); - p_l = v - (p_h - u); - z_h = cp_h * p_h; /* cp_h+cp_l = 2/(3*log2) */ - z_l = cp_l * p_h + p_l * cp + dp_l[k]; - /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */ - t = (double) n; - t1 = (((z_h + z_l) + dp_h[k]) + t); - SET_LOW_WORD (t1, 0); - t2 = z_l - (((t1 - t) - dp_h[k]) - z_h); - } + /* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */ + u = ax-bp[k]; /* bp[0]=1.0, bp[1]=1.5 */ + v = one/(ax+bp[k]); + s = u*v; + s_h = s; + SET_LOW_WORD(s_h,0); + /* t_h=ax+bp[k] High */ + t_h = zero; + SET_HIGH_WORD(t_h,((ix>>1)|0x20000000)+0x00080000+(k<<18)); + t_l = ax - (t_h-bp[k]); + s_l = v*((u-s_h*t_h)-s_h*t_l); + /* compute log(ax) */ + s2 = s*s; + r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6))))); + r += s_l*(s_h+s); + s2 = s_h*s_h; + t_h = 3.0+s2+r; + SET_LOW_WORD(t_h,0); + t_l = r-((t_h-3.0)-s2); + /* u+v = s*(1+...) */ + u = s_h*t_h; + v = s_l*t_h+t_l*s; + /* 2/(3log2)*(s+...) */ + p_h = u+v; + SET_LOW_WORD(p_h,0); + p_l = v-(p_h-u); + z_h = cp_h*p_h; /* cp_h+cp_l = 2/(3*log2) */ + z_l = cp_l*p_h+p_l*cp+dp_l[k]; + /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */ + t = (double)n; + t1 = (((z_h+z_l)+dp_h[k])+t); + SET_LOW_WORD(t1,0); + t2 = z_l-(((t1-t)-dp_h[k])-z_h); + } - s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ - if (((((uint32_t) hx >> 31) - 1) | (yisint - 1)) == 0) - s = -one; /* (-ve)**(odd int) */ + s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ + if(((((uint32_t)hx>>31)-1)|(yisint-1))==0) + s = -one;/* (-ve)**(odd int) */ - /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ - y1 = y; - SET_LOW_WORD (y1, 0); - p_l = (y - y1) * t1 + y * t2; - p_h = y1 * t1; - z = p_l + p_h; - EXTRACT_WORDS (j, i, z); - if (j >= 0x40900000) - { /* z >= 1024 */ - if (((j - 0x40900000) | i) != 0) /* if z > 1024 */ - return s * huge * huge; /* overflow */ - else - { - if (p_l + ovt > z - p_h) - return s * huge * huge; /* overflow */ + /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ + y1 = y; + SET_LOW_WORD(y1,0); + p_l = (y-y1)*t1+y*t2; + p_h = y1*t1; + z = p_l+p_h; + EXTRACT_WORDS(j,i,z); + if (j>=0x40900000) { /* z >= 1024 */ + if(((j-0x40900000)|i)!=0) /* if z > 1024 */ + return s*huge*huge; /* overflow */ + else { + if(p_l+ovt>z-p_h) return s*huge*huge; /* overflow */ + } + } 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) return s*tiny*tiny; /* underflow */ + } } - } - 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) - return s * tiny * tiny; /* underflow */ + /* + * compute 2**(p_h+p_l) + */ + i = j&0x7fffffff; + k = (i>>20)-0x3ff; + n = 0; + 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 */ + t = zero; + SET_HIGH_WORD(t,n&~(0x000fffff>>k)); + n = ((n&0x000fffff)|0x00100000)>>(20-k); + if(j<0) n = -n; + p_h -= t; } - } - /* - * compute 2**(p_h+p_l) - */ - i = j & 0x7fffffff; - k = (i >> 20) - 0x3ff; - n = 0; - 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 */ - t = zero; - SET_HIGH_WORD (t, n & ~(0x000fffff >> k)); - n = ((n & 0x000fffff) | 0x00100000) >> (20 - k); - if (j < 0) - n = -n; - p_h -= t; - } - t = p_l + p_h; - SET_LOW_WORD (t, 0); - u = t * lg2_h; - v = (p_l - (t - p_h)) * lg2 + t * lg2_l; - z = u + v; - w = v - (z - u); - t = z * z; - t1 = z - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5)))); - r = (z * t1) / (t1 - two) - (w + z * w); - z = one - (r - z); - GET_HIGH_WORD (j, z); - j += (n << 20); - if ((j >> 20) <= 0) - z = scalbn (z, (int) n); /* subnormal output */ - else - SET_HIGH_WORD (z, j); - return s * z; + t = p_l+p_h; + SET_LOW_WORD(t,0); + u = t*lg2_h; + v = (p_l-(t-p_h))*lg2+t*lg2_l; + z = u+v; + w = v-(z-u); + t = z*z; + t1 = z - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); + r = (z*t1)/(t1-two)-(w+z*w); + z = one-(r-z); + GET_HIGH_WORD(j,z); + j += (n<<20); + if((j>>20)<=0) z = scalbn(z,(int)n); /* subnormal output */ + else SET_HIGH_WORD(z,j); + return s*z; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_rem_pio2.c b/native/fdlibm/e_rem_pio2.c index 584149a8e..6d3fd19a4 100644 --- a/native/fdlibm/e_rem_pio2.c +++ b/native/fdlibm/e_rem_pio2.c @@ -30,17 +30,17 @@ static const int32_t two_over_pi[] = { #else static int32_t two_over_pi[] = { #endif - 0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, - 0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A, - 0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, - 0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41, - 0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8, - 0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF, - 0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5, - 0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08, - 0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3, - 0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880, - 0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, +0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, +0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A, +0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, +0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41, +0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8, +0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF, +0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5, +0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08, +0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3, +0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880, +0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, }; #ifdef __STDC__ @@ -48,12 +48,12 @@ static const int32_t npio2_hw[] = { #else static int32_t npio2_hw[] = { #endif - 0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, - 0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C, - 0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A, - 0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C, - 0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB, - 0x404858EB, 0x404921FB, +0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, +0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C, +0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A, +0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C, +0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB, +0x404858EB, 0x404921FB, }; /* @@ -71,152 +71,115 @@ static const double #else static double #endif - zero = 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ - half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ - two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ - invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ - pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ - pio2_1t = 6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */ - pio2_2 = 6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */ - pio2_2t = 2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */ - pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ - pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ +zero = 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ +half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ +two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ +invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ +pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ +pio2_1t = 6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */ +pio2_2 = 6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */ +pio2_2t = 2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */ +pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ +pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ #ifdef __STDC__ -int32_t -__ieee754_rem_pio2 (double x, double *y) + int32_t __ieee754_rem_pio2(double x, double *y) #else -int32_t -__ieee754_rem_pio2 (x, y) - double x, y[]; + int32_t __ieee754_rem_pio2(x,y) + double x,y[]; #endif { - double z, w, t, r, fn; - double tx[3]; - int32_t i, j, n, ix, hx; - int e0, nx; - uint32_t low; + double z,w,t,r,fn; + double tx[3]; + int32_t i,j,n,ix,hx; + int e0,nx; + uint32_t low; - GET_HIGH_WORD (hx, x); /* high word of x */ - ix = hx & 0x7fffffff; - if (ix <= 0x3fe921fb) /* |x| ~<= pi/4 , no need for reduction */ - { - y[0] = x; - y[1] = 0; - return 0; - } - if (ix < 0x4002d97c) - { /* |x| < 3pi/4, special case with n=+-1 */ - if (hx > 0) - { - z = x - pio2_1; - if (ix != 0x3ff921fb) - { /* 33+53 bit pi is good enough */ - y[0] = z - pio2_1t; - y[1] = (z - y[0]) - pio2_1t; - } - else - { /* near pi/2, use 33+33+53 bit pi */ - z -= pio2_2; - y[0] = z - pio2_2t; - y[1] = (z - y[0]) - pio2_2t; - } - return 1; - } - else - { /* negative x */ - z = x + pio2_1; - if (ix != 0x3ff921fb) - { /* 33+53 bit pi is good enough */ - y[0] = z + pio2_1t; - y[1] = (z - y[0]) + pio2_1t; - } - else - { /* near pi/2, use 33+33+53 bit pi */ - z += pio2_2; - y[0] = z + pio2_2t; - y[1] = (z - y[0]) + pio2_2t; + GET_HIGH_WORD(hx,x); /* high word of x */ + ix = hx&0x7fffffff; + if(ix<=0x3fe921fb) /* |x| ~<= pi/4 , no need for reduction */ + {y[0] = x; y[1] = 0; return 0;} + if(ix<0x4002d97c) { /* |x| < 3pi/4, special case with n=+-1 */ + if(hx>0) { + z = x - pio2_1; + if(ix!=0x3ff921fb) { /* 33+53 bit pi is good enough */ + y[0] = z - pio2_1t; + y[1] = (z-y[0])-pio2_1t; + } else { /* near pi/2, use 33+33+53 bit pi */ + z -= pio2_2; + y[0] = z - pio2_2t; + y[1] = (z-y[0])-pio2_2t; + } + return 1; + } else { /* negative x */ + z = x + pio2_1; + if(ix!=0x3ff921fb) { /* 33+53 bit pi is good enough */ + y[0] = z + pio2_1t; + y[1] = (z-y[0])+pio2_1t; + } else { /* near pi/2, use 33+33+53 bit pi */ + z += pio2_2; + y[0] = z + pio2_2t; + y[1] = (z-y[0])+pio2_2t; + } + return -1; } - return -1; } - } - if (ix <= 0x413921fb) - { /* |x| ~<= 2^19*(pi/2), medium size */ - t = fabs (x); - n = (int32_t) (t * invpio2 + half); - fn = (double) n; - r = t - fn * pio2_1; - w = fn * pio2_1t; /* 1st round good to 85 bit */ - if (n < 32 && ix != npio2_hw[n - 1]) - { - y[0] = r - w; /* quick check no cancellation */ - } - else - { - uint32_t high; - j = ix >> 20; - y[0] = r - w; - GET_HIGH_WORD (high, y[0]); - i = j - ((high >> 20) & 0x7ff); - if (i > 16) - { /* 2nd iteration needed, good to 118 */ - t = r; - w = fn * pio2_2; - r = t - w; - w = fn * pio2_2t - ((t - r) - w); - y[0] = r - w; - GET_HIGH_WORD (high, y[0]); - i = j - ((high >> 20) & 0x7ff); - if (i > 49) - { /* 3rd iteration need, 151 bits acc */ - t = r; /* will cover all possible cases */ - w = fn * pio2_3; - r = t - w; - w = fn * pio2_3t - ((t - r) - w); - y[0] = r - w; + if(ix<=0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ + t = fabs(x); + n = (int32_t) (t*invpio2+half); + fn = (double)n; + r = t-fn*pio2_1; + w = fn*pio2_1t; /* 1st round good to 85 bit */ + if(n<32&&ix!=npio2_hw[n-1]) { + y[0] = r-w; /* quick check no cancellation */ + } else { + uint32_t high; + j = ix>>20; + y[0] = r-w; + GET_HIGH_WORD(high,y[0]); + i = j-((high>>20)&0x7ff); + if(i>16) { /* 2nd iteration needed, good to 118 */ + t = r; + w = fn*pio2_2; + r = t-w; + w = fn*pio2_2t-((t-r)-w); + y[0] = r-w; + GET_HIGH_WORD(high,y[0]); + i = j-((high>>20)&0x7ff); + if(i>49) { /* 3rd iteration need, 151 bits acc */ + t = r; /* will cover all possible cases */ + w = fn*pio2_3; + r = t-w; + w = fn*pio2_3t-((t-r)-w); + y[0] = r-w; + } } } + y[1] = (r-y[0])-w; + if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} + else return n; + } + /* + * all other (large) arguments + */ + if(ix>=0x7ff00000) { /* x is inf or NaN */ + y[0]=y[1]=x-x; return 0; } - y[1] = (r - y[0]) - w; - if (hx < 0) - { - y[0] = -y[0]; - y[1] = -y[1]; - return -n; + /* set z = scalbn(|x|,ilogb(x)-23) */ + GET_LOW_WORD(low,x); + SET_LOW_WORD(z,low); + e0 = (int)((ix>>20)-1046); /* e0 = ilogb(z)-23; */ + SET_HIGH_WORD(z, ix - ((int32_t)e0<<20)); + for(i=0;i<2;i++) { + tx[i] = (double)((int32_t)(z)); + z = (z-tx[i])*two24; } - else + tx[2] = z; + nx = 3; + while(tx[nx-1]==zero) nx--; /* skip zero term */ + n = __kernel_rem_pio2(tx,y,e0,nx,2,two_over_pi); + if(hx<0) {y[0] = -y[0]; y[1] = -y[1]; return -n;} return n; - } - /* - * all other (large) arguments - */ - if (ix >= 0x7ff00000) - { /* x is inf or NaN */ - y[0] = y[1] = x - x; - return 0; - } - /* set z = scalbn(|x|,ilogb(x)-23) */ - GET_LOW_WORD (low, x); - SET_LOW_WORD (z, low); - e0 = (int) ((ix >> 20) - 1046); /* e0 = ilogb(z)-23; */ - SET_HIGH_WORD (z, ix - ((int32_t) e0 << 20)); - for (i = 0; i < 2; i++) - { - tx[i] = (double) ((int32_t) (z)); - z = (z - tx[i]) * two24; - } - tx[2] = z; - nx = 3; - while (tx[nx - 1] == zero) - nx--; /* skip zero term */ - n = __kernel_rem_pio2 (tx, y, e0, nx, 2, two_over_pi); - if (hx < 0) - { - y[0] = -y[0]; - y[1] = -y[1]; - return -n; - } - return n; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_remainder.c b/native/fdlibm/e_remainder.c index a66956690..4716d8d05 100644 --- a/native/fdlibm/e_remainder.c +++ b/native/fdlibm/e_remainder.c @@ -32,61 +32,49 @@ static double zero = 0.0; #ifdef __STDC__ -double -__ieee754_remainder (double x, double p) + double __ieee754_remainder(double x, double p) #else -double -__ieee754_remainder (x, p) - double x, p; + double __ieee754_remainder(x,p) + double x,p; #endif { - int32_t hx, hp; - uint32_t sx, lx, lp; - double p_half; + int32_t hx,hp; + uint32_t sx,lx,lp; + double p_half; - EXTRACT_WORDS (hx, lx, x); - EXTRACT_WORDS (hp, lp, p); - sx = hx & 0x80000000; - hp &= 0x7fffffff; - hx &= 0x7fffffff; + EXTRACT_WORDS(hx,lx,x); + EXTRACT_WORDS(hp,lp,p); + sx = hx&0x80000000; + hp &= 0x7fffffff; + hx &= 0x7fffffff; - /* purge off exception values */ - if ((hp | lp) == 0) - return (x * p) / (x * p); /* p = 0 */ - if ((hx >= 0x7ff00000) || /* x not finite */ - ((hp >= 0x7ff00000) && /* p is NaN */ - (((hp - 0x7ff00000) | lp) != 0))) - return (x * p) / (x * p); + /* purge off exception values */ + if((hp|lp)==0) return (x*p)/(x*p); /* p = 0 */ + if((hx>=0x7ff00000)|| /* x not finite */ + ((hp>=0x7ff00000)&& /* p is NaN */ + (((hp-0x7ff00000)|lp)!=0))) + return (x*p)/(x*p); - if (hp <= 0x7fdfffff) - x = __ieee754_fmod (x, p + p); /* now x < 2p */ - if (((hx - hp) | (lx - lp)) == 0) - return zero * x; - x = fabs (x); - p = fabs (p); - if (hp < 0x00200000) - { - if (x + x > p) - { - x -= p; - if (x + x >= p) - x -= p; + if (hp<=0x7fdfffff) x = __ieee754_fmod(x,p+p); /* now x < 2p */ + if (((hx-hp)|(lx-lp))==0) return zero*x; + x = fabs(x); + p = fabs(p); + if (hp<0x00200000) { + if(x+x>p) { + x-=p; + if(x+x>=p) x -= p; + } + } else { + p_half = 0.5*p; + if(x>p_half) { + x-=p; + if(x>=p_half) x -= p; + } } - } - else - { - p_half = 0.5 * p; - if (x > p_half) - { - x -= p; - if (x >= p_half) - x -= p; - } - } - GET_HIGH_WORD (hx, x); - SET_HIGH_WORD (x, hx ^ sx); - return x; + GET_HIGH_WORD(hx,x); + SET_HIGH_WORD(x,hx^sx); + return x; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/e_scalb.c b/native/fdlibm/e_scalb.c index 5fff3b388..0bb924b43 100644 --- a/native/fdlibm/e_scalb.c +++ b/native/fdlibm/e_scalb.c @@ -23,44 +23,32 @@ #ifdef _SCALB_INT #ifdef __STDC__ -double -__ieee754_scalb (double x, int fn) + double __ieee754_scalb(double x, int fn) #else -double -__ieee754_scalb (x, fn) - double x; - int fn; + double __ieee754_scalb(x,fn) + double x; int fn; #endif #else #ifdef __STDC__ -double -__ieee754_scalb (double x, double fn) + double __ieee754_scalb(double x, double fn) #else -double -__ieee754_scalb (x, fn) - double x, fn; + double __ieee754_scalb(x,fn) + double x, fn; #endif #endif { #ifdef _SCALB_INT - return scalbn (x, fn); + return scalbn(x,fn); #else - if (isnan (x) || isnan (fn)) - return x * fn; - if (!finite (fn)) - { - if (fn > 0.0) - return x * fn; - else - return x / (-fn); - } - if (rint (fn) != fn) - return (fn - fn) / (fn - fn); - if (fn > 65000.0) - return scalbn (x, 65000); - if (-fn > 65000.0) - return scalbn (x, -65000); - return scalbn (x, (int) fn); + if (isnan(x)||isnan(fn)) return x*fn; + if (!finite(fn)) { + if(fn>0.0) return x*fn; + else return x/(-fn); + } + if (rint(fn)!=fn) return (fn-fn)/(fn-fn); + if ( fn > 65000.0) return scalbn(x, 65000); + if (-fn > 65000.0) return scalbn(x,-65000); + return scalbn(x,(int)fn); #endif } diff --git a/native/fdlibm/e_sqrt.c b/native/fdlibm/e_sqrt.c index dc965e9f9..1d566a084 100644 --- a/native/fdlibm/e_sqrt.c +++ b/native/fdlibm/e_sqrt.c @@ -86,136 +86,110 @@ #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -static const double one = 1.0, tiny = 1.0e-300; +static const double one = 1.0, tiny=1.0e-300; #else -static double one = 1.0, tiny = 1.0e-300; +static double one = 1.0, tiny=1.0e-300; #endif #ifdef __STDC__ -double -__ieee754_sqrt (double x) + double __ieee754_sqrt(double x) #else -double -__ieee754_sqrt (x) - double x; + double __ieee754_sqrt(x) + double x; #endif { - double z; - int32_t sign = (int) 0x80000000; - uint32_t r, t1, s1, ix1, q1; - int32_t ix0, s0, q, m, t, i; - - EXTRACT_WORDS (ix0, ix1, x); - - /* take care of Inf and NaN */ - if ((ix0 & 0x7ff00000) == 0x7ff00000) - { - return x * x + x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf - sqrt(-inf)=sNaN */ - } - /* take care of zero */ - if (ix0 <= 0) - { - if (((ix0 & (~sign)) | ix1) == 0) - return x; /* sqrt(+-0) = +-0 */ - else if (ix0 < 0) - return (x - x) / (x - x); /* sqrt(-ve) = sNaN */ - } - /* normalize x */ - m = (ix0 >> 20); - if (m == 0) - { /* subnormal x */ - while (ix0 == 0) - { - m -= 21; - ix0 |= (ix1 >> 11); - ix1 <<= 21; + double z; + int32_t sign = (int)0x80000000; + uint32_t r,t1,s1,ix1,q1; + int32_t ix0,s0,q,m,t,i; + + EXTRACT_WORDS(ix0,ix1,x); + + /* take care of Inf and NaN */ + if((ix0&0x7ff00000)==0x7ff00000) { + return x*x+x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf + sqrt(-inf)=sNaN */ } - for (i = 0; (ix0 & 0x00100000) == 0; i++) - ix0 <<= 1; - m -= i - 1; - ix0 |= (ix1 >> (32 - i)); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0 & 0x000fffff) | 0x00100000; - if (m & 1) - { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) - { - t = s0 + r; - if (t <= ix0) - { - s0 = t + r; - ix0 -= t; - q += r; + /* take care of zero */ + if(ix0<=0) { + if(((ix0&(~sign))|ix1)==0) return x;/* sqrt(+-0) = +-0 */ + else if(ix0<0) + return (x-x)/(x-x); /* sqrt(-ve) = sNaN */ } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - r = sign; - while (r != 0) - { - t1 = s1 + r; - t = s0; - if ((t < ix0) || ((t == ix0) && (t1 <= ix1))) - { - s1 = t1 + r; - if (((t1 & sign) == (uint32_t) sign) && (s1 & sign) == 0) - s0 += 1; - ix0 -= t; - if (ix1 < t1) - ix0 -= 1; - ix1 -= t1; - q1 += r; + /* normalize x */ + m = (ix0>>20); + if(m==0) { /* subnormal x */ + while(ix0==0) { + m -= 21; + ix0 |= (ix1>>11); ix1 <<= 21; + } + for(i=0;(ix0&0x00100000)==0;i++) ix0<<=1; + m -= i-1; + ix0 |= (ix1>>(32-i)); + ix1 <<= i; } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if ((ix0 | ix1) != 0) - { - z = one - tiny; /* trigger inexact flag */ - if (z >= one) - { - z = one + tiny; - if (q1 == (uint32_t) 0xffffffff) - { - q1 = 0; - q += 1; + m -= 1023; /* unbias exponent */ + ix0 = (ix0&0x000fffff)|0x00100000; + if(m&1){ /* odd m, double x to make it even */ + ix0 += ix0 + ((ix1&sign)>>31); + ix1 += ix1; + } + m >>= 1; /* m = [m/2] */ + + /* generate sqrt(x) bit by bit */ + ix0 += ix0 + ((ix1&sign)>>31); + ix1 += ix1; + q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ + r = 0x00200000; /* r = moving bit from right to left */ + + while(r!=0) { + t = s0+r; + if(t<=ix0) { + s0 = t+r; + ix0 -= t; + q += r; } - else if (z > one) - { - if (q1 == (uint32_t) 0xfffffffe) - q += 1; - q1 += 2; + ix0 += ix0 + ((ix1&sign)>>31); + ix1 += ix1; + r>>=1; + } + + r = sign; + while(r!=0) { + t1 = s1+r; + t = s0; + if((t<ix0)||((t==ix0)&&(t1<=ix1))) { + s1 = t1+r; + if(((t1&sign)==(uint32_t)sign)&&(s1&sign)==0) s0 += 1; + ix0 -= t; + if (ix1 < t1) ix0 -= 1; + ix1 -= t1; + q1 += r; + } + ix0 += ix0 + ((ix1&sign)>>31); + ix1 += ix1; + r>>=1; + } + + /* use floating add to find out rounding direction */ + if((ix0|ix1)!=0) { + z = one-tiny; /* trigger inexact flag */ + if (z>=one) { + z = one+tiny; + if (q1==(uint32_t)0xffffffff) { q1=0; q += 1;} + else if (z>one) { + if (q1==(uint32_t)0xfffffffe) q+=1; + q1+=2; + } else + q1 += (q1&1); } - else - q1 += (q1 & 1); } - } - ix0 = (q >> 1) + 0x3fe00000; - ix1 = q1 >> 1; - if ((q & 1) == 1) - ix1 |= sign; - ix0 += (m << 20); - INSERT_WORDS (z, ix0, ix1); - return z; + ix0 = (q>>1)+0x3fe00000; + ix1 = q1>>1; + if ((q&1)==1) ix1 |= sign; + ix0 += (m <<20); + INSERT_WORDS(z,ix0,ix1); + return z; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/fdlibm.h b/native/fdlibm/fdlibm.h index 4bca5ba07..3b303e78d 100644 --- a/native/fdlibm/fdlibm.h +++ b/native/fdlibm/fdlibm.h @@ -49,173 +49,170 @@ * (one may replace the following line by "#include <values.h>") */ -#define X_TLOSS 1.41484755040568800000e+16 +#define X_TLOSS 1.41484755040568800000e+16 /* These typedefs are true for the targets running Java. */ #define _IEEE_LIBM #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * ANSI/POSIX */ - extern double acos __P ((double)); - extern double asin __P ((double)); - extern double atan __P ((double)); - extern double atan2 __P ((double, double)); - extern double cos __P ((double)); - extern double sin __P ((double)); - extern double tan __P ((double)); - - extern double cosh __P ((double)); - extern double sinh __P ((double)); - extern double tanh __P ((double)); - - extern double exp __P ((double)); - extern double frexp __P ((double, int *)); - extern double ldexp __P ((double, int)); - extern double log __P ((double)); - extern double log10 __P ((double)); - extern double modf __P ((double, double *)); - - extern double pow __P ((double, double)); - extern double sqrt __P ((double)); - - extern double ceil __P ((double)); - extern double fabs __P ((double)); - extern double floor __P ((double)); - extern double fmod __P ((double, double)); - - extern double erf __P ((double)); - extern double erfc __P ((double)); - extern double gamma __P ((double)); - extern double hypot __P ((double, double)); - extern int isnan __P ((double)); - extern int finite __P ((double)); - extern double j0 __P ((double)); - extern double j1 __P ((double)); - extern double jn __P ((int, double)); - extern double lgamma __P ((double)); - extern double y0 __P ((double)); - extern double y1 __P ((double)); - extern double yn __P ((int, double)); - - extern double acosh __P ((double)); - extern double asinh __P ((double)); - extern double atanh __P ((double)); - extern double cbrt __P ((double)); - extern double logb __P ((double)); - extern double nextafter __P ((double, double)); - extern double remainder __P ((double, double)); +extern double acos __P((double)); +extern double asin __P((double)); +extern double atan __P((double)); +extern double atan2 __P((double, double)); +extern double cos __P((double)); +extern double sin __P((double)); +extern double tan __P((double)); + +extern double cosh __P((double)); +extern double sinh __P((double)); +extern double tanh __P((double)); + +extern double exp __P((double)); +extern double frexp __P((double, int *)); +extern double ldexp __P((double, int)); +extern double log __P((double)); +extern double log10 __P((double)); +extern double modf __P((double, double *)); + +extern double pow __P((double, double)); +extern double sqrt __P((double)); + +extern double ceil __P((double)); +extern double fabs __P((double)); +extern double floor __P((double)); +extern double fmod __P((double, double)); + +extern double erf __P((double)); +extern double erfc __P((double)); +extern double gamma __P((double)); +extern double hypot __P((double, double)); +extern int isnan __P((double)); +extern int finite __P((double)); +extern double j0 __P((double)); +extern double j1 __P((double)); +extern double jn __P((int, double)); +extern double lgamma __P((double)); +extern double y0 __P((double)); +extern double y1 __P((double)); +extern double yn __P((int, double)); + +extern double acosh __P((double)); +extern double asinh __P((double)); +extern double atanh __P((double)); +extern double cbrt __P((double)); +extern double logb __P((double)); +extern double nextafter __P((double, double)); +extern double remainder __P((double, double)); /* Functions that are not documented, and are not in <math.h>. */ - extern double logb __P ((double)); +extern double logb __P((double)); #ifdef _SCALB_INT - extern double scalb __P ((double, int)); +extern double scalb __P((double, int)); #else - extern double scalb __P ((double, double)); +extern double scalb __P((double, double)); #endif - extern double significand __P ((double)); +extern double significand __P((double)); /* ieee style elementary functions */ - extern double __ieee754_sqrt __P ((double)); - extern double __ieee754_acos __P ((double)); - extern double __ieee754_acosh __P ((double)); - extern double __ieee754_log __P ((double)); - extern double __ieee754_atanh __P ((double)); - extern double __ieee754_asin __P ((double)); - extern double __ieee754_atan2 __P ((double, double)); - extern double __ieee754_exp __P ((double)); - extern double __ieee754_cosh __P ((double)); - extern double __ieee754_fmod __P ((double, double)); - extern double __ieee754_pow __P ((double, double)); - extern double __ieee754_lgamma_r __P ((double, int *)); - extern double __ieee754_gamma_r __P ((double, int *)); - extern double __ieee754_log10 __P ((double)); - extern double __ieee754_sinh __P ((double)); - extern double __ieee754_hypot __P ((double, double)); - extern double __ieee754_j0 __P ((double)); - extern double __ieee754_j1 __P ((double)); - extern double __ieee754_y0 __P ((double)); - extern double __ieee754_y1 __P ((double)); - extern double __ieee754_jn __P ((int, double)); - extern double __ieee754_yn __P ((int, double)); - extern double __ieee754_remainder __P ((double, double)); - extern int32_t __ieee754_rem_pio2 __P ((double, double *)); +extern double __ieee754_sqrt __P((double)); +extern double __ieee754_acos __P((double)); +extern double __ieee754_acosh __P((double)); +extern double __ieee754_log __P((double)); +extern double __ieee754_atanh __P((double)); +extern double __ieee754_asin __P((double)); +extern double __ieee754_atan2 __P((double,double)); +extern double __ieee754_exp __P((double)); +extern double __ieee754_cosh __P((double)); +extern double __ieee754_fmod __P((double,double)); +extern double __ieee754_pow __P((double,double)); +extern double __ieee754_lgamma_r __P((double,int *)); +extern double __ieee754_gamma_r __P((double,int *)); +extern double __ieee754_log10 __P((double)); +extern double __ieee754_sinh __P((double)); +extern double __ieee754_hypot __P((double,double)); +extern double __ieee754_j0 __P((double)); +extern double __ieee754_j1 __P((double)); +extern double __ieee754_y0 __P((double)); +extern double __ieee754_y1 __P((double)); +extern double __ieee754_jn __P((int,double)); +extern double __ieee754_yn __P((int,double)); +extern double __ieee754_remainder __P((double,double)); +extern int32_t __ieee754_rem_pio2 __P((double,double*)); #ifdef _SCALB_INT - extern double __ieee754_scalb __P ((double, int)); +extern double __ieee754_scalb __P((double,int)); #else - extern double __ieee754_scalb __P ((double, double)); +extern double __ieee754_scalb __P((double,double)); #endif /* fdlibm kernel function */ - extern double __kernel_standard __P ((double, double, int)); - extern double __kernel_sin __P ((double, double, int)); - extern double __kernel_cos __P ((double, double)); - extern double __kernel_tan __P ((double, double, int)); - extern int __kernel_rem_pio2 - __P ((double *, double *, int, int, int, const int32_t *)); +extern double __kernel_standard __P((double,double,int)); +extern double __kernel_sin __P((double,double,int)); +extern double __kernel_cos __P((double,double)); +extern double __kernel_tan __P((double,double,int)); +extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int32_t*)); /* Undocumented float functions. */ - extern float logbf __P ((float)); +extern float logbf __P((float)); #ifdef _SCALB_INT - extern float scalbf __P ((float, int)); +extern float scalbf __P((float, int)); #else - extern float scalbf __P ((float, float)); +extern float scalbf __P((float, float)); #endif - extern float significandf __P ((float)); +extern float significandf __P((float)); /* * Functions callable from C, intended to support IEEE arithmetic. */ - extern double copysign __P ((double, double)); - extern int ilogb __P ((double)); - extern double rint __P ((double)); - extern float rintf __P ((float)); - extern double scalbn __P ((double, int)); +extern double copysign __P((double, double)); +extern int ilogb __P((double)); +extern double rint __P((double)); +extern float rintf __P((float)); +extern double scalbn __P((double, int)); /* ieee style elementary float functions */ - extern float __ieee754_sqrtf __P ((float)); - extern float __ieee754_acosf __P ((float)); - extern float __ieee754_acoshf __P ((float)); - extern float __ieee754_logf __P ((float)); - extern float __ieee754_atanhf __P ((float)); - extern float __ieee754_asinf __P ((float)); - extern float __ieee754_atan2f __P ((float, float)); - extern float __ieee754_expf __P ((float)); - extern float __ieee754_coshf __P ((float)); - extern float __ieee754_fmodf __P ((float, float)); - extern float __ieee754_powf __P ((float, float)); - extern float __ieee754_lgammaf_r __P ((float, int *)); - extern float __ieee754_gammaf_r __P ((float, int *)); - extern float __ieee754_log10f __P ((float)); - extern float __ieee754_sinhf __P ((float)); - extern float __ieee754_hypotf __P ((float, float)); - extern float __ieee754_j0f __P ((float)); - extern float __ieee754_j1f __P ((float)); - extern float __ieee754_y0f __P ((float)); - extern float __ieee754_y1f __P ((float)); - extern float __ieee754_jnf __P ((int, float)); - extern float __ieee754_ynf __P ((int, float)); - extern float __ieee754_remainderf __P ((float, float)); - extern int32_t __ieee754_rem_pio2f __P ((float, float *)); +extern float __ieee754_sqrtf __P((float)); +extern float __ieee754_acosf __P((float)); +extern float __ieee754_acoshf __P((float)); +extern float __ieee754_logf __P((float)); +extern float __ieee754_atanhf __P((float)); +extern float __ieee754_asinf __P((float)); +extern float __ieee754_atan2f __P((float,float)); +extern float __ieee754_expf __P((float)); +extern float __ieee754_coshf __P((float)); +extern float __ieee754_fmodf __P((float,float)); +extern float __ieee754_powf __P((float,float)); +extern float __ieee754_lgammaf_r __P((float,int *)); +extern float __ieee754_gammaf_r __P((float,int *)); +extern float __ieee754_log10f __P((float)); +extern float __ieee754_sinhf __P((float)); +extern float __ieee754_hypotf __P((float,float)); +extern float __ieee754_j0f __P((float)); +extern float __ieee754_j1f __P((float)); +extern float __ieee754_y0f __P((float)); +extern float __ieee754_y1f __P((float)); +extern float __ieee754_jnf __P((int,float)); +extern float __ieee754_ynf __P((int,float)); +extern float __ieee754_remainderf __P((float,float)); +extern int32_t __ieee754_rem_pio2f __P((float,float*)); #ifdef _SCALB_INT - extern float __ieee754_scalbf __P ((float, int)); +extern float __ieee754_scalbf __P((float,int)); #else - extern float __ieee754_scalbf __P ((float, float)); +extern float __ieee754_scalbf __P((float,float)); #endif /* float versions of fdlibm kernel functions */ - extern float __kernel_sinf __P ((float, float, int)); - extern float __kernel_cosf __P ((float, float)); - extern float __kernel_tanf __P ((float, float, int)); - extern int __kernel_rem_pio2f - __P ((float *, float *, int, int, int, const int32_t *)); +extern float __kernel_sinf __P((float,float,int)); +extern float __kernel_cosf __P((float,float)); +extern float __kernel_tanf __P((float,float,int)); +extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int32_t*)); /* The original code used statements like n0 = ((*(int*)&one)>>29)^1; * index of high word * @@ -230,7 +227,7 @@ extern "C" #ifndef __IEEE_BIG_ENDIAN #ifndef __IEEE_LITTLE_ENDIAN -#error Must define endianness + #error Must define endianness #endif #endif @@ -239,31 +236,29 @@ extern "C" #ifdef __IEEE_BIG_ENDIAN - typedef union _ieee_double_shape_type_union ieee_double_shape_type; - union _ieee_double_shape_type_union +typedef union +{ + double value; + struct { - double value; - struct - { - uint32_t msw; - uint32_t lsw; - } parts; - }; + uint32_t msw; + uint32_t lsw; + } parts; +} ieee_double_shape_type; #endif #ifdef __IEEE_LITTLE_ENDIAN - typedef union _ieee_double_shape_type_union ieee_double_shape_type; - union _ieee_double_shape_type_union +typedef union +{ + double value; + struct { - double value; - struct - { - uint32_t lsw; - uint32_t msw; - } parts; - }; + uint32_t lsw; + uint32_t msw; + } parts; +} ieee_double_shape_type; #endif @@ -328,12 +323,11 @@ do { \ /* A union which permits us to convert between a float and a 32 bit int. */ - typedef union _ieee_float_shape_type_union ieee_float_shape_type; - union _ieee_float_shape_type_union - { - float value; - uint32_t word; - }; +typedef union +{ + float value; + uint32_t word; +} ieee_float_shape_type; /* Get a 32 bit int from a float. */ @@ -357,4 +351,4 @@ do { \ } #endif -#endif /* __CLASSPATH_FDLIBM_H__ */ +#endif /* __CLASSPATH_FDLIBM_H__ */ diff --git a/native/fdlibm/k_cos.c b/native/fdlibm/k_cos.c index 3ddb462ba..acf50a82e 100644 --- a/native/fdlibm/k_cos.c +++ b/native/fdlibm/k_cos.c @@ -55,50 +55,42 @@ static const double #else static double #endif - one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ - C1 = 4.16666666666666019037e-02, /* 0x3FA55555, 0x5555554C */ - C2 = -1.38888888888741095749e-03, /* 0xBF56C16C, 0x16C15177 */ - C3 = 2.48015872894767294178e-05, /* 0x3EFA01A0, 0x19CB1590 */ - C4 = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */ - C5 = 2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */ - C6 = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */ +one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ +C1 = 4.16666666666666019037e-02, /* 0x3FA55555, 0x5555554C */ +C2 = -1.38888888888741095749e-03, /* 0xBF56C16C, 0x16C15177 */ +C3 = 2.48015872894767294178e-05, /* 0x3EFA01A0, 0x19CB1590 */ +C4 = -2.75573143513906633035e-07, /* 0xBE927E4F, 0x809C52AD */ +C5 = 2.08757232129817482790e-09, /* 0x3E21EE9E, 0xBDB4B1C4 */ +C6 = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */ #ifdef __STDC__ -double -__kernel_cos (double x, double y) + double __kernel_cos(double x, double y) #else -double -__kernel_cos (x, y) - double x, y; + double __kernel_cos(x, y) + double x,y; #endif { - double a, hz, z, r, qx; - int32_t ix; - GET_HIGH_WORD (ix, x); - ix &= 0x7fffffff; /* ix = |x|'s high word */ - if (ix < 0x3e400000) - { /* if x < 2**27 */ - if (((int) x) == 0) - return one; /* generate inexact */ - } - z = x * x; - r = z * (C1 + z * (C2 + z * (C3 + z * (C4 + z * (C5 + z * C6))))); - if (ix < 0x3FD33333) /* if |x| < 0.3 */ - return one - (0.5 * z - (z * r - x * y)); - else - { - if (ix > 0x3fe90000) - { /* x > 0.78125 */ - qx = 0.28125; + double a,hz,z,r,qx; + int32_t ix; + GET_HIGH_WORD(ix,x); + ix &= 0x7fffffff; /* ix = |x|'s high word*/ + if(ix<0x3e400000) { /* if x < 2**27 */ + if(((int)x)==0) return one; /* generate inexact */ } - else - { - INSERT_WORDS (qx, ix - 0x00200000, 0); /* x/4 */ + z = x*x; + r = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6))))); + if(ix < 0x3FD33333) /* if |x| < 0.3 */ + return one - (0.5*z - (z*r - x*y)); + else { + if(ix > 0x3fe90000) { /* x > 0.78125 */ + qx = 0.28125; + } else { + INSERT_WORDS(qx,ix-0x00200000,0); /* x/4 */ + } + hz = 0.5*z-qx; + a = one-qx; + return a - (hz - (z*r-x*y)); } - hz = 0.5 * z - qx; - a = one - qx; - return a - (hz - (z * r - x * y)); - } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/k_rem_pio2.c b/native/fdlibm/k_rem_pio2.c index 5e2da5690..2f4ca1725 100644 --- a/native/fdlibm/k_rem_pio2.c +++ b/native/fdlibm/k_rem_pio2.c @@ -132,9 +132,9 @@ #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -static const int init_jk[] = { 2, 3, 4, 6 }; /* initial value for jk */ +static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ #else -static int init_jk[] = { 2, 3, 4, 6 }; +static int init_jk[] = {2,3,4,6}; #endif #ifdef __STDC__ @@ -142,14 +142,14 @@ static const double PIo2[] = { #else static double PIo2[] = { #endif - 1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */ - 7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */ - 5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */ - 3.28200341580791294123e-22, /* 0x3B78CC51, 0x60000000 */ - 1.27065575308067607349e-29, /* 0x39F01B83, 0x80000000 */ - 1.22933308981111328932e-36, /* 0x387A2520, 0x40000000 */ - 2.73370053816464559624e-44, /* 0x36E38222, 0x80000000 */ - 2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */ + 1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */ + 7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */ + 5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */ + 3.28200341580791294123e-22, /* 0x3B78CC51, 0x60000000 */ + 1.27065575308067607349e-29, /* 0x39F01B83, 0x80000000 */ + 1.22933308981111328932e-36, /* 0x387A2520, 0x40000000 */ + 2.73370053816464559624e-44, /* 0x36E38222, 0x80000000 */ + 2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */ }; #ifdef __STDC__ @@ -157,228 +157,164 @@ static const double #else static double #endif - zero = 0.0, one = 1.0, two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ - twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */ +zero = 0.0, +one = 1.0, +two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ +twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */ #ifdef __STDC__ -int -__kernel_rem_pio2 (double *x, double *y, int e0, int nx, int prec, - const int32_t *ipio2) + int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int32_t *ipio2) #else -int -__kernel_rem_pio2 (x, y, e0, nx, prec, ipio2) - double x[], y[]; - int e0, nx, prec; - int32_t ipio2[]; + int __kernel_rem_pio2(x,y,e0,nx,prec,ipio2) + double x[], y[]; int e0,nx,prec; int32_t ipio2[]; #endif { - int32_t jz, jx, jv, jp, jk, carry, n, iq[20], i, j, k, m, q0, ih; - double z, fw, f[20], fq[20], q[20]; + int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih; + double z,fw,f[20],fq[20],q[20]; - /* initialize jk */ - jk = init_jk[prec]; - jp = jk; + /* initialize jk*/ + jk = init_jk[prec]; + jp = jk; - /* determine jx,jv,q0, note that 3>q0 */ - jx = nx - 1; - jv = (e0 - 3) / 24; - if (jv < 0) - jv = 0; - q0 = e0 - 24 * (jv + 1); + /* determine jx,jv,q0, note that 3>q0 */ + jx = nx-1; + jv = (e0-3)/24; if(jv<0) jv=0; + q0 = e0-24*(jv+1); - /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */ - j = jv - jx; - m = jx + jk; - for (i = 0; i <= m; i++, j++) - f[i] = (j < 0) ? zero : (double) ipio2[j]; + /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */ + j = jv-jx; m = jx+jk; + for(i=0;i<=m;i++,j++) f[i] = (j<0)? zero : (double) ipio2[j]; - /* compute q[0],q[1],...q[jk] */ - for (i = 0; i <= jk; i++) - { - for (j = 0, fw = 0.0; j <= jx; j++) - fw += x[j] * f[jx + i - j]; - q[i] = fw; - } + /* compute q[0],q[1],...q[jk] */ + for (i=0;i<=jk;i++) { + for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw; + } - jz = jk; + jz = jk; recompute: - /* distill q[] into iq[] reversingly */ - for (i = 0, j = jz, z = q[jz]; j > 0; i++, j--) - { - fw = (double) ((int32_t) (twon24 * z)); - iq[i] = (int32_t) (z - two24 * fw); - z = q[j - 1] + fw; - } + /* distill q[] into iq[] reversingly */ + for(i=0,j=jz,z=q[jz];j>0;i++,j--) { + fw = (double)((int32_t)(twon24* z)); + iq[i] = (int32_t)(z-two24*fw); + z = q[j-1]+fw; + } - /* compute n */ - z = scalbn (z, (int) q0); /* actual value of z */ - z -= 8.0 * floor (z * 0.125); /* trim off integer >= 8 */ - n = (int32_t) z; - z -= (double) n; - ih = 0; - if (q0 > 0) - { /* need iq[jz-1] to determine n */ - i = (iq[jz - 1] >> (24 - q0)); - n += i; - iq[jz - 1] -= i << (24 - q0); - ih = iq[jz - 1] >> (23 - q0); - } - else if (q0 == 0) - ih = iq[jz - 1] >> 23; - else if (z >= 0.5) - ih = 2; + /* compute n */ + z = scalbn(z,(int)q0); /* actual value of z */ + z -= 8.0*floor(z*0.125); /* trim off integer >= 8 */ + n = (int32_t) z; + z -= (double)n; + ih = 0; + if(q0>0) { /* need iq[jz-1] to determine n */ + i = (iq[jz-1]>>(24-q0)); n += i; + iq[jz-1] -= i<<(24-q0); + ih = iq[jz-1]>>(23-q0); + } + else if(q0==0) ih = iq[jz-1]>>23; + else if(z>=0.5) ih=2; - if (ih > 0) - { /* q > 0.5 */ - n += 1; - carry = 0; - for (i = 0; i < jz; i++) - { /* compute 1-q */ - j = iq[i]; - if (carry == 0) - { - if (j != 0) - { - carry = 1; - iq[i] = 0x1000000 - j; - } + if(ih>0) { /* q > 0.5 */ + n += 1; carry = 0; + for(i=0;i<jz ;i++) { /* compute 1-q */ + j = iq[i]; + if(carry==0) { + if(j!=0) { + carry = 1; iq[i] = 0x1000000- j; + } + } else iq[i] = 0xffffff - j; } - else - iq[i] = 0xffffff - j; - } - if (q0 > 0) - { /* rare case: chance is 1 in 12 */ - switch (q0) - { - case 1: - iq[jz - 1] &= 0x7fffff; - break; - case 2: - iq[jz - 1] &= 0x3fffff; - break; + if(q0>0) { /* rare case: chance is 1 in 12 */ + switch(q0) { + case 1: + iq[jz-1] &= 0x7fffff; break; + case 2: + iq[jz-1] &= 0x3fffff; break; + } + } + if(ih==2) { + z = one - z; + if(carry!=0) z -= scalbn(one,(int)q0); } } - if (ih == 2) - { - z = one - z; - if (carry != 0) - z -= scalbn (one, (int) q0); - } - } - /* check if recomputation is needed */ - if (z == zero) - { - j = 0; - for (i = jz - 1; i >= jk; i--) - j |= iq[i]; - if (j == 0) - { /* need recomputation */ - for (k = 1; iq[jk - k] == 0; k++); /* k = no. of terms needed */ + /* check if recomputation is needed */ + if(z==zero) { + j = 0; + for (i=jz-1;i>=jk;i--) j |= iq[i]; + if(j==0) { /* need recomputation */ + for(k=1;iq[jk-k]==0;k++); /* k = no. of terms needed */ - for (i = jz + 1; i <= jz + k; i++) - { /* add q[jz+1] to q[jz+k] */ - f[jx + i] = (double) ipio2[jv + i]; - for (j = 0, fw = 0.0; j <= jx; j++) - fw += x[j] * f[jx + i - j]; - q[i] = fw; + for(i=jz+1;i<=jz+k;i++) { /* add q[jz+1] to q[jz+k] */ + f[jx+i] = (double) ipio2[jv+i]; + for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; + q[i] = fw; + } + jz += k; + goto recompute; } - jz += k; - goto recompute; } - } - /* chop off zero terms */ - if (z == 0.0) - { - jz -= 1; - q0 -= 24; - while (iq[jz] == 0) - { - jz--; - q0 -= 24; - } - } - else - { /* break z into 24-bit if necessary */ - z = scalbn (z, -(int) q0); - if (z >= two24) - { - fw = (double) ((int32_t) (twon24 * z)); - iq[jz] = (int32_t) (z - two24 * fw); - jz += 1; - q0 += 24; - iq[jz] = (int32_t) fw; + /* chop off zero terms */ + if(z==0.0) { + jz -= 1; q0 -= 24; + while(iq[jz]==0) { jz--; q0-=24;} + } else { /* break z into 24-bit if necessary */ + z = scalbn(z,-(int)q0); + if(z>=two24) { + fw = (double)((int32_t)(twon24*z)); + iq[jz] = (int32_t)(z-two24*fw); + jz += 1; q0 += 24; + iq[jz] = (int32_t) fw; + } else iq[jz] = (int32_t) z ; } - else - iq[jz] = (int32_t) z; - } - /* convert integer "bit" chunk to floating-point value */ - fw = scalbn (one, (int) q0); - for (i = jz; i >= 0; i--) - { - q[i] = fw * (double) iq[i]; - fw *= twon24; - } - - /* compute PIo2[0,...,jp]*q[jz,...,0] */ - for (i = jz; i >= 0; i--) - { - for (fw = 0.0, k = 0; k <= jp && k <= jz - i; k++) - fw += PIo2[k] * q[i + k]; - fq[jz - i] = fw; - } - - /* compress fq[] into y[] */ - switch (prec) - { - case 0: - fw = 0.0; - for (i = jz; i >= 0; i--) - fw += fq[i]; - y[0] = (ih == 0) ? fw : -fw; - break; - case 1: - case 2: - fw = 0.0; - for (i = jz; i >= 0; i--) - fw += fq[i]; - y[0] = (ih == 0) ? fw : -fw; - fw = fq[0] - fw; - for (i = 1; i <= jz; i++) - fw += fq[i]; - y[1] = (ih == 0) ? fw : -fw; - break; - case 3: /* painful */ - for (i = jz; i > 0; i--) - { - fw = fq[i - 1] + fq[i]; - fq[i] += fq[i - 1] - fw; - fq[i - 1] = fw; - } - for (i = jz; i > 1; i--) - { - fw = fq[i - 1] + fq[i]; - fq[i] += fq[i - 1] - fw; - fq[i - 1] = fw; + /* convert integer "bit" chunk to floating-point value */ + fw = scalbn(one,(int)q0); + for(i=jz;i>=0;i--) { + q[i] = fw*(double)iq[i]; fw*=twon24; } - for (fw = 0.0, i = jz; i >= 2; i--) - fw += fq[i]; - if (ih == 0) - { - y[0] = fq[0]; - y[1] = fq[1]; - y[2] = fw; + + /* compute PIo2[0,...,jp]*q[jz,...,0] */ + for(i=jz;i>=0;i--) { + for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k]; + fq[jz-i] = fw; } - else - { - y[0] = -fq[0]; - y[1] = -fq[1]; - y[2] = -fw; + + /* compress fq[] into y[] */ + switch(prec) { + case 0: + fw = 0.0; + for (i=jz;i>=0;i--) fw += fq[i]; + y[0] = (ih==0)? fw: -fw; + break; + case 1: + case 2: + fw = 0.0; + for (i=jz;i>=0;i--) fw += fq[i]; + y[0] = (ih==0)? fw: -fw; + fw = fq[0]-fw; + for (i=1;i<=jz;i++) fw += fq[i]; + y[1] = (ih==0)? fw: -fw; + break; + case 3: /* painful */ + for (i=jz;i>0;i--) { + fw = fq[i-1]+fq[i]; + fq[i] += fq[i-1]-fw; + fq[i-1] = fw; + } + for (i=jz;i>1;i--) { + fw = fq[i-1]+fq[i]; + fq[i] += fq[i-1]-fw; + fq[i-1] = fw; + } + for (fw=0.0,i=jz;i>=2;i--) fw += fq[i]; + if(ih==0) { + y[0] = fq[0]; y[1] = fq[1]; y[2] = fw; + } else { + y[0] = -fq[0]; y[1] = -fq[1]; y[2] = -fw; + } } - } - return n & 7; + return n&7; } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/k_sin.c b/native/fdlibm/k_sin.c index 3e249470e..b4ad387c5 100644 --- a/native/fdlibm/k_sin.c +++ b/native/fdlibm/k_sin.c @@ -48,40 +48,32 @@ static const double #else static double #endif - half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ - S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */ - S2 = 8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */ - S3 = -1.98412698298579493134e-04, /* 0xBF2A01A0, 0x19C161D5 */ - S4 = 2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */ - S5 = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */ - S6 = 1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */ +half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ +S1 = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */ +S2 = 8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */ +S3 = -1.98412698298579493134e-04, /* 0xBF2A01A0, 0x19C161D5 */ +S4 = 2.75573137070700676789e-06, /* 0x3EC71DE3, 0x57B1FE7D */ +S5 = -2.50507602534068634195e-08, /* 0xBE5AE5E6, 0x8A2B9CEB */ +S6 = 1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */ #ifdef __STDC__ -double -__kernel_sin (double x, double y, int iy) + double __kernel_sin(double x, double y, int iy) #else -double -__kernel_sin (x, y, iy) - double x, y; - int iy; /* iy=0 if y is zero */ + double __kernel_sin(x, y, iy) + double x,y; int iy; /* iy=0 if y is zero */ #endif { - double z, r, v; - int32_t ix; - GET_HIGH_WORD (ix, x); - ix &= 0x7fffffff; /* high word of x */ - if (ix < 0x3e400000) /* |x| < 2**-27 */ - { - if ((int) x == 0) - return x; - } /* generate inexact */ - z = x * x; - v = z * x; - r = S2 + z * (S3 + z * (S4 + z * (S5 + z * S6))); - if (iy == 0) - return x + v * (S1 + z * r); - else - return x - ((z * (half * y - v * r) - y) - v * S1); + double z,r,v; + int32_t ix; + GET_HIGH_WORD(ix,x); + ix &= 0x7fffffff; /* high word of x */ + if(ix<0x3e400000) /* |x| < 2**-27 */ + {if((int)x==0) return x;} /* generate inexact */ + z = x*x; + v = z*x; + r = S2+z*(S3+z*(S4+z*(S5+z*S6))); + if(iy==0) return x+v*(S1+z*r); + else return x-((z*(half*y-v*r)-y)-v*S1); } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/k_tan.c b/native/fdlibm/k_tan.c index 230ddc887..a1067a70a 100644 --- a/native/fdlibm/k_tan.c +++ b/native/fdlibm/k_tan.c @@ -54,100 +54,79 @@ static const double #else static double #endif - one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ - pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ - pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ - T[] = { - 3.33333333333334091986e-01, /* 0x3FD55555, 0x55555563 */ - 1.33333333333201242699e-01, /* 0x3FC11111, 0x1110FE7A */ - 5.39682539762260521377e-02, /* 0x3FABA1BA, 0x1BB341FE */ - 2.18694882948595424599e-02, /* 0x3F9664F4, 0x8406D637 */ - 8.86323982359930005737e-03, /* 0x3F8226E3, 0xE96E8493 */ - 3.59207910759131235356e-03, /* 0x3F6D6D22, 0xC9560328 */ - 1.45620945432529025516e-03, /* 0x3F57DBC8, 0xFEE08315 */ - 5.88041240820264096874e-04, /* 0x3F4344D8, 0xF2F26501 */ - 2.46463134818469906812e-04, /* 0x3F3026F7, 0x1A8D1068 */ - 7.81794442939557092300e-05, /* 0x3F147E88, 0xA03792A6 */ - 7.14072491382608190305e-05, /* 0x3F12B80F, 0x32F0A7E9 */ - -1.85586374855275456654e-05, /* 0xBEF375CB, 0xDB605373 */ - 2.59073051863633712884e-05, /* 0x3EFB2A70, 0x74BF7AD4 */ +one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ +pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ +pio4lo= 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ +T[] = { + 3.33333333333334091986e-01, /* 0x3FD55555, 0x55555563 */ + 1.33333333333201242699e-01, /* 0x3FC11111, 0x1110FE7A */ + 5.39682539762260521377e-02, /* 0x3FABA1BA, 0x1BB341FE */ + 2.18694882948595424599e-02, /* 0x3F9664F4, 0x8406D637 */ + 8.86323982359930005737e-03, /* 0x3F8226E3, 0xE96E8493 */ + 3.59207910759131235356e-03, /* 0x3F6D6D22, 0xC9560328 */ + 1.45620945432529025516e-03, /* 0x3F57DBC8, 0xFEE08315 */ + 5.88041240820264096874e-04, /* 0x3F4344D8, 0xF2F26501 */ + 2.46463134818469906812e-04, /* 0x3F3026F7, 0x1A8D1068 */ + 7.81794442939557092300e-05, /* 0x3F147E88, 0xA03792A6 */ + 7.14072491382608190305e-05, /* 0x3F12B80F, 0x32F0A7E9 */ + -1.85586374855275456654e-05, /* 0xBEF375CB, 0xDB605373 */ + 2.59073051863633712884e-05, /* 0x3EFB2A70, 0x74BF7AD4 */ }; #ifdef __STDC__ -double -__kernel_tan (double x, double y, int iy) + double __kernel_tan(double x, double y, int iy) #else -double -__kernel_tan (x, y, iy) - double x, y; - int iy; + double __kernel_tan(x, y, iy) + double x,y; int iy; #endif { - double z, r, v, w, s; - int32_t ix, hx; - GET_HIGH_WORD (hx, x); - ix = hx & 0x7fffffff; /* high word of |x| */ - if (ix < 0x3e300000) /* x < 2**-28 */ - { - if ((int) x == 0) - { /* generate inexact */ - uint32_t low; - GET_LOW_WORD (low, x); - if (((ix | low) | (iy + 1)) == 0) - return one / fabs (x); - else - return (iy == 1) ? x : -one / x; + double z,r,v,w,s; + int32_t ix,hx; + GET_HIGH_WORD(hx,x); + ix = hx&0x7fffffff; /* high word of |x| */ + if(ix<0x3e300000) /* x < 2**-28 */ + {if((int)x==0) { /* generate inexact */ + uint32_t low; + GET_LOW_WORD(low,x); + if(((ix|low)|(iy+1))==0) return one/fabs(x); + else return (iy==1)? x: -one/x; + } + } + if(ix>=0x3FE59428) { /* |x|>=0.6744 */ + if(hx<0) {x = -x; y = -y;} + z = pio4-x; + w = pio4lo-y; + x = z+w; y = 0.0; } - } - if (ix >= 0x3FE59428) - { /* |x|>=0.6744 */ - if (hx < 0) - { - x = -x; - y = -y; + z = x*x; + w = z*z; + /* Break x^5*(T[1]+x^2*T[2]+...) into + * x^5(T[1]+x^4*T[3]+...+x^20*T[11]) + + * x^5(x^2*(T[2]+x^4*T[4]+...+x^22*[T12])) + */ + r = T[1]+w*(T[3]+w*(T[5]+w*(T[7]+w*(T[9]+w*T[11])))); + v = z*(T[2]+w*(T[4]+w*(T[6]+w*(T[8]+w*(T[10]+w*T[12]))))); + s = z*x; + r = y + z*(s*(r+v)+y); + r += T[0]*s; + w = x+r; + if(ix>=0x3FE59428) { + v = (double)iy; + return (double)(1-((hx>>30)&2))*(v-2.0*(x-(w*w/(w+v)-r))); + } + if(iy==1) return w; + else { /* if allow error up to 2 ulp, + simply return -1.0/(x+r) here */ + /* compute -1.0/(x+r) accurately */ + double a,t; + z = w; + SET_LOW_WORD(z,0); + v = r-(z - x); /* z+v = r+x */ + t = a = -1.0/w; /* a = -1.0/w */ + SET_LOW_WORD(t,0); + s = 1.0+t*z; + return t+a*(s+t*v); } - z = pio4 - x; - w = pio4lo - y; - x = z + w; - y = 0.0; - } - z = x * x; - w = z * z; - /* Break x^5*(T[1]+x^2*T[2]+...) into - * x^5(T[1]+x^4*T[3]+...+x^20*T[11]) + - * x^5(x^2*(T[2]+x^4*T[4]+...+x^22*[T12])) - */ - r = T[1] + w * (T[3] + w * (T[5] + w * (T[7] + w * (T[9] + w * T[11])))); - v = - z * (T[2] + - w * (T[4] + w * (T[6] + w * (T[8] + w * (T[10] + w * T[12]))))); - s = z * x; - r = y + z * (s * (r + v) + y); - r += T[0] * s; - w = x + r; - if (ix >= 0x3FE59428) - { - v = (double) iy; - return (double) (1 - ((hx >> 30) & 2)) * (v - - 2.0 * (x - - (w * w / (w + v) - - r))); - } - if (iy == 1) - return w; - else - { /* if allow error up to 2 ulp, - simply return -1.0/(x+r) here */ - /* compute -1.0/(x+r) accurately */ - double a, t; - z = w; - SET_LOW_WORD (z, 0); - v = r - (z - x); /* z+v = r+x */ - t = a = -1.0 / w; /* a = -1.0/w */ - SET_LOW_WORD (t, 0); - s = 1.0 + t * z; - return t + a * (s + t * v); - } } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/mprec.c b/native/fdlibm/mprec.c index b63175425..12dd5d261 100644 --- a/native/fdlibm/mprec.c +++ b/native/fdlibm/mprec.c @@ -104,12 +104,12 @@ _DEFUN (Balloc, (ptr, k), struct _Jv_reent *ptr _AND int k) JvAssert (i < MAX_BIGNUMS); - if (i >= MAX_BIGNUMS) + if (i >= MAX_BIGNUMS) return NULL; ptr->_allocation_map |= j; rv = &ptr->_freelist[i]; - + rv->_k = k; rv->_maxwds = 32; @@ -127,13 +127,16 @@ _DEFUN (Bfree, (ptr, v), struct _Jv_reent *ptr _AND _Jv_Bigint * v) JvAssert (i >= 0 && i < MAX_BIGNUMS); if (i >= 0 && i < MAX_BIGNUMS) - ptr->_allocation_map &= ~(1 << i); + ptr->_allocation_map &= ~ (1 << i); } _Jv_Bigint * _DEFUN (multadd, (ptr, b, m, a), - struct _Jv_reent *ptr _AND _Jv_Bigint * b _AND int m _AND int a) + struct _Jv_reent *ptr _AND + _Jv_Bigint * b _AND + int m _AND + int a) { int i, wds; unsigned long *x, y; @@ -178,7 +181,10 @@ _DEFUN (multadd, (ptr, b, m, a), _Jv_Bigint * _DEFUN (s2b, (ptr, s, nd0, nd, y9), struct _Jv_reent * ptr _AND - _CONST char *s _AND int nd0 _AND int nd _AND unsigned long y9) + _CONST char *s _AND + int nd0 _AND + int nd _AND + unsigned long y9) { _Jv_Bigint *b; int i, k; @@ -213,7 +219,8 @@ _DEFUN (s2b, (ptr, s, nd0, nd, y9), } int -_DEFUN (hi0bits, (x), register unsigned long x) +_DEFUN (hi0bits, + (x), register unsigned long x) { register int k = 0; @@ -308,8 +315,7 @@ _DEFUN (i2b, (ptr, i), struct _Jv_reent * ptr _AND int i) } _Jv_Bigint * -_DEFUN (mult, (ptr, a, b), - struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_Bigint * b) +_DEFUN (mult, (ptr, a, b), struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_Bigint * b) { _Jv_Bigint *c; int k, wa, wb, wc; @@ -406,7 +412,7 @@ _DEFUN (pow5mult, { _Jv_Bigint *b1, *p5, *p51; int i; - static _CONST int p05[3] = { 5, 25, 125 }; + static _CONST int p05[3] = {5, 25, 125}; if ((i = k & 3)) b = multadd (ptr, b, p05[i - 1], 0); @@ -440,8 +446,7 @@ _DEFUN (pow5mult, } _Jv_Bigint * -_DEFUN (lshift, (ptr, b, k), - struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int k) +_DEFUN (lshift, (ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int k) { int i, k1, n, n1; _Jv_Bigint *b1; @@ -661,7 +666,8 @@ _DEFUN (ulp, (_x), double _x) } double -_DEFUN (b2d, (a, e), _Jv_Bigint * a _AND int *e) +_DEFUN (b2d, (a, e), + _Jv_Bigint * a _AND int *e) { unsigned long *xa, *xa0, w, y, z; int k; @@ -739,7 +745,11 @@ ret_d: _Jv_Bigint * _DEFUN (d2b, (ptr, _d, e, bits), - struct _Jv_reent * ptr _AND double _d _AND int *e _AND int *bits) + struct _Jv_reent * ptr _AND + double _d _AND + int *e _AND + int *bits) + { union double_union d; _Jv_Bigint *b; @@ -878,12 +888,12 @@ _DEFUN (d2b, #endif return b; } - #undef d0 #undef d1 double _DEFUN (ratio, (a, b), _Jv_Bigint * a _AND _Jv_Bigint * b) + { union double_union da, db; int k, ka, kb; @@ -922,18 +932,27 @@ _DEFUN (ratio, (a, b), _Jv_Bigint * a _AND _Jv_Bigint * b) } -_CONST double tens[] = { +_CONST double + tens[] = +{ 1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22, 1e23, 1e24 + }; #if !defined(_DOUBLE_IS_32BITS) && !defined(__v800) -_CONST double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 }; +_CONST double bigtens[] = +{1e16, 1e32, 1e64, 1e128, 1e256}; -_CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 }; +_CONST double tinytens[] = +{1e-16, 1e-32, 1e-64, 1e-128, 1e-256}; #else -_CONST double bigtens[] = { 1e16, 1e32 }; +_CONST double bigtens[] = +{1e16, 1e32}; -_CONST double tinytens[] = { 1e-16, 1e-32 }; +_CONST double tinytens[] = +{1e-16, 1e-32}; #endif + + diff --git a/native/fdlibm/mprec.h b/native/fdlibm/mprec.h index 3a4f4c461..da45d82aa 100644 --- a/native/fdlibm/mprec.h +++ b/native/fdlibm/mprec.h @@ -51,25 +51,24 @@ #endif #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* ISO C99 int type declarations */ #if !defined HAVE_INT32_DEFINED && defined HAVE_BSD_INT32_DEFINED - typedef u_int32_t uint32_t; +typedef u_int32_t uint32_t; #endif #if !defined HAVE_BSD_INT32_DEFINED && !defined HAVE_INT32_DEFINED // FIXME -- this could have problems with systems that don't define SI to be 4 - typedef int int32_t __attribute__ ((mode (SI))); +typedef int int32_t __attribute__((mode(SI))); /* This is a blatant hack: on Solaris 2.5, pthread.h defines uint32_t in pthread.h, which we sometimes include. We protect our definition the same way Solaris 2.5 does, to avoid redefining it. */ # ifndef _UINT32_T - typedef unsigned int uint32_t __attribute__ ((mode (SI))); +typedef unsigned int uint32_t __attribute__((mode(SI))); # endif #endif @@ -96,21 +95,22 @@ extern "C" #ifdef Unsigned_Shifts #define Sign_Extend(a,b) if (b < 0) a |= (uint32_t)0xffff0000; #else -#define Sign_Extend(a,b) /*no-op */ +#define Sign_Extend(a,b) /*no-op*/ #endif #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1 - Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined. +Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined. #endif + /* If we are going to examine or modify specific bits in a double using the word0 and/or word1 macros, then we must wrap the double inside a union. This is necessary to avoid undefined behavior according to the ANSI C spec. */ - union double_union - { - double d; - uint32_t i[2]; - }; +union double_union +{ + double d; + uint32_t i[2]; +}; #ifdef IEEE_8087 #define word0(x) (x.i[1]) @@ -148,7 +148,7 @@ extern "C" #define P 24 #define Bias 127 #if 0 -#define IEEE_Arith /* it is, but the code doesn't handle IEEE singles yet */ +#define IEEE_Arith /* it is, but the code doesn't handle IEEE singles yet */ #endif #define Emin (-126) #define Exp_1 ((uint32_t)0x3f800000L) @@ -202,7 +202,7 @@ extern "C" #define Tiny1 1 #define Quick_max 14 #define Int_max 14 -#define Infinite(x) (word0(x) == ((uint32_t)0x7ff00000L)) /* sufficient test for here */ +#define Infinite(x) (word0(x) == ((uint32_t)0x7ff00000L)) /* sufficient test for here */ #endif #else @@ -218,7 +218,7 @@ extern "C" #define Bias 65 #define Exp_1 ((uint32_t)0x41000000L) #define Exp_11 ((uint32_t)0x41000000L) -#define Ebits 8 /* exponent has 7 bits, but 8 is the right value in b2d */ +#define Ebits 8 /* exponent has 7 bits, but 8 is the right value in b2d */ #define Frac_mask ((uint32_t)0xffffffL) #define Frac_mask1 ((uint32_t)0xffffffL) #define Bletch 4 @@ -232,7 +232,7 @@ extern "C" #define Tiny1 0 #define Quick_max 14 #define Int_max 15 -#else /* VAX */ +#else /* VAX */ #define Exp_shift 23 #define Exp_shift1 7 #define Exp_msk1 0x80 @@ -267,9 +267,9 @@ extern "C" #define rounded_product(a,b) a = rnd_prod(a, b) #define rounded_quotient(a,b) a = rnd_quot(a, b) #ifdef KR_headers - extern double rnd_prod (), rnd_quot (); +extern double rnd_prod(), rnd_quot(); #else - extern double rnd_prod (double, double), rnd_quot (double, double); +extern double rnd_prod(double, double), rnd_quot(double, double); #endif #else #define rounded_product(a,b) a *= b @@ -297,12 +297,12 @@ extern "C" #define MAX_BIGNUMS 16 #define MAX_BIGNUM_WDS 32 - struct _Jv_Bigint - { - struct _Jv_Bigint *_next; - int _k, _maxwds, _sign, _wds; - unsigned long _x[MAX_BIGNUM_WDS]; - }; +struct _Jv_Bigint +{ + struct _Jv_Bigint *_next; + int _k, _maxwds, _sign, _wds; + unsigned long _x[MAX_BIGNUM_WDS]; +}; #define _PTR void * @@ -319,24 +319,24 @@ extern "C" #define _CAST_VOID (void) - struct _Jv_reent - { - /* local copy of errno */ - int _errno; +struct _Jv_reent +{ + /* local copy of errno */ + int _errno; - /* used by mprec routines */ - struct _Jv_Bigint *_result; - int _result_k; - struct _Jv_Bigint *_p5s; + /* used by mprec routines */ + struct _Jv_Bigint *_result; + int _result_k; + struct _Jv_Bigint *_p5s; - struct _Jv_Bigint _freelist[MAX_BIGNUMS]; - int _allocation_map; + struct _Jv_Bigint _freelist[MAX_BIGNUMS]; + int _allocation_map; - int num; - }; + int num; +}; - typedef struct _Jv_Bigint _Jv_Bigint; +typedef struct _Jv_Bigint _Jv_Bigint; #define Balloc _Jv_Balloc #define Bfree _Jv_Bfree @@ -363,38 +363,30 @@ extern "C" #define _dtoa_r _Jv_dtoa_r #define _strtod_r _Jv_strtod_r - extern double _EXFUN (_strtod_r, - (struct _Jv_reent * ptr, const char *s00, char **se)); - extern char *_EXFUN (_dtoa_r, - (struct _Jv_reent * ptr, double d, int mode, - int ndigits, int *decpt, int *sign, char **rve, - int float_type)); - void _EXFUN (_dtoa, - (double d, int mode, int ndigits, int *decpt, int *sign, - char **rve, char *buf, int float_type)); - - double _EXFUN (ulp, (double x)); - double _EXFUN (b2d, (_Jv_Bigint * a, int *e)); - _Jv_Bigint *_EXFUN (Balloc, (struct _Jv_reent * p, int k)); - void _EXFUN (Bfree, (struct _Jv_reent * p, _Jv_Bigint * v)); - _Jv_Bigint *_EXFUN (multadd, - (struct _Jv_reent * p, _Jv_Bigint *, int, int)); - _Jv_Bigint *_EXFUN (s2b, - (struct _Jv_reent *, const char *, int, int, - unsigned long)); - _Jv_Bigint *_EXFUN (i2b, (struct _Jv_reent *, int)); - _Jv_Bigint *_EXFUN (mult, (struct _Jv_reent *, _Jv_Bigint *, _Jv_Bigint *)); - _Jv_Bigint *_EXFUN (pow5mult, (struct _Jv_reent *, _Jv_Bigint *, int k)); - int _EXFUN (hi0bits, (unsigned long)); - int _EXFUN (lo0bits, (unsigned long *)); - _Jv_Bigint *_EXFUN (d2b, - (struct _Jv_reent * p, double d, int *e, int *bits)); - _Jv_Bigint *_EXFUN (lshift, (struct _Jv_reent * p, _Jv_Bigint * b, int k)); - _Jv_Bigint *_EXFUN (diff, - (struct _Jv_reent * p, _Jv_Bigint * a, _Jv_Bigint * b)); - int _EXFUN (cmp, (_Jv_Bigint * a, _Jv_Bigint * b)); - - double _EXFUN (ratio, (_Jv_Bigint * a, _Jv_Bigint * b)); +extern double _EXFUN(_strtod_r, (struct _Jv_reent *ptr, const char *s00, char **se)); +extern char* _EXFUN(_dtoa_r, (struct _Jv_reent *ptr, double d, + int mode, int ndigits, int *decpt, int *sign, + char **rve, int float_type)); +void _EXFUN(_dtoa, (double d, int mode, int ndigits, int *decpt, int *sign, + char **rve, char *buf, int float_type)); + +double _EXFUN(ulp,(double x)); +double _EXFUN(b2d,(_Jv_Bigint *a , int *e)); +_Jv_Bigint * _EXFUN(Balloc,(struct _Jv_reent *p, int k)); +void _EXFUN(Bfree,(struct _Jv_reent *p, _Jv_Bigint *v)); +_Jv_Bigint * _EXFUN(multadd,(struct _Jv_reent *p, _Jv_Bigint *, int, int)); +_Jv_Bigint * _EXFUN(s2b,(struct _Jv_reent *, const char*, int, int, unsigned long)); +_Jv_Bigint * _EXFUN(i2b,(struct _Jv_reent *,int)); +_Jv_Bigint * _EXFUN(mult, (struct _Jv_reent *, _Jv_Bigint *, _Jv_Bigint *)); +_Jv_Bigint * _EXFUN(pow5mult, (struct _Jv_reent *, _Jv_Bigint *, int k)); +int _EXFUN(hi0bits,(unsigned long)); +int _EXFUN(lo0bits,(unsigned long *)); +_Jv_Bigint * _EXFUN(d2b,(struct _Jv_reent *p, double d, int *e, int *bits)); +_Jv_Bigint * _EXFUN(lshift,(struct _Jv_reent *p, _Jv_Bigint *b, int k)); +_Jv_Bigint * _EXFUN(diff,(struct _Jv_reent *p, _Jv_Bigint *a, _Jv_Bigint *b)); +int _EXFUN(cmp,(_Jv_Bigint *a, _Jv_Bigint *b)); + +double _EXFUN(ratio,(_Jv_Bigint *a, _Jv_Bigint *b)); #define Bcopy(x,y) memcpy((char *)&x->_sign, (char *)&y->_sign, y->_wds*sizeof(long) + 2*sizeof(int)) #if defined(_DOUBLE_IS_32BITS) && defined(__v800) @@ -403,12 +395,12 @@ extern "C" #define n_bigtens 5 #endif - extern _CONST double tinytens[]; - extern _CONST double bigtens[]; - extern _CONST double tens[]; +extern _CONST double tinytens[]; +extern _CONST double bigtens[]; +extern _CONST double tens[]; #ifdef __cplusplus } #endif -#endif /* __CLASSPATH_MPREC_H__ */ +#endif /* __CLASSPATH_MPREC_H__ */ diff --git a/native/fdlibm/s_atan.c b/native/fdlibm/s_atan.c index ad1df0770..2ee745854 100644 --- a/native/fdlibm/s_atan.c +++ b/native/fdlibm/s_atan.c @@ -82,10 +82,10 @@ static const double atanhi[] = { #else static double atanhi[] = { #endif - 4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */ - 7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */ - 9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */ - 1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */ + 4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */ + 7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */ + 9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */ + 1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */ }; #ifdef __STDC__ @@ -93,10 +93,10 @@ static const double atanlo[] = { #else static double atanlo[] = { #endif - 2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */ - 3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */ - 1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */ - 6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */ + 2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */ + 3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */ + 1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */ + 6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */ }; #ifdef __STDC__ @@ -104,105 +104,78 @@ static const double aT[] = { #else static double aT[] = { #endif - 3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */ - -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */ - 1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */ - -1.11111104054623557880e-01, /* 0xBFBC71C6, 0xFE231671 */ - 9.09088713343650656196e-02, /* 0x3FB745CD, 0xC54C206E */ - -7.69187620504482999495e-02, /* 0xBFB3B0F2, 0xAF749A6D */ - 6.66107313738753120669e-02, /* 0x3FB10D66, 0xA0D03D51 */ - -5.83357013379057348645e-02, /* 0xBFADDE2D, 0x52DEFD9A */ - 4.97687799461593236017e-02, /* 0x3FA97B4B, 0x24760DEB */ - -3.65315727442169155270e-02, /* 0xBFA2B444, 0x2C6A6C2F */ - 1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */ + 3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */ + -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */ + 1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */ + -1.11111104054623557880e-01, /* 0xBFBC71C6, 0xFE231671 */ + 9.09088713343650656196e-02, /* 0x3FB745CD, 0xC54C206E */ + -7.69187620504482999495e-02, /* 0xBFB3B0F2, 0xAF749A6D */ + 6.66107313738753120669e-02, /* 0x3FB10D66, 0xA0D03D51 */ + -5.83357013379057348645e-02, /* 0xBFADDE2D, 0x52DEFD9A */ + 4.97687799461593236017e-02, /* 0x3FA97B4B, 0x24760DEB */ + -3.65315727442169155270e-02, /* 0xBFA2B444, 0x2C6A6C2F */ + 1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */ }; #ifdef __STDC__ -static const double + static const double #else -static double + static double #endif - one = 1.0, huge = 1.0e300; +one = 1.0, +huge = 1.0e300; #ifdef __STDC__ -double -atan (double x) + double atan(double x) #else -double -atan (x) - double x; + double atan(x) + double x; #endif { - double w, s1, s2, z; - int32_t ix, hx, id; - - GET_HIGH_WORD (hx, x); - ix = hx & 0x7fffffff; - if (ix >= 0x44100000) - { /* if |x| >= 2^66 */ - uint32_t low; - GET_LOW_WORD (low, x); - if (ix > 0x7ff00000 || (ix == 0x7ff00000 && (low != 0))) - return x + x; /* NaN */ - if (hx > 0) - return atanhi[3] + atanlo[3]; - else - return -atanhi[3] - atanlo[3]; - } - if (ix < 0x3fdc0000) - { /* |x| < 0.4375 */ - if (ix < 0x3e200000) - { /* |x| < 2^-29 */ - if (huge + x > one) - return x; /* raise inexact */ - } - id = -1; - } - else - { - x = fabs (x); - if (ix < 0x3ff30000) - { /* |x| < 1.1875 */ - if (ix < 0x3fe60000) - { /* 7/16 <=|x|<11/16 */ - id = 0; - x = (2.0 * x - one) / (2.0 + x); - } - else - { /* 11/16<=|x|< 19/16 */ - id = 1; - x = (x - one) / (x + one); + double w,s1,s2,z; + int32_t ix,hx,id; + + GET_HIGH_WORD(hx,x); + ix = hx&0x7fffffff; + if(ix>=0x44100000) { /* if |x| >= 2^66 */ + uint32_t low; + GET_LOW_WORD(low,x); + if(ix>0x7ff00000|| + (ix==0x7ff00000&&(low!=0))) + return x+x; /* NaN */ + if(hx>0) return atanhi[3]+atanlo[3]; + else return -atanhi[3]-atanlo[3]; + } if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ + if (ix < 0x3e200000) { /* |x| < 2^-29 */ + if(huge+x>one) return x; /* raise inexact */ } - } - else - { - if (ix < 0x40038000) - { /* |x| < 2.4375 */ - id = 2; - x = (x - 1.5) / (one + 1.5 * x); + id = -1; + } else { + x = fabs(x); + if (ix < 0x3ff30000) { /* |x| < 1.1875 */ + if (ix < 0x3fe60000) { /* 7/16 <=|x|<11/16 */ + id = 0; x = (2.0*x-one)/(2.0+x); + } else { /* 11/16<=|x|< 19/16 */ + id = 1; x = (x-one)/(x+one); } - else - { /* 2.4375 <= |x| < 2^66 */ - id = 3; - x = -1.0 / x; + } else { + if (ix < 0x40038000) { /* |x| < 2.4375 */ + id = 2; x = (x-1.5)/(one+1.5*x); + } else { /* 2.4375 <= |x| < 2^66 */ + id = 3; x = -1.0/x; } + }} + /* end of argument reduction */ + z = x*x; + w = z*z; + /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ + s1 = z*(aT[0]+w*(aT[2]+w*(aT[4]+w*(aT[6]+w*(aT[8]+w*aT[10]))))); + s2 = w*(aT[1]+w*(aT[3]+w*(aT[5]+w*(aT[7]+w*aT[9])))); + if (id<0) return x - x*(s1+s2); + else { + z = atanhi[id] - ((x*(s1+s2) - atanlo[id]) - x); + return (hx<0)? -z:z; } - } - /* end of argument reduction */ - z = x * x; - w = z * z; - /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ - s1 = - z * (aT[0] + - w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); - s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); - if (id < 0) - return x - x * (s1 + s2); - else - { - z = atanhi[id] - ((x * (s1 + s2) - atanlo[id]) - x); - return (hx < 0) ? -z : z; - } } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_ceil.c b/native/fdlibm/s_ceil.c index 44a1e36d3..250373b40 100644 --- a/native/fdlibm/s_ceil.c +++ b/native/fdlibm/s_ceil.c @@ -31,81 +31,50 @@ static double huge = 1.0e300; #endif #ifdef __STDC__ -double -ceil (double x) + double ceil(double x) #else -double -ceil (x) - double x; + double ceil(x) + double x; #endif { - int32_t i0, i1, j0; - uint32_t i, j; - EXTRACT_WORDS (i0, i1, x); - 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 */ - if (i0 < 0) - { - i0 = 0x80000000; - i1 = 0; + int32_t i0,i1,j0; + uint32_t i,j; + EXTRACT_WORDS(i0,i1,x); + 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 */ + if(i0<0) {i0=0x80000000;i1=0;} + else if((i0|i1)!=0) { i0=0x3ff00000;i1=0;} } - else if ((i0 | i1) != 0) - { - i0 = 0x3ff00000; - i1 = 0; + } else { + i = (0x000fffff)>>j0; + if(((i0&i)|i1)==0) return x; /* x is integral */ + if(huge+x>0.0) { /* raise inexact flag */ + if(i0>0) i0 += (0x00100000)>>j0; + i0 &= (~i); i1=0; } } - } - else - { - i = (0x000fffff) >> j0; - if (((i0 & i) | i1) == 0) - return x; /* x is integral */ - if (huge + x > 0.0) - { /* raise inexact flag */ - if (i0 > 0) - i0 += (0x00100000) >> j0; - i0 &= (~i); - i1 = 0; - } - } - } - else if (j0 > 51) - { - if (j0 == 0x400) - return x + x; /* inf or NaN */ - else - return x; /* x is integral */ - } - else - { - i = ((uint32_t) (0xffffffff)) >> (j0 - 20); - if ((i1 & i) == 0) - return x; /* x is integral */ - if (huge + x > 0.0) - { /* raise inexact flag */ - if (i0 > 0) - { - if (j0 == 20) - i0 += 1; - else - { - j = i1 + (1 << (52 - j0)); - if (j < (uint32_t) i1) - i0 += 1; /* got a carry */ - i1 = j; + } else if (j0>51) { + if(j0==0x400) return x+x; /* inf or NaN */ + else return x; /* x is integral */ + } else { + i = ((uint32_t)(0xffffffff))>>(j0-20); + if((i1&i)==0) return x; /* x is integral */ + if(huge+x>0.0) { /* raise inexact flag */ + if(i0>0) { + if(j0==20) i0+=1; + else { + j = i1 + (1<<(52-j0)); + if(j<(uint32_t)i1) i0+=1; /* got a carry */ + i1 = j; + } } + i1 &= (~i); } - i1 &= (~i); } - } - INSERT_WORDS (x, i0, i1); - return x; + INSERT_WORDS(x,i0,i1); + return x; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_copysign.c b/native/fdlibm/s_copysign.c index 4ddd401fe..4804df130 100644 --- a/native/fdlibm/s_copysign.c +++ b/native/fdlibm/s_copysign.c @@ -66,19 +66,17 @@ Definition (Issue 2). #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -copysign (double x, double y) + double copysign(double x, double y) #else -double -copysign (x, y) - double x, y; + double copysign(x,y) + double x,y; #endif { - uint32_t hx, hy; - GET_HIGH_WORD (hx, x); - GET_HIGH_WORD (hy, y); - SET_HIGH_WORD (x, (hx & 0x7fffffff) | (hy & 0x80000000)); - return x; + uint32_t hx,hy; + GET_HIGH_WORD(hx,x); + GET_HIGH_WORD(hy,y); + SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); + return x; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_cos.c b/native/fdlibm/s_cos.c index 12c9a7a41..be1538d4c 100644 --- a/native/fdlibm/s_cos.c +++ b/native/fdlibm/s_cos.c @@ -47,45 +47,36 @@ #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -cos (double x) + double cos(double x) #else -double -cos (x) - double x; + double cos(x) + double x; #endif { - double y[2], z = 0.0; - int32_t n, ix; + double y[2],z=0.0; + int32_t n,ix; - /* High word of x. */ - GET_HIGH_WORD (ix, x); + /* High word of x. */ + GET_HIGH_WORD(ix,x); - /* |x| ~< pi/4 */ - ix &= 0x7fffffff; - if (ix <= 0x3fe921fb) - return __kernel_cos (x, z); + /* |x| ~< pi/4 */ + ix &= 0x7fffffff; + if(ix <= 0x3fe921fb) return __kernel_cos(x,z); - /* cos(Inf or NaN) is NaN */ - else if (ix >= 0x7ff00000) - return x - x; + /* cos(Inf or NaN) is NaN */ + else if (ix>=0x7ff00000) return x-x; - /* argument reduction needed */ - else - { - n = __ieee754_rem_pio2 (x, y); - switch (n & 3) - { - case 0: - return __kernel_cos (y[0], y[1]); - case 1: - return -__kernel_sin (y[0], y[1], 1); - case 2: - return -__kernel_cos (y[0], y[1]); - default: - return __kernel_sin (y[0], y[1], 1); + /* argument reduction needed */ + else { + n = __ieee754_rem_pio2(x,y); + switch(n&3) { + case 0: return __kernel_cos(y[0],y[1]); + case 1: return -__kernel_sin(y[0],y[1],1); + case 2: return -__kernel_cos(y[0],y[1]); + default: + return __kernel_sin(y[0],y[1],1); + } } - } } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_fabs.c b/native/fdlibm/s_fabs.c index 8f260ddae..dfee33fec 100644 --- a/native/fdlibm/s_fabs.c +++ b/native/fdlibm/s_fabs.c @@ -58,18 +58,16 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -fabs (double x) + double fabs(double x) #else -double -fabs (x) - double x; + double fabs(x) + double x; #endif { - uint32_t high; - GET_HIGH_WORD (high, x); - SET_HIGH_WORD (x, high & 0x7fffffff); - return x; + uint32_t high; + GET_HIGH_WORD(high,x); + SET_HIGH_WORD(x,high&0x7fffffff); + return x; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_floor.c b/native/fdlibm/s_floor.c index 85aee4c93..77e39cb7d 100644 --- a/native/fdlibm/s_floor.c +++ b/native/fdlibm/s_floor.c @@ -84,80 +84,51 @@ static double huge = 1.0e300; #endif #ifdef __STDC__ -double -floor (double x) + double floor(double x) #else -double -floor (x) - double x; + double floor(x) + double x; #endif { - int32_t i0, i1, j0; - uint32_t i, j; - EXTRACT_WORDS (i0, i1, x); - 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 */ - if (i0 >= 0) - { - i0 = i1 = 0; + int32_t i0,i1,j0; + uint32_t i,j; + EXTRACT_WORDS(i0,i1,x); + 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 */ + if(i0>=0) {i0=i1=0;} + else if(((i0&0x7fffffff)|i1)!=0) + { i0=0xbff00000;i1=0;} } - else if (((i0 & 0x7fffffff) | i1) != 0) - { - i0 = 0xbff00000; - i1 = 0; + } else { + i = (0x000fffff)>>j0; + if(((i0&i)|i1)==0) return x; /* x is integral */ + if(huge+x>0.0) { /* raise inexact flag */ + if(i0<0) i0 += (0x00100000)>>j0; + i0 &= (~i); i1=0; } } - } - else - { - i = (0x000fffff) >> j0; - if (((i0 & i) | i1) == 0) - return x; /* x is integral */ - if (huge + x > 0.0) - { /* raise inexact flag */ - if (i0 < 0) - i0 += (0x00100000) >> j0; - i0 &= (~i); - i1 = 0; - } - } - } - else if (j0 > 51) - { - if (j0 == 0x400) - return x + x; /* inf or NaN */ - else - return x; /* x is integral */ - } - else - { - i = ((uint32_t) (0xffffffff)) >> (j0 - 20); - if ((i1 & i) == 0) - return x; /* x is integral */ - if (huge + x > 0.0) - { /* raise inexact flag */ - if (i0 < 0) - { - if (j0 == 20) - i0 += 1; - else - { - j = i1 + (1 << (52 - j0)); - if (j < (uint32_t) i1) - i0 += 1; /* got a carry */ - i1 = j; + } else if (j0>51) { + if(j0==0x400) return x+x; /* inf or NaN */ + else return x; /* x is integral */ + } else { + i = ((uint32_t)(0xffffffff))>>(j0-20); + if((i1&i)==0) return x; /* x is integral */ + if(huge+x>0.0) { /* raise inexact flag */ + if(i0<0) { + if(j0==20) i0+=1; + else { + j = i1+(1<<(52-j0)); + if(j<(uint32_t)i1) i0 +=1 ; /* got a carry */ + i1=j; + } } + i1 &= (~i); } - i1 &= (~i); } - } - INSERT_WORDS (x, i0, i1); - return x; + INSERT_WORDS(x,i0,i1); + return x; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_rint.c b/native/fdlibm/s_rint.c index 7e907731f..5d3f8114e 100644 --- a/native/fdlibm/s_rint.c +++ b/native/fdlibm/s_rint.c @@ -30,77 +30,58 @@ static const double #else static double #endif - TWO52[2] = { - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ +TWO52[2]={ + 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ }; #ifdef __STDC__ -double -rint (double x) + double rint(double x) #else -double -rint (x) - double x; + double rint(x) + double x; #endif { - int32_t i0, j0, sx; - uint32_t i, i1; - double t; - volatile double w; - EXTRACT_WORDS (i0, i1, x); - sx = (i0 >> 31) & 1; - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) - { - if (j0 < 0) - { - if (((i0 & 0x7fffffff) | i1) == 0) - return x; - i1 |= (i0 & 0x0fffff); - i0 &= 0xfffe0000; - i0 |= ((i1 | -i1) >> 12) & 0x80000; - SET_HIGH_WORD (x, i0); - w = TWO52[sx] + x; - t = w - TWO52[sx]; - GET_HIGH_WORD (i0, t); - SET_HIGH_WORD (t, (i0 & 0x7fffffff) | (sx << 31)); - return t; - } - else - { - i = (0x000fffff) >> j0; - if (((i0 & i) | i1) == 0) - return x; /* x is integral */ - i >>= 1; - if (((i0 & i) | i1) != 0) - { - if (j0 == 19) - i1 = 0x40000000; - else - i0 = (i0 & (~i)) | ((0x20000) >> j0); + int32_t i0,j0,sx; + uint32_t i,i1; + double t; + volatile double w; + EXTRACT_WORDS(i0,i1,x); + sx = (i0>>31)&1; + j0 = ((i0>>20)&0x7ff)-0x3ff; + if(j0<20) { + if(j0<0) { + if(((i0&0x7fffffff)|i1)==0) return x; + i1 |= (i0&0x0fffff); + i0 &= 0xfffe0000; + i0 |= ((i1|-i1)>>12)&0x80000; + SET_HIGH_WORD(x,i0); + w = TWO52[sx]+x; + t = w-TWO52[sx]; + GET_HIGH_WORD(i0,t); + SET_HIGH_WORD(t,(i0&0x7fffffff)|(sx<<31)); + return t; + } else { + i = (0x000fffff)>>j0; + if(((i0&i)|i1)==0) return x; /* x is integral */ + i>>=1; + if(((i0&i)|i1)!=0) { + if(j0==19) i1 = 0x40000000; else + i0 = (i0&(~i))|((0x20000)>>j0); + } } + } else if (j0>51) { + if(j0==0x400) return x+x; /* inf or NaN */ + else return x; /* x is integral */ + } else { + i = ((uint32_t)(0xffffffff))>>(j0-20); + if((i1&i)==0) return x; /* x is integral */ + i>>=1; + if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-20)); } - } - else if (j0 > 51) - { - if (j0 == 0x400) - return x + x; /* inf or NaN */ - else - return x; /* x is integral */ - } - else - { - i = ((uint32_t) (0xffffffff)) >> (j0 - 20); - if ((i1 & i) == 0) - return x; /* x is integral */ - i >>= 1; - if ((i1 & i) != 0) - i1 = (i1 & (~i)) | ((0x40000000) >> (j0 - 20)); - } - INSERT_WORDS (x, i0, i1); - w = TWO52[sx] + x; - return w - TWO52[sx]; + INSERT_WORDS(x,i0,i1); + w = TWO52[sx]+x; + return w-TWO52[sx]; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_scalbn.c b/native/fdlibm/s_scalbn.c index 0b167a150..36ee88981 100644 --- a/native/fdlibm/s_scalbn.c +++ b/native/fdlibm/s_scalbn.c @@ -64,53 +64,41 @@ static const double #else static double #endif - two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ - twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */ - huge = 1.0e+300, tiny = 1.0e-300; +two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ +twom54 = 5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */ +huge = 1.0e+300, +tiny = 1.0e-300; #ifdef __STDC__ -double -scalbn (double x, int n) + double scalbn (double x, int n) #else -double -scalbn (x, n) - double x; - int n; + double scalbn (x,n) + double x; int n; #endif { - int32_t k, hx, lx; - EXTRACT_WORDS (hx, lx, x); - k = (hx & 0x7ff00000) >> 20; /* extract exponent */ - if (k == 0) - { /* 0 or subnormal x */ - if ((lx | (hx & 0x7fffffff)) == 0) - return x; /* +-0 */ - x *= two54; - GET_HIGH_WORD (hx, x); - k = ((hx & 0x7ff00000) >> 20) - 54; - if (n < -50000) - return tiny * x; /*underflow */ - } - if (k == 0x7ff) - return x + x; /* NaN or Inf */ - k = k + n; - if (k > 0x7fe) - return huge * copysign (huge, x); /* overflow */ - if (k > 0) /* normal result */ - { - SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); - return x; - } - if (k <= -54) - { - if (n > 50000) /* in case integer overflow in n+k */ - return huge * copysign (huge, x); /*overflow */ - else - return tiny * copysign (tiny, x); /*underflow */ - } - k += 54; /* subnormal result */ - SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); - return x * twom54; + int32_t k,hx,lx; + EXTRACT_WORDS(hx,lx,x); + k = (hx&0x7ff00000)>>20; /* extract exponent */ + if (k==0) { /* 0 or subnormal x */ + if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */ + x *= two54; + GET_HIGH_WORD(hx,x); + k = ((hx&0x7ff00000)>>20) - 54; + if (n< -50000) return tiny*x; /*underflow*/ + } + if (k==0x7ff) return x+x; /* NaN or Inf */ + k = k+n; + if (k > 0x7fe) return huge*copysign(huge,x); /* overflow */ + if (k > 0) /* normal result */ + {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;} + if (k <= -54) { + if (n > 50000) /* in case integer overflow in n+k */ + return huge*copysign(huge,x); /*overflow*/ + else return tiny*copysign(tiny,x); /*underflow*/ + } + k += 54; /* subnormal result */ + SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); + return x*twom54; } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_sin.c b/native/fdlibm/s_sin.c index f90a15db2..d31545554 100644 --- a/native/fdlibm/s_sin.c +++ b/native/fdlibm/s_sin.c @@ -97,45 +97,36 @@ QUICKREF #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -sin (double x) + double sin(double x) #else -double -sin (x) - double x; + double sin(x) + double x; #endif { - double y[2], z = 0.0; - int32_t n, ix; - - /* High word of x. */ - GET_HIGH_WORD (ix, x); - - /* |x| ~< pi/4 */ - ix &= 0x7fffffff; - if (ix <= 0x3fe921fb) - return __kernel_sin (x, z, 0); - - /* sin(Inf or NaN) is NaN */ - else if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction needed */ - else - { - n = __ieee754_rem_pio2 (x, y); - switch (n & 3) - { - case 0: - return __kernel_sin (y[0], y[1], 1); - case 1: - return __kernel_cos (y[0], y[1]); - case 2: - return -__kernel_sin (y[0], y[1], 1); - default: - return -__kernel_cos (y[0], y[1]); + double y[2],z=0.0; + int32_t n,ix; + + /* High word of x. */ + GET_HIGH_WORD(ix,x); + + /* |x| ~< pi/4 */ + ix &= 0x7fffffff; + if(ix <= 0x3fe921fb) return __kernel_sin(x,z,0); + + /* sin(Inf or NaN) is NaN */ + else if (ix>=0x7ff00000) return x-x; + + /* argument reduction needed */ + else { + n = __ieee754_rem_pio2(x,y); + switch(n&3) { + case 0: return __kernel_sin(y[0],y[1],1); + case 1: return __kernel_cos(y[0],y[1]); + case 2: return -__kernel_sin(y[0],y[1],1); + default: + return -__kernel_cos(y[0],y[1]); + } } - } } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/s_tan.c b/native/fdlibm/s_tan.c index ab5b9b8ce..20995fcbd 100644 --- a/native/fdlibm/s_tan.c +++ b/native/fdlibm/s_tan.c @@ -84,36 +84,31 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -tan (double x) + double tan(double x) #else -double -tan (x) - double x; + double tan(x) + double x; #endif { - double y[2], z = 0.0; - int32_t n, ix; - - /* High word of x. */ - GET_HIGH_WORD (ix, x); - - /* |x| ~< pi/4 */ - ix &= 0x7fffffff; - if (ix <= 0x3fe921fb) - return __kernel_tan (x, z, 1); - - /* tan(Inf or NaN) is NaN */ - else if (ix >= 0x7ff00000) - return x - x; /* NaN */ - - /* argument reduction needed */ - else - { - n = __ieee754_rem_pio2 (x, y); - return __kernel_tan (y[0], y[1], 1 - ((n & 1) << 1)); /* 1 -- n even - -1 -- n odd */ - } + double y[2],z=0.0; + int32_t n,ix; + + /* High word of x. */ + GET_HIGH_WORD(ix,x); + + /* |x| ~< pi/4 */ + ix &= 0x7fffffff; + if(ix <= 0x3fe921fb) return __kernel_tan(x,z,1); + + /* tan(Inf or NaN) is NaN */ + else if (ix>=0x7ff00000) return x-x; /* NaN */ + + /* argument reduction needed */ + else { + n = __ieee754_rem_pio2(x,y); + return __kernel_tan(y[0],y[1],1-((n&1)<<1)); /* 1 -- n even + -1 -- n odd */ + } } #endif /* _DOUBLE_IS_32BITS */ diff --git a/native/fdlibm/sf_fabs.c b/native/fdlibm/sf_fabs.c index 2fdf02ac8..34f88afc4 100644 --- a/native/fdlibm/sf_fabs.c +++ b/native/fdlibm/sf_fabs.c @@ -20,32 +20,28 @@ #include "fdlibm.h" #ifdef __STDC__ -float -fabsf (float x) + float fabsf(float x) #else -float -fabsf (x) - float x; + float fabsf(x) + float x; #endif { - uint32_t ix; - GET_FLOAT_WORD (ix, x); - SET_FLOAT_WORD (x, ix & 0x7fffffff); - return x; + uint32_t ix; + GET_FLOAT_WORD(ix,x); + SET_FLOAT_WORD(x,ix&0x7fffffff); + return x; } #ifdef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -fabs (double x) + double fabs(double x) #else -double -fabs (x) - double x; + double fabs(x) + double x; #endif { - return (double) fabsf ((float) x); + return (double) fabsf((float) x); } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/sf_rint.c b/native/fdlibm/sf_rint.c index ac112311a..f44207287 100644 --- a/native/fdlibm/sf_rint.c +++ b/native/fdlibm/sf_rint.c @@ -20,76 +20,61 @@ static const float #else static float #endif - TWO23[2] = { - 8.3886080000e+06, /* 0x4b000000 */ - -8.3886080000e+06, /* 0xcb000000 */ +TWO23[2]={ + 8.3886080000e+06, /* 0x4b000000 */ + -8.3886080000e+06, /* 0xcb000000 */ }; #ifdef __STDC__ -float -rintf (float x) + float rintf(float x) #else -float -rintf (x) - float x; + float rintf(x) + float x; #endif { - int32_t i0, j0, sx; - uint32_t i, i1; - float w, t; - GET_FLOAT_WORD (i0, x); - sx = (i0 >> 31) & 1; - j0 = ((i0 >> 23) & 0xff) - 0x7f; - if (j0 < 23) - { - if (j0 < 0) - { - if ((i0 & 0x7fffffff) == 0) - return x; - i1 = (i0 & 0x07fffff); - i0 &= 0xfff00000; - i0 |= ((i1 | -i1) >> 9) & 0x400000; - SET_FLOAT_WORD (x, i0); - w = TWO23[sx] + x; - t = w - TWO23[sx]; - GET_FLOAT_WORD (i0, t); - SET_FLOAT_WORD (t, (i0 & 0x7fffffff) | (sx << 31)); - return t; + int32_t i0,j0,sx; + uint32_t i,i1; + float w,t; + GET_FLOAT_WORD(i0,x); + sx = (i0>>31)&1; + j0 = ((i0>>23)&0xff)-0x7f; + if(j0<23) { + if(j0<0) { + if((i0&0x7fffffff)==0) return x; + i1 = (i0&0x07fffff); + i0 &= 0xfff00000; + i0 |= ((i1|-i1)>>9)&0x400000; + SET_FLOAT_WORD(x,i0); + w = TWO23[sx]+x; + t = w-TWO23[sx]; + GET_FLOAT_WORD(i0,t); + SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31)); + return t; + } else { + i = (0x007fffff)>>j0; + if((i0&i)==0) return x; /* x is integral */ + i>>=1; + if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0); + } + } else { + if(j0==0x80) return x+x; /* inf or NaN */ + else return x; /* x is integral */ } - else - { - i = (0x007fffff) >> j0; - if ((i0 & i) == 0) - return x; /* x is integral */ - i >>= 1; - if ((i0 & i) != 0) - i0 = (i0 & (~i)) | ((0x100000) >> j0); - } - } - else - { - if (j0 == 0x80) - return x + x; /* inf or NaN */ - else - return x; /* x is integral */ - } - SET_FLOAT_WORD (x, i0); - w = TWO23[sx] + x; - return w - TWO23[sx]; + SET_FLOAT_WORD(x,i0); + w = TWO23[sx]+x; + return w-TWO23[sx]; } #ifdef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -rint (double x) + double rint(double x) #else -double -rint (x) - double x; + double rint(x) + double x; #endif { - return (double) rintf ((float) x); + return (double) rintf((float) x); } #endif /* defined(_DOUBLE_IS_32BITS) */ diff --git a/native/fdlibm/strtod.c b/native/fdlibm/strtod.c index 5ae22e5d6..1777b1aae 100644 --- a/native/fdlibm/strtod.c +++ b/native/fdlibm/strtod.c @@ -104,11 +104,13 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, double _DEFUN (_strtod_r, (ptr, s00, se), - struct _Jv_reent *ptr _AND _CONST char *s00 _AND char **se) + struct _Jv_reent *ptr _AND + _CONST char *s00 _AND + char **se) { int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; - int digits = 0; /* Number of digits found in fraction part. */ + int digits = 0; /* Number of digits found in fraction part. */ long e; _CONST char *s, *s0, *s1; double aadj, aadj1, adj; @@ -293,8 +295,8 @@ dig_done: if (e <= Ten_pmax + i) { /* A fancier test would sometimes let us do - * this for larger i values. - */ + * this for larger i values. + */ e -= i; rv.d *= tens[i]; #ifdef VAX @@ -381,7 +383,7 @@ dig_done: { e1 >>= 4; if (e1 >= 1 << n_bigtens) - goto undfl; + goto undfl; for (j = 0; e1 > 1; j++, e1 >>= 1) if (e1 & 1) rv.d *= tinytens[j]; @@ -414,7 +416,7 @@ dig_done: } } - /* Now the hard part -- adjusting rv to the correct value. */ + /* Now the hard part -- adjusting rv to the correct value.*/ /* Put digits into bd: true value = bd * 10^e */ @@ -505,8 +507,9 @@ dig_done: if ((word0 (rv) & Bndry_mask1) == Bndry_mask1 && word1 (rv) == 0xffffffff) { - /*boundary case -- increment exponent */ - word0 (rv) = (word0 (rv) & Exp_mask) + Exp_msk1 + /*boundary case -- increment exponent*/ + word0 (rv) = (word0 (rv) & Exp_mask) + + Exp_msk1 #ifdef IBM | Exp_msk1 >> 4 #endif @@ -615,7 +618,8 @@ dig_done: word0 (rv) -= P * Exp_msk1; adj = aadj1 * ulp (rv.d); rv.d += adj; - if ((word0 (rv) & Exp_mask) >= Exp_msk1 * (DBL_MAX_EXP + Bias - P)) + if ((word0 (rv) & Exp_mask) >= + Exp_msk1 * (DBL_MAX_EXP + Bias - P)) { if (word0 (rv0) == Big0 && word1 (rv0) == Big1) goto ovfl; @@ -645,7 +649,8 @@ dig_done: if ((word0 (rv) & Exp_mask) <= P * Exp_msk1) #endif { - if (word0 (rv0) == Tiny0 && word1 (rv0) == Tiny1) + if (word0 (rv0) == Tiny0 + && word1 (rv0) == Tiny1) goto undfl; word0 (rv) = Tiny0; word1 (rv) = Tiny1; @@ -711,3 +716,4 @@ ret: ptr->_errno = EINVAL; return sign ? -rv.d : rv.d; } + diff --git a/native/fdlibm/w_acos.c b/native/fdlibm/w_acos.c index 60d2aad7b..c9ca99c40 100644 --- a/native/fdlibm/w_acos.c +++ b/native/fdlibm/w_acos.c @@ -82,42 +82,36 @@ MATHREF #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -acos (double x) /* wrapper acos */ + double acos(double x) /* wrapper acos */ #else -double -acos (x) /* wrapper acos */ - double x; + double acos(x) /* wrapper acos */ + double x; #endif { #ifdef _IEEE_LIBM - return __ieee754_acos (x); + return __ieee754_acos(x); #else - double z; - struct exception exc; - z = __ieee754_acos (x); - if (_LIB_VERSION == _IEEE_ || isnan (x)) - return z; - if (fabs (x) > 1.0) - { - /* acos(|x|>1) */ - exc.type = DOMAIN; - exc.name = "acos"; - exc.err = 0; - exc.arg1 = exc.arg2 = x; - exc.retval = 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + double z; + struct exception exc; + z = __ieee754_acos(x); + if(_LIB_VERSION == _IEEE_ || isnan(x)) return z; + if(fabs(x)>1.0) { + /* acos(|x|>1) */ + exc.type = DOMAIN; + exc.name = "acos"; + exc.err = 0; + exc.arg1 = exc.arg2 = x; + exc.retval = 0.0; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } diff --git a/native/fdlibm/w_asin.c b/native/fdlibm/w_asin.c index 0c712fcbf..f6cb271d3 100644 --- a/native/fdlibm/w_asin.c +++ b/native/fdlibm/w_asin.c @@ -85,42 +85,36 @@ MATHREF #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -asin (double x) /* wrapper asin */ + double asin(double x) /* wrapper asin */ #else -double -asin (x) /* wrapper asin */ - double x; + double asin(x) /* wrapper asin */ + double x; #endif { #ifdef _IEEE_LIBM - return __ieee754_asin (x); + return __ieee754_asin(x); #else - double z; - struct exception exc; - z = __ieee754_asin (x); - if (_LIB_VERSION == _IEEE_ || isnan (x)) - return z; - if (fabs (x) > 1.0) - { - /* asin(|x|>1) */ - exc.type = DOMAIN; - exc.name = "asin"; - exc.err = 0; - exc.arg1 = exc.arg2 = x; - exc.retval = 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + double z; + struct exception exc; + z = __ieee754_asin(x); + if(_LIB_VERSION == _IEEE_ || isnan(x)) return z; + if(fabs(x)>1.0) { + /* asin(|x|>1) */ + exc.type = DOMAIN; + exc.name = "asin"; + exc.err = 0; + exc.arg1 = exc.arg2 = x; + exc.retval = 0.0; + if(_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } diff --git a/native/fdlibm/w_atan2.c b/native/fdlibm/w_atan2.c index 9bf7475a5..91742c72b 100644 --- a/native/fdlibm/w_atan2.c +++ b/native/fdlibm/w_atan2.c @@ -80,43 +80,37 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -atan2 (double y, double x) /* wrapper atan2 */ + double atan2(double y, double x) /* wrapper atan2 */ #else -double -atan2 (y, x) /* wrapper atan2 */ - double y, x; + double atan2(y,x) /* wrapper atan2 */ + double y,x; #endif { #ifdef _IEEE_LIBM - return __ieee754_atan2 (y, x); + return __ieee754_atan2(y,x); #else - double z; - struct exception exc; - z = __ieee754_atan2 (y, x); - if (_LIB_VERSION == _IEEE_ || isnan (x) || isnan (y)) - return z; - if (x == 0.0 && y == 0.0) - { - /* atan2(+-0,+-0) */ - exc.arg1 = y; - exc.arg2 = x; - exc.type = DOMAIN; - exc.name = "atan2"; - exc.err = 0; - exc.retval = 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + double z; + struct exception exc; + z = __ieee754_atan2(y,x); + if(_LIB_VERSION == _IEEE_||isnan(x)||isnan(y)) return z; + if(x==0.0&&y==0.0) { + /* atan2(+-0,+-0) */ + exc.arg1 = y; + exc.arg2 = x; + exc.type = DOMAIN; + exc.name = "atan2"; + exc.err = 0; + exc.retval = 0.0; + if(_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } diff --git a/native/fdlibm/w_exp.c b/native/fdlibm/w_exp.c index 09f3b2eac..ae792a846 100644 --- a/native/fdlibm/w_exp.c +++ b/native/fdlibm/w_exp.c @@ -70,75 +70,66 @@ static const double #else static double #endif - o_threshold = 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ - u_threshold = -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ +o_threshold= 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ +u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ #ifdef __STDC__ -double -exp (double x) /* wrapper exp */ + double exp(double x) /* wrapper exp */ #else -double -exp (x) /* wrapper exp */ - double x; + double exp(x) /* wrapper exp */ + double x; #endif { #ifdef _IEEE_LIBM - return __ieee754_exp (x); + return __ieee754_exp(x); #else - double z; - struct exception exc; - z = __ieee754_exp (x); - if (_LIB_VERSION == _IEEE_) - return z; - if (finite (x)) - { - if (x > o_threshold) - { - /* exp(finite) overflow */ + double z; + struct exception exc; + z = __ieee754_exp(x); + if(_LIB_VERSION == _IEEE_) return z; + if(finite(x)) { + if(x>o_threshold) { + /* exp(finite) overflow */ #ifndef HUGE_VAL #define HUGE_VAL inf - double inf = 0.0; + double inf = 0.0; - SET_HIGH_WORD (inf, 0x7ff00000); /* set inf to infinite */ + SET_HIGH_WORD(inf,0x7ff00000); /* set inf to infinite */ #endif - exc.type = OVERFLOW; - exc.name = "exp"; - exc.err = 0; - exc.arg1 = exc.arg2 = x; - if (_LIB_VERSION == _SVID_) - exc.retval = HUGE; - else - exc.retval = HUGE_VAL; - if (_LIB_VERSION == _POSIX_) - errno = ERANGE; - else if (!matherr (&exc)) - { - errno = ERANGE; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else if (x < u_threshold) - { - /* exp(finite) underflow */ - exc.type = UNDERFLOW; - exc.name = "exp"; - exc.err = 0; - exc.arg1 = exc.arg2 = x; - exc.retval = 0.0; - if (_LIB_VERSION == _POSIX_) - errno = ERANGE; - else if (!matherr (&exc)) - { - errno = ERANGE; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - } - return z; + exc.type = OVERFLOW; + exc.name = "exp"; + exc.err = 0; + exc.arg1 = exc.arg2 = x; + if (_LIB_VERSION == _SVID_) + exc.retval = HUGE; + else + exc.retval = HUGE_VAL; + if (_LIB_VERSION == _POSIX_) + errno = ERANGE; + else if (!matherr(&exc)) { + errno = ERANGE; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else if(x<u_threshold) { + /* exp(finite) underflow */ + exc.type = UNDERFLOW; + exc.name = "exp"; + exc.err = 0; + exc.arg1 = exc.arg2 = x; + exc.retval = 0.0; + if (_LIB_VERSION == _POSIX_) + errno = ERANGE; + else if (!matherr(&exc)) { + errno = ERANGE; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } + } + return z; #endif } diff --git a/native/fdlibm/w_fmod.c b/native/fdlibm/w_fmod.c index 0e9fedc3a..b6b36cb76 100644 --- a/native/fdlibm/w_fmod.c +++ b/native/fdlibm/w_fmod.c @@ -67,46 +67,40 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -fmod (double x, double y) /* wrapper fmod */ + double fmod(double x, double y) /* wrapper fmod */ #else -double -fmod (x, y) /* wrapper fmod */ - double x, y; + double fmod(x,y) /* wrapper fmod */ + double x,y; #endif { #ifdef _IEEE_LIBM - return __ieee754_fmod (x, y); + return __ieee754_fmod(x,y); #else - double z; - struct exception exc; - z = __ieee754_fmod (x, y); - if (_LIB_VERSION == _IEEE_ || isnan (y) || isnan (x)) - return z; - if (y == 0.0) - { - /* fmod(x,0) */ - exc.type = DOMAIN; - exc.name = "fmod"; - exc.arg1 = x; - exc.arg2 = y; - exc.err = 0; - if (_LIB_VERSION == _SVID_) - exc.retval = x; - else - exc.retval = 0.0 / 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + double z; + struct exception exc; + z = __ieee754_fmod(x,y); + if(_LIB_VERSION == _IEEE_ ||isnan(y)||isnan(x)) return z; + if(y==0.0) { + /* fmod(x,0) */ + exc.type = DOMAIN; + exc.name = "fmod"; + exc.arg1 = x; + exc.arg2 = y; + exc.err = 0; + if (_LIB_VERSION == _SVID_) + exc.retval = x; + else + exc.retval = 0.0/0.0; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } diff --git a/native/fdlibm/w_log.c b/native/fdlibm/w_log.c index efa0a5f42..dcc8b9762 100644 --- a/native/fdlibm/w_log.c +++ b/native/fdlibm/w_log.c @@ -62,61 +62,53 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -log (double x) /* wrapper log */ + double log(double x) /* wrapper log */ #else -double -log (x) /* wrapper log */ - double x; + double log(x) /* wrapper log */ + double x; #endif { #ifdef _IEEE_LIBM - return __ieee754_log (x); + return __ieee754_log(x); #else - double z; - struct exception exc; - z = __ieee754_log (x); - if (_LIB_VERSION == _IEEE_ || isnan (x) || x > 0.0) - return z; -#ifndef HUGE_VAL + double z; + struct exception exc; + z = __ieee754_log(x); + if(_LIB_VERSION == _IEEE_ || isnan(x) || x > 0.0) return z; +#ifndef HUGE_VAL #define HUGE_VAL inf - double inf = 0.0; + double inf = 0.0; - SET_HIGH_WORD (inf, 0x7ff00000); /* set inf to infinite */ + SET_HIGH_WORD(inf,0x7ff00000); /* set inf to infinite */ #endif - exc.name = "log"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = x; - if (_LIB_VERSION == _SVID_) - exc.retval = -HUGE; - else - exc.retval = -HUGE_VAL; - if (x == 0.0) - { - /* log(0) */ - exc.type = SING; - if (_LIB_VERSION == _POSIX_) - errno = ERANGE; - else if (!matherr (&exc)) - { - errno = EDOM; - } - } - else - { - /* log(x<0) */ - exc.type = DOMAIN; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; + exc.name = "log"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = x; + if (_LIB_VERSION == _SVID_) + exc.retval = -HUGE; + else + exc.retval = -HUGE_VAL; + if(x==0.0) { + /* log(0) */ + exc.type = SING; + if (_LIB_VERSION == _POSIX_) + errno = ERANGE; + else if (!matherr(&exc)) { + errno = EDOM; + } + } else { + /* log(x<0) */ + exc.type = DOMAIN; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; #endif } diff --git a/native/fdlibm/w_pow.c b/native/fdlibm/w_pow.c index 2089fef79..3df099a17 100644 --- a/native/fdlibm/w_pow.c +++ b/native/fdlibm/w_pow.c @@ -65,180 +65,167 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -pow (double x, double y) /* wrapper pow */ + double pow(double x, double y) /* wrapper pow */ #else -double -pow (x, y) /* wrapper pow */ - double x, y; + double pow(x,y) /* wrapper pow */ + double x,y; #endif { #ifdef _IEEE_LIBM - return __ieee754_pow (x, y); + return __ieee754_pow(x,y); #else - double z; -#ifndef HUGE_VAL + double z; +#ifndef HUGE_VAL #define HUGE_VAL inf - double inf = 0.0; + double inf = 0.0; - SET_HIGH_WORD (inf, 0x7ff00000); /* set inf to infinite */ + SET_HIGH_WORD(inf,0x7ff00000); /* set inf to infinite */ #endif - struct exception exc; - z = __ieee754_pow (x, y); - if (_LIB_VERSION == _IEEE_ || isnan (y)) - return z; - if (isnan (x)) - { - if (y == 0.0) - { - /* pow(NaN,0.0) */ - /* error only if _LIB_VERSION == _SVID_ & _XOPEN_ */ - exc.type = DOMAIN; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - exc.retval = x; - if (_LIB_VERSION == _IEEE_ || _LIB_VERSION == _POSIX_) - exc.retval = 1.0; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; - } - if (x == 0.0) - { - if (y == 0.0) - { - /* pow(0.0,0.0) */ - /* error only if _LIB_VERSION == _SVID_ */ - exc.type = DOMAIN; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - exc.retval = 0.0; - if (_LIB_VERSION != _SVID_) - exc.retval = 1.0; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - if (finite (y) && y < 0.0) - { - /* 0**neg */ - exc.type = DOMAIN; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - if (_LIB_VERSION == _SVID_) - exc.retval = 0.0; - else - exc.retval = -HUGE_VAL; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; + struct exception exc; + z=__ieee754_pow(x,y); + if(_LIB_VERSION == _IEEE_|| isnan(y)) return z; + if(isnan(x)) { + if(y==0.0) { + /* pow(NaN,0.0) */ + /* error only if _LIB_VERSION == _SVID_ & _XOPEN_ */ + exc.type = DOMAIN; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + exc.retval = x; + if (_LIB_VERSION == _IEEE_ || + _LIB_VERSION == _POSIX_) exc.retval = 1.0; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; } - return z; - } - if (!finite (z)) - { - if (finite (x) && finite (y)) - { - if (isnan (z)) - { - /* neg**non-integral */ - exc.type = DOMAIN; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - if (_LIB_VERSION == _SVID_) + if(x==0.0){ + if(y==0.0) { + /* pow(0.0,0.0) */ + /* error only if _LIB_VERSION == _SVID_ */ + exc.type = DOMAIN; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; exc.retval = 0.0; - else - exc.retval = 0.0 / 0.0; /* X/Open allow NaN */ - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; + if (_LIB_VERSION != _SVID_) exc.retval = 1.0; + else if (!matherr(&exc)) { + errno = EDOM; } - if (exc.err != 0) - errno = exc.err; - return exc.retval; + if (exc.err != 0) + errno = exc.err; + return exc.retval; } - else - { - /* pow(x,y) overflow */ - exc.type = OVERFLOW; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - if (_LIB_VERSION == _SVID_) - { - exc.retval = HUGE; - y *= 0.5; - if (x < 0.0 && rint (y) != y) - exc.retval = -HUGE; - } - else - { - exc.retval = HUGE_VAL; - y *= 0.5; - if (x < 0.0 && rint (y) != y) - exc.retval = -HUGE_VAL; - } - if (_LIB_VERSION == _POSIX_) - errno = ERANGE; - else if (!matherr (&exc)) - { - errno = ERANGE; + if(finite(y)&&y<0.0) { + /* 0**neg */ + exc.type = DOMAIN; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + if (_LIB_VERSION == _SVID_) + exc.retval = 0.0; + else + exc.retval = -HUGE_VAL; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - } - } - if (z == 0.0 && finite (x) && finite (y)) - { - /* pow(x,y) underflow */ - exc.type = UNDERFLOW; - exc.name = "pow"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - exc.retval = 0.0; - if (_LIB_VERSION == _POSIX_) - errno = ERANGE; - else if (!matherr (&exc)) - { - errno = ERANGE; + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } + return z; } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - return z; + if(!finite(z)) { + if(finite(x)&&finite(y)) { + if(isnan(z)) { + /* neg**non-integral */ + exc.type = DOMAIN; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + if (_LIB_VERSION == _SVID_) + exc.retval = 0.0; + else + exc.retval = 0.0/0.0; /* X/Open allow NaN */ + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else { + /* pow(x,y) overflow */ + exc.type = OVERFLOW; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + if (_LIB_VERSION == _SVID_) { + exc.retval = HUGE; + y *= 0.5; + if(x<0.0&&rint(y)!=y) exc.retval = -HUGE; + } else { + exc.retval = HUGE_VAL; + y *= 0.5; + if(x<0.0&&rint(y)!=y) exc.retval = -HUGE_VAL; + } + if (_LIB_VERSION == _POSIX_) + errno = ERANGE; + else if (!matherr(&exc)) { + errno = ERANGE; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } + } + } + if(z==0.0&&finite(x)&&finite(y)) { + /* pow(x,y) underflow */ + exc.type = UNDERFLOW; + exc.name = "pow"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + exc.retval = 0.0; + if (_LIB_VERSION == _POSIX_) + errno = ERANGE; + else if (!matherr(&exc)) { + errno = ERANGE; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } + return z; #endif } #endif /* defined(_DOUBLE_IS_32BITS) */ + + + + + + + + + + + + + + diff --git a/native/fdlibm/w_remainder.c b/native/fdlibm/w_remainder.c index 6de6888a8..a06be0e7b 100644 --- a/native/fdlibm/w_remainder.c +++ b/native/fdlibm/w_remainder.c @@ -65,44 +65,55 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -remainder (double x, double y) /* wrapper remainder */ + double remainder(double x, double y) /* wrapper remainder */ #else -double -remainder (x, y) /* wrapper remainder */ - double x, y; + double remainder(x,y) /* wrapper remainder */ + double x,y; #endif { #ifdef _IEEE_LIBM - return __ieee754_remainder (x, y); + return __ieee754_remainder(x,y); #else - double z; - struct exception exc; - z = __ieee754_remainder (x, y); - if (_LIB_VERSION == _IEEE_ || isnan (y)) - return z; - if (y == 0.0) - { - /* remainder(x,0) */ - exc.type = DOMAIN; - exc.name = "remainder"; - exc.err = 0; - exc.arg1 = x; - exc.arg2 = y; - exc.retval = 0.0 / 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + double z; + struct exception exc; + z = __ieee754_remainder(x,y); + if(_LIB_VERSION == _IEEE_ || isnan(y)) return z; + if(y==0.0) { + /* remainder(x,0) */ + exc.type = DOMAIN; + exc.name = "remainder"; + exc.err = 0; + exc.arg1 = x; + exc.arg2 = y; + exc.retval = 0.0/0.0; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } #endif /* defined(_DOUBLE_IS_32BITS) */ + + + + + + + + + + + + + + + + + diff --git a/native/fdlibm/w_sqrt.c b/native/fdlibm/w_sqrt.c index 0304ee4fe..23a793ce7 100644 --- a/native/fdlibm/w_sqrt.c +++ b/native/fdlibm/w_sqrt.c @@ -55,44 +55,38 @@ PORTABILITY #ifndef _DOUBLE_IS_32BITS #ifdef __STDC__ -double -sqrt (double x) /* wrapper sqrt */ + double sqrt(double x) /* wrapper sqrt */ #else -double -sqrt (x) /* wrapper sqrt */ - double x; + double sqrt(x) /* wrapper sqrt */ + double x; #endif { #ifdef _IEEE_LIBM - return __ieee754_sqrt (x); + return __ieee754_sqrt(x); #else - struct exception exc; - double z; - z = __ieee754_sqrt (x); - if (_LIB_VERSION == _IEEE_ || isnan (x)) - return z; - if (x < 0.0) - { - exc.type = DOMAIN; - exc.name = "sqrt"; - exc.err = 0; - exc.arg1 = exc.arg2 = x; - if (_LIB_VERSION == _SVID_) - exc.retval = 0.0; - else - exc.retval = 0.0 / 0.0; - if (_LIB_VERSION == _POSIX_) - errno = EDOM; - else if (!matherr (&exc)) - { - errno = EDOM; - } - if (exc.err != 0) - errno = exc.err; - return exc.retval; - } - else - return z; + struct exception exc; + double z; + z = __ieee754_sqrt(x); + if(_LIB_VERSION == _IEEE_ || isnan(x)) return z; + if(x<0.0) { + exc.type = DOMAIN; + exc.name = "sqrt"; + exc.err = 0; + exc.arg1 = exc.arg2 = x; + if (_LIB_VERSION == _SVID_) + exc.retval = 0.0; + else + exc.retval = 0.0/0.0; + if (_LIB_VERSION == _POSIX_) + errno = EDOM; + else if (!matherr(&exc)) { + errno = EDOM; + } + if (exc.err != 0) + errno = exc.err; + return exc.retval; + } else + return z; #endif } diff --git a/native/jni/classpath/jcl.c b/native/jni/classpath/jcl.c index ee91e1e4b..eec10560e 100644 --- a/native/jni/classpath/jcl.c +++ b/native/jni/classpath/jcl.c @@ -43,138 +43,106 @@ exception statement from your version. */ #include <jcl.h> #ifndef __GNUC__ -#define __attribute__(x) /* nothing */ +#define __attribute__(x) /* nothing */ #endif -JNIEXPORT void JNICALL -JCL_ThrowException (JNIEnv *env, char *className, char *errMsg) -{ - jclass excClass; - if ((*env)->ExceptionOccurred (env)) - { - (*env)->ExceptionClear (env); - } - excClass = (*env)->FindClass (env, className); - if (excClass == NULL) - { - jclass errExcClass; - errExcClass = - (*env)->FindClass (env, "java/lang/ClassNotFoundException"); - if (errExcClass == NULL) - { - errExcClass = (*env)->FindClass (env, "java/lang/InternalError"); - if (errExcClass == NULL) - { - fprintf (stderr, "JCL: Utterly failed to throw exeption "); - fprintf (stderr, className); - fprintf (stderr, " with message "); - fprintf (stderr, errMsg); - return; - } +JNIEXPORT void JNICALL JCL_ThrowException(JNIEnv * env, char * className, char * errMsg) { + jclass excClass; + if((*env)->ExceptionOccurred(env)) { + (*env)->ExceptionClear(env); } - /* Removed this (more comprehensive) error string to avoid the need for a - * static variable or allocation of a buffer for this message in this (unlikely) - * error case. --Fridi. - * - * sprintf(errstr,"JCL: Failed to throw exception %s with message %s: could not find exception class.", className, errMsg); - */ - (*env)->ThrowNew (env, errExcClass, className); - } - (*env)->ThrowNew (env, excClass, errMsg); + excClass = (*env)->FindClass(env, className); + if(excClass == NULL) { + jclass errExcClass; + errExcClass = (*env)->FindClass(env, "java/lang/ClassNotFoundException"); + if(errExcClass == NULL) { + errExcClass = (*env)->FindClass(env, "java/lang/InternalError"); + if(errExcClass == NULL) { + fprintf(stderr, "JCL: Utterly failed to throw exeption "); + fprintf(stderr, className); + fprintf(stderr, " with message "); + fprintf(stderr, errMsg); + return; + } + } + /* Removed this (more comprehensive) error string to avoid the need for a + * static variable or allocation of a buffer for this message in this (unlikely) + * error case. --Fridi. + * + * sprintf(errstr,"JCL: Failed to throw exception %s with message %s: could not find exception class.", className, errMsg); + */ + (*env)->ThrowNew(env, errExcClass, className); + } + (*env)->ThrowNew(env, excClass, errMsg); } -JNIEXPORT void *JNICALL -JCL_malloc (JNIEnv *env, size_t size) -{ - void *mem = malloc (size); - if (mem == NULL) - { - JCL_ThrowException (env, "java/lang/OutOfMemoryError", - "malloc() failed."); - return NULL; - } - return mem; +JNIEXPORT void * JNICALL JCL_malloc(JNIEnv * env, size_t size) { + void * mem = malloc(size); + if(mem == NULL) { + JCL_ThrowException(env, "java/lang/OutOfMemoryError", "malloc() failed."); + return NULL; + } + return mem; } -JNIEXPORT void *JNICALL -JCL_realloc (JNIEnv *env, void *ptr, size_t size) +JNIEXPORT void * JNICALL JCL_realloc(JNIEnv *env, void *ptr, size_t size) { - ptr = realloc (ptr, size); + ptr = realloc(ptr, size); if (ptr == 0) { - JCL_ThrowException (env, "java/lang/OutOfMemoryError", - "malloc() failed."); + JCL_ThrowException(env, "java/lang/OutOfMemoryError", + "malloc() failed."); return NULL; } - return (ptr); + return(ptr); } -JNIEXPORT void JNICALL -JCL_free (JNIEnv *env __attribute__ ((unused)), void *p) +JNIEXPORT void JNICALL JCL_free(JNIEnv * env __attribute__((unused)), + void * p) { - if (p != NULL) - { - free (p); - } + if(p != NULL) { + free(p); + } } -JNIEXPORT const char *JNICALL -JCL_jstring_to_cstring (JNIEnv *env, jstring s) -{ - const char *cstr; - if (s == NULL) - { - JCL_ThrowException (env, "java/lang/NullPointerException", - "Null string"); - return NULL; - } - cstr = (const char *) (*env)->GetStringUTFChars (env, s, NULL); - if (cstr == NULL) - { - JCL_ThrowException (env, "java/lang/InternalError", - "GetStringUTFChars() failed."); - return NULL; - } - return cstr; +JNIEXPORT const char * JNICALL JCL_jstring_to_cstring(JNIEnv * env, jstring s) { + const char* cstr; + if(s == NULL) { + JCL_ThrowException(env, "java/lang/NullPointerException","Null string"); + return NULL; + } + cstr = (const char*)(*env)->GetStringUTFChars(env, s, NULL); + if(cstr == NULL) { + JCL_ThrowException(env, "java/lang/InternalError", "GetStringUTFChars() failed."); + return NULL; + } + return cstr; } -JNIEXPORT void JNICALL -JCL_free_cstring (JNIEnv *env, jstring s, const char *cstr) -{ - (*env)->ReleaseStringUTFChars (env, s, cstr); +JNIEXPORT void JNICALL JCL_free_cstring(JNIEnv * env, jstring s, const char * cstr) { + (*env)->ReleaseStringUTFChars(env, s, cstr); } -JNIEXPORT jint JNICALL -JCL_MonitorEnter (JNIEnv *env, jobject o) -{ - jint retval = (*env)->MonitorEnter (env, o); - if (retval != 0) - { - JCL_ThrowException (env, "java/lang/InternalError", - "MonitorEnter() failed."); - } - return retval; +JNIEXPORT jint JNICALL JCL_MonitorEnter(JNIEnv * env, jobject o) { + jint retval = (*env)->MonitorEnter(env,o); + if(retval != 0) { + JCL_ThrowException(env, "java/lang/InternalError", "MonitorEnter() failed."); + } + return retval; } -JNIEXPORT jint JNICALL -JCL_MonitorExit (JNIEnv *env, jobject o) -{ - jint retval = (*env)->MonitorExit (env, o); - if (retval != 0) - { - JCL_ThrowException (env, "java/lang/InternalError", - "MonitorExit() failed."); - } - return retval; +JNIEXPORT jint JNICALL JCL_MonitorExit(JNIEnv * env, jobject o) { + jint retval = (*env)->MonitorExit(env,o); + if(retval != 0) { + JCL_ThrowException(env, "java/lang/InternalError", "MonitorExit() failed."); + } + return retval; } -JNIEXPORT jclass JNICALL -JCL_FindClass (JNIEnv *env, char *className) -{ - jclass retval = (*env)->FindClass (env, className); - if (retval == NULL) - { - JCL_ThrowException (env, "java/lang/ClassNotFoundException", className); - } - return retval; +JNIEXPORT jclass JNICALL JCL_FindClass(JNIEnv * env, char * className) { + jclass retval = (*env)->FindClass(env,className); + if(retval == NULL) { + JCL_ThrowException(env, "java/lang/ClassNotFoundException", className); + } + return retval; } diff --git a/native/jni/classpath/jcl.h b/native/jni/classpath/jcl.h index dcfda6ef4..e337ed755 100644 --- a/native/jni/classpath/jcl.h +++ b/native/jni/classpath/jcl.h @@ -42,17 +42,15 @@ exception statement from your version. */ #include <jni.h> #include <config.h> -JNIEXPORT jclass JNICALL JCL_FindClass (JNIEnv *env, char *className); -JNIEXPORT void JNICALL JCL_ThrowException (JNIEnv *env, char *className, - char *errMsg); -JNIEXPORT void *JNICALL JCL_malloc (JNIEnv *env, size_t size); -JNIEXPORT void *JNICALL JCL_realloc (JNIEnv *env, void *ptr, size_t size); -JNIEXPORT void JNICALL JCL_free (JNIEnv *env, void *p); -JNIEXPORT const char *JNICALL JCL_jstring_to_cstring (JNIEnv *env, jstring s); -JNIEXPORT void JNICALL JCL_free_cstring (JNIEnv *env, jstring s, - const char *cstr); -JNIEXPORT jint JNICALL JCL_MonitorEnter (JNIEnv *env, jobject o); -JNIEXPORT jint JNICALL JCL_MonitorExit (JNIEnv *env, jobject o); +JNIEXPORT jclass JNICALL JCL_FindClass(JNIEnv * env, char * className); +JNIEXPORT void JNICALL JCL_ThrowException(JNIEnv * env, char * className, char * errMsg); +JNIEXPORT void * JNICALL JCL_malloc(JNIEnv *env, size_t size); +JNIEXPORT void * JNICALL JCL_realloc(JNIEnv *env, void *ptr, size_t size); +JNIEXPORT void JNICALL JCL_free(JNIEnv *env, void * p); +JNIEXPORT const char * JNICALL JCL_jstring_to_cstring(JNIEnv *env, jstring s); +JNIEXPORT void JNICALL JCL_free_cstring(JNIEnv *env, jstring s, const char * cstr); +JNIEXPORT jint JNICALL JCL_MonitorEnter(JNIEnv *env, jobject o); +JNIEXPORT jint JNICALL JCL_MonitorExit(JNIEnv *env, jobject o); #define JCL_RETHROW_EXCEPTION(env) if((*(env))->ExceptionOccurred((env)) != NULL) return NULL; diff --git a/native/jni/classpath/jnilink.c b/native/jni/classpath/jnilink.c index 6652c9cb9..887f8b7cb 100644 --- a/native/jni/classpath/jnilink.c +++ b/native/jni/classpath/jnilink.c @@ -45,66 +45,60 @@ exception statement from your version. */ #define GETCLASS(c) *(jclass*)(c) JNIEXPORT jclass JNICALL -LINK_RelinkClass (JNIEnv *env, linkedClass *c, char *name) -{ - jclass found; - LINK_UnlinkClass (env, *c); +LINK_RelinkClass (JNIEnv * env, linkedClass * c, char * name) { + jclass found; + LINK_UnlinkClass(env,*c); - found = (*env)->FindClass (env, name); - if (found == NULL) - return NULL; + found = (*env)->FindClass(env,name); + if(found == NULL) + return NULL; - *c = JCL_malloc (env, sizeof (jclass)); - if (*c == NULL) - return NULL; + *c = JCL_malloc(env,sizeof(jclass)); + if(*c == NULL) + return NULL; - GETCLASS (*c) = (*env)->NewGlobalRef (env, found); - return GETCLASS (*c); + GETCLASS(*c) = (*env)->NewGlobalRef(env,found); + return GETCLASS(*c); } JNIEXPORT jclass JNICALL -LINK_RelinkKnownClass (JNIEnv *env, linkedClass *c, jclass newClass) -{ - LINK_UnlinkClass (env, *c); +LINK_RelinkKnownClass(JNIEnv * env, linkedClass * c, jclass newClass) { + LINK_UnlinkClass(env,*c); - *c = JCL_malloc (env, sizeof (jclass)); - if (*c == NULL) - return NULL; + *c = JCL_malloc(env,sizeof(jclass)); + if(*c == NULL) + return NULL; - GETCLASS (*c) = (*env)->NewGlobalRef (env, newClass); - return newClass; + GETCLASS(*c) = (*env)->NewGlobalRef(env,newClass); + return newClass; } JNIEXPORT jmethodID JNICALL -LINK_RelinkMethod (JNIEnv *env, jmethodID *m, linkedClass c, - char *name, char *sig) -{ - *m = (*env)->GetMethodID (env, GETCLASS (c), name, sig); - return *m; +LINK_RelinkMethod (JNIEnv * env, jmethodID * m, linkedClass c, + char * name, char * sig) { + *m = (*env)->GetMethodID(env,GETCLASS(c),name,sig); + return *m; } JNIEXPORT jmethodID JNICALL -LINK_RelinkStaticMethod (JNIEnv *env, jmethodID *m, linkedClass c, - char *name, char *sig) -{ - *m = (*env)->GetStaticMethodID (env, GETCLASS (c), name, sig); - return *m; +LINK_RelinkStaticMethod(JNIEnv * env, jmethodID * m, linkedClass c, + char * name, char * sig) { + *m = (*env)->GetStaticMethodID(env,GETCLASS(c),name,sig); + return *m; } JNIEXPORT jfieldID JNICALL -LINK_RelinkField (JNIEnv *env, jfieldID *f, linkedClass c, - char *name, char *sig) -{ - *f = (*env)->GetFieldID (env, GETCLASS (c), name, sig); - return *f; +LINK_RelinkField (JNIEnv * env, jfieldID * f, linkedClass c, + char * name, char * sig) { + *f = (*env)->GetFieldID(env,GETCLASS(c),name,sig); + return *f; } JNIEXPORT jfieldID JNICALL -LINK_RelinkStaticField (JNIEnv *env, jfieldID *f, linkedClass c, - char *name, char *sig) -{ - *f = (*env)->GetStaticFieldID (env, GETCLASS (c), name, sig); - return *f; +LINK_RelinkStaticField (JNIEnv * env, jfieldID * f, linkedClass c, + char * name, char * sig) { + *f = (*env)->GetStaticFieldID(env,GETCLASS(c),name,sig); + return *f; } @@ -112,14 +106,12 @@ LINK_RelinkStaticField (JNIEnv *env, jfieldID *f, linkedClass c, destroys any object references * the linker might have kept around. */ -JNIEXPORT void JNICALL -LINK_UnlinkClass (JNIEnv *env, linkedClass *c) -{ - if (*c != NULL) - { - if (GETCLASS (*c) != NULL) - (*env)->DeleteGlobalRef (env, GETCLASS (*c)); - JCL_free (env, *c); - *c = NULL; - } +JNIEXPORT void JNICALL LINK_UnlinkClass (JNIEnv * env, linkedClass * c) { + if(*c != NULL) { + if(GETCLASS(*c) != NULL) + (*env)->DeleteGlobalRef(env,GETCLASS(*c)); + JCL_free(env,*c); + *c = NULL; + } } + diff --git a/native/jni/classpath/jnilink.h b/native/jni/classpath/jnilink.h index f937ffe6f..448e2b5df 100644 --- a/native/jni/classpath/jnilink.h +++ b/native/jni/classpath/jnilink.h @@ -41,7 +41,7 @@ exception statement from your version. */ #include <jni.h> -typedef void *linkedClass; +typedef void* linkedClass; #define LINK_LinkClass(env,c,name) ((c)==NULL ? LINK_ReallyLinkClass((env),&(c),(name)) : (c)) #define LINK_LinkKnownClass(env,c,newClass) ((c)==NULL ? LINK_ReallyLinkKnownClass((env),&(c),(newClass)) : (c)) @@ -53,30 +53,34 @@ typedef void *linkedClass; #define LINK_LinkConstructor(env,m,c,sig) ((m)==NULL ? LINK_RelinkMethod((env),&(m),(c),"<init>",(sig)) : (m)) JNIEXPORT jclass JNICALL -LINK_ReallyLinkClass (JNIEnv *env, linkedClass *c, char *name); +LINK_ReallyLinkClass (JNIEnv * env, linkedClass * c, + char * name); JNIEXPORT jclass JNICALL -LINK_ReallyLinkKnownClass (JNIEnv *env, linkedClass *c, jclass newClass); +LINK_ReallyLinkKnownClass(JNIEnv * env, linkedClass * c, + jclass newClass); JNIEXPORT jclass JNICALL -LINK_RelinkClass (JNIEnv *env, linkedClass *c, char *name); +LINK_RelinkClass (JNIEnv * env, linkedClass * c, + char * name); JNIEXPORT jclass JNICALL -LINK_RelinkKnownClass (JNIEnv *env, linkedClass *c, jclass newClass); +LINK_RelinkKnownClass (JNIEnv * env, linkedClass * c, + jclass newClass); JNIEXPORT jmethodID JNICALL -LINK_RelinkMethod (JNIEnv *env, jmethodID *m, linkedClass c, - char *name, char *sig); +LINK_RelinkMethod (JNIEnv * env, jmethodID * m, linkedClass c, + char * name, char * sig); JNIEXPORT jmethodID JNICALL -LINK_RelinkStaticMethod (JNIEnv *env, jmethodID *m, linkedClass c, - char *name, char *sig); +LINK_RelinkStaticMethod(JNIEnv * env, jmethodID * m, linkedClass c, + char * name, char * sig); JNIEXPORT jfieldID JNICALL -LINK_RelinkField (JNIEnv *env, jfieldID *f, linkedClass c, - char *name, char *sig); +LINK_RelinkField (JNIEnv * env, jfieldID * f, linkedClass c, + char * name, char * sig); JNIEXPORT jfieldID JNICALL -LINK_RelinkStaticField (JNIEnv *env, jfieldID *f, linkedClass c, - char *name, char *sig); +LINK_RelinkStaticField (JNIEnv * env, jfieldID * f, linkedClass c, + char * name, char * sig); /* These are for when the class referencing the symbols is unloaded; it destroys any object references * the linker might have kept around. */ -JNIEXPORT void JNICALL LINK_UnlinkClass (JNIEnv *env, linkedClass *c); +JNIEXPORT void JNICALL LINK_UnlinkClass (JNIEnv * env, linkedClass * c); #endif diff --git a/native/jni/classpath/native_state.c b/native/jni/classpath/native_state.c index fdf3be92a..746686edd 100644 --- a/native/jni/classpath/native_state.c +++ b/native/jni/classpath/native_state.c @@ -61,7 +61,7 @@ init_state_table_with_size (JNIEnv *env, jclass clazz, jint size) table->head = (struct state_node **) calloc (sizeof (struct state_node *), table->size); table->hash = hash; - table->clazz = clazz_g; + table->clazz = clazz_g; return table; } @@ -97,7 +97,7 @@ remove_node (struct state_node **head, jint obj_id) return NULL; } - + static void * get_node (struct state_node **head, jint obj_id) { @@ -119,7 +119,7 @@ get_node (struct state_node **head, jint obj_id) /* Return the match. */ return node->c_state; } - + back_ptr = node; node = node->next; } @@ -127,7 +127,7 @@ get_node (struct state_node **head, jint obj_id) return NULL; } -static void +static void add_node (struct state_node **head, jint obj_id, void *state) { struct state_node *node = *head; @@ -137,7 +137,7 @@ add_node (struct state_node **head, jint obj_id, void *state) if (node != NULL) { - while (node->next != NULL && obj_id != node->key) + while (node->next != NULL && obj_id != node->key) { back_ptr = node; node = node->next; @@ -164,12 +164,12 @@ add_node (struct state_node **head, jint obj_id, void *state) *head = new_node; } -void -set_state_oid (JNIEnv *env, jobject lock, struct state_table *table, +void +set_state_oid (JNIEnv *env, jobject lock, struct state_table *table, jint obj_id, void *state) { jint hash; - + hash = obj_id % table->size; (*env)->MonitorEnter (env, lock); @@ -183,7 +183,7 @@ get_state_oid (JNIEnv *env, jobject lock, struct state_table *table, { jint hash; void *return_value; - + hash = obj_id % table->size; (*env)->MonitorEnter (env, lock); @@ -199,7 +199,7 @@ remove_state_oid (JNIEnv *env, jobject lock, struct state_table *table, { jint hash; void *return_value; - + hash = obj_id % table->size; (*env)->MonitorEnter (env, lock); diff --git a/native/jni/classpath/native_state.h b/native/jni/classpath/native_state.h index 19b52d0be..25ef6b546 100644 --- a/native/jni/classpath/native_state.h +++ b/native/jni/classpath/native_state.h @@ -55,17 +55,17 @@ struct state_node struct state_node *next; }; -struct state_table *init_state_table_with_size (JNIEnv *, jclass, jint); -struct state_table *init_state_table (JNIEnv *, jclass); +struct state_table * init_state_table_with_size (JNIEnv *, jclass, jint); +struct state_table * init_state_table (JNIEnv *, jclass); /* lowlevel api */ void set_state_oid (JNIEnv *, jobject, struct state_table *, jint, void *); -void *get_state_oid (JNIEnv *, jobject, struct state_table *, jint); -void *remove_state_oid (JNIEnv *, jobject, struct state_table *, jint); +void * get_state_oid (JNIEnv *, jobject, struct state_table *, jint); +void * remove_state_oid (JNIEnv *, jobject, struct state_table *, jint); /* highlevel api */ int set_state (JNIEnv *, jobject, struct state_table *, void *); -void *get_state (JNIEnv *, jobject, struct state_table *); -void *remove_state_slot (JNIEnv *, jobject, struct state_table *); +void * get_state (JNIEnv *, jobject, struct state_table *); +void * remove_state_slot (JNIEnv *, jobject, struct state_table *); #endif diff --git a/native/jni/classpath/primlib.c b/native/jni/classpath/primlib.c index e5f7f72be..c7396e2a9 100644 --- a/native/jni/classpath/primlib.c +++ b/native/jni/classpath/primlib.c @@ -39,686 +39,425 @@ exception statement from your version. */ #include <primlib.h> #include <jcl.h> -static jclass nativeWrapClass[PRIMLIB_NUMTYPES] = - { NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL +static jclass nativeWrapClass[PRIMLIB_NUMTYPES] = {NULL,NULL,NULL, NULL,NULL,NULL, + NULL,NULL,NULL, NULL,NULL,NULL}; + +static jclass nativeTypeClass[PRIMLIB_NUMTYPES] = {NULL,NULL,NULL, NULL,NULL,NULL, + NULL,NULL,NULL, NULL,NULL,NULL}; + +static jmethodID nativeWrapClassConstructor[PRIMLIB_NUMTYPES] = {NULL,NULL,NULL, NULL,NULL,NULL, + NULL,NULL,NULL, NULL,NULL,NULL}; + +static jmethodID nativeWrapClassAccessor[PRIMLIB_NUMTYPES] = {NULL,NULL,NULL, NULL,NULL,NULL, + NULL,NULL,NULL, NULL,NULL,NULL}; + +static char * nativeWrapClassName[PRIMLIB_NUMTYPES] = { + NULL, + NULL, + "java/lang/Boolean", + "java/lang/Byte", + "java/lang/Character", + "java/lang/Short", + "java/lang/Integer", + "java/lang/Long", + "java/lang/Float", + "java/lang/Double", + "java/lang/Void", + NULL + }; + +static char * nativeWrapClassConstructorSig[PRIMLIB_NUMTYPES] = { + NULL, + NULL, + "(Z)V", + "(B)V", + "(C)V", + "(S)V", + "(I)V", + "(J)V", + "(F)V", + "(D)V", + "()V", + NULL + }; + +static char * nativeWrapClassAccessorName[PRIMLIB_NUMTYPES] = { + NULL, + NULL, + "booleanValue", + "byteValue", + "charValue", + "shortValue", + "intValue", + "longValue", + "floatValue", + "doubleValue", + NULL, + NULL }; -static jclass nativeTypeClass[PRIMLIB_NUMTYPES] = - { NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL +static char * nativeWrapClassAccessorSig[PRIMLIB_NUMTYPES] = { + NULL, + NULL, + "()Z", + "()B", + "()C", + "()S", + "()I", + "()J", + "()F", + "()D", + NULL, + NULL }; -static jmethodID nativeWrapClassConstructor[PRIMLIB_NUMTYPES] = - { NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL -}; -static jmethodID nativeWrapClassAccessor[PRIMLIB_NUMTYPES] = - { NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL -}; +JNIEXPORT jclass JNICALL PRIMLIB_GetNativeWrapClass(JNIEnv * env, int reflectType) { + return LINK_LinkClass(env,nativeWrapClass[reflectType],nativeWrapClassName[reflectType]); +} -static char *nativeWrapClassName[PRIMLIB_NUMTYPES] = { - NULL, - NULL, - "java/lang/Boolean", - "java/lang/Byte", - "java/lang/Character", - "java/lang/Short", - "java/lang/Integer", - "java/lang/Long", - "java/lang/Float", - "java/lang/Double", - "java/lang/Void", - NULL -}; +static jclass ActuallyGetNativeTypeClass(JNIEnv * env, int reflectType) { + jclass wrapClass; + jfieldID typeField; -static char *nativeWrapClassConstructorSig[PRIMLIB_NUMTYPES] = { - NULL, - NULL, - "(Z)V", - "(B)V", - "(C)V", - "(S)V", - "(I)V", - "(J)V", - "(F)V", - "(D)V", - "()V", - NULL -}; + wrapClass = PRIMLIB_GetNativeWrapClass(env, reflectType); + if(wrapClass == NULL) + return NULL; + typeField = (*env)->GetStaticFieldID(env, wrapClass, "TYPE", "Ljava/lang/Class"); + if(typeField == NULL) + return NULL; + return (*env)->GetStaticObjectField(env, wrapClass, typeField); +} -static char *nativeWrapClassAccessorName[PRIMLIB_NUMTYPES] = { - NULL, - NULL, - "booleanValue", - "byteValue", - "charValue", - "shortValue", - "intValue", - "longValue", - "floatValue", - "doubleValue", - NULL, - NULL -}; +JNIEXPORT jclass JNICALL PRIMLIB_GetNativeTypeClass(JNIEnv * env, int reflectType) { + return LINK_LinkKnownClass(env, nativeTypeClass[reflectType], ActuallyGetNativeTypeClass(env,reflectType)); +} -static char *nativeWrapClassAccessorSig[PRIMLIB_NUMTYPES] = { - NULL, - NULL, - "()Z", - "()B", - "()C", - "()S", - "()I", - "()J", - "()F", - "()D", - NULL, - NULL -}; +JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassConstructor(JNIEnv * env, int reflectType) { + PRIMLIB_GetNativeWrapClass(env,reflectType); + return LINK_LinkConstructor(env, nativeWrapClassConstructor[reflectType], nativeWrapClass[reflectType], nativeWrapClassConstructorSig[reflectType]); +} + +JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassAccessor(JNIEnv * env, int reflectType) { + PRIMLIB_GetNativeWrapClass(env,reflectType); + return LINK_LinkMethod(env, nativeWrapClassAccessor[reflectType], nativeWrapClass[reflectType], nativeWrapClassAccessorName[reflectType], nativeWrapClassAccessorSig[reflectType]); +} + + + +JNIEXPORT jobject JNICALL PRIMLIB_WrapBoolean(JNIEnv * env, jboolean b) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_BOOLEAN); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BOOLEAN), construct, b); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapByte (JNIEnv * env, jbyte b) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_BYTE); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE), construct, b); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapChar (JNIEnv * env, jchar c) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_CHAR); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR), construct, c); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapShort (JNIEnv * env, jshort s) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_SHORT); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT), construct, s); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapInt (JNIEnv * env, jint i) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_INT); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT), construct, i); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapLong (JNIEnv * env, jlong l) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_LONG); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_LONG), construct, l); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapFloat (JNIEnv * env, jfloat f) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_FLOAT); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_FLOAT), construct, f); +} + +JNIEXPORT jobject JNICALL PRIMLIB_WrapDouble (JNIEnv * env, jdouble d) { + jmethodID construct = PRIMLIB_GetNativeWrapClassConstructor(env, PRIMLIB_DOUBLE); + JCL_RETHROW_EXCEPTION(env); + return (*env)->NewObject(env, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_DOUBLE), construct, d); +} + + +JNIEXPORT jboolean JNICALL PRIMLIB_UnwrapBoolean(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BOOLEAN))) { + return PRIMLIB_GetBooleanObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return JNI_FALSE; + } +} + +JNIEXPORT jbyte JNICALL PRIMLIB_UnwrapByte(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} + +JNIEXPORT jshort JNICALL PRIMLIB_UnwrapShort(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT))) { + return PRIMLIB_GetShortObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return (jshort)PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} + +JNIEXPORT jchar JNICALL PRIMLIB_UnwrapChar(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR))) { + return PRIMLIB_GetCharObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} + +JNIEXPORT jint JNICALL PRIMLIB_UnwrapInt(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT))) { + return PRIMLIB_GetIntObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT))) { + return (jint)PRIMLIB_GetShortObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR))) { + return (jint)PRIMLIB_GetCharObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return (jint)PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} + +JNIEXPORT jlong JNICALL PRIMLIB_UnwrapLong(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_LONG))) { + return PRIMLIB_GetLongObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT))) { + return (jlong)PRIMLIB_GetIntObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT))) { + return (jlong)PRIMLIB_GetShortObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR))) { + return (jlong)PRIMLIB_GetCharObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return (jlong)PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} +JNIEXPORT jfloat JNICALL PRIMLIB_UnwrapFloat(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_FLOAT))) { + return PRIMLIB_GetFloatObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_LONG))) { + return (jfloat)PRIMLIB_GetLongObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT))) { + return (jfloat)PRIMLIB_GetIntObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT))) { + return (jfloat)PRIMLIB_GetShortObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR))) { + return (jfloat)PRIMLIB_GetCharObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return (jfloat)PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; + } +} -JNIEXPORT jclass JNICALL -PRIMLIB_GetNativeWrapClass (JNIEnv *env, int reflectType) -{ - return LINK_LinkClass (env, nativeWrapClass[reflectType], - nativeWrapClassName[reflectType]); -} - -static jclass -ActuallyGetNativeTypeClass (JNIEnv *env, int reflectType) -{ - jclass wrapClass; - jfieldID typeField; - - wrapClass = PRIMLIB_GetNativeWrapClass (env, reflectType); - if (wrapClass == NULL) - return NULL; - typeField = - (*env)->GetStaticFieldID (env, wrapClass, "TYPE", "Ljava/lang/Class"); - if (typeField == NULL) - return NULL; - return (*env)->GetStaticObjectField (env, wrapClass, typeField); -} - -JNIEXPORT jclass JNICALL -PRIMLIB_GetNativeTypeClass (JNIEnv *env, int reflectType) -{ - return LINK_LinkKnownClass (env, nativeTypeClass[reflectType], - ActuallyGetNativeTypeClass (env, reflectType)); -} - -JNIEXPORT jmethodID JNICALL -PRIMLIB_GetNativeWrapClassConstructor (JNIEnv *env, int reflectType) -{ - PRIMLIB_GetNativeWrapClass (env, reflectType); - return LINK_LinkConstructor (env, nativeWrapClassConstructor[reflectType], - nativeWrapClass[reflectType], - nativeWrapClassConstructorSig[reflectType]); -} - -JNIEXPORT jmethodID JNICALL -PRIMLIB_GetNativeWrapClassAccessor (JNIEnv *env, int reflectType) -{ - PRIMLIB_GetNativeWrapClass (env, reflectType); - return LINK_LinkMethod (env, nativeWrapClassAccessor[reflectType], - nativeWrapClass[reflectType], - nativeWrapClassAccessorName[reflectType], - nativeWrapClassAccessorSig[reflectType]); -} - - - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapBoolean (JNIEnv *env, jboolean b) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_BOOLEAN); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BOOLEAN), - construct, b); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapByte (JNIEnv *env, jbyte b) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_BYTE); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE), - construct, b); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapChar (JNIEnv *env, jchar c) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_CHAR); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR), - construct, c); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapShort (JNIEnv *env, jshort s) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_SHORT); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT), - construct, s); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapInt (JNIEnv *env, jint i) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_INT); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT), - construct, i); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapLong (JNIEnv *env, jlong l) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_LONG); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_LONG), - construct, l); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapFloat (JNIEnv *env, jfloat f) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_FLOAT); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_FLOAT), - construct, f); -} - -JNIEXPORT jobject JNICALL -PRIMLIB_WrapDouble (JNIEnv *env, jdouble d) -{ - jmethodID construct = - PRIMLIB_GetNativeWrapClassConstructor (env, PRIMLIB_DOUBLE); - JCL_RETHROW_EXCEPTION (env); - return (*env)->NewObject (env, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_DOUBLE), - construct, d); -} - - -JNIEXPORT jboolean JNICALL -PRIMLIB_UnwrapBoolean (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BOOLEAN))) - { - return PRIMLIB_GetBooleanObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return JNI_FALSE; - } -} - -JNIEXPORT jbyte JNICALL -PRIMLIB_UnwrapByte (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jshort JNICALL -PRIMLIB_UnwrapShort (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT))) - { - return PRIMLIB_GetShortObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return (jshort) PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jchar JNICALL -PRIMLIB_UnwrapChar (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR))) - { - return PRIMLIB_GetCharObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jint JNICALL -PRIMLIB_UnwrapInt (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT))) - { - return PRIMLIB_GetIntObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT))) - { - return (jint) PRIMLIB_GetShortObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR))) - { - return (jint) PRIMLIB_GetCharObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return (jint) PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jlong JNICALL -PRIMLIB_UnwrapLong (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, PRIMLIB_GetNativeWrapClass (env, PRIMLIB_LONG))) - { - return PRIMLIB_GetLongObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT))) - { - return (jlong) PRIMLIB_GetIntObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT))) - { - return (jlong) PRIMLIB_GetShortObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR))) - { - return (jlong) PRIMLIB_GetCharObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return (jlong) PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jfloat JNICALL -PRIMLIB_UnwrapFloat (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_FLOAT))) - { - return PRIMLIB_GetFloatObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_LONG))) - { - return (jfloat) PRIMLIB_GetLongObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT))) - { - return (jfloat) PRIMLIB_GetIntObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT))) - { - return (jfloat) PRIMLIB_GetShortObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR))) - { - return (jfloat) PRIMLIB_GetCharObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return (jfloat) PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jdouble JNICALL -PRIMLIB_UnwrapDouble (JNIEnv *env, jobject obj) -{ - if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_DOUBLE))) - { - return PRIMLIB_GetDoubleObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_FLOAT))) - { - return (jdouble) PRIMLIB_GetFloatObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_LONG))) - { - return (jdouble) PRIMLIB_GetLongObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT))) - { - return (jdouble) PRIMLIB_GetIntObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT))) - { - return (jdouble) PRIMLIB_GetShortObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR))) - { - return (jdouble) PRIMLIB_GetCharObjectValue (env, obj); - } - else if ((*env)-> - IsInstanceOf (env, obj, - PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE))) - { - return (jdouble) PRIMLIB_GetByteObjectValue (env, obj); - } - else - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct type."); - return 0; - } -} - -JNIEXPORT jint JNICALL -PRIMLIB_GetReflectiveWrapperType (JNIEnv *env, jobject obj) -{ - jclass typeClass; - if (obj == NULL) - { - return PRIMLIB_NULL; - } - - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_DOUBLE); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_DOUBLE; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_FLOAT); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_FLOAT; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_LONG); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_LONG; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_INT); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_INT; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_CHAR); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_CHAR; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_SHORT); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_SHORT; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BYTE); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_BYTE; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_BOOLEAN); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_BOOLEAN; - } - typeClass = PRIMLIB_GetNativeWrapClass (env, PRIMLIB_VOID); - if ((*env)->IsInstanceOf (env, obj, typeClass)) - { - return PRIMLIB_VOID; - } - return PRIMLIB_OBJECT; -} - -JNIEXPORT jint JNICALL -PRIMLIB_GetReflectiveType (JNIEnv *env, jclass returnType) -{ - jclass typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_DOUBLE); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_DOUBLE; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_FLOAT); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_FLOAT; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_LONG); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_LONG; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_INT); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_INT; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_CHAR); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_CHAR; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_SHORT); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_SHORT; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_BYTE); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_BYTE; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_BOOLEAN); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_BOOLEAN; - } - typeClass = PRIMLIB_GetNativeTypeClass (env, PRIMLIB_VOID); - if ((*env)->IsAssignableFrom (env, returnType, typeClass)) - { - return PRIMLIB_VOID; - } - return PRIMLIB_OBJECT; -} - - -JNIEXPORT jboolean JNICALL -PRIMLIB_GetBooleanObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_BOOLEAN); - return (*env)->CallBooleanMethod (env, obj, acc); -} - -JNIEXPORT jbyte JNICALL -PRIMLIB_GetByteObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_BYTE); - return (*env)->CallByteMethod (env, obj, acc); -} - -JNIEXPORT jshort JNICALL -PRIMLIB_GetShortObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_SHORT); - return (*env)->CallShortMethod (env, obj, acc); -} - -JNIEXPORT jchar JNICALL -PRIMLIB_GetCharObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_CHAR); - return (*env)->CallCharMethod (env, obj, acc); -} - -JNIEXPORT jint JNICALL -PRIMLIB_GetIntObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_INT); - return (*env)->CallIntMethod (env, obj, acc); -} - -JNIEXPORT jlong JNICALL -PRIMLIB_GetLongObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_LONG); - return (*env)->CallLongMethod (env, obj, acc); -} - -JNIEXPORT jfloat JNICALL -PRIMLIB_GetFloatObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_FLOAT); - return (*env)->CallFloatMethod (env, obj, acc); -} - -JNIEXPORT jdouble JNICALL -PRIMLIB_GetDoubleObjectValue (JNIEnv *env, jobject obj) -{ - jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor (env, PRIMLIB_DOUBLE); - return (*env)->CallDoubleMethod (env, obj, acc); -} - - - -JNIEXPORT jvalue JNICALL -PRIMLIB_UnwrapJValue (JNIEnv *env, jobject obj, jclass classType) -{ - jvalue retval; - jint objType = PRIMLIB_GetReflectiveType (env, classType); - if (objType == PRIMLIB_BOOLEAN) - { - retval.z = PRIMLIB_UnwrapBoolean (env, obj); - } - else if (objType == PRIMLIB_BYTE) - { - retval.b = PRIMLIB_UnwrapByte (env, obj); - } - else if (objType == PRIMLIB_CHAR) - { - retval.c = PRIMLIB_UnwrapChar (env, obj); - } - else if (objType == PRIMLIB_SHORT) - { - retval.s = PRIMLIB_UnwrapShort (env, obj); - } - else if (objType == PRIMLIB_INT) - { - retval.i = PRIMLIB_UnwrapInt (env, obj); - } - else if (objType == PRIMLIB_LONG) - { - retval.j = PRIMLIB_UnwrapLong (env, obj); - } - else if (objType == PRIMLIB_FLOAT) - { - retval.f = PRIMLIB_UnwrapFloat (env, obj); - } - else if (objType == PRIMLIB_DOUBLE) - { - retval.d = PRIMLIB_UnwrapDouble (env, obj); - } - else - { - if (obj != NULL && !(*env)->IsInstanceOf (env, obj, classType)) - { - JCL_ThrowException (env, "java/lang/IllegalArgumentException", - "Argument not of correct object type."); - return retval; +JNIEXPORT jdouble JNICALL PRIMLIB_UnwrapDouble(JNIEnv * env, jobject obj) { + if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_DOUBLE))) { + return PRIMLIB_GetDoubleObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_FLOAT))) { + return (jdouble)PRIMLIB_GetFloatObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_LONG))) { + return (jdouble)PRIMLIB_GetLongObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT))) { + return (jdouble)PRIMLIB_GetIntObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT))) { + return (jdouble)PRIMLIB_GetShortObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR))) { + return (jdouble)PRIMLIB_GetCharObjectValue(env, obj); + } else if((*env)->IsInstanceOf(env, obj, PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE))) { + return (jdouble)PRIMLIB_GetByteObjectValue(env, obj); + } else { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct type."); + return 0; } - retval.l = obj; - } - return retval; } + +JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveWrapperType(JNIEnv * env, jobject obj) { + jclass typeClass; + if(obj == NULL) { + return PRIMLIB_NULL; + } + + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_DOUBLE); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_DOUBLE; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_FLOAT); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_FLOAT; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_LONG); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_LONG; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_INT); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_INT; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_CHAR); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_CHAR; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_SHORT); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_SHORT; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BYTE); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_BYTE; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_BOOLEAN); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_BOOLEAN; + } + typeClass = PRIMLIB_GetNativeWrapClass(env, PRIMLIB_VOID); + if((*env)->IsInstanceOf(env, obj, typeClass)) { + return PRIMLIB_VOID; + } + return PRIMLIB_OBJECT; +} + +JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveType(JNIEnv * env, jclass returnType) { + jclass typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_DOUBLE); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_DOUBLE; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_FLOAT); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_FLOAT; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_LONG); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_LONG; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_INT); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_INT; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_CHAR); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_CHAR; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_SHORT); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_SHORT; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_BYTE); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_BYTE; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_BOOLEAN); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_BOOLEAN; + } + typeClass = PRIMLIB_GetNativeTypeClass(env, PRIMLIB_VOID); + if((*env)->IsAssignableFrom(env, returnType, typeClass)) { + return PRIMLIB_VOID; + } + return PRIMLIB_OBJECT; +} + + +JNIEXPORT jboolean JNICALL PRIMLIB_GetBooleanObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_BOOLEAN); + return (*env)->CallBooleanMethod(env, obj, acc); +} + +JNIEXPORT jbyte JNICALL PRIMLIB_GetByteObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_BYTE); + return (*env)->CallByteMethod(env, obj, acc); +} + +JNIEXPORT jshort JNICALL PRIMLIB_GetShortObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_SHORT); + return (*env)->CallShortMethod(env, obj, acc); +} + +JNIEXPORT jchar JNICALL PRIMLIB_GetCharObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_CHAR); + return (*env)->CallCharMethod(env, obj, acc); +} + +JNIEXPORT jint JNICALL PRIMLIB_GetIntObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_INT); + return (*env)->CallIntMethod(env, obj, acc); +} + +JNIEXPORT jlong JNICALL PRIMLIB_GetLongObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_LONG); + return (*env)->CallLongMethod(env, obj, acc); +} + +JNIEXPORT jfloat JNICALL PRIMLIB_GetFloatObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_FLOAT); + return (*env)->CallFloatMethod(env, obj, acc); +} + +JNIEXPORT jdouble JNICALL PRIMLIB_GetDoubleObjectValue(JNIEnv * env, jobject obj) { + jmethodID acc = PRIMLIB_GetNativeWrapClassAccessor(env, PRIMLIB_DOUBLE); + return (*env)->CallDoubleMethod(env, obj, acc); +} + + + +JNIEXPORT jvalue JNICALL PRIMLIB_UnwrapJValue(JNIEnv* env, jobject obj, jclass classType) { + jvalue retval; + jint objType = PRIMLIB_GetReflectiveType(env, classType); + if(objType == PRIMLIB_BOOLEAN) { + retval.z = PRIMLIB_UnwrapBoolean(env,obj); + } else if(objType == PRIMLIB_BYTE) { + retval.b = PRIMLIB_UnwrapByte(env,obj); + } else if(objType == PRIMLIB_CHAR) { + retval.c = PRIMLIB_UnwrapChar(env,obj); + } else if(objType == PRIMLIB_SHORT) { + retval.s = PRIMLIB_UnwrapShort(env,obj); + } else if(objType == PRIMLIB_INT) { + retval.i = PRIMLIB_UnwrapInt(env,obj); + } else if(objType == PRIMLIB_LONG) { + retval.j = PRIMLIB_UnwrapLong(env,obj); + } else if(objType == PRIMLIB_FLOAT) { + retval.f = PRIMLIB_UnwrapFloat(env,obj); + } else if(objType == PRIMLIB_DOUBLE) { + retval.d = PRIMLIB_UnwrapDouble(env,obj); + } else { + if(obj != NULL && !(*env)->IsInstanceOf(env, obj, classType)) { + JCL_ThrowException(env, "java/lang/IllegalArgumentException", "Argument not of correct object type."); + return retval; + } + retval.l = obj; + } + return retval; +} + diff --git a/native/jni/classpath/primlib.h b/native/jni/classpath/primlib.h index 70dac9a1b..12f3bae91 100644 --- a/native/jni/classpath/primlib.h +++ b/native/jni/classpath/primlib.h @@ -55,59 +55,48 @@ exception statement from your version. */ #define PRIMLIB_NUMTYPES 12 /* Low-level primitive class accessor functions. */ -JNIEXPORT jclass JNICALL PRIMLIB_GetNativeWrapClass - (JNIEnv *env, int reflectType); -JNIEXPORT jclass JNICALL PRIMLIB_GetNativeTypeClass - (JNIEnv *env, int reflectType); -JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassConstructor - (JNIEnv *env, int reflectType); -JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassAccessor - (JNIEnv *env, int reflectType); +JNIEXPORT jclass JNICALL PRIMLIB_GetNativeWrapClass(JNIEnv * env, int reflectType); +JNIEXPORT jclass JNICALL PRIMLIB_GetNativeTypeClass(JNIEnv * env, int reflectType); +JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassConstructor(JNIEnv * env, int reflectType); +JNIEXPORT jmethodID JNICALL PRIMLIB_GetNativeWrapClassAccessor(JNIEnv * env, int reflectType); /* Type discovery functions: WrapperType finds out j.l.Boolean/Byte/etc., and Type finds out j.l.Boolean.TYPE, etc. */ -JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveWrapperType - (JNIEnv *env, jobject obj); -JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveType - (JNIEnv *env, jclass returnType); +JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveWrapperType(JNIEnv * env, jobject obj); +JNIEXPORT jint JNICALL PRIMLIB_GetReflectiveType(JNIEnv * env, jclass returnType); /* Constructor functions. */ -JNIEXPORT jobject JNICALL PRIMLIB_WrapBoolean (JNIEnv *env, jboolean b); -JNIEXPORT jobject JNICALL PRIMLIB_WrapByte (JNIEnv *env, jbyte b); -JNIEXPORT jobject JNICALL PRIMLIB_WrapChar (JNIEnv *env, jchar c); -JNIEXPORT jobject JNICALL PRIMLIB_WrapShort (JNIEnv *env, jshort s); -JNIEXPORT jobject JNICALL PRIMLIB_WrapInt (JNIEnv *env, jint i); -JNIEXPORT jobject JNICALL PRIMLIB_WrapLong (JNIEnv *env, jlong l); -JNIEXPORT jobject JNICALL PRIMLIB_WrapFloat (JNIEnv *env, jfloat f); -JNIEXPORT jobject JNICALL PRIMLIB_WrapDouble (JNIEnv *env, jdouble d); +JNIEXPORT jobject JNICALL PRIMLIB_WrapBoolean(JNIEnv * env, jboolean b); +JNIEXPORT jobject JNICALL PRIMLIB_WrapByte (JNIEnv * env, jbyte b); +JNIEXPORT jobject JNICALL PRIMLIB_WrapChar (JNIEnv * env, jchar c); +JNIEXPORT jobject JNICALL PRIMLIB_WrapShort (JNIEnv * env, jshort s); +JNIEXPORT jobject JNICALL PRIMLIB_WrapInt (JNIEnv * env, jint i); +JNIEXPORT jobject JNICALL PRIMLIB_WrapLong (JNIEnv * env, jlong l); +JNIEXPORT jobject JNICALL PRIMLIB_WrapFloat (JNIEnv * env, jfloat f); +JNIEXPORT jobject JNICALL PRIMLIB_WrapDouble (JNIEnv * env, jdouble d); /* Widening conversion unwrapping functions. */ -JNIEXPORT jboolean JNICALL PRIMLIB_UnwrapBoolean (JNIEnv *env, jobject obj); -JNIEXPORT jbyte JNICALL PRIMLIB_UnwrapByte (JNIEnv *env, jobject obj); -JNIEXPORT jshort JNICALL PRIMLIB_UnwrapShort (JNIEnv *env, jobject obj); -JNIEXPORT jchar JNICALL PRIMLIB_UnwrapChar (JNIEnv *env, jobject obj); -JNIEXPORT jint JNICALL PRIMLIB_UnwrapInt (JNIEnv *env, jobject obj); -JNIEXPORT jlong JNICALL PRIMLIB_UnwrapLong (JNIEnv *env, jobject obj); -JNIEXPORT jfloat JNICALL PRIMLIB_UnwrapFloat (JNIEnv *env, jobject obj); -JNIEXPORT jdouble JNICALL PRIMLIB_UnwrapDouble (JNIEnv *env, jobject obj); +JNIEXPORT jboolean JNICALL PRIMLIB_UnwrapBoolean(JNIEnv * env, jobject obj); +JNIEXPORT jbyte JNICALL PRIMLIB_UnwrapByte (JNIEnv * env, jobject obj); +JNIEXPORT jshort JNICALL PRIMLIB_UnwrapShort (JNIEnv * env, jobject obj); +JNIEXPORT jchar JNICALL PRIMLIB_UnwrapChar (JNIEnv * env, jobject obj); +JNIEXPORT jint JNICALL PRIMLIB_UnwrapInt (JNIEnv * env, jobject obj); +JNIEXPORT jlong JNICALL PRIMLIB_UnwrapLong (JNIEnv * env, jobject obj); +JNIEXPORT jfloat JNICALL PRIMLIB_UnwrapFloat (JNIEnv * env, jobject obj); +JNIEXPORT jdouble JNICALL PRIMLIB_UnwrapDouble (JNIEnv * env, jobject obj); /* Simple unwrapping functions. Objects *must* be of correct type. */ -JNIEXPORT jboolean JNICALL PRIMLIB_GetBooleanObjectValue - (JNIEnv *env, jobject obj); -JNIEXPORT jbyte JNICALL PRIMLIB_GetByteObjectValue (JNIEnv *env, jobject obj); -JNIEXPORT jshort JNICALL PRIMLIB_GetShortObjectValue - (JNIEnv *env, jobject obj); -JNIEXPORT jchar JNICALL PRIMLIB_GetCharObjectValue (JNIEnv *env, jobject obj); -JNIEXPORT jint JNICALL PRIMLIB_GetIntObjectValue (JNIEnv *env, jobject obj); -JNIEXPORT jlong JNICALL PRIMLIB_GetLongObjectValue (JNIEnv *env, jobject obj); -JNIEXPORT jfloat JNICALL PRIMLIB_GetFloatObjectValue - (JNIEnv *env, jobject obj); -JNIEXPORT jdouble JNICALL PRIMLIB_GetDoubleObjectValue - (JNIEnv *env, jobject obj); +JNIEXPORT jboolean JNICALL PRIMLIB_GetBooleanObjectValue(JNIEnv * env, jobject obj); +JNIEXPORT jbyte JNICALL PRIMLIB_GetByteObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jshort JNICALL PRIMLIB_GetShortObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jchar JNICALL PRIMLIB_GetCharObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jint JNICALL PRIMLIB_GetIntObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jlong JNICALL PRIMLIB_GetLongObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jfloat JNICALL PRIMLIB_GetFloatObjectValue (JNIEnv * env, jobject obj); +JNIEXPORT jdouble JNICALL PRIMLIB_GetDoubleObjectValue (JNIEnv * env, jobject obj); /* jvalue conversion: Unwrap obj to the type of classType, with widening conversion. */ -JNIEXPORT jvalue JNICALL PRIMLIB_UnwrapJValue - (JNIEnv *env, jobject obj, jclass classType); +JNIEXPORT jvalue JNICALL PRIMLIB_UnwrapJValue(JNIEnv* env, jobject obj, jclass classType); #endif diff --git a/native/jni/gtk-peer/gdkfont.h b/native/jni/gtk-peer/gdkfont.h index 04f881271..f2ee86a2d 100644 --- a/native/jni/gtk-peer/gdkfont.h +++ b/native/jni/gtk-peer/gdkfont.h @@ -80,7 +80,7 @@ struct peerfont PangoContext *ctx; }; -struct glyphvec +struct glyphvec { /* the GList is list of PangoGlyphItems, each of which is a pair of 1 PangoItem and 1 PangoGlyphString. */ diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c index 7a99cd6b9..afb705bf6 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c @@ -56,31 +56,26 @@ pango text objects: */ -enum java_awt_font_style -{ +enum java_awt_font_style { java_awt_font_PLAIN = 0, java_awt_font_BOLD = 1, java_awt_font_ITALIC = 2 }; -enum java_awt_font_baseline -{ +enum java_awt_font_baseline { java_awt_font_ROMAN_BASELINE = 0, java_awt_font_CENTER_BASELINE = 1, java_awt_font_HANGING_BASELINE = 2 }; -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initStaticState (JNIEnv - *env, - jclass clazz) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initStaticState + (JNIEnv *env, jclass clazz) { NSA_FONT_INIT (env, clazz); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initState (JNIEnv *env, - jobject self) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initState + (JNIEnv *env, jobject self) { struct peerfont *pfont = NULL; @@ -99,7 +94,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_dispose struct peerfont *pfont = NULL; gdk_threads_enter (); - pfont = (struct peerfont *) NSA_DEL_FONT_PTR (env, self); + pfont = (struct peerfont *)NSA_DEL_FONT_PTR (env, self); g_assert (pfont != NULL); if (pfont->ctx != NULL) g_object_unref (pfont->ctx); @@ -112,18 +107,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_dispose } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_setFont - (JNIEnv *env, jobject self, jstring family_name_str, jint style_int, - jint size) + (JNIEnv *env, jobject self, jstring family_name_str, jint style_int, jint size) { struct peerfont *pfont = NULL; - PangoFontMap *map = NULL; + PangoFontMap *map = NULL; char const *family_name = NULL; gdk_threads_enter (); enum java_awt_font_style style = (enum java_awt_font_style) style_int; g_assert (self != NULL); - pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, self); + pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, self); g_assert (pfont != NULL); if (pfont->ctx != NULL) @@ -136,19 +130,19 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_setFont pfont->desc = pango_font_description_new (); g_assert (pfont->desc != NULL); - family_name = (*env)->GetStringUTFChars (env, family_name_str, 0); + family_name = (*env)->GetStringUTFChars(env, family_name_str, 0); g_assert (family_name != NULL); pango_font_description_set_family (pfont->desc, family_name); - (*env)->ReleaseStringUTFChars (env, family_name_str, family_name); + (*env)->ReleaseStringUTFChars(env, family_name_str, family_name); - pango_font_description_set_size (pfont->desc, size * PANGO_SCALE); + pango_font_description_set_size (pfont->desc, size * PANGO_SCALE); if (style & java_awt_font_BOLD) pango_font_description_set_weight (pfont->desc, PANGO_WEIGHT_BOLD); if (style & java_awt_font_ITALIC) pango_font_description_set_style (pfont->desc, PANGO_STYLE_ITALIC); - + /* FIXME: these are possibly wrong, and should in any case probably be cached between calls. @@ -156,9 +150,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_setFont map = pango_ft2_font_map_for_display (); g_assert (map != NULL); - + if (pfont->ctx == NULL) - pfont->ctx = pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (map)); + pfont->ctx = pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (map)); g_assert (pfont->ctx != NULL); if (pfont->font != NULL) @@ -169,3 +163,5 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_setFont gdk_threads_leave (); } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c index 49ee03a42..cc09102de 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c @@ -47,20 +47,15 @@ #define MAX_ADVANCE 4 #define NUM_METRICS 5 -JNIEXPORT jintArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics_initState (JNIEnv - *env, - jobject - self, - jobject - font) +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics_initState + (JNIEnv *env, jobject self, jobject font) { jintArray array; jint *metrics; struct peerfont *pf = NULL; FT_Matrix mat; - pf = NSA_GET_FONT_PTR (env, font); + pf = NSA_GET_FONT_PTR(env, font); g_assert (pf != NULL); array = (*env)->NewIntArray (env, NUM_METRICS); @@ -76,25 +71,25 @@ Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics_initState (JNIEnv double pointsize = pango_font_description_get_size (pf->desc); pointsize /= (double) PANGO_SCALE; - mat.xx = DOUBLE_TO_16_16 (1); - mat.xy = DOUBLE_TO_16_16 (0); - mat.yx = DOUBLE_TO_16_16 (0); - mat.yy = DOUBLE_TO_16_16 (1); - - FT_Face face = pango_ft2_font_get_face (pf->font); - FT_Set_Transform (face, &mat, NULL); - FT_Set_Char_Size (face, + mat.xx = DOUBLE_TO_16_16(1); + mat.xy = DOUBLE_TO_16_16(0); + mat.yx = DOUBLE_TO_16_16(0); + mat.yy = DOUBLE_TO_16_16(1); + + FT_Face face = pango_ft2_font_get_face (pf->font); + FT_Set_Transform(face, &mat, NULL); + FT_Set_Char_Size( face, + DOUBLE_TO_26_6 (pointsize), DOUBLE_TO_26_6 (pointsize), - DOUBLE_TO_26_6 (pointsize), 0, 0); + 0, 0); - metrics[ASCENT] = ceil (DOUBLE_FROM_26_6 (face->size->metrics.ascender)); - metrics[MAX_ASCENT] = metrics[ASCENT]; - metrics[DESCENT] = floor (DOUBLE_FROM_26_6 (face->size->metrics.descender)); + metrics[ASCENT] = ceil (DOUBLE_FROM_26_6(face->size->metrics.ascender)); + metrics[MAX_ASCENT] = metrics[ASCENT]; + metrics[DESCENT] = floor (DOUBLE_FROM_26_6(face->size->metrics.descender)); if (metrics[DESCENT] < 0) - metrics[DESCENT] = -metrics[DESCENT]; + metrics[DESCENT] = - metrics[DESCENT]; metrics[MAX_DESCENT] = metrics[DESCENT]; - metrics[MAX_ADVANCE] = - ceil (DOUBLE_FROM_26_6 (face->size->metrics.max_advance)); + metrics[MAX_ADVANCE] = ceil (DOUBLE_FROM_26_6(face->size->metrics.max_advance)); gdk_threads_leave (); @@ -102,3 +97,4 @@ Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics_initState (JNIEnv return array; } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c index e17921fc9..6036db7c7 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c @@ -46,11 +46,8 @@ exception statement from your version. */ #define MAX_ADVANCE 4 #define NUM_METRICS 5 -JNIEXPORT jintArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, - jobject obj - __attribute__ ((unused)), - jstring fname, jint size) +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState + (JNIEnv *env, jobject obj __attribute__((unused)), jstring fname, jint size) { jintArray array; jint *metrics; @@ -69,20 +66,19 @@ Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); - context = gdk_pango_context_get (); + context = gdk_pango_context_get(); pango_context_set_font_description (context, font_desc); pango_metrics = pango_context_get_metrics (context, font_desc, NULL); metrics[ASCENT] = pango_font_metrics_get_ascent (pango_metrics) / PANGO_SCALE; - metrics[MAX_ASCENT] = metrics[ASCENT]; + metrics[MAX_ASCENT] = metrics[ASCENT]; metrics[DESCENT] = pango_font_metrics_get_descent (pango_metrics) / PANGO_SCALE; metrics[MAX_DESCENT] = metrics[DESCENT]; metrics[MAX_ADVANCE] = - pango_font_metrics_get_approximate_char_width (pango_metrics) / - PANGO_SCALE; + pango_font_metrics_get_approximate_char_width (pango_metrics) / PANGO_SCALE; pango_font_metrics_unref (pango_metrics); @@ -97,7 +93,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, } JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth - (JNIEnv *env, jobject obj __attribute__ ((unused)), + (JNIEnv *env, jobject obj __attribute__((unused)), jstring fname, jint size, jstring str) { PangoFontDescription *font_desc; @@ -115,7 +111,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); - context = gdk_pango_context_get (); + context = gdk_pango_context_get(); pango_context_set_font_description (context, font_desc); layout = pango_layout_new (context); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c index 56c662331..b05d76ecb 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c @@ -40,28 +40,25 @@ struct state_table *native_glyphvector_state_table; -typedef struct _rect_t_struct rect_t; -struct _rect_t_struct -{ +typedef struct { double x; double y; double width; double height; -}; +} rect_t; #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0)) #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0) #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) #define DOUBLE_FROM_16_16(t) ((double)(t) / 65536.0) - -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initStaticState (JNIEnv *env, - jclass clazz) + +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initStaticState + (JNIEnv *env, jclass clazz) { NSA_GV_INIT (env, clazz); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState (JNIEnv *env, jobject self, jobject font, jobject ctx) { struct glyphvec *vec = NULL; @@ -69,7 +66,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState gdk_threads_enter (); g_assert (font != NULL); - pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, font); + pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font); g_assert (pfont != NULL); g_assert (pfont->ctx != NULL); g_assert (pfont->desc != NULL); @@ -78,12 +75,12 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState vec = (struct glyphvec *) g_malloc0 (sizeof (struct glyphvec)); g_assert (vec != NULL); - vec->desc = pango_font_describe (pfont->font); + vec->desc = pango_font_describe (pfont->font); g_assert (vec->desc != NULL); vec->font = pfont->font; g_object_ref (vec->font); - + vec->ctx = pfont->ctx; g_object_ref (vec->ctx); @@ -91,8 +88,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState gdk_threads_leave (); } -static void -free_glyphitems (GList * list) +static void free_glyphitems (GList *list) { GList *i = NULL; PangoGlyphItem *gi = NULL; @@ -100,20 +96,21 @@ free_glyphitems (GList * list) for (i = g_list_first (list); i != NULL; i = g_list_next (i)) { g_assert (i->data != NULL); - gi = (PangoGlyphItem *) i->data; + gi = (PangoGlyphItem *)i->data; if (gi->glyphs != NULL) pango_glyph_string_free (gi->glyphs); if (gi->item != NULL) g_free (gi->item); - } + } g_list_free (list); } -static void -seek_glyphstring_idx (GList * list, int idx, - int *nidx, PangoGlyphString ** gs, PangoFont ** fnt) +static void seek_glyphstring_idx (GList *list, int idx, + int *nidx, + PangoGlyphString **gs, + PangoFont **fnt) { GList *i = NULL; PangoGlyphItem *gi = NULL; @@ -126,12 +123,12 @@ seek_glyphstring_idx (GList * list, int idx, for (i = g_list_first (list); i != NULL; i = g_list_next (i)) { g_assert (i->data != NULL); - gi = (PangoGlyphItem *) i->data; + gi = (PangoGlyphItem *)i->data; g_assert (gi->glyphs != NULL); - + if (begin <= idx && idx < begin + gi->glyphs->num_glyphs) - { + { *gs = gi->glyphs; *nidx = idx - begin; if (fnt && gi->item) @@ -147,8 +144,9 @@ seek_glyphstring_idx (GList * list, int idx, *nidx = -1; } -static void -seek_glyph_idx (GList * list, int idx, PangoGlyphInfo ** g, PangoFont ** fnt) +static void seek_glyph_idx (GList *list, int idx, + PangoGlyphInfo **g, + PangoFont **fnt) { PangoGlyphString *gs = NULL; int nidx = -1; @@ -166,8 +164,8 @@ seek_glyph_idx (GList * list, int idx, PangoGlyphInfo ** g, PangoFont ** fnt) *g = gs->glyphs + nidx; } -static void -union_rects (rect_t * r1, const rect_t * r2) +static void union_rects (rect_t *r1, + const rect_t *r2) { rect_t r; @@ -177,7 +175,7 @@ union_rects (rect_t * r1, const rect_t * r2) /* x is the left edge of the rect, y is the top edge of the rect - */ + */ #ifndef min #define min(x,y) ((x) < (y) ? (x) : (y)) @@ -187,19 +185,20 @@ union_rects (rect_t * r1, const rect_t * r2) #define max(x,y) ((x) < (y) ? (y) : (x)) #endif - r.x = min (r1->x, r2->x); + r.x = min(r1->x, r2->x); - r.y = min (r1->y, r2->y); + r.y = min(r1->y, r2->y); - r.width = max (r1->x + r1->width, r2->x + r2->width) - r.x; + r.width = max(r1->x + r1->width, + r2->x + r2->width) - r.x; - r.height = max (r1->y + r1->height, r2->y + r2->height) - r.y; + r.height = max(r1->y + r1->height, + r2->y + r2->height) - r.y; - *r1 = r; + *r1 = r; } -static jdoubleArray -rect_to_array (JNIEnv *env, const rect_t * r) +static jdoubleArray rect_to_array (JNIEnv *env, const rect_t *r) { /* We often return rectangles as arrays : { x, y, w, h } */ jdoubleArray ret; @@ -225,7 +224,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_dispose gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_DEL_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_DEL_GV_PTR (env, self); g_assert (vec != NULL); if (vec->glyphitems != NULL) @@ -233,7 +232,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_dispose free_glyphitems (vec->glyphitems); vec->glyphitems = NULL; } - + if (vec->desc != NULL) pango_font_description_free (vec->desc); @@ -245,25 +244,25 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_dispose } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars (JNIEnv *env, jobject self, jstring chars) { struct glyphvec *vec = NULL; gchar *str = NULL; GList *items = NULL, *item = NULL; PangoGlyphItem *gi; - PangoAttrList *attrs = NULL; + PangoAttrList *attrs = NULL; gint len = 0; gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->desc != NULL); g_assert (vec->ctx != NULL); - + len = (*gdk_env)->GetStringUTFLength (env, chars); - str = (gchar *) (*env)->GetStringUTFChars (env, chars, NULL); + str = (gchar *)(*env)->GetStringUTFChars (env, chars, NULL); g_assert (str != NULL); /* step 1: set our FontFescription in the context, then "itemize" the @@ -271,18 +270,18 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars attrs = pango_attr_list_new (); g_assert (attrs != NULL); - + pango_context_set_font_description (vec->ctx, vec->desc); items = pango_itemize (vec->ctx, str, 0, len, attrs, NULL); g_assert (items != NULL); - + /* - step 2: for each item: - - shape the item into a glyphstring - - store the (item, glyphstring) pair in the vec->glyphitems list - */ - + step 2: for each item: + - shape the item into a glyphstring + - store the (item, glyphstring) pair in the vec->glyphitems list + */ + if (vec->glyphitems != NULL) { free_glyphitems (vec->glyphitems); @@ -294,15 +293,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars g_assert (item->data != NULL); gi = NULL; - gi = g_malloc0 (sizeof (PangoGlyphItem)); + gi = g_malloc0 (sizeof(PangoGlyphItem)); g_assert (gi != NULL); - gi->item = (PangoItem *) item->data; + gi->item = (PangoItem *)item->data; gi->glyphs = pango_glyph_string_new (); g_assert (gi->glyphs != NULL); - pango_shape (str + gi->item->offset, - gi->item->length, &(gi->item->analysis), gi->glyphs); + pango_shape (str + gi->item->offset, + gi->item->length, + &(gi->item->analysis), + gi->glyphs); vec->glyphitems = g_list_append (vec->glyphitems, gi); } @@ -310,7 +311,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars /* ownership of each item has been transferred to glyphitems, but the list should be freed. - */ + */ g_list_free (items); pango_attr_list_unref (attrs); @@ -320,19 +321,19 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setChars } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes (JNIEnv *env, jobject self, jintArray codes) { struct glyphvec *vec = NULL; gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); /* - FIXME: setting glyph codes doesn't seem particularly plausible at the - moment. + FIXME: setting glyph codes doesn't seem particularly plausible at the + moment. */ gdk_threads_leave (); @@ -340,7 +341,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes } -JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCode +JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCode (JNIEnv *env, jobject self, jint idx) { struct glyphvec *vec = NULL; @@ -349,7 +350,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCode gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->glyphitems != NULL); @@ -358,11 +359,11 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCode ret = gi->glyph; gdk_threads_leave (); - return (jint) (ret); + return (jint)(ret); } -JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_numGlyphs +JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_numGlyphs (JNIEnv *env, jobject self) { GList *i = NULL; @@ -372,26 +373,24 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_numGlyphs gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); for (i = g_list_first (vec->glyphitems); i != NULL; i = g_list_next (i)) { g_assert (i->data != NULL); - gi = (PangoGlyphItem *) i->data; + gi = (PangoGlyphItem *)i->data; g_assert (gi->glyphs != NULL); count += gi->glyphs->num_glyphs; - } + } gdk_threads_leave (); return count; } -JNIEXPORT jint JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex (JNIEnv *env, - jobject self, - jint idx) +JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex + (JNIEnv *env, jobject self, jint idx) { /* FIXME: this is not correct, rather it assumes a (broken) 1:1 @@ -399,34 +398,35 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex (JNIEnv *env, broken) using pango's current interface, or perhaps in terms of characters if some better byte->character conversion operator is found. for the time being we leave it broken. - */ + */ return idx; } -static void -assume_pointsize_and_identity_transform (double pointsize, FT_Face face) +static void +assume_pointsize_and_identity_transform(double pointsize, + FT_Face face) { FT_Matrix mat; - mat.xx = DOUBLE_TO_16_16 (1); - mat.xy = DOUBLE_TO_16_16 (0); - mat.yx = DOUBLE_TO_16_16 (0); - mat.yy = DOUBLE_TO_16_16 (1); - FT_Set_Transform (face, &mat, NULL); - FT_Set_Char_Size (face, + mat.xx = DOUBLE_TO_16_16(1); + mat.xy = DOUBLE_TO_16_16(0); + mat.yx = DOUBLE_TO_16_16(0); + mat.yy = DOUBLE_TO_16_16(1); + FT_Set_Transform(face, &mat, NULL); + FT_Set_Char_Size( face, DOUBLE_TO_26_6 (pointsize), - DOUBLE_TO_26_6 (pointsize), 0, 0); -} + DOUBLE_TO_26_6 (pointsize), + 0, 0); +} -JNIEXPORT jdoubleArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents (JNIEnv *env, - jobject self) +JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents + (JNIEnv *env, jobject self) { struct glyphvec *vec = NULL; int j; GList *i; PangoGlyphItem *gi = NULL; - rect_t rect = { 0, 0, 0, 0 }; - rect_t tmp; + rect_t rect = {0,0,0,0}; + rect_t tmp; jdoubleArray ret; double x = 0, y = 0; double pointsize; @@ -434,7 +434,7 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents (JNIEnv *env, gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->glyphitems != NULL); @@ -444,12 +444,12 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents (JNIEnv *env, for (i = g_list_first (vec->glyphitems); i != NULL; i = g_list_next (i)) { g_assert (i->data != NULL); - gi = (PangoGlyphItem *) i->data; + gi = (PangoGlyphItem *)i->data; g_assert (gi->glyphs != NULL); face = pango_ft2_font_get_face (gi->item->analysis.font); assume_pointsize_and_identity_transform (pointsize, face); - + for (j = 0; j < gi->glyphs->num_glyphs; ++j) { FT_Load_Glyph (face, gi->glyphs->glyphs[j].glyph, FT_LOAD_DEFAULT); @@ -462,7 +462,7 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents (JNIEnv *env, x += DOUBLE_FROM_26_6 (face->glyph->advance.x); y += DOUBLE_FROM_26_6 (face->glyph->advance.y); } - } + } ret = rect_to_array (env, &rect); gdk_threads_leave (); @@ -470,16 +470,15 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allInkExtents (JNIEnv *env, } -JNIEXPORT jdoubleArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents (JNIEnv *env, - jobject self) +JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents + (JNIEnv *env, jobject self) { struct glyphvec *vec = NULL; int j; GList *i; PangoGlyphItem *gi = NULL; - rect_t rect = { 0, 0, 0, 0 }; - rect_t tmp; + rect_t rect = {0,0,0,0}; + rect_t tmp; jdoubleArray ret; double x = 0, y = 0; double pointsize; @@ -487,7 +486,7 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents (JNIEnv *env, gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->glyphitems != NULL); @@ -497,12 +496,12 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents (JNIEnv *env, for (i = g_list_first (vec->glyphitems); i != NULL; i = g_list_next (i)) { g_assert (i->data != NULL); - gi = (PangoGlyphItem *) i->data; + gi = (PangoGlyphItem *)i->data; g_assert (gi->glyphs != NULL); face = pango_ft2_font_get_face (gi->item->analysis.font); assume_pointsize_and_identity_transform (pointsize, face); - + for (j = 0; j < gi->glyphs->num_glyphs; ++j) { FT_Load_Glyph (face, gi->glyphs->glyphs[j].glyph, FT_LOAD_DEFAULT); @@ -520,7 +519,7 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents (JNIEnv *env, x += DOUBLE_FROM_26_6 (face->glyph->advance.x); y += DOUBLE_FROM_26_6 (face->glyph->advance.y); } - } + } ret = rect_to_array (env, &rect); gdk_threads_leave (); @@ -528,13 +527,11 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_allLogicalExtents (JNIEnv *env, } -JNIEXPORT jdoubleArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents (JNIEnv *env, - jobject self, - jint idx) +JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents + (JNIEnv *env, jobject self, jint idx) { struct glyphvec *vec = NULL; - rect_t rect = { 0, 0, 0, 0 }; + rect_t rect = {0,0,0,0}; PangoGlyphInfo *gi = NULL; PangoFont *font = NULL; jdoubleArray ret; @@ -543,10 +540,10 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents (JNIEnv *env, gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->glyphitems != NULL); - + seek_glyph_idx (vec->glyphitems, idx, &gi, &font); g_assert (gi != NULL); g_assert (font != NULL); @@ -555,7 +552,7 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents (JNIEnv *env, pointsize /= (double) PANGO_SCALE; face = pango_ft2_font_get_face (font); - assume_pointsize_and_identity_transform (pointsize, face); + assume_pointsize_and_identity_transform (pointsize, face); FT_Load_Glyph (face, gi->glyph, FT_LOAD_DEFAULT); @@ -563,9 +560,9 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents (JNIEnv *env, the "logical bounds" are some fancy combination of hori advance and height such that it's good for inverting as a highlight. revisit. */ - - rect.x = 0; - rect.y = 0; + + rect.x = 0; + rect.y = 0; rect.width = DOUBLE_FROM_26_6 (face->glyph->advance.x); rect.height = DOUBLE_FROM_26_6 (face->glyph->advance.y); @@ -575,25 +572,23 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphLogicalExtents (JNIEnv *env, } -JNIEXPORT jdoubleArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphInkExtents (JNIEnv *env, - jobject self, - jint idx) +JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphInkExtents + (JNIEnv *env, jobject self, jint idx) { struct glyphvec *vec = NULL; - rect_t rect = { 0, 0, 0, 0 }; + rect_t rect = {0,0,0,0}; PangoGlyphInfo *gi = NULL; PangoFont *font = NULL; jdoubleArray ret; double pointsize; FT_Face face; - + gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->glyphitems != NULL); - + seek_glyph_idx (vec->glyphitems, idx, &gi, &font); g_assert (gi != NULL); g_assert (font != NULL); @@ -602,8 +597,8 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphInkExtents (JNIEnv *env, pointsize /= (double) PANGO_SCALE; face = pango_ft2_font_get_face (font); - assume_pointsize_and_identity_transform (pointsize, face); - + assume_pointsize_and_identity_transform (pointsize, face); + FT_Load_Glyph (face, gi->glyph, FT_LOAD_DEFAULT); /* FIXME: this needs to change for vertical layouts */ rect.x = DOUBLE_FROM_26_6 (face->glyph->metrics.horiBearingX); @@ -617,17 +612,15 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphInkExtents (JNIEnv *env, } -JNIEXPORT jboolean JNICALL -Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal (JNIEnv *env, - jobject self, - jint idx) +JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal + (JNIEnv *env, jobject self, jint idx) { struct glyphvec *vec = NULL; PangoDirection dir; gdk_threads_enter (); g_assert (self != NULL); - vec = (struct glyphvec *) NSA_GET_GV_PTR (env, self); + vec = (struct glyphvec *)NSA_GET_GV_PTR (env, self); g_assert (vec != NULL); g_assert (vec->desc != NULL); g_assert (vec->ctx != NULL); @@ -643,11 +636,13 @@ Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal (JNIEnv *env, gdk_threads_leave (); - return ((dir == PANGO_DIRECTION_LTR) || (dir == PANGO_DIRECTION_RTL)); + return + ((dir == PANGO_DIRECTION_LTR) || + (dir == PANGO_DIRECTION_RTL)); } -JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_isEqual +JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_isEqual (JNIEnv *env, jobject self, jobject other) { struct glyphvec *vec1 = NULL, *vec2 = NULL; @@ -655,15 +650,17 @@ JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGlyphVector_isEqual gdk_threads_enter (); g_assert (self != NULL); - vec1 = (struct glyphvec *) NSA_GET_GV_PTR (env, self); - vec2 = (struct glyphvec *) NSA_GET_GV_PTR (env, other); + vec1 = (struct glyphvec *)NSA_GET_GV_PTR (env, self); + vec2 = (struct glyphvec *)NSA_GET_GV_PTR (env, other); g_assert (vec1 != NULL); g_assert (vec2 != NULL); - + /* FIXME: is there some more advantageous definition of equality for glyph vectors? */ eq = (vec1 == vec2); - + gdk_threads_leave (); return eq; } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c index e75b0d675..9c370e936 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c @@ -42,8 +42,9 @@ exception statement from your version. */ #define GDK_STABLE_IS_PIXMAP(d) (GDK_IS_PIXMAP(d)) -GdkPoint *translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, - jint npoints, jint x_offset, jint y_offset); +GdkPoint * +translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, + jint npoints, jint x_offset, jint y_offset); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState (JNIEnv *env, jobject obj, jobject old) @@ -62,7 +63,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyState if (GDK_STABLE_IS_PIXMAP (g->drawable)) gdk_pixmap_ref (g->drawable); - else /* GDK_IS_WINDOW (g->drawable) */ + else /* GDK_IS_WINDOW (g->drawable) */ gdk_window_ref (g->drawable); gdk_colormap_ref (g->cm); @@ -81,7 +82,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II g->x_offset = g->y_offset = 0; gdk_threads_enter (); - g->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, + g->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, gdk_rgb_get_visual ()->depth); g->cm = gdk_rgb_get_cmap (); gdk_colormap_ref (g->cm); @@ -93,8 +94,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II /* copy the native state of the peer (GtkWidget *) to the native state of the graphics object */ -JNIEXPORT jintArray JNICALL - Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject obj, jobject peer) { struct graphics *g = (struct graphics *) malloc (sizeof (struct graphics)); @@ -152,9 +152,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose g = (struct graphics *) NSA_DEL_PTR (env, obj); - if (!g) - return; /* dispose has been called more than once */ - + if (!g) return; /* dispose has been called more than once */ + gdk_threads_enter (); XFlush (GDK_DISPLAY ()); @@ -162,7 +161,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_dispose if (GDK_STABLE_IS_PIXMAP (g->drawable)) gdk_pixmap_unref (g->drawable); - else /* GDK_IS_WINDOW (g->drawable) */ + else /* GDK_IS_WINDOW (g->drawable) */ gdk_window_unref (g->drawable); gdk_colormap_unref (g->cm); @@ -188,7 +187,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_translateNative } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString - (JNIEnv *env, jobject obj, jstring str, jint x, jint y, + (JNIEnv *env, jobject obj, jstring str, jint x, jint y, jstring fname, jint style, jint size) { struct graphics *g; @@ -216,7 +215,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - context = gdk_pango_context_get (); + context = gdk_pango_context_get(); pango_context_set_font_description (context, font_desc); layout = pango_layout_new (context); @@ -226,9 +225,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString baseline_y = pango_layout_iter_get_baseline (iter); - gdk_draw_layout (g->drawable, g->gc, - x + g->x_offset, - y + g->y_offset - (baseline_y / PANGO_SCALE), layout); + gdk_draw_layout (g->drawable, g->gc, + x + g->x_offset, y + g->y_offset - (baseline_y / PANGO_SCALE), layout); pango_font_description_free (font_desc); pango_layout_iter_free (iter); @@ -247,8 +245,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_line (g->drawable, g->gc, - x + g->x_offset, y + g->y_offset, + gdk_draw_line (g->drawable, g->gc, + x + g->x_offset, y + g->y_offset, x2 + g->x_offset, y2 + g->y_offset); gdk_threads_leave (); } @@ -261,7 +259,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_rectangle (g->drawable, g->gc, TRUE, + gdk_draw_rectangle (g->drawable, g->gc, TRUE, x + g->x_offset, y + g->y_offset, width, height); gdk_threads_leave (); } @@ -274,13 +272,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_rectangle (g->drawable, g->gc, FALSE, + gdk_draw_rectangle (g->drawable, g->gc, FALSE, x + g->x_offset, y + g->y_offset, width, height); gdk_threads_leave (); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea - (JNIEnv *env, jobject obj, jint x, jint y, + (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, jint dx, jint dy) { struct graphics *g; @@ -288,16 +286,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyArea g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_window_copy_area ((GdkWindow *) g->drawable, + gdk_window_copy_area ((GdkWindow *)g->drawable, g->gc, x + g->x_offset + dx, y + g->y_offset + dy, - (GdkWindow *) g->drawable, - x + g->x_offset, y + g->y_offset, width, height); + (GdkWindow *)g->drawable, + x + g->x_offset, y + g->y_offset, + width, height); gdk_threads_leave (); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyPixmap - (JNIEnv *env, jobject obj, jobject offscreen, + (JNIEnv *env, jobject obj, jobject offscreen, jint x, jint y, jint width, jint height) { struct graphics *g1, *g2; @@ -306,14 +305,15 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_copyPixmap g2 = (struct graphics *) NSA_GET_PTR (env, offscreen); gdk_threads_enter (); - gdk_window_copy_area ((GdkWindow *) g1->drawable, + gdk_window_copy_area ((GdkWindow *)g1->drawable, g1->gc, x + g1->x_offset, y + g1->y_offset, - (GdkWindow *) g2->drawable, - 0 + g2->x_offset, 0 + g2->y_offset, width, height); + (GdkWindow *)g2->drawable, + 0 + g2->x_offset, 0 + g2->y_offset, + width, height); gdk_threads_leave (); } - + @@ -329,14 +329,14 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect gdk_threads_enter (); if (GDK_IS_WINDOW (g->drawable)) { - gdk_window_clear_area ((GdkWindow *) g->drawable, + gdk_window_clear_area ((GdkWindow *)g->drawable, x + g->x_offset, y + g->y_offset, width, height); } else { gdk_gc_get_values (g->gc, &saved); gdk_gc_set_foreground (g->gc, &(saved.background)); - gdk_draw_rectangle (g->drawable, g->gc, TRUE, + gdk_draw_rectangle (g->drawable, g->gc, TRUE, x + g->x_offset, y + g->y_offset, width, height); gdk_gc_set_foreground (g->gc, &(saved.foreground)); } @@ -348,7 +348,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction { struct graphics *g; g = (struct graphics *) NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gdk_gc_set_function (g->gc, func); gdk_threads_leave (); @@ -366,7 +366,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor color.blue = blue << 8; g = (struct graphics *) NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gdk_color_alloc (g->cm, &color); gdk_gc_set_foreground (g->gc, &color); @@ -374,7 +374,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc - (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, + (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, jint angle1, jint angle2) { struct graphics *g; @@ -382,14 +382,14 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawArc g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_arc (g->drawable, g->gc, FALSE, - x + g->x_offset, y + g->y_offset, + gdk_draw_arc (g->drawable, g->gc, FALSE, + x + g->x_offset, y + g->y_offset, width, height, angle1 << 6, angle2 << 6); gdk_threads_leave (); -} +} GdkPoint * -translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, +translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, jint npoints, jint x_offset, jint y_offset) { GdkPoint *points; @@ -399,7 +399,7 @@ translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, /* allocate one more point than necessary, in case we need to tack on an extra due to the semantics of Java polygons. */ points = g_malloc (sizeof (GdkPoint) * (npoints + 1)); - + x = (*env)->GetIntArrayElements (env, xpoints, NULL); y = (*env)->GetIntArrayElements (env, ypoints, NULL); @@ -416,7 +416,7 @@ translate_points (JNIEnv *env, jintArray xpoints, jintArray ypoints, } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline - (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, + (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, jint npoints) { struct graphics *g; @@ -434,7 +434,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon - (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, + (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, jint npoints) { struct graphics *g; @@ -446,8 +446,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon /* make sure the polygon is closed, per Java semantics. if it's not, we close it. */ - if (points[0].x != points[npoints - 1].x - || points[0].y != points[npoints - 1].y) + if (points[0].x != points[npoints-1].x || points[0].y != points[npoints-1].y) points[npoints++] = points[0]; gdk_threads_enter (); @@ -458,7 +457,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolygon } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillPolygon - (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, + (JNIEnv *env, jobject obj, jintArray xpoints, jintArray ypoints, jint npoints) { struct graphics *g; @@ -475,7 +474,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillPolygon } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc - (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, + (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height, jint angle1, jint angle2) { struct graphics *g; @@ -483,11 +482,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillArc g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_arc (g->drawable, g->gc, TRUE, - x + g->x_offset, y + g->y_offset, + gdk_draw_arc (g->drawable, g->gc, TRUE, + x + g->x_offset, y + g->y_offset, width, height, angle1 << 6, angle2 << 6); gdk_threads_leave (); -} +} JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawOval (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) @@ -497,10 +496,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawOval g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_arc (g->drawable, g->gc, FALSE, - x + g->x_offset, y + g->y_offset, width, height, 0, 23040); + gdk_draw_arc (g->drawable, g->gc, FALSE, + x + g->x_offset, y + g->y_offset, + width, height, 0, 23040); gdk_threads_leave (); -} +} JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillOval (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) @@ -510,10 +510,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillOval g = (struct graphics *) NSA_GET_PTR (env, obj); gdk_threads_enter (); - gdk_draw_arc (g->drawable, g->gc, TRUE, - x + g->x_offset, y + g->y_offset, width, height, 0, 23040); + gdk_draw_arc (g->drawable, g->gc, TRUE, + x + g->x_offset, y + g->y_offset, + width, height, 0, 23040); gdk_threads_leave (); -} +} JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c index 9bb5179fc..f8ee342a0 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c @@ -64,11 +64,10 @@ struct state_table *native_graphics2d_state_table; #define NSA_DEL_G2D_PTR(env, obj) \ remove_state_slot (env, obj, native_graphics2d_state_table) -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState (JNIEnv *env, - jclass clazz) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState + (JNIEnv *env, jclass clazz) { - NSA_G2D_INIT (env, clazz); + NSA_G2D_INIT (env, clazz); } /* these public final constants are part of the java2d public API, so we @@ -80,54 +79,54 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState (JNIEnv *env, #endif enum java_awt_alpha_composite_rule -{ - java_awt_alpha_composite_CLEAR = 1, - java_awt_alpha_composite_SRC = 2, - java_awt_alpha_composite_SRC_OVER = 3, - java_awt_alpha_composite_DST_OVER = 4, - java_awt_alpha_composite_SRC_IN = 5, - java_awt_alpha_composite_DST_IN = 6, - java_awt_alpha_composite_SRC_OUT = 7, - java_awt_alpha_composite_DST_OUT = 8, - java_awt_alpha_composite_DST = 9, - java_awt_alpha_composite_SRC_ATOP = 10, - java_awt_alpha_composite_DST_ATOP = 11, - java_awt_alpha_composite_XOR = 12 -}; + { + java_awt_alpha_composite_CLEAR = 1, + java_awt_alpha_composite_SRC = 2, + java_awt_alpha_composite_SRC_OVER = 3, + java_awt_alpha_composite_DST_OVER = 4, + java_awt_alpha_composite_SRC_IN = 5, + java_awt_alpha_composite_DST_IN = 6, + java_awt_alpha_composite_SRC_OUT = 7, + java_awt_alpha_composite_DST_OUT = 8, + java_awt_alpha_composite_DST = 9, + java_awt_alpha_composite_SRC_ATOP = 10, + java_awt_alpha_composite_DST_ATOP = 11, + java_awt_alpha_composite_XOR = 12 + }; enum java_awt_basic_stroke_join_rule -{ - java_awt_basic_stroke_JOIN_MITER = 0, - java_awt_basic_stroke_JOIN_ROUND = 1, - java_awt_basic_stroke_JOIN_BEVEL = 2 -}; + { + java_awt_basic_stroke_JOIN_MITER = 0, + java_awt_basic_stroke_JOIN_ROUND = 1, + java_awt_basic_stroke_JOIN_BEVEL = 2 + }; enum java_awt_basic_stroke_cap_rule -{ - java_awt_basic_stroke_CAP_BUTT = 0, - java_awt_basic_stroke_CAP_ROUND = 1, - java_awt_basic_stroke_CAP_SQUARE = 2 -}; + { + java_awt_basic_stroke_CAP_BUTT = 0, + java_awt_basic_stroke_CAP_ROUND = 1, + java_awt_basic_stroke_CAP_SQUARE = 2 + }; enum java_awt_geom_path_iterator_winding_rule -{ - java_awt_geom_path_iterator_WIND_EVEN_ODD = 0, - java_awt_geom_path_iterator_WIND_NON_ZERO = 1 -}; + { + java_awt_geom_path_iterator_WIND_EVEN_ODD = 0, + java_awt_geom_path_iterator_WIND_NON_ZERO = 1 + }; enum java_awt_rendering_hints_filter -{ - java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR = 0, - java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR = 1, - java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED = 2, - java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY = 3, - java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT = 4 -}; - -static void -grab_current_drawable (GtkWidget * widget, GdkDrawable ** draw, - GdkWindow ** win) -{ + { + java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR = 0, + java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR = 1, + java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED = 2, + java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY = 3, + java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT = 4 + + }; + +static void +grab_current_drawable (GtkWidget *widget, GdkDrawable **draw, GdkWindow **win) +{ g_assert (widget != NULL); g_assert (draw != NULL); g_assert (win != NULL); @@ -154,7 +153,7 @@ grab_current_drawable (GtkWidget * widget, GdkDrawable ** draw, static int x_server_has_render_extension (void) { - int ev = 0, err = 0; + int ev = 0, err = 0; return (int) XRenderQueryExtension (GDK_DISPLAY (), &ev, &err); } @@ -166,25 +165,24 @@ init_graphics2d_as_pixbuf (struct graphics2d *gr) gint bits_per_sample = 8; gint total_channels = 4; gboolean has_alpha = TRUE; - + g_assert (gr != NULL); g_assert (gr->drawable != NULL); - if (gr->debug) - printf ("initializing graphics2d as pixbuf\n"); + if (gr->debug) printf ("initializing graphics2d as pixbuf\n"); gdk_drawable_get_size (gr->drawable, &width, &height); - gr->drawbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - has_alpha, bits_per_sample, width, height); + gr->drawbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + has_alpha, bits_per_sample, + width, height); g_assert (gr->drawbuf != NULL); g_assert (gdk_pixbuf_get_bits_per_sample (gr->drawbuf) == bits_per_sample); g_assert (gdk_pixbuf_get_n_channels (gr->drawbuf) == total_channels); - - gr->surface = - cairo_surface_create_for_image (gdk_pixbuf_get_pixels (gr->drawbuf), - CAIRO_FORMAT_ARGB32, - gdk_pixbuf_get_width (gr->drawbuf), - gdk_pixbuf_get_height (gr->drawbuf), - gdk_pixbuf_get_rowstride (gr->drawbuf)); + + gr->surface = cairo_surface_create_for_image (gdk_pixbuf_get_pixels (gr->drawbuf), + CAIRO_FORMAT_ARGB32, + gdk_pixbuf_get_width (gr->drawbuf), + gdk_pixbuf_get_height (gr->drawbuf), + gdk_pixbuf_get_rowstride (gr->drawbuf)); g_assert (gr->surface != NULL); g_assert (gr->cr != NULL); cairo_set_target_surface (gr->cr, gr->surface); @@ -194,37 +192,34 @@ static void init_graphics2d_as_renderable (struct graphics2d *gr) { Drawable draw; - Display *dpy; - Visual *vis; - + Display * dpy; + Visual * vis; + g_assert (gr != NULL); g_assert (gr->drawable != NULL); gr->drawbuf = NULL; - - if (gr->debug) - printf ("initializing graphics2d as renderable\n"); + + if (gr->debug) printf ("initializing graphics2d as renderable\n"); draw = gdk_x11_drawable_get_xid (gr->drawable); - + dpy = gdk_x11_drawable_get_xdisplay (gr->drawable); g_assert (dpy != NULL); - + vis = gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (gr->drawable)); g_assert (vis != NULL); - - gr->surface = cairo_xlib_surface_create (dpy, draw, vis, + + gr->surface = cairo_xlib_surface_create (dpy, draw, vis, CAIRO_FORMAT_ARGB32, - DefaultColormap (dpy, - DefaultScreen - (dpy))); + DefaultColormap (dpy, DefaultScreen (dpy))); g_assert (gr->surface != NULL); g_assert (gr->cr != NULL); cairo_set_target_surface (gr->cr, gr->surface); } static void -begin_drawing_operation (struct graphics2d *gr) -{ +begin_drawing_operation (struct graphics2d * gr) +{ gdk_threads_enter (); if (gr->drawbuf) { @@ -232,32 +227,33 @@ begin_drawing_operation (struct graphics2d *gr) gint drawable_width, drawable_height; gint pixbuf_width, pixbuf_height; gint width, height; - + gdk_drawable_get_size (gr->drawable, &drawable_width, &drawable_height); pixbuf_width = gdk_pixbuf_get_width (gr->drawbuf); pixbuf_height = gdk_pixbuf_get_height (gr->drawbuf); width = min (drawable_width, pixbuf_width); height = min (drawable_height, pixbuf_height); - gdk_pixbuf_get_from_drawable (gr->drawbuf, /* destination pixbuf */ - gr->drawable, NULL, /* colormap */ - 0, 0, 0, 0, width, height); - - if (gr->debug) - printf ("copied (%d, %d) pixels from GDK drawable to pixbuf\n", - width, height); + gdk_pixbuf_get_from_drawable (gr->drawbuf, /* destination pixbuf */ + gr->drawable, + NULL, /* colormap */ + 0, 0, 0, 0, + width, height); + + if (gr->debug) printf ("copied (%d, %d) pixels from GDK drawable to pixbuf\n", + width, height); } } static void -end_drawing_operation (struct graphics2d *gr) +end_drawing_operation (struct graphics2d * gr) { if (gr->drawbuf) - { + { gint drawable_width, drawable_height; gint pixbuf_width, pixbuf_height; gint width, height; - + gdk_drawable_get_size (gr->drawable, &drawable_width, &drawable_height); pixbuf_width = gdk_pixbuf_get_width (gr->drawbuf); pixbuf_height = gdk_pixbuf_get_height (gr->drawbuf); @@ -265,18 +261,18 @@ end_drawing_operation (struct graphics2d *gr) height = min (drawable_height, pixbuf_height); gdk_draw_pixbuf (gr->drawable, NULL, gr->drawbuf, - 0, 0, 0, 0, - width, height, GDK_RGB_DITHER_NORMAL, 0, 0); + 0, 0, 0, 0, + width, height, + GDK_RGB_DITHER_NORMAL, 0, 0); - if (gr->debug) - printf ("copied (%d, %d) pixels from pixbuf to GDK drawable\n", - width, height); + if (gr->debug) printf ("copied (%d, %d) pixels from pixbuf to GDK drawable\n", + width, height); } gdk_threads_leave (); } -static void +static void update_pattern_transform (struct graphics2d *gr) { double a, b, c, d, tx, ty; @@ -299,7 +295,7 @@ update_pattern_transform (struct graphics2d *gr) static void check_for_debug (struct graphics2d *gr) { - gr->debug = (gboolean) (getenv ("DEBUGJ2D") != NULL); + gr->debug = (gboolean)(getenv("DEBUGJ2D") != NULL); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_copyState @@ -309,21 +305,20 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_copyState g = (struct graphics2d *) malloc (sizeof (struct graphics2d)); g_assert (g != NULL); - memset (g, 0, sizeof (struct graphics2d)); + memset (g, 0, sizeof(struct graphics2d)); g_old = (struct graphics2d *) NSA_GET_G2D_PTR (env, old); g_assert (g_old != NULL); - if (g_old->debug) - printf ("copying state from existing graphics2d\n"); + if (g_old->debug) printf ("copying state from existing graphics2d\n"); g->drawable = g_old->drawable; - g->debug = g_old->debug; + g->debug = g_old->debug; gdk_threads_enter (); g_object_ref (g->drawable); - - g->cr = cairo_create (); + + g->cr = cairo_create(); g_assert (g->cr != NULL); if (x_server_has_render_extension ()) @@ -345,23 +340,21 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II struct graphics2d *gr; gdk_threads_enter (); - + gr = (struct graphics2d *) malloc (sizeof (struct graphics2d)); g_assert (gr != NULL); - memset (gr, 0, sizeof (struct graphics2d)); - - check_for_debug (gr); + memset (gr, 0, sizeof(struct graphics2d)); - if (gr->debug) - printf ("constructing offscreen drawable of size (%d,%d)\n", - width, height); + check_for_debug (gr); - gr->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, - gdk_rgb_get_visual ()-> - depth); + if (gr->debug) printf ("constructing offscreen drawable of size (%d,%d)\n", + width, height); + + gr->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, + gdk_rgb_get_visual ()->depth); g_assert (gr->drawable != NULL); - gr->cr = cairo_create (); + gr->cr = cairo_create(); g_assert (gr->cr != NULL); if (x_server_has_render_extension ()) @@ -370,29 +363,24 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II init_graphics2d_as_pixbuf (gr); gdk_threads_leave (); - if (gr->debug) - printf ("constructed offscreen drawable of size (%d,%d)\n", - width, height); + if (gr->debug) printf ("constructed offscreen drawable of size (%d,%d)\n", + width, height); NSA_SET_G2D_PTR (env, obj, gr); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable (JNIEnv *env, - jobject self, - jobject other, - jint x, jint y) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable + (JNIEnv *env, jobject self, jobject other, jint x, jint y) { struct graphics2d *src = NULL, *dst = NULL; gint s_height, s_width, d_height, d_width, height, width; GdkGC *gc; - src = (struct graphics2d *) NSA_GET_G2D_PTR (env, other); - dst = (struct graphics2d *) NSA_GET_G2D_PTR (env, self); + src = (struct graphics2d *)NSA_GET_G2D_PTR (env, other); + dst = (struct graphics2d *)NSA_GET_G2D_PTR (env, self); g_assert (src != NULL); - g_assert (dst != NULL); + g_assert (dst != NULL); - if (src->debug) - printf ("copying from offscreen drawable\n"); + if (src->debug) printf ("copying from offscreen drawable\n"); gdk_threads_enter (); gdk_drawable_get_size (src->drawable, &s_width, &s_height); @@ -403,19 +391,18 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable (JNIEnv *env, gc = gdk_gc_new (dst->drawable); g_assert (gc != NULL); - gdk_draw_drawable (dst->drawable, gc, src->drawable, - 0, 0, x, y, width, height); + gdk_draw_drawable(dst->drawable, gc, src->drawable, + 0, 0, x, y, width, height); gdk_flush (); g_object_unref (gc); - if (src->debug) - printf ("copied %d x %d pixels from offscreen drawable\n", width, height); - gdk_threads_leave (); + if (src->debug) printf ("copied %d x %d pixels from offscreen drawable\n", width, height); + gdk_threads_leave (); } static jintArray -current_colors_of_widget (GtkWidget * widget, JNIEnv *env) +current_colors_of_widget (GtkWidget *widget, JNIEnv *env) { GdkColor color; jintArray array; @@ -438,12 +425,11 @@ current_colors_of_widget (GtkWidget * widget, JNIEnv *env) rgb[5] = color.blue >> 8; (*env)->ReleaseIntArrayElements (env, array, rgb, 0); - + return array; } -JNIEXPORT jintArray JNICALL - Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2 (JNIEnv *env, jobject obj, jobject peer) { struct graphics2d *gr = NULL; @@ -457,11 +443,11 @@ JNIEXPORT jintArray JNICALL gr = (struct graphics2d *) malloc (sizeof (struct graphics2d)); g_assert (gr != NULL); - memset (gr, 0, sizeof (struct graphics2d)); + memset (gr, 0, sizeof(struct graphics2d)); check_for_debug (gr); - gr->cr = cairo_create (); + gr->cr = cairo_create(); g_assert (gr->cr != NULL); widget = GTK_WIDGET (ptr); @@ -488,9 +474,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_DEL_G2D_PTR (env, obj); - if (gr == NULL) - return; /* dispose has been called more than once */ - + if (gr == NULL) + return; /* dispose has been called more than once */ + gdk_threads_enter (); if (gr->surface) @@ -499,7 +485,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose cairo_destroy (gr->cr); if (gr->drawbuf) - g_object_unref (gr->drawbuf); + g_object_unref (gr->drawbuf); g_object_unref (gr->drawable); @@ -509,20 +495,20 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose if (gr->pattern_pixels) free (gr->pattern_pixels); - if (gr->debug) - printf ("disposed of graphics2d\n"); + if (gr->debug) printf ("disposed of graphics2d\n"); free (gr); gdk_threads_leave (); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient - (JNIEnv *env, jobject obj, - jdouble x1, jdouble y1, +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient + (JNIEnv *env, jobject obj, + jdouble x1, jdouble y1, jdouble x2, jdouble y2, jint r1, jint g1, jint b1, jint a1, - jint r2, jint g2, jint b2, jint a2, jboolean cyclic) + jint r2, jint g2, jint b2, jint a2, + jboolean cyclic) { struct graphics2d *gr = NULL; cairo_surface_t *surf = NULL; @@ -530,30 +516,29 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf - ("setGradient (%f,%f) -> (%f,%f); (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n", x1, - y1, x2, y2, r1, g1, b1, a1, r2, g2, b2, a2); - + if (gr->debug) printf ("setGradient (%f,%f) -> (%f,%f); (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n", + x1, y1, + x2, y2, + r1, g1, b1, a1, + r2, g2, b2, a2); + cairo_save (gr->cr); - + if (cyclic) - surf = - cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 3, 2); + surf = cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 3, 2); else - surf = - cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 2, 2); + surf = cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 2, 2); g_assert (surf != NULL); cairo_set_target_surface (gr->cr, surf); - + cairo_identity_matrix (gr->cr); cairo_set_rgb_color (gr->cr, r1 / 255.0, g1 / 255.0, b1 / 255.0); cairo_set_alpha (gr->cr, a1 / 255.0); cairo_rectangle (gr->cr, 0, 0, 1, 2); cairo_fill (gr->cr); - + cairo_set_rgb_color (gr->cr, r2 / 255.0, g2 / 255.0, b2 / 255.0); cairo_set_alpha (gr->cr, a2 / 255.0); cairo_rectangle (gr->cr, 1, 0, 1, 2); @@ -581,11 +566,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient is which transformation turns our existing unit vector into [p,q]. which means solving for M in - + [p,q] = M[1,0] [p,q] = |a b| [1,0] - |c d| + |c d| [p,q] = [a,c], with b = d = 0. @@ -600,7 +585,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient the way cairo is going to use this transformation. I'm a bit confused by that, but it seems to work right, so we take reciprocals of values and negate offsets. oh well. - + */ double a = (x2 - x1 == 0.) ? 0. : ((cyclic ? 3.0 : 2.0) / (x2 - x1)); @@ -608,7 +593,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient double dx = (x1 == 0.) ? 0. : 1. / x1; double dy = (y1 == 0.) ? 0. : 1. / y1; - cairo_matrix_set_affine (mat, a, 0., c, 0., dx, dy); + cairo_matrix_set_affine (mat, + a, 0., + c, 0., + dx, dy); cairo_surface_set_matrix (surf, mat); cairo_matrix_destroy (mat); @@ -626,19 +614,15 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient gr->pattern_pixels = NULL; } - gr->pattern = surf; + gr->pattern = surf; - cairo_restore (gr->cr); + cairo_restore (gr->cr); cairo_set_pattern (gr->cr, gr->pattern); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels (JNIEnv *env, - jobject obj, - jintArray jarr, - jint w, jint h, - jint stride) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels + (JNIEnv *env, jobject obj, jintArray jarr, jint w, jint h, jint stride) { struct graphics2d *gr = NULL; jint *jpixels = NULL; @@ -646,9 +630,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels (JNIEnv *env, gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("setTexturePixels (%d pixels, %dx%d, stride: %d)\n", - (*env)->GetArrayLength (env, jarr), w, h, stride); + if (gr->debug) printf ("setTexturePixels (%d pixels, %dx%d, stride: %d)\n", + (*env)->GetArrayLength (env, jarr), w, h, stride); if (gr->pattern) cairo_surface_destroy (gr->pattern); @@ -667,8 +650,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels (JNIEnv *env, memcpy (gr->pattern_pixels, jpixels, h * stride * 4); (*env)->ReleaseIntArrayElements (env, jarr, jpixels, 0); - gr->pattern = cairo_surface_create_for_image (gr->pattern_pixels, - CAIRO_FORMAT_ARGB32, + gr->pattern = cairo_surface_create_for_image (gr->pattern_pixels, + CAIRO_FORMAT_ARGB32, w, h, stride * 4); g_assert (gr->pattern != NULL); cairo_surface_set_repeat (gr->pattern, 1); @@ -676,8 +659,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels (JNIEnv *env, } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels - (JNIEnv *env, jobject obj, jintArray java_pixels, +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels + (JNIEnv *env, jobject obj, jintArray java_pixels, jint w, jint h, jint stride, jdoubleArray java_matrix) { struct graphics2d *gr = NULL; @@ -687,9 +670,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("drawPixels (%d pixels, %dx%d, stride: %d)\n", - (*env)->GetArrayLength (env, java_pixels), w, h, stride); + if (gr->debug) printf ("drawPixels (%d pixels, %dx%d, stride: %d)\n", + (*env)->GetArrayLength (env, java_pixels), w, h, stride); native_pixels = (*env)->GetIntArrayElements (env, java_pixels, NULL); native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL); @@ -698,39 +680,37 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels g_assert ((*env)->GetArrayLength (env, java_matrix) == 6); begin_drawing_operation (gr); - - { - cairo_matrix_t *mat = NULL; - cairo_surface_t *surf = - cairo_surface_create_for_image ((char *) native_pixels, - CAIRO_FORMAT_ARGB32, - w, h, stride * 4); - mat = cairo_matrix_create (); - cairo_matrix_set_affine (mat, - native_matrix[0], native_matrix[1], - native_matrix[2], native_matrix[3], - native_matrix[4], native_matrix[5]); - cairo_surface_set_matrix (surf, mat); - cairo_surface_set_filter (surf, cairo_surface_get_filter (gr->surface)); - cairo_show_surface (gr->cr, surf, w, h); - cairo_matrix_destroy (mat); - cairo_surface_destroy (surf); - } - - end_drawing_operation (gr); + + { + cairo_matrix_t *mat = NULL; + cairo_surface_t *surf = cairo_surface_create_for_image ((char *)native_pixels, + CAIRO_FORMAT_ARGB32, + w, h, stride * 4); + mat = cairo_matrix_create (); + cairo_matrix_set_affine (mat, + native_matrix[0], native_matrix[1], + native_matrix[2], native_matrix[3], + native_matrix[4], native_matrix[5]); + cairo_surface_set_matrix (surf, mat); + cairo_surface_set_filter (surf, cairo_surface_get_filter(gr->surface)); + cairo_show_surface (gr->cr, surf, w, h); + cairo_matrix_destroy (mat); + cairo_surface_destroy (surf); + } + + end_drawing_operation (gr); (*env)->ReleaseIntArrayElements (env, java_pixels, native_pixels, 0); (*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0); } -JNIEXPORT jintArray JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels (JNIEnv *env, - jobject obj) +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; jintArray java_pixels; - jint *native_pixels; + jint* native_pixels; GdkPixbuf *buf = NULL; gint width, height; gint bits_per_sample = 8; @@ -740,81 +720,81 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels (JNIEnv *env, gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - - if (gr->debug) - printf ("getImagePixels\n"); - + + if (gr->debug) printf ("getImagePixels\n"); + gdk_drawable_get_size (gr->drawable, &width, &height); - - buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, - bits_per_sample, width, height); + + buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha, + bits_per_sample, + width, height); g_assert (buf != NULL); g_assert (gdk_pixbuf_get_bits_per_sample (buf) == bits_per_sample); g_assert (gdk_pixbuf_get_n_channels (buf) == total_channels); - - + + /* copy pixels from drawable to pixbuf */ - + gdk_pixbuf_get_from_drawable (buf, gr->drawable, - NULL, 0, 0, 0, 0, width, height); - - native_pixels = gdk_pixbuf_get_pixels (buf); - - + NULL, + 0, 0, 0, 0, + width, height); + + native_pixels= gdk_pixbuf_get_pixels (buf); + + /* NOTE: The pixels we got in the pixbuf are stored in reversed order. i.e 0xBBGGRRAA. We need to convert them to 0xAARRGGBB. */ - - for (i = 0; i < width * height; i++) - { - - /* convert pixels from 0xBBGGRRAA to 0xAARRGGBB */ - - px = native_pixels[i]; - px = ((px >> 24) & 0xff) | ((px << 8) & 0xffffff00); - px = ((px >> 8) & 0x00ff00ff) | ((px << 8) & 0xff00ff00); - px = ((px >> 16) & 0x0000ffff) | ((px << 16) & 0xffff0000); - native_pixels[i] = px; - + + for (i=0; i<width * height; i++) + { + + /* convert pixels from 0xBBGGRRAA to 0xAARRGGBB */ + + px = native_pixels[i]; + px = ((px >> 24) & 0xff) | ((px << 8) & 0xffffff00); + px = ((px >> 8) & 0x00ff00ff) | ((px << 8) & 0xff00ff00); + px = ((px >> 16) & 0x0000ffff) | ((px << 16) & 0xffff0000); + native_pixels[i] = px; + } - java_pixels = (*env)->NewIntArray (env, width * height); - - (*env)->SetIntArrayRegion (env, java_pixels, - (jsize) 0, (jsize) width * height, - (jint *) native_pixels); - - return java_pixels; - + java_pixels = (*env) -> NewIntArray (env, width * height); + + (*env)->SetIntArrayRegion(env, java_pixels, + (jsize)0, (jsize) width*height, + (jint*) native_pixels); + + return java_pixels; + } /* passthrough methods to cairo */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSave - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSave + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_save\n"); + if (gr->debug) printf ("cairo_save\n"); cairo_save (gr->cr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRestore - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRestore + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_restore\n"); + if (gr->debug) printf ("cairo_restore\n"); cairo_restore (gr->cr); update_pattern_transform (gr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix - (JNIEnv *env, jobject obj, jdoubleArray java_matrix) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix + (JNIEnv *env, jobject obj, jdoubleArray java_matrix) { struct graphics2d *gr = NULL; jdouble *native_matrix = NULL; @@ -822,19 +802,18 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL); + native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL); g_assert (native_matrix != NULL); g_assert ((*env)->GetArrayLength (env, java_matrix) == 6); - if (gr->debug) - printf ("cairo_set_matrix [ %f, %f, %f, %f, %f, %f ]\n", - native_matrix[0], native_matrix[1], - native_matrix[2], native_matrix[3], - native_matrix[4], native_matrix[5]); + if (gr->debug) printf ("cairo_set_matrix [ %f, %f, %f, %f, %f, %f ]\n", + native_matrix[0], native_matrix[1], + native_matrix[2], native_matrix[3], + native_matrix[4], native_matrix[5]); { - cairo_matrix_t *mat = cairo_matrix_create (); - cairo_matrix_set_affine (mat, + cairo_matrix_t * mat = cairo_matrix_create (); + cairo_matrix_set_affine (mat, native_matrix[0], native_matrix[1], native_matrix[2], native_matrix[3], native_matrix[4], native_matrix[5]); @@ -846,8 +825,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix update_pattern_transform (gr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont - (JNIEnv *env, jobject obj, jobject font) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont + (JNIEnv *env, jobject obj, jobject font) { struct graphics2d *gr = NULL; struct peerfont *pfont = NULL; @@ -857,7 +836,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, font); + pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font); g_assert (pfont != NULL); gdk_threads_enter (); @@ -868,27 +847,21 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont ft = cairo_ft_font_create_for_ft_face (face); g_assert (ft != NULL); - if (gr->debug) - printf ("cairo_set_font '%s'\n", face->family_name); - + if (gr->debug) printf ("cairo_set_font '%s'\n", face->family_name); + cairo_set_font (gr->cr, ft); - cairo_scale_font (gr->cr, - pango_font_description_get_size (pfont->desc) / - (double) PANGO_SCALE); + cairo_scale_font (gr->cr, + pango_font_description_get_size (pfont->desc) / + (double)PANGO_SCALE); cairo_font_destroy (ft); gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs (JNIEnv *env, - jobject obj, - jintArray - java_codes, - jfloatArray - java_posns) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs + (JNIEnv *env, jobject obj, jintArray java_codes, jfloatArray java_posns) { struct graphics2d *gr = NULL; cairo_glyph_t *glyphs = NULL; @@ -900,8 +873,8 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs (JNIEnv *env, gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - native_codes = (*env)->GetIntArrayElements (env, java_codes, NULL); - native_posns = (*env)->GetFloatArrayElements (env, java_posns, NULL); + native_codes = (*env)->GetIntArrayElements (env, java_codes, NULL); + native_posns = (*env)->GetFloatArrayElements (env, java_posns, NULL); g_assert (native_codes != NULL); g_assert (native_posns != NULL); @@ -909,20 +882,18 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs (JNIEnv *env, nposns = (*env)->GetArrayLength (env, java_posns); g_assert (2 * ncodes == nposns); - if (gr->debug) - printf ("cairo_show_glyphs (%d glyphs)\n", ncodes); + if (gr->debug) printf ("cairo_show_glyphs (%d glyphs)\n", ncodes); - glyphs = malloc (sizeof (cairo_glyph_t) * ncodes); + glyphs = malloc (sizeof(cairo_glyph_t) * ncodes); g_assert (glyphs); for (i = 0; i < ncodes; ++i) { glyphs[i].index = native_codes[i]; - glyphs[i].x = (double) native_posns[2 * i]; - glyphs[i].y = (double) native_posns[2 * i + 1]; - if (gr->debug) - printf ("cairo_show_glyphs (glyph %d (code %d) : %f,%f)\n", - i, glyphs[i].index, glyphs[i].x, glyphs[i].y); + glyphs[i].x = (double) native_posns[2*i]; + glyphs[i].y = (double) native_posns[2*i + 1]; + if (gr->debug) printf ("cairo_show_glyphs (glyph %d (code %d) : %f,%f)\n", + i, glyphs[i].index, glyphs[i].x, glyphs[i].y); } (*env)->ReleaseIntArrayElements (env, java_codes, native_codes, 0); @@ -932,77 +903,70 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs (JNIEnv *env, cairo_show_glyphs (gr->cr, glyphs, ncodes); end_drawing_operation (gr); - free (glyphs); + free(glyphs); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator (JNIEnv *env, - jobject obj, - jint op) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator + (JNIEnv *env, jobject obj, jint op) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_operator %d\n", op); + if (gr->debug) printf ("cairo_set_operator %d\n", op); switch ((enum java_awt_alpha_composite_rule) op) { - case java_awt_alpha_composite_CLEAR: + case java_awt_alpha_composite_CLEAR: cairo_set_operator (gr->cr, CAIRO_OPERATOR_CLEAR); break; - - case java_awt_alpha_composite_SRC: + + case java_awt_alpha_composite_SRC: cairo_set_operator (gr->cr, CAIRO_OPERATOR_SRC); break; - - case java_awt_alpha_composite_SRC_OVER: + + case java_awt_alpha_composite_SRC_OVER: cairo_set_operator (gr->cr, CAIRO_OPERATOR_OVER); break; - case java_awt_alpha_composite_DST_OVER: + case java_awt_alpha_composite_DST_OVER: cairo_set_operator (gr->cr, CAIRO_OPERATOR_OVER_REVERSE); break; - case java_awt_alpha_composite_SRC_IN: + case java_awt_alpha_composite_SRC_IN: cairo_set_operator (gr->cr, CAIRO_OPERATOR_IN); break; - case java_awt_alpha_composite_DST_IN: + case java_awt_alpha_composite_DST_IN: cairo_set_operator (gr->cr, CAIRO_OPERATOR_IN_REVERSE); break; - case java_awt_alpha_composite_SRC_OUT: + case java_awt_alpha_composite_SRC_OUT: cairo_set_operator (gr->cr, CAIRO_OPERATOR_OUT); break; - case java_awt_alpha_composite_DST_OUT: + case java_awt_alpha_composite_DST_OUT: cairo_set_operator (gr->cr, CAIRO_OPERATOR_OUT_REVERSE); break; - case java_awt_alpha_composite_DST: + case java_awt_alpha_composite_DST: cairo_set_operator (gr->cr, CAIRO_OPERATOR_DST); break; - case java_awt_alpha_composite_SRC_ATOP: + case java_awt_alpha_composite_SRC_ATOP: cairo_set_operator (gr->cr, CAIRO_OPERATOR_ATOP); break; - case java_awt_alpha_composite_DST_ATOP: + case java_awt_alpha_composite_DST_ATOP: cairo_set_operator (gr->cr, CAIRO_OPERATOR_ATOP_REVERSE); break; - case java_awt_alpha_composite_XOR: + case java_awt_alpha_composite_XOR: cairo_set_operator (gr->cr, CAIRO_OPERATOR_XOR); break; } } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBColor (JNIEnv *env, - jobject obj, - jdouble r, - jdouble g, - jdouble b) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBColor + (JNIEnv *env, jobject obj, jdouble r, jdouble g, jdouble b) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); @@ -1013,8 +977,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBColor (JNIEnv *env, draw to a PixBuf, you must exchange the R and B components of your color. */ - if (gr->debug) - printf ("cairo_set_rgb_color (%f, %f, %f)\n", r, g, b); + if (gr->debug) printf ("cairo_set_rgb_color (%f, %f, %f)\n", r, g, b); if (gr->drawbuf) cairo_set_rgb_color (gr->cr, b, g, r); @@ -1022,26 +985,22 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBColor (JNIEnv *env, cairo_set_rgb_color (gr->cr, r, g, b); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetAlpha - (JNIEnv *env, jobject obj, jdouble a) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetAlpha + (JNIEnv *env, jobject obj, jdouble a) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_alpha %f\n", a); + if (gr->debug) printf ("cairo_set_alpha %f\n", a); cairo_set_alpha (gr->cr, a); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule (JNIEnv *env, - jobject obj, - jint rule) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule + (JNIEnv *env, jobject obj, jint rule) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); - if (gr->debug) - printf ("cairo_set_fill_rule %d\n", rule); + if (gr->debug) printf ("cairo_set_fill_rule %d\n", rule); g_assert (gr != NULL); switch ((enum java_awt_geom_path_iterator_winding_rule) rule) { @@ -1051,58 +1010,49 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule (JNIEnv *env, case java_awt_geom_path_iterator_WIND_EVEN_ODD: cairo_set_fill_rule (gr->cr, CAIRO_FILL_RULE_EVEN_ODD); break; - } + } } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth (JNIEnv *env, - jobject obj, - jdouble width) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth + (JNIEnv *env, jobject obj, jdouble width) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_line_width %f\n", width); + if (gr->debug) printf ("cairo_set_line_width %f\n", width); cairo_set_line_width (gr->cr, width); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap (JNIEnv *env, - jobject obj, - jint cap) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap + (JNIEnv *env, jobject obj, jint cap) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_line_cap %d\n", cap); + if (gr->debug) printf ("cairo_set_line_cap %d\n", cap); switch ((enum java_awt_basic_stroke_cap_rule) cap) { - case java_awt_basic_stroke_CAP_BUTT: + case java_awt_basic_stroke_CAP_BUTT: cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_BUTT); break; - case java_awt_basic_stroke_CAP_ROUND: + case java_awt_basic_stroke_CAP_ROUND: cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_ROUND); break; - case java_awt_basic_stroke_CAP_SQUARE: + case java_awt_basic_stroke_CAP_SQUARE: cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_SQUARE); break; } } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin (JNIEnv *env, - jobject obj, - jint join) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin + (JNIEnv *env, jobject obj, jint join) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_line_join %d\n", join); + if (gr->debug) printf ("cairo_set_line_join %d\n", join); switch ((enum java_awt_basic_stroke_join_rule) join) { case java_awt_basic_stroke_JOIN_MITER: @@ -1119,209 +1069,179 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin (JNIEnv *env, } } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash - (JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash + (JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset) { struct graphics2d *gr = NULL; jdouble *dasharr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_dash\n"); - dasharr = (*env)->GetDoubleArrayElements (env, dashes, NULL); + if (gr->debug) printf ("cairo_set_dash\n"); + dasharr = (*env)->GetDoubleArrayElements (env, dashes, NULL); g_assert (dasharr != NULL); cairo_set_dash (gr->cr, dasharr, ndash, offset); (*env)->ReleaseDoubleArrayElements (env, dashes, dasharr, 0); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit (JNIEnv *env, - jobject obj, - jdouble miter) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit + (JNIEnv *env, jobject obj, jdouble miter) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_set_miter_limit %f\n", miter); + if (gr->debug) printf ("cairo_set_miter_limit %f\n", miter); cairo_set_miter_limit (gr->cr, miter); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_new_path\n"); + if (gr->debug) printf ("cairo_new_path\n"); cairo_new_path (gr->cr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoMoveTo - (JNIEnv *env, jobject obj, jdouble x, jdouble y) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoMoveTo + (JNIEnv *env, jobject obj, jdouble x, jdouble y) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_move_to (%f, %f)\n", x, y); + if (gr->debug) printf ("cairo_move_to (%f, %f)\n", x, y); cairo_move_to (gr->cr, x, y); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoLineTo - (JNIEnv *env, jobject obj, jdouble x, jdouble y) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoLineTo + (JNIEnv *env, jobject obj, jdouble x, jdouble y) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_line_to (%f, %f)\n", x, y); + if (gr->debug) printf ("cairo_line_to (%f, %f)\n", x, y); cairo_line_to (gr->cr, x, y); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoCurveTo - (JNIEnv *env, jobject obj, jdouble x1, jdouble y1, jdouble x2, jdouble y2, - jdouble x3, jdouble y3) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoCurveTo + (JNIEnv *env, jobject obj, jdouble x1, jdouble y1, jdouble x2, jdouble y2, jdouble x3, jdouble y3) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_curve_to (%f, %f), (%f, %f), (%f, %f)\n", x1, y1, x2, y2, - x3, y3); + if (gr->debug) printf ("cairo_curve_to (%f, %f), (%f, %f), (%f, %f)\n", x1, y1, x2, y2, x3, y3); cairo_curve_to (gr->cr, x1, y1, x2, y2, x3, y3); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelMoveTo - (JNIEnv *env, jobject obj, jdouble dx, jdouble dy) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelMoveTo + (JNIEnv *env, jobject obj, jdouble dx, jdouble dy) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_rel_move_to (%f, %f)\n", dx, dy); + if (gr->debug) printf ("cairo_rel_move_to (%f, %f)\n", dx, dy); cairo_rel_move_to (gr->cr, dx, dy); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelLineTo - (JNIEnv *env, jobject obj, jdouble dx, jdouble dy) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelLineTo + (JNIEnv *env, jobject obj, jdouble dx, jdouble dy) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_rel_line_to (%f, %f)\n", dx, dy); + if (gr->debug) printf ("cairo_rel_line_to (%f, %f)\n", dx, dy); cairo_rel_line_to (gr->cr, dx, dy); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelCurveTo (JNIEnv *env, - jobject obj, - jdouble dx1, - jdouble dy1, - jdouble dx2, - jdouble dy2, - jdouble dx3, - jdouble dy3) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelCurveTo + (JNIEnv *env, jobject obj, jdouble dx1, jdouble dy1, jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_rel_curve_to (%f, %f), (%f, %f), (%f, %f)\n", dx1, dy1, - dx2, dy2, dx3, dy3); + if (gr->debug) printf ("cairo_rel_curve_to (%f, %f), (%f, %f), (%f, %f)\n", dx1, dy1, dx2, dy2, dx3, dy3); cairo_rel_curve_to (gr->cr, dx1, dy1, dx2, dy2, dx3, dy3); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRectangle - (JNIEnv *env, jobject obj, jdouble x, jdouble y, jdouble width, - jdouble height) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRectangle + (JNIEnv *env, jobject obj, jdouble x, jdouble y, jdouble width, jdouble height) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_rectangle (%f, %f) (%f, %f)\n", x, y, width, height); + if (gr->debug) printf ("cairo_rectangle (%f, %f) (%f, %f)\n", x, y, width, height); cairo_rectangle (gr->cr, x, y, width, height); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClosePath - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClosePath + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_close_path\n"); + if (gr->debug) printf ("cairo_close_path\n"); cairo_close_path (gr->cr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoStroke - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoStroke + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_stroke\n"); + if (gr->debug) printf ("cairo_stroke\n"); begin_drawing_operation (gr); cairo_stroke (gr->cr); end_drawing_operation (gr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoFill - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoFill + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_fill\n"); + if (gr->debug) printf ("cairo_fill\n"); begin_drawing_operation (gr); cairo_fill (gr->cr); end_drawing_operation (gr); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip - (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip + (JNIEnv *env, jobject obj) { struct graphics2d *gr = NULL; gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_clip\n"); + if (gr->debug) printf ("cairo_clip\n"); cairo_clip (gr->cr); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, - jobject obj, - jint filter) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter + (JNIEnv *env, jobject obj, jint filter) { - struct graphics2d *gr = NULL; - gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); - g_assert (gr != NULL); - if (gr->debug) - printf ("cairo_surface_set_filter %d\n", filter); - switch ((enum java_awt_rendering_hints_filter) filter) - { - case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR: - cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST); - break; - case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR: - cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BILINEAR); - break; - case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED: - cairo_surface_set_filter (gr->surface, CAIRO_FILTER_FAST); - break; - case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT: - cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST); - break; - case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY: - cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BEST); - break; - } + struct graphics2d *gr = NULL; + gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj); + g_assert (gr != NULL); + if (gr->debug) printf ("cairo_surface_set_filter %d\n", filter); + switch ((enum java_awt_rendering_hints_filter) filter) + { + case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR: + cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST); + break; + case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR: + cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BILINEAR); + break; + case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED: + cairo_surface_set_filter (gr->surface, CAIRO_FILTER_FAST); + break; + case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT: + cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST); + break; + case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY: + cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BEST); + break; + } } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c index 4be525d47..222c7cede 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c @@ -62,7 +62,8 @@ jmethodID areaPreparedID; jmethodID areaUpdatedID; static void -area_prepared (GdkPixbufLoader * loader, jobject *decoder) +area_prepared (GdkPixbufLoader *loader, + jobject *decoder) { jint width, height; @@ -70,61 +71,68 @@ area_prepared (GdkPixbufLoader * loader, jobject *decoder) if (pixbuf == NULL) return; - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf), gdk_threads_leave (); + width = gdk_pixbuf_get_width (pixbuf); + height = gdk_pixbuf_get_height (pixbuf), + + gdk_threads_leave (); g_assert (decoder != NULL); (*gdk_env)->CallVoidMethod (gdk_env, - *decoder, areaPreparedID, width, height); + *decoder, + areaPreparedID, + width, height); gdk_threads_enter (); } static void -area_updated (GdkPixbufLoader * loader, - gint x, gint y, gint width, gint height, jobject *decoder) +area_updated (GdkPixbufLoader *loader, + gint x, gint y, + gint width, gint height, + jobject *decoder) { jint stride_bytes, stride_pixels, n_channels, n_pixels; int i, px; - jintArray jpixels; + jintArray jpixels; jint *java_pixels; guchar *gdk_pixels; GdkPixbuf *pixbuf_no_alpha = NULL; GdkPixbuf *pixbuf = NULL; - + pixbuf_no_alpha = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf_no_alpha == NULL) return; - pixbuf = gdk_pixbuf_add_alpha (pixbuf_no_alpha, FALSE, 0, 0, 0); + pixbuf = gdk_pixbuf_add_alpha(pixbuf_no_alpha, FALSE, 0, 0, 0); g_assert (gdk_pixbuf_get_has_alpha (pixbuf)); - + stride_bytes = gdk_pixbuf_get_rowstride (pixbuf); n_channels = gdk_pixbuf_get_n_channels (pixbuf); - stride_pixels = stride_bytes / n_channels; + stride_pixels = stride_bytes / n_channels; n_pixels = height * stride_pixels; gdk_pixels = gdk_pixbuf_get_pixels (pixbuf); jpixels = (*gdk_env)->NewIntArray (gdk_env, n_pixels); java_pixels = (*gdk_env)->GetIntArrayElements (gdk_env, jpixels, NULL); - memcpy (java_pixels, - gdk_pixels + (y * stride_bytes), (height * stride_bytes)); + memcpy (java_pixels, + gdk_pixels + (y * stride_bytes), + (height * stride_bytes)); for (i = 0; i < n_pixels; ++i) { px = java_pixels[i]; /* move alpha around (GdkPixbufLoader results are AGBR not GBRA, in - the lsb sense) */ + the lsb sense) */ /* px = ((px >> 24) & 0xff) | ((px << 8) & 0xffffff00); */ /* it appears to require a full byte swap, now, not just a shift to - the A channel. why did this change? don't know. */ - px = ((px >> 8) & 0x00ff00ff) | ((px << 8) & 0xff00ff00); - px = ((px >> 16) & 0x0000ffff) | ((px << 16) & 0xffff0000); + the A channel. why did this change? don't know. */ + px = ((px >> 8) & 0x00ff00ff) | ((px << 8) & 0xff00ff00); + px = ((px >> 16) & 0x0000ffff) | ((px << 16) & 0xffff0000); java_pixels[i] = px; } @@ -134,20 +142,21 @@ area_updated (GdkPixbufLoader * loader, gdk_threads_leave (); (*gdk_env)->ReleaseIntArrayElements (gdk_env, jpixels, java_pixels, 0); - (*gdk_env)->CallVoidMethod (gdk_env, - *decoder, + (*gdk_env)->CallVoidMethod (gdk_env, + *decoder, areaUpdatedID, (jint) x, (jint) y, (jint) width, (jint) height, - jpixels, stride_pixels); + jpixels, + stride_pixels); gdk_threads_enter (); } static void -closed (GdkPixbufLoader * loader __attribute__ ((unused)), jobject *decoder) +closed (GdkPixbufLoader *loader __attribute__((unused)), jobject *decoder) { gdk_threads_leave (); - (*gdk_env)->DeleteGlobalRef (gdk_env, *decoder); + (*gdk_env)->DeleteGlobalRef (gdk_env, *decoder); free (decoder); gdk_threads_enter (); } @@ -166,25 +175,25 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initState gdk_threads_enter (); loader = gdk_pixbuf_loader_new (); - g_assert (loader != NULL); - g_signal_connect (loader, "area-prepared", G_CALLBACK (area_prepared), - decoder); - g_signal_connect (loader, "area-updated", G_CALLBACK (area_updated), - decoder); + g_assert (loader != NULL); + g_signal_connect (loader, "area-prepared", G_CALLBACK (area_prepared), decoder); + g_signal_connect (loader, "area-updated", G_CALLBACK (area_updated), decoder); g_signal_connect (loader, "closed", G_CALLBACK (closed), decoder); gdk_threads_leave (); NSA_SET_PB_PTR (env, obj, loader); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState (JNIEnv *env, - jclass clazz) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState + (JNIEnv *env, jclass clazz) { - areaPreparedID = (*env)->GetMethodID (env, clazz, "areaPrepared", "(II)V"); + areaPreparedID = (*env)->GetMethodID (env, clazz, + "areaPrepared", + "(II)V"); areaUpdatedID = (*env)->GetMethodID (env, clazz, - "areaUpdated", "(IIII[II)V"); + "areaUpdated", + "(IIII[II)V"); NSA_PB_INIT (env, clazz); } @@ -194,14 +203,14 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_finish { GdkPixbufLoader *loader = NULL; - loader = (GdkPixbufLoader *) NSA_DEL_PB_PTR (env, obj); + loader = (GdkPixbufLoader *)NSA_DEL_PB_PTR (env, obj); if (loader == NULL) return; gdk_threads_enter (); gdk_pixbuf_loader_close (loader, NULL); g_object_unref (loader); - gdk_threads_leave (); + gdk_threads_leave (); } @@ -216,7 +225,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_pumpBytes bytes = (*gdk_env)->GetByteArrayElements (gdk_env, jarr, NULL); g_assert (bytes != NULL); - loader = (GdkPixbufLoader *) NSA_GET_PB_PTR (env, obj); + loader = (GdkPixbufLoader *)NSA_GET_PB_PTR (env, obj); g_assert (loader != NULL); gdk_threads_enter (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c index 968dc1cce..7f5d44a2d 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c @@ -41,7 +41,8 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkButtonPeer.h" JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject obj) +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create + (JNIEnv *env, jobject obj) { GtkWidget *button; @@ -49,8 +50,8 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject obj) NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - - button = gtk_button_new (); + + button = gtk_button_new(); gtk_widget_show (button); gdk_threads_leave (); @@ -59,7 +60,7 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject obj) } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr; @@ -70,13 +71,13 @@ JNIEXPORT void JNICALL gtk_widget_realize (GTK_WIDGET (ptr)); - connect_awt_hook (env, obj, 1, GTK_BUTTON (ptr)->event_window); + connect_awt_hook (env, obj, 1, GTK_BUTTON(ptr)->event_window); gdk_threads_leave (); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals (JNIEnv *env, jobject obj) { /* FIXME: Do we need to connect any signals here? Otherwise just do not @@ -86,8 +87,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel (JNIEnv *env, jobject obj, jstring jtext) { const char *text; @@ -95,18 +96,18 @@ JNIEXPORT void JNICALL void *ptr; ptr = NSA_GET_PTR (env, obj); - label = gtk_bin_get_child (GTK_BIN (ptr)); + label = gtk_bin_get_child (GTK_BIN(ptr)); text = (*env)->GetStringUTFChars (env, jtext, NULL); gdk_threads_enter (); - gtk_label_set_text (GTK_LABEL (label), text); + gtk_label_set_text (GTK_LABEL(label), text); gdk_threads_leave (); (*env)->ReleaseStringUTFChars (env, jtext, text); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -118,14 +119,14 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); button = GTK_WIDGET (ptr); - label = gtk_bin_get_child (GTK_BIN (button)); - + label = gtk_bin_get_child (GTK_BIN(button)); + if (!label) - return; + return; font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -136,17 +137,17 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - gtk_widget_modify_font (GTK_WIDGET (label), font_desc); + gtk_widget_modify_font (GTK_WIDGET(label), font_desc); pango_font_description_free (font_desc); - gdk_threads_leave (); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, name, font_name); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, jobject obj, jint red, jint green, jint blue) { GdkColor color; @@ -161,10 +162,10 @@ JNIEXPORT void JNICALL gdk_threads_enter (); - label = gtk_bin_get_child (GTK_BIN (ptr)); + label = gtk_bin_get_child (GTK_BIN(ptr)); if (!label) - return; + return; gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &color); gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, &color); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c index a4e42eb3b..6a1a90ce1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c @@ -48,10 +48,12 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_create NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + widget = gtk_type_new (gtk_drawing_area_get_type ()); gdk_threads_leave (); NSA_SET_PTR (env, obj, widget); } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c index 87c76c069..71600c082 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c @@ -40,7 +40,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkMenuItemPeer.h" JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create +Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create (JNIEnv *env, jobject obj, jstring label) { GtkWidget *widget; @@ -52,7 +52,7 @@ JNIEXPORT void JNICALL str = (*env)->GetStringUTFChars (env, label, NULL); gdk_threads_enter (); - + widget = gtk_check_menu_item_new_with_label (str); gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (widget), 1); gtk_widget_show (widget); @@ -65,13 +65,13 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_setState +Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_setState (JNIEnv *env, jobject obj, jboolean state) { void *ptr; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (ptr), state); gdk_threads_leave (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c index 984995590..b0582cbe5 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c @@ -40,7 +40,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkCheckboxPeer.h" #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" -static void item_toggled (GtkToggleButton * item, jobject peer); +static void item_toggled (GtkToggleButton *item, jobject peer); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_dispose (JNIEnv *env, jobject obj) @@ -77,7 +77,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_remove } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate +Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject obj, jobject group, jboolean state) { GtkWidget *button; @@ -108,7 +108,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals +Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); @@ -118,7 +118,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); g_signal_connect (G_OBJECT (ptr), "toggled", - GTK_SIGNAL_FUNC (item_toggled), *gref); + GTK_SIGNAL_FUNC (item_toggled), *gref); gdk_threads_leave (); @@ -126,8 +126,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup (JNIEnv *env, jobject obj, jobject group) { GtkRadioButton *button; @@ -148,7 +148,7 @@ JNIEXPORT void JNICALL gtk_radio_button_set_group (button, NULL); else gtk_radio_button_set_group (button, - gtk_radio_button_group + gtk_radio_button_group (GTK_RADIO_BUTTON (native_group))); gdk_threads_leave (); @@ -165,7 +165,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont +Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -177,14 +177,14 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); button = GTK_WIDGET (ptr); - label = gtk_bin_get_child (GTK_BIN (button)); + label = gtk_bin_get_child (GTK_BIN(button)); if (!label) - return; + return; font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -194,18 +194,18 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - - gtk_widget_modify_font (GTK_WIDGET (label), font_desc); - + + gtk_widget_modify_font (GTK_WIDGET(label), font_desc); + pango_font_description_free (font_desc); - - gdk_threads_leave (); - + + gdk_threads_leave(); + (*env)->ReleaseStringUTFChars (env, name, font_name); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel +Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel (JNIEnv *env, jobject obj, jstring label) { const char *str; @@ -214,7 +214,7 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); - label_widget = gtk_bin_get_child (GTK_BIN (ptr)); + label_widget = gtk_bin_get_child (GTK_BIN(ptr)); str = (*env)->GetStringUTFChars (env, label, 0); @@ -228,7 +228,7 @@ JNIEXPORT void JNICALL } static void -item_toggled (GtkToggleButton * item, jobject peer) +item_toggled (GtkToggleButton *item, jobject peer) { //g_print ("toggled\n"); (*gdk_env)->CallVoidMethod (gdk_env, peer, diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c index e3e6a73d4..9b262d33d 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c @@ -39,13 +39,14 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkChoicePeer.h" -static void connect_choice_item_selectable_hook (JNIEnv *env, - jobject peer_obj, - GtkItem * menuitem, +static void connect_choice_item_selectable_hook (JNIEnv *env, + jobject peer_obj, + GtkItem *menuitem, const char *label); -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create + (JNIEnv *env, jobject obj) { GtkWidget *menu; GtkOptionMenu *option_menu; @@ -55,14 +56,14 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create (JNIEnv *env, jobject obj) NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + option_menu = GTK_OPTION_MENU (gtk_option_menu_new ()); menu = gtk_menu_new (); gtk_widget_show (menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); - gtk_widget_size_request (gtk_menu_item_new_with_label (""), + gtk_widget_size_request (gtk_menu_item_new_with_label (""), &child_requisition); option_menu->width = child_requisition.width; option_menu->height = child_requisition.height; @@ -72,8 +73,8 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create (JNIEnv *env, jobject obj) NSA_SET_PTR (env, obj, option_menu); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append (JNIEnv *env, jobject obj, jobjectArray items) { gpointer ptr; @@ -89,11 +90,11 @@ JNIEXPORT void JNICALL /* Are we adding the first element? */ if (gtk_option_menu_get_history (GTK_OPTION_MENU (ptr)) < 0) - need_set_history = 1; + need_set_history = 1; count = (*env)->GetArrayLength (env, items); - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { jobject item; const char *label; @@ -106,21 +107,21 @@ JNIEXPORT void JNICALL gtk_menu_append (menu, menuitem); gtk_widget_show (menuitem); - connect_choice_item_selectable_hook (env, obj, + connect_choice_item_selectable_hook (env, obj, GTK_ITEM (menuitem), label); (*env)->ReleaseStringUTFChars (env, item, label); } - /* If we just added the first element select it. */ + /* If we just added the first element select it. */ if (need_set_history) gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0); gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd (JNIEnv *env, jobject obj, jstring item, jint index) { void *ptr; @@ -130,17 +131,17 @@ JNIEXPORT void JNICALL int need_set_history = 0; ptr = NSA_GET_PTR (env, obj); - - label = (*env)->GetStringUTFChars (env, item, 0); + + label = (*env)->GetStringUTFChars (env, item, 0); gdk_threads_enter (); - + current = gtk_option_menu_get_history (GTK_OPTION_MENU (ptr)); /* Are we adding the first element or below or at the currently selected one? */ if ((current < 0) || (current >= index)) - need_set_history = 1; + need_set_history = 1; menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (ptr)); menuitem = gtk_menu_item_new_with_label (label); @@ -151,7 +152,7 @@ JNIEXPORT void JNICALL /* If we just added the first element select it. If we added at of below the currently selected position make - the first item the selected one. */ + the first item the selected one. */ if (need_set_history) gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0); @@ -160,8 +161,8 @@ JNIEXPORT void JNICALL (*env)->ReleaseStringUTFChars (env, item, label); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove (JNIEnv *env, jobject obj, jint index) { void *ptr; @@ -195,7 +196,7 @@ JNIEXPORT void JNICALL /* Are we removing the currently selected element? */ if (gtk_option_menu_get_history (GTK_OPTION_MENU (ptr)) == index) - need_set_history = 1; + need_set_history = 1; } for (i = from; i >= to; i--) @@ -206,15 +207,15 @@ JNIEXPORT void JNICALL } /* If we just removed the currently selected element and there are - still elements left in the list, make the first item the selected one. */ + still elements left in the list, make the first item the selected one. */ if (need_set_history && gtk_container_children (menu)) gtk_option_menu_set_history (GTK_OPTION_MENU (ptr), 0); gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkChoicePeer_select +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_select (JNIEnv *env, jobject obj, jint index) { void *ptr; @@ -226,8 +227,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory (JNIEnv *env, jobject obj) { void *ptr; @@ -245,7 +246,7 @@ JNIEXPORT jint JNICALL } static void -item_activate (GtkItem * item __attribute__ ((unused)), +item_activate (GtkItem *item __attribute__((unused)), struct item_event_hook_info *ie) { jstring label; @@ -254,12 +255,14 @@ item_activate (GtkItem * item __attribute__ ((unused)), label = (*gdk_env)->NewStringUTF (gdk_env, ie->label); (*gdk_env)->CallVoidMethod (gdk_env, ie->peer_obj, choicePostItemEventID, - label, (jint) AWT_ITEM_SELECTED); + label, + (jint) AWT_ITEM_SELECTED); gdk_threads_enter (); } static void -item_removed (gpointer data, GClosure gc __attribute__ ((unused))) +item_removed (gpointer data, + GClosure gc __attribute__((unused))) { struct item_event_hook_info *ie = data; @@ -268,14 +271,15 @@ item_removed (gpointer data, GClosure gc __attribute__ ((unused))) } static void -connect_choice_item_selectable_hook (JNIEnv *env, - jobject peer_obj, - GtkItem * menuitem, const char *label) +connect_choice_item_selectable_hook (JNIEnv *env, + jobject peer_obj, + GtkItem *menuitem, + const char *label) { struct item_event_hook_info *ie; jobject *peer_objGlobPtr; - ie = (struct item_event_hook_info *) + ie = (struct item_event_hook_info *) malloc (sizeof (struct item_event_hook_info)); peer_objGlobPtr = NSA_GET_GLOBAL_REF (env, peer_obj); @@ -284,7 +288,7 @@ connect_choice_item_selectable_hook (JNIEnv *env, ie->peer_obj = *peer_objGlobPtr; ie->label = strdup (label); - g_signal_connect_data (G_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (item_activate), ie, - (GClosureNotify) item_removed, 0); + g_signal_connect_data (G_OBJECT (menuitem), "activate", + GTK_SIGNAL_FUNC (item_activate), ie, + (GClosureNotify) item_removed, 0); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c index aec50fa18..a13274003 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c @@ -50,19 +50,19 @@ gint selection_clear (GtkWidget *, GdkEventSelection *); GtkWidget *clipboard; jobject cb_obj; -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, jobject obj) { if (!stringSelectionReceivedID) { jclass gtkclipboard; - gtkclipboard = (*env)->FindClass (env, + gtkclipboard = (*env)->FindClass (env, "gnu/java/awt/peer/gtk/GtkClipboard"); stringSelectionReceivedID = (*env)->GetMethodID (env, gtkclipboard, - "stringSelectionReceived", - "(Ljava/lang/String;)V"); + "stringSelectionReceived", + "(Ljava/lang/String;)V"); stringSelectionHandlerID = (*env)->GetMethodID (env, gtkclipboard, "stringSelectionHandler", "()Ljava/lang/String;"); @@ -75,38 +75,36 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env, gdk_threads_enter (); clipboard = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (G_OBJECT (clipboard), "selection_received", - GTK_SIGNAL_FUNC (selection_received), NULL); + g_signal_connect (G_OBJECT(clipboard), "selection_received", + GTK_SIGNAL_FUNC (selection_received), NULL); - g_signal_connect (G_OBJECT (clipboard), "selection_clear_event", - GTK_SIGNAL_FUNC (selection_clear), NULL); + g_signal_connect (G_OBJECT(clipboard), "selection_clear_event", + GTK_SIGNAL_FUNC (selection_clear), NULL); - gtk_selection_add_target (clipboard, GDK_SELECTION_PRIMARY, + gtk_selection_add_target (clipboard, GDK_SELECTION_PRIMARY, GDK_TARGET_STRING, 0); - g_signal_connect (G_OBJECT (clipboard), "selection_get", - GTK_SIGNAL_FUNC (selection_get), NULL); + g_signal_connect (G_OBJECT(clipboard), "selection_get", + GTK_SIGNAL_FUNC (selection_get), NULL); gdk_threads_leave (); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion - (JNIEnv *env __attribute__ ((unused)), jclass clazz - __attribute__ ((unused))) +Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion + (JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused))) { gdk_threads_enter (); - gtk_selection_convert (clipboard, GDK_SELECTION_PRIMARY, + gtk_selection_convert (clipboard, GDK_SELECTION_PRIMARY, GDK_TARGET_STRING, GDK_CURRENT_TIME); gdk_threads_leave (); } void -selection_received (GtkWidget * widget __attribute__ ((unused)), - GtkSelectionData * selection_data - __attribute__ ((unused)), guint time - __attribute__ ((unused)), gpointer data - __attribute__ ((unused))) +selection_received (GtkWidget *widget __attribute__((unused)), + GtkSelectionData *selection_data __attribute__((unused)), + guint time __attribute__((unused)), + gpointer data __attribute__((unused))) { /* Check to see if retrieval succeeded */ if (selection_data->length < 0 @@ -118,7 +116,7 @@ selection_received (GtkWidget * widget __attribute__ ((unused)), else { char *str = (char *) selection_data->data; - + (*gdk_env)->CallVoidMethod (gdk_env, cb_obj, stringSelectionReceivedID, (*gdk_env)->NewStringUTF (gdk_env, str)); } @@ -127,37 +125,38 @@ selection_received (GtkWidget * widget __attribute__ ((unused)), } void -selection_get (GtkWidget * widget __attribute__ ((unused)), - GtkSelectionData * selection_data, - guint info __attribute__ ((unused)), - guint time __attribute__ ((unused)), - gpointer data __attribute__ ((unused))) +selection_get (GtkWidget *widget __attribute__((unused)), + GtkSelectionData *selection_data, + guint info __attribute__((unused)), + guint time __attribute__((unused)), + gpointer data __attribute__((unused))) { jstring jstr; const char *utf; jsize utflen; - jstr = (*gdk_env)->CallObjectMethod (gdk_env, cb_obj, + jstr = (*gdk_env)->CallObjectMethod (gdk_env, cb_obj, stringSelectionHandlerID); if (!jstr) { - gtk_selection_data_set (selection_data, GDK_TARGET_STRING, 8, NULL, 0); + gtk_selection_data_set (selection_data, + GDK_TARGET_STRING, 8, NULL, 0); return; } utflen = (*gdk_env)->GetStringUTFLength (gdk_env, jstr); utf = (*gdk_env)->GetStringUTFChars (gdk_env, jstr, NULL); - gtk_selection_data_set (selection_data, GDK_TARGET_STRING, 8, - (char *) utf, utflen); + gtk_selection_data_set (selection_data, GDK_TARGET_STRING, 8, + (char *)utf, utflen); (*gdk_env)->ReleaseStringUTFChars (gdk_env, jstr, utf); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet - (JNIEnv *env, jclass clazz __attribute__ ((unused))) +Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet + (JNIEnv *env, jclass clazz __attribute__((unused))) { GdkWindow *owner; @@ -168,16 +167,15 @@ JNIEXPORT void JNICALL owner = gdk_selection_owner_get (GDK_SELECTION_PRIMARY); if (owner && owner == clipboard->window) (*env)->CallVoidMethod (env, cb_obj, selectionClearID); - - gtk_selection_owner_set (clipboard, GDK_SELECTION_PRIMARY, - GDK_CURRENT_TIME); + + gtk_selection_owner_set (clipboard, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); gdk_threads_leave (); } gint -selection_clear (GtkWidget * widget __attribute__ ((unused)), - GdkEventSelection * event __attribute__ ((unused))) +selection_clear (GtkWidget *widget __attribute__((unused)), + GdkEventSelection *event __attribute__((unused))) { (*gdk_env)->CallVoidMethod (gdk_env, cb_obj, selectionClearID); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c index 549c663c8..0575865fb 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c @@ -40,8 +40,8 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include <gtk/gtkprivate.h> -static GtkWidget *find_fg_color_widget (GtkWidget * widget); -static GtkWidget *find_bg_color_widget (GtkWidget * widget); +static GtkWidget *find_fg_color_widget (GtkWidget *widget); +static GtkWidget *find_bg_color_widget (GtkWidget *widget); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose (JNIEnv *env, jobject obj) @@ -53,7 +53,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose ptr = NSA_DEL_PTR (env, obj); gdk_threads_enter (); - + /* For now the native state for any object must be a widget. However, a subclass could override dispose() if required. */ gtk_widget_destroy (GTK_WIDGET (ptr)); @@ -61,9 +61,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor - (JNIEnv *env, jobject obj, jint type) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor + (JNIEnv *env, jobject obj, jint type) { void *ptr; GtkWidget *widget; @@ -116,10 +116,10 @@ JNIEXPORT void JNICALL default: gdk_cursor_type = GDK_LEFT_PTR; } - + gdk_threads_enter (); - widget = GTK_WIDGET (ptr); + widget = GTK_WIDGET(ptr); gdk_cursor = gdk_cursor_new (gdk_cursor_type); gdk_window_set_cursor (widget->window, gdk_cursor); @@ -128,14 +128,13 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus (JNIEnv *env, - jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus + (JNIEnv *env, jobject obj) { void *ptr; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gtk_widget_grab_focus (GTK_WIDGET (ptr)); gdk_threads_leave (); @@ -144,9 +143,9 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus (JNIEnv *env, /* * Find the origin of a widget's window. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen - (JNIEnv *env, jobject obj, jintArray jpoint) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen + (JNIEnv * env, jobject obj, jintArray jpoint) { void *ptr; jint *point; @@ -156,24 +155,24 @@ JNIEXPORT void JNICALL gdk_threads_enter (); - gdk_window_get_origin (GTK_WIDGET (ptr)->window, point, point + 1); + gdk_window_get_origin (GTK_WIDGET (ptr)->window, point, point+1); if (!GTK_IS_CONTAINER (ptr)) { - *point += GTK_WIDGET (ptr)->allocation.x; - *(point + 1) += GTK_WIDGET (ptr)->allocation.y; + *point += GTK_WIDGET(ptr)->allocation.x; + *(point+1) += GTK_WIDGET(ptr)->allocation.y; } gdk_threads_leave (); - (*env)->ReleaseIntArrayElements (env, jpoint, point, 0); + (*env)->ReleaseIntArrayElements(env, jpoint, point, 0); } /* * Find this widget's current size. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions (JNIEnv *env, jobject obj, jintArray jdims) { void *ptr; @@ -182,7 +181,7 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); - dims = (*env)->GetIntArrayElements (env, jdims, 0); + dims = (*env)->GetIntArrayElements (env, jdims, 0); dims[0] = dims[1] = 0; gdk_threads_enter (); @@ -200,8 +199,8 @@ JNIEXPORT void JNICALL /* * Find this widget's preferred size. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions (JNIEnv *env, jobject obj, jintArray jdims) { void *ptr; @@ -211,7 +210,7 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); - dims = (*env)->GetIntArrayElements (env, jdims, 0); + dims = (*env)->GetIntArrayElements (env, jdims, 0); dims[0] = dims[1] = 0; gdk_threads_enter (); @@ -235,26 +234,21 @@ JNIEXPORT void JNICALL (*env)->ReleaseIntArrayElements (env, jdims, dims, 0); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetUsize (JNIEnv *env, - jobject obj, - jint w, jint h) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetUsize (JNIEnv *env, + jobject obj, jint w, jint h) { void *ptr; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gtk_widget_set_usize (GTK_WIDGET (ptr), w, h); gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, - jobject obj, - jint x, jint y, - jint width, - jint height) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds + (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) { GtkWidget *widget; void *ptr; @@ -277,8 +271,8 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, gdk_threads_leave (); } -JNIEXPORT jintArray JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground +JNIEXPORT jintArray JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv *env, jobject obj) { void *ptr; @@ -295,16 +289,16 @@ JNIEXPORT jintArray JNICALL array = (*env)->NewIntArray (env, 3); rgb = (*env)->GetIntArrayElements (env, array, NULL); /* convert color data from 16 bit values down to 8 bit values */ - rgb[0] = bg.red >> 8; + rgb[0] = bg.red >> 8; rgb[1] = bg.green >> 8; - rgb[2] = bg.blue >> 8; + rgb[2] = bg.blue >> 8; (*env)->ReleaseIntArrayElements (env, array, rgb, 0); return array; } -JNIEXPORT jintArray JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground +JNIEXPORT jintArray JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground (JNIEnv *env, jobject obj) { void *ptr; @@ -321,16 +315,16 @@ JNIEXPORT jintArray JNICALL array = (*env)->NewIntArray (env, 3); rgb = (*env)->GetIntArrayElements (env, array, NULL); /* convert color data from 16 bit values down to 8 bit values */ - rgb[0] = fg.red >> 8; + rgb[0] = fg.red >> 8; rgb[1] = fg.green >> 8; - rgb[2] = fg.blue >> 8; + rgb[2] = fg.blue >> 8; (*env)->ReleaseIntArrayElements (env, array, rgb, 0); return array; } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv *env, jobject obj, jint red, jint green, jint blue) { GdkColor normal_color; @@ -361,8 +355,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv *env, jobject obj, jint red, jint green, jint blue) { GdkColor color; @@ -387,7 +381,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -398,7 +392,7 @@ JNIEXPORT void JNICALL font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -409,17 +403,17 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - gtk_widget_modify_font (GTK_WIDGET (ptr), font_desc); + gtk_widget_modify_font (GTK_WIDGET(ptr), font_desc); pango_font_description_free (font_desc); - gdk_threads_leave (); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, name, font_name); } void -set_visible (GtkWidget * widget, jboolean visible) +set_visible (GtkWidget *widget, jboolean visible) { if (visible) gtk_widget_show (widget); @@ -428,16 +422,16 @@ set_visible (GtkWidget * widget, jboolean visible) } GtkLayout * -find_gtk_layout (GtkWidget * parent) +find_gtk_layout (GtkWidget *parent) { if (GTK_IS_WINDOW (parent)) { - GList *children = gtk_container_children - (GTK_CONTAINER (GTK_BIN (parent)->child)); + GList *children = gtk_container_children + (GTK_CONTAINER (GTK_BIN (parent)->child)); if (GTK_IS_MENU_BAR (children->data)) return GTK_LAYOUT (children->next->data); - else /* GTK_IS_LAYOUT (children->data) */ + else /* GTK_IS_LAYOUT (children->data) */ return GTK_LAYOUT (children->data); } @@ -447,48 +441,49 @@ find_gtk_layout (GtkWidget * parent) #define WIDGET_CLASS(w) GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass) void -set_parent (GtkWidget * widget, GtkContainer * parent) +set_parent (GtkWidget *widget, GtkContainer *parent) { if (GTK_IS_WINDOW (parent)) { - GList *children = gtk_container_children - (GTK_CONTAINER (GTK_BIN (parent)->child)); + GList *children = gtk_container_children + (GTK_CONTAINER (GTK_BIN (parent)->child)); if (GTK_IS_MENU_BAR (children->data)) gtk_layout_put (GTK_LAYOUT (children->next->data), widget, 0, 0); - else /* GTK_IS_LAYOUT (children->data) */ + else /* GTK_IS_LAYOUT (children->data) */ gtk_layout_put (GTK_LAYOUT (children->data), widget, 0, 0); } - else if (GTK_IS_SCROLLED_WINDOW (parent)) - { + else + if (GTK_IS_SCROLLED_WINDOW (parent)) + { /* if (WIDGET_CLASS (widget)->set_scroll_adjustments_signal) */ /* gtk_container_add (GTK_CONTAINER (parent), widget); */ /* else */ /* { */ - gtk_scrolled_window_add_with_viewport - (GTK_SCROLLED_WINDOW (parent), widget); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (widget->parent), - GTK_SHADOW_NONE); + gtk_scrolled_window_add_with_viewport + (GTK_SCROLLED_WINDOW (parent), widget); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (widget->parent), + GTK_SHADOW_NONE); /* } */ - } + } /* gtk_layout_put */ /* (GTK_LAYOUT (GTK_BIN (parent)->child), widget, 0, 0); */ /* if (GTK_IS_SCROLLED_WINDOW (parent)) */ /* gtk_layout_put */ /* (GTK_LAYOUT (GTK_BIN (GTK_BIN (parent)->child)->child), widget, 0, 0); */ - else - gtk_layout_put (GTK_LAYOUT (parent), widget, 0, 0); + else + gtk_layout_put (GTK_LAYOUT (parent), widget, 0, 0); } -JNIEXPORT jboolean JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled +JNIEXPORT jboolean JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled (JNIEnv *env, jobject obj) { void *ptr; jboolean ret_val; - + ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); @@ -498,10 +493,9 @@ JNIEXPORT jboolean JNICALL return ret_val; } -JNIEXPORT jboolean JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab - (JNIEnv *env __attribute__ ((unused)), jclass clazz - __attribute__ ((unused))) +JNIEXPORT jboolean JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab + (JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused))) { GtkWidget *widget; jboolean retval; @@ -514,8 +508,8 @@ JNIEXPORT jboolean JNICALL return retval; } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2 +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv *env, jobject obj, jstring jname, jstring jvalue) { const char *name; @@ -526,16 +520,15 @@ JNIEXPORT void JNICALL name = (*env)->GetStringUTFChars (env, jname, NULL); value = (*env)->GetStringUTFChars (env, jvalue, NULL); - gdk_threads_enter (); - g_object_set (ptr, name, value, NULL); - gdk_threads_leave (); + gdk_threads_enter(); + g_object_set(ptr, name, value, NULL); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, name); (*env)->ReleaseStringUTFChars (env, jvalue, value); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z (JNIEnv *env, jobject obj, jstring jname, jboolean value) { const char *name; @@ -545,15 +538,14 @@ JNIEXPORT void JNICALL name = (*env)->GetStringUTFChars (env, jname, NULL); - gdk_threads_enter (); - g_object_set (ptr, name, value, NULL); - gdk_threads_leave (); + gdk_threads_enter(); + g_object_set(ptr, name, value, NULL); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, name); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I (JNIEnv *env, jobject obj, jstring jname, jint value) { const char *name; @@ -562,15 +554,14 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); name = (*env)->GetStringUTFChars (env, jname, NULL); - gdk_threads_enter (); - g_object_set (ptr, name, value, NULL); - gdk_threads_leave (); + gdk_threads_enter(); + g_object_set(ptr, name, value, NULL); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, name); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F (JNIEnv *env, jobject obj, jstring jname, jfloat value) { const char *name; @@ -579,15 +570,15 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); name = (*env)->GetStringUTFChars (env, jname, NULL); - gdk_threads_enter (); - g_object_set (ptr, name, value, NULL); - gdk_threads_leave (); + gdk_threads_enter(); + g_object_set(ptr, name, value, NULL); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, name); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2 +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2 (JNIEnv *env, jobject obj1, jstring jname, jobject obj2) { const char *name; @@ -595,7 +586,7 @@ JNIEXPORT void JNICALL ptr1 = NSA_GET_PTR (env, obj1); ptr2 = NSA_GET_PTR (env, obj2); - + name = (*env)->GetStringUTFChars (env, jname, NULL); /* special case to catch where we need to set the parent */ @@ -609,38 +600,36 @@ JNIEXPORT void JNICALL return; } - gdk_threads_enter (); - g_object_set (ptr1, name, ptr2, NULL); - gdk_threads_leave (); + gdk_threads_enter(); + g_object_set(ptr1, name, ptr2, NULL); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, name); } gboolean -filter_expose_event_handler (GtkWidget * widget, GdkEvent * event, - jobject peer) +filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer) { // Prevent the default event handler from getting this signal if applicable // FIXME: I came up with these filters by looking for patterns in the unwanted // expose events that are fed back to us from gtk/X. Perhaps there is // a way to prevent them from occuring in the first place. - if (event->type == GDK_EXPOSE && (!GTK_IS_LAYOUT (widget) - || event->any.window != widget->window)) + if (event->type == GDK_EXPOSE && (!GTK_IS_LAYOUT(widget) + || event->any.window != widget->window)) { - g_signal_stop_emission_by_name (GTK_OBJECT (widget), "event"); + g_signal_stop_emission_by_name(GTK_OBJECT(widget), "event"); return FALSE; } else { // There may be non-expose events that are triggered while we're // painting a heavyweight peer. - return pre_event_handler (widget, event, peer); + return pre_event_handler(widget, event, peer); } } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, - jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter + (JNIEnv *env, jobject obj) { GtkObject *filterobj; GtkWidget *vbox, *layout; @@ -654,38 +643,37 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, // GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow. // Events go to the GtkLayout layer, so we filter them there. - if (GTK_IS_WINDOW (ptr)) + if (GTK_IS_WINDOW(ptr)) { - children = gtk_container_get_children (GTK_CONTAINER (ptr)); + children = gtk_container_get_children(GTK_CONTAINER(ptr)); vbox = children->data; - g_assert (GTK_IS_VBOX (vbox)); + g_assert (GTK_IS_VBOX(vbox)); - children = gtk_container_get_children (GTK_CONTAINER (vbox)); + children = gtk_container_get_children(GTK_CONTAINER(vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); - g_assert (GTK_IS_LAYOUT (layout)); + g_assert (GTK_IS_LAYOUT(layout)); - filterobj = GTK_OBJECT (layout); + filterobj = GTK_OBJECT(layout); } else { - filterobj = GTK_OBJECT (ptr); + filterobj = GTK_OBJECT(ptr); } g_signal_handlers_block_by_func (filterobj, *pre_event_handler, *gref); - g_signal_connect (filterobj, "event", - G_CALLBACK (filter_expose_event_handler), *gref); + g_signal_connect( filterobj, "event", + G_CALLBACK(filter_expose_event_handler), *gref); gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, - jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter + (JNIEnv *env, jobject obj) { GtkObject *filterobj; GtkWidget *vbox, *layout; @@ -699,68 +687,58 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, // GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow. // Events go to the GtkLayout layer, so we filter them there. - if (GTK_IS_WINDOW (ptr)) + if (GTK_IS_WINDOW(ptr)) { - children = gtk_container_get_children (GTK_CONTAINER (ptr)); + children = gtk_container_get_children(GTK_CONTAINER(ptr)); vbox = children->data; - g_assert (GTK_IS_VBOX (vbox)); + g_assert (GTK_IS_VBOX(vbox)); - children = gtk_container_get_children (GTK_CONTAINER (vbox)); + children = gtk_container_get_children(GTK_CONTAINER(vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); - g_assert (GTK_IS_LAYOUT (layout)); + g_assert (GTK_IS_LAYOUT(layout)); - filterobj = GTK_OBJECT (layout); + filterobj = GTK_OBJECT(layout); } else { - filterobj = GTK_OBJECT (ptr); + filterobj = GTK_OBJECT(ptr); } g_signal_handlers_disconnect_by_func (filterobj, - *filter_expose_event_handler, *gref); + *filter_expose_event_handler, *gref); g_signal_handlers_unblock_by_func (filterobj, *pre_event_handler, *gref); gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea (JNIEnv - *env, - jobject - obj, - jint x, - jint y, - jint - width, - jint - height) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea + (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) { GdkRectangle rect; void *ptr; ptr = NSA_GET_PTR (env, obj); - rect.x = x + GTK_WIDGET (ptr)->allocation.x; - rect.y = y + GTK_WIDGET (ptr)->allocation.y; + rect.x = x + GTK_WIDGET(ptr)->allocation.x; + rect.y = y + GTK_WIDGET(ptr)->allocation.y; rect.width = width; rect.height = height; gdk_threads_enter (); gdk_window_invalidate_rect (GTK_WIDGET (ptr)->window, &rect, 0); - gdk_window_process_all_updates (); + gdk_window_process_all_updates(); gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, - jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject + (JNIEnv *env, jobject obj) { void *ptr; @@ -775,9 +753,8 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, gdk_threads_leave (); } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, - jobject obj) +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals + (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); jobject *gref = NSA_GET_GLOBAL_REF (env, obj); @@ -786,7 +763,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, gdk_threads_enter (); gtk_widget_realize (GTK_WIDGET (ptr)); - + /* FIXME: We could check here if this is a scrolled window with a single child that does not have an associated jobject. This means that it is one of our wrapped widgets like List or TextArea @@ -795,19 +772,19 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, /* Connect EVENT signal, which happens _before_ any specific signal. */ - g_signal_connect (GTK_OBJECT (ptr), "event", - G_CALLBACK (pre_event_handler), *gref); + g_signal_connect (GTK_OBJECT (ptr), "event", + G_CALLBACK (pre_event_handler), *gref); gdk_threads_leave (); } static GtkWidget * -find_fg_color_widget (GtkWidget * widget) +find_fg_color_widget (GtkWidget *widget) { GtkWidget *fg_color_widget; if (GTK_IS_EVENT_BOX (widget) || GTK_IS_BUTTON (widget)) - fg_color_widget = gtk_bin_get_child (GTK_BIN (widget)); + fg_color_widget = gtk_bin_get_child (GTK_BIN(widget)); else fg_color_widget = widget; @@ -815,19 +792,19 @@ find_fg_color_widget (GtkWidget * widget) } static GtkWidget * -find_bg_color_widget (GtkWidget * widget) +find_bg_color_widget (GtkWidget *widget) { GtkWidget *bg_color_widget; if (GTK_IS_WINDOW (widget)) { GtkWidget *vbox; - GList *children; + GList* children; - children = gtk_container_get_children (GTK_CONTAINER (widget)); + children = gtk_container_get_children(GTK_CONTAINER(widget)); vbox = children->data; - children = gtk_container_get_children (GTK_CONTAINER (vbox)); + children = gtk_container_get_children(GTK_CONTAINER(vbox)); bg_color_widget = children->data; } else @@ -835,3 +812,4 @@ find_bg_color_widget (GtkWidget * widget) return bg_color_widget; } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c index e96441141..a4aa6dd1a 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c @@ -46,19 +46,13 @@ exception statement from your version. */ #define AWT_EXCEPTION "java/awt/AWTException" JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create__J (JNIEnv *env, - jobject obj, - jlong socket_id) +Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create__J (JNIEnv *env, jobject obj, jlong socket_id) { - JCL_ThrowException (env, AWT_EXCEPTION, - "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.create(): not implemented"); + JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.create(): not implemented"); } JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, - jobject obj, - jlong socket_id) +Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject obj, jlong socket_id) { - JCL_ThrowException (env, AWT_EXCEPTION, - "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.construct(): not implemented"); + JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.construct(): not implemented"); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c index 9db5d56e6..95f730111 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c @@ -113,7 +113,7 @@ state_to_awt_mods_with_button_states (guint state) no modifiers. GDK's key events behave in the exact opposite way, so this translation code is needed. */ jint -keyevent_state_to_awt_mods (GdkEvent * event) +keyevent_state_to_awt_mods (GdkEvent *event) { jint result = 0; guint state; @@ -123,53 +123,55 @@ keyevent_state_to_awt_mods (GdkEvent * event) state = event->key.state; if (event->key.keyval == GDK_Shift_L - || event->key.keyval == GDK_Shift_R) - result |= AWT_SHIFT_MASK; + || event->key.keyval == GDK_Shift_R) + result |= AWT_SHIFT_MASK; else - { - if (state & GDK_SHIFT_MASK) - result |= AWT_SHIFT_MASK; - } + { + if (state & GDK_SHIFT_MASK) + result |= AWT_SHIFT_MASK; + } if (event->key.keyval == GDK_Control_L - || event->key.keyval == GDK_Control_R) - result |= AWT_CTRL_MASK; + || event->key.keyval == GDK_Control_R) + result |= AWT_CTRL_MASK; else - { - if (state & GDK_CONTROL_MASK) - result |= AWT_CTRL_MASK; - } - - if (event->key.keyval == GDK_Alt_L || event->key.keyval == GDK_Alt_R) - result |= AWT_ALT_MASK; + { + if (state & GDK_CONTROL_MASK) + result |= AWT_CTRL_MASK; + } + + if (event->key.keyval == GDK_Alt_L + || event->key.keyval == GDK_Alt_R) + result |= AWT_ALT_MASK; else - { - if (state & GDK_MOD1_MASK) - result |= AWT_ALT_MASK; - } + { + if (state & GDK_MOD1_MASK) + result |= AWT_ALT_MASK; + } } else if (event->type == GDK_KEY_RELEASE) { state = event->key.state; if (event->key.keyval != GDK_Shift_L - && event->key.keyval != GDK_Shift_R) - { - if (state & GDK_SHIFT_MASK) - result |= AWT_SHIFT_MASK; - } + && event->key.keyval != GDK_Shift_R) + { + if (state & GDK_SHIFT_MASK) + result |= AWT_SHIFT_MASK; + } if (event->key.keyval != GDK_Control_L - && event->key.keyval != GDK_Control_R) - { - if (state & GDK_CONTROL_MASK) - result |= AWT_CTRL_MASK; - } - - if (event->key.keyval != GDK_Alt_L && event->key.keyval != GDK_Alt_R) - { - if (state & GDK_MOD1_MASK) - result |= AWT_ALT_MASK; - } + && event->key.keyval != GDK_Control_R) + { + if (state & GDK_CONTROL_MASK) + result |= AWT_CTRL_MASK; + } + + if (event->key.keyval != GDK_Alt_L + && event->key.keyval != GDK_Alt_R) + { + if (state & GDK_MOD1_MASK) + result |= AWT_ALT_MASK; + } } return result; @@ -179,18 +181,20 @@ keyevent_state_to_awt_mods (GdkEvent * event) first keyval corresponds roughly to Java's notion of a virtual key. Returns the uppercase version of the first keyval. */ static guint -get_first_keyval_from_keymap (GdkEvent * event) +get_first_keyval_from_keymap (GdkEvent *event) { guint keyval; guint *keyvals; gint n_entries; if (!gdk_keymap_get_entries_for_keycode (NULL, - event->key.hardware_keycode, - NULL, &keyvals, &n_entries)) + event->key.hardware_keycode, + NULL, + &keyvals, + &n_entries)) { g_warning ("No keyval found for hardware keycode %d\n", - event->key.hardware_keycode); + event->key.hardware_keycode); /* Try to recover by using the keyval in the event structure. */ keyvals = &(event->key.keyval); } @@ -203,8 +207,8 @@ get_first_keyval_from_keymap (GdkEvent * event) #ifdef __GNUC__ __inline #endif - static jint -keysym_to_awt_keycode (GdkEvent * event) +static jint +keysym_to_awt_keycode (GdkEvent *event) { guint ukeyval; guint state; @@ -254,37 +258,37 @@ keysym_to_awt_keycode (GdkEvent * event) /* For keys on the numeric keypad, the JVM produces one of two virtual keys, depending on the num lock state. */ if (state & GDK_MOD2_MASK) - return VK_NUMPAD9; + return VK_NUMPAD9; else - return VK_PAGE_UP; + return VK_PAGE_UP; case GDK_Page_Up: return VK_PAGE_UP; case GDK_KP_Page_Down: if (state & GDK_MOD2_MASK) - return VK_NUMPAD3; + return VK_NUMPAD3; else - return VK_PAGE_DOWN; + return VK_PAGE_DOWN; case GDK_Page_Down: return VK_PAGE_DOWN; case GDK_KP_End: if (state & GDK_MOD2_MASK) - return VK_NUMPAD1; + return VK_NUMPAD1; else - return VK_END; + return VK_END; case GDK_End: return VK_END; case GDK_KP_Home: if (state & GDK_MOD2_MASK) - return VK_NUMPAD7; + return VK_NUMPAD7; else - return VK_HOME; + return VK_HOME; case GDK_Home: return VK_HOME; case GDK_KP_Begin: if (state & GDK_MOD2_MASK) - return VK_NUMPAD5; + return VK_NUMPAD5; else - return VK_UNDEFINED; + return VK_UNDEFINED; case GDK_Left: return VK_LEFT; case GDK_Up: @@ -302,49 +306,49 @@ keysym_to_awt_keycode (GdkEvent * event) case GDK_slash: return VK_SLASH; /* - return VK_0; - return VK_1; - return VK_2; - return VK_3; - return VK_4; - return VK_5; - return VK_6; - return VK_7; - return VK_8; - return VK_9; - */ + return VK_0; + return VK_1; + return VK_2; + return VK_3; + return VK_4; + return VK_5; + return VK_6; + return VK_7; + return VK_8; + return VK_9; + */ case GDK_semicolon: return VK_SEMICOLON; case GDK_equal: return VK_EQUALS; /* - return VK_A; - return VK_B; - return VK_C; - return VK_D; - return VK_E; - return VK_F; - return VK_G; - return VK_H; - return VK_I; - return VK_J; - return VK_K; - return VK_L; - return VK_M; - return VK_N; - return VK_O; - return VK_P; - return VK_Q; - return VK_R; - return VK_S; - return VK_T; - return VK_U; - return VK_V; - return VK_W; - return VK_X; - return VK_Y; - return VK_Z; - */ + return VK_A; + return VK_B; + return VK_C; + return VK_D; + return VK_E; + return VK_F; + return VK_G; + return VK_H; + return VK_I; + return VK_J; + return VK_K; + return VK_L; + return VK_M; + return VK_N; + return VK_O; + return VK_P; + return VK_Q; + return VK_R; + return VK_S; + return VK_T; + return VK_U; + return VK_V; + return VK_W; + return VK_X; + return VK_Y; + return VK_Z; + */ case GDK_bracketleft: return VK_OPEN_BRACKET; case GDK_backslash: @@ -376,8 +380,8 @@ keysym_to_awt_keycode (GdkEvent * event) case GDK_KP_Add: return VK_ADD; /* - return VK_SEPARATER; - */ + return VK_SEPARATER; + */ case GDK_KP_Separator: return VK_SEPARATOR; case GDK_KP_Subtract: @@ -388,9 +392,9 @@ keysym_to_awt_keycode (GdkEvent * event) return VK_DIVIDE; case GDK_KP_Delete: if (state & GDK_MOD2_MASK) - return VK_DECIMAL; + return VK_DECIMAL; else - return VK_DELETE; + return VK_DELETE; case GDK_Delete: return VK_DELETE; case GDK_Num_Lock: @@ -449,9 +453,9 @@ keysym_to_awt_keycode (GdkEvent * event) return VK_PRINTSCREEN; case GDK_KP_Insert: if (state & GDK_MOD2_MASK) - return VK_NUMPAD0; + return VK_NUMPAD0; else - return VK_INSERT; + return VK_INSERT; case GDK_Insert: return VK_INSERT; case GDK_Help: @@ -465,24 +469,24 @@ keysym_to_awt_keycode (GdkEvent * event) return VK_QUOTE; case GDK_KP_Up: if (state & GDK_MOD2_MASK) - return VK_NUMPAD8; + return VK_NUMPAD8; else - return VK_KP_UP; + return VK_KP_UP; case GDK_KP_Down: if (state & GDK_MOD2_MASK) - return VK_NUMPAD2; + return VK_NUMPAD2; else - return VK_KP_DOWN; + return VK_KP_DOWN; case GDK_KP_Left: if (state & GDK_MOD2_MASK) - return VK_NUMPAD4; + return VK_NUMPAD4; else - return VK_KP_LEFT; + return VK_KP_LEFT; case GDK_KP_Right: if (state & GDK_MOD2_MASK) - return VK_NUMPAD6; + return VK_NUMPAD6; else - return VK_KP_RIGHT; + return VK_KP_RIGHT; case GDK_dead_grave: return VK_DEAD_GRAVE; case GDK_dead_acute: @@ -554,62 +558,62 @@ keysym_to_awt_keycode (GdkEvent * event) case GDK_underscore: return VK_UNDERSCORE; /* - return VK_FINAL; - return VK_CONVERT; - return VK_NONCONVERT; - return VK_ACCEPT; - */ + return VK_FINAL; + return VK_CONVERT; + return VK_NONCONVERT; + return VK_ACCEPT; + */ case GDK_Mode_switch: return VK_MODECHANGE; /* - return VK_KANA; - */ + return VK_KANA; + */ case GDK_Kanji: return VK_KANJI; /* - return VK_ALPHANUMERIC; - */ + return VK_ALPHANUMERIC; + */ case GDK_Katakana: return VK_KATAKANA; case GDK_Hiragana: return VK_HIRAGANA; /* - return VK_FULL_WIDTH; - return VK_HALF_WIDTH; - return VK_ROMAN_CHARACTERS; - return VK_ALL_CANDIDATES; - */ + return VK_FULL_WIDTH; + return VK_HALF_WIDTH; + return VK_ROMAN_CHARACTERS; + return VK_ALL_CANDIDATES; + */ case GDK_PreviousCandidate: return VK_PREVIOUS_CANDIDATE; case GDK_Codeinput: return VK_CODE_INPUT; /* - return VK_JAPANESE_KATAKANA; - return VK_JAPANESE_HIRAGANA; - return VK_JAPANESE_ROMAN; - */ + return VK_JAPANESE_KATAKANA; + return VK_JAPANESE_HIRAGANA; + return VK_JAPANESE_ROMAN; + */ case GDK_Kana_Lock: return VK_KANA_LOCK; /* - return VK_INPUT_METHOD_ON_OFF; - return VK_CUT; - return VK_COPY; - return VK_PASTE; - return VK_UNDO; - return VK_AGAIN; - return VK_FIND; - return VK_PROPS; - return VK_STOP; - return VK_COMPOSE; - return VK_ALT_GRAPH; - */ + return VK_INPUT_METHOD_ON_OFF; + return VK_CUT; + return VK_COPY; + return VK_PASTE; + return VK_UNDO; + return VK_AGAIN; + return VK_FIND; + return VK_PROPS; + return VK_STOP; + return VK_COMPOSE; + return VK_ALT_GRAPH; + */ default: return VK_UNDEFINED; } } static jint -keysym_to_awt_keylocation (GdkEvent * event) +keysym_to_awt_keylocation (GdkEvent *event) { guint ukeyval; @@ -775,30 +779,30 @@ keysym_to_awt_keylocation (GdkEvent * event) } static jchar -keyevent_to_awt_keychar (GdkEvent * event) +keyevent_to_awt_keychar (GdkEvent *event) { if (event->key.length > 0) { /* Translate GDK carriage return to Java linefeed. */ if (event->key.string[0] == 13) - return VK_ENTER; + return VK_ENTER; else - return event->key.string[0]; + return event->key.string[0]; } else { switch (event->key.keyval) - { - case GDK_BackSpace: - return VK_BACK_SPACE; - case GDK_Tab: - return VK_TAB; - case GDK_Delete: - case GDK_KP_Delete: - return VK_DELETE; - default: - return AWT_KEY_CHAR_UNDEFINED; - } + { + case GDK_BackSpace: + return VK_BACK_SPACE; + case GDK_Tab: + return VK_TAB; + case GDK_Delete: + case GDK_KP_Delete: + return VK_DELETE; + default: + return AWT_KEY_CHAR_UNDEFINED; + } } } @@ -807,26 +811,28 @@ keyevent_to_awt_keychar (GdkEvent * event) GtkIMContext "commit" signals, but that do trigger Java KEY_TYPED events. */ static int -generates_key_typed_event (GdkEvent * event, GtkWidget * source) +generates_key_typed_event (GdkEvent *event, GtkWidget *source) { guint keyval; - if (!GTK_IS_ENTRY (source) && !GTK_IS_TEXT_VIEW (source)) + if (!GTK_IS_ENTRY (source) + && !GTK_IS_TEXT_VIEW (source)) return event->key.length ? 1 : 0; keyval = event->key.keyval; return (keyval == GDK_Escape - || keyval == GDK_BackSpace - || keyval == GDK_Delete - || keyval == GDK_KP_Delete - || keyval == GDK_Return - || keyval == GDK_KP_Enter - || (keyval == GDK_Tab && GTK_IS_TEXT_VIEW (source))) ? 1 : 0; + || keyval == GDK_BackSpace + || keyval == GDK_Delete + || keyval == GDK_KP_Delete + || keyval == GDK_Return + || keyval == GDK_KP_Enter + || (keyval == GDK_Tab + && GTK_IS_TEXT_VIEW(source))) ? 1 : 0; } void -awt_event_handler (GdkEvent * event) +awt_event_handler (GdkEvent *event) { /* keep synthetic AWT events from being processed recursively */ if (event->type & SYNTHETIC_EVENT_MASK && event->type != GDK_NOTHING) @@ -838,7 +844,7 @@ awt_event_handler (GdkEvent * event) } gboolean -pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) +pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer) { GtkWidget *event_widget; static guint32 button_click_time = 0; @@ -849,30 +855,30 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) /* If it is not a focus change event, the widget must be realized already. If not, ignore the event (Gtk+ will do the same). */ - if (!(event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED (widget))) + if (!(event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget))) return FALSE; - + /* Do not handle propagated events. AWT has its own propagation rules */ gdk_window_get_user_data (event->any.window, (void **) &event_widget); if (event_widget != widget) return FALSE; - /* We only care about input events */ + /* We only care about input events */ if (!(event->type == GDK_BUTTON_PRESS - || event->type == GDK_BUTTON_RELEASE - || event->type == GDK_ENTER_NOTIFY - || event->type == GDK_LEAVE_NOTIFY - || event->type == GDK_CONFIGURE - || event->type == GDK_EXPOSE - || event->type == GDK_KEY_PRESS - || event->type == GDK_KEY_RELEASE - || event->type == GDK_FOCUS_CHANGE - || event->type == GDK_MOTION_NOTIFY)) + || event->type == GDK_BUTTON_RELEASE + || event->type == GDK_ENTER_NOTIFY + || event->type == GDK_LEAVE_NOTIFY + || event->type == GDK_CONFIGURE + || event->type == GDK_EXPOSE + || event->type == GDK_KEY_PRESS + || event->type == GDK_KEY_RELEASE + || event->type == GDK_FOCUS_CHANGE + || event->type == GDK_MOTION_NOTIFY)) { return FALSE; } /* g_print("event %u widget %s peer %p\n", - event->type, gtk_widget_get_name (widget), peer); */ + event->type, gtk_widget_get_name (widget), peer); */ /* If it has no jobject associated we can send no AWT event */ if (!peer) @@ -891,7 +897,7 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) click_count++; else click_count = 1; - + button_click_time = event->button.time; button_window = event->button.window; button_number = event->button.button; @@ -901,16 +907,16 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) { case GDK_BUTTON_PRESS: (*gdk_env)->CallVoidMethod (gdk_env, peer, - postMouseEventID, - AWT_MOUSE_PRESSED, - (jlong) event->button.time, + postMouseEventID, + AWT_MOUSE_PRESSED, + (jlong)event->button.time, state_to_awt_mods (event->button.state) | - button_to_awt_mods (event->button.button), - (jint) event->button.x, - (jint) event->button.y, - click_count, + button_to_awt_mods (event->button.button), + (jint)event->button.x, + (jint)event->button.y, + click_count, (event->button.button == 3) ? JNI_TRUE : - JNI_FALSE); + JNI_FALSE); hasBeenDragged = FALSE; break; case GDK_BUTTON_RELEASE: @@ -919,72 +925,78 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, - AWT_MOUSE_RELEASED, - (jlong) event->button.time, + AWT_MOUSE_RELEASED, + (jlong)event->button.time, state_to_awt_mods (event->button.state) | - button_to_awt_mods (event->button.button), - (jint) event->button.x, - (jint) event->button.y, - click_count, JNI_FALSE); + button_to_awt_mods (event->button.button), + (jint)event->button.x, + (jint)event->button.y, + click_count, + JNI_FALSE); // Generate an AWT click event only if the release occured in the // window it was pressed in, and the mouse has not been dragged since // the last time it was pressed. gdk_window_get_size (event->any.window, &width, &height); - if (!hasBeenDragged + if (! hasBeenDragged && event->button.x >= 0 - && event->button.y >= 0 - && event->button.x <= width && event->button.y <= height) - { + && event->button.y >= 0 + && event->button.x <= width + && event->button.y <= height) + { (*gdk_env)->CallVoidMethod (gdk_env, peer, - postMouseEventID, - AWT_MOUSE_CLICKED, - (jlong) event->button.time, - state_to_awt_mods (event->button. - state) | - button_to_awt_mods (event->button. - button), - (jint) event->button.x, - (jint) event->button.y, click_count, - JNI_FALSE); - } + postMouseEventID, + AWT_MOUSE_CLICKED, + (jlong)event->button.time, + state_to_awt_mods (event->button.state) | + button_to_awt_mods (event->button.button), + (jint)event->button.x, + (jint)event->button.y, + click_count, + JNI_FALSE); + } } break; case GDK_MOTION_NOTIFY: if (event->motion.state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK - | GDK_BUTTON4_MASK | GDK_BUTTON5_MASK)) + | GDK_BUTTON4_MASK + | GDK_BUTTON5_MASK)) { (*gdk_env)->CallVoidMethod (gdk_env, peer, - postMouseEventID, + postMouseEventID, AWT_MOUSE_DRAGGED, - (jlong) event->motion.time, - state_to_awt_mods_with_button_states - (event->motion.state), - (jint) event->motion.x, - (jint) event->motion.y, 0, JNI_FALSE); + (jlong)event->motion.time, + state_to_awt_mods_with_button_states (event->motion.state), + (jint)event->motion.x, + (jint)event->motion.y, + 0, + JNI_FALSE); hasBeenDragged = TRUE; } else - (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, + (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, AWT_MOUSE_MOVED, - (jlong) event->motion.time, + (jlong)event->motion.time, state_to_awt_mods (event->motion.state), - (jint) event->motion.x, - (jint) event->motion.y, 0, JNI_FALSE); + (jint)event->motion.x, + (jint)event->motion.y, + 0, + JNI_FALSE); break; case GDK_ENTER_NOTIFY: /* We are not interested in enter events that are due to grab/ungrab and not to actually crossing boundaries */ if (event->crossing.mode == GDK_CROSSING_NORMAL) - (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, - AWT_MOUSE_ENTERED, - (jlong) event->crossing.time, - state_to_awt_mods_with_button_states - (event->crossing.state), - (jint) event->crossing.x, - (jint) event->crossing.y, 0, JNI_FALSE); + (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, + AWT_MOUSE_ENTERED, + (jlong)event->crossing.time, + state_to_awt_mods_with_button_states (event->crossing.state), + (jint)event->crossing.x, + (jint)event->crossing.y, + 0, + JNI_FALSE); break; case GDK_LEAVE_NOTIFY: /* We are not interested in leave events that are due to @@ -992,19 +1004,20 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) if (event->crossing.mode == GDK_CROSSING_NORMAL) (*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID, - AWT_MOUSE_EXITED, - (jlong) event->crossing.time, - state_to_awt_mods_with_button_states - (event->crossing.state), - (jint) event->crossing.x, - (jint) event->crossing.y, 0, JNI_FALSE); + AWT_MOUSE_EXITED, + (jlong)event->crossing.time, + state_to_awt_mods_with_button_states (event->crossing.state), + (jint)event->crossing.x, + (jint)event->crossing.y, + 0, + JNI_FALSE); break; case GDK_CONFIGURE: { /* GtkWidget *widget; - gdk_window_get_user_data (event->any.window, (void **) &widget); */ - + gdk_window_get_user_data (event->any.window, (void **) &widget); */ + if (widget && GTK_WIDGET_TOPLEVEL (widget)) { /* Configure events are not posted to the AWT event @@ -1013,7 +1026,7 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) returns. */ gdk_threads_leave (); - (*gdk_env)->CallVoidMethod (gdk_env, peer, + (*gdk_env)->CallVoidMethod (gdk_env, peer, postConfigureEventID, (jint) event->configure.x, (jint) event->configure.y, @@ -1025,136 +1038,136 @@ pre_event_handler (GtkWidget * widget, GdkEvent * event, jobject peer) break; case GDK_EXPOSE: { - // This filters out unwanted feedback expose events from gtk/X - // when we explictly invalidate and update heavyweight components, - // thus avoiding an infinite loop. - // FIXME: I'm not quite sure why we're getting these expose events. - // Maybe there is a way to avoid them? - if ((event->any.window == widget->window && event->any.send_event) - || GTK_IS_LAYOUT (widget)) - { + // This filters out unwanted feedback expose events from gtk/X + // when we explictly invalidate and update heavyweight components, + // thus avoiding an infinite loop. + // FIXME: I'm not quite sure why we're getting these expose events. + // Maybe there is a way to avoid them? + if((event->any.window == widget->window && event->any.send_event) + || GTK_IS_LAYOUT(widget)) + { (*gdk_env)->CallVoidMethod (gdk_env, peer, - postExposeEventID, - (jint) event->expose.area.x, - (jint) event->expose.area.y, - (jint) event->expose.area.width, - (jint) event->expose.area.height); - } + postExposeEventID, + (jint)event->expose.area.x, + (jint)event->expose.area.y, + (jint)event->expose.area.width, + (jint)event->expose.area.height); + } } break; case GDK_FOCUS_CHANGE: (*gdk_env)->CallVoidMethod (gdk_env, peer, postFocusEventID, - (jint) (event->focus_change.in) ? + (jint) (event->focus_change.in) ? AWT_FOCUS_GAINED : AWT_FOCUS_LOST, JNI_FALSE); break; case GDK_KEY_PRESS: case GDK_KEY_RELEASE: { - GdkWindow *obj_window; - jobject *focus_obj_ptr = NULL; + GdkWindow *obj_window; + jobject *focus_obj_ptr = NULL; int generates_key_typed = 0; - /* A widget with a grab will get key events */ + /* A widget with a grab will get key events */ if (!GTK_IS_WINDOW (widget)) focus_obj_ptr = &peer; else { - GtkWindow *window; + GtkWindow *window; - /* Check if we have an enabled focused widget in this window. + /* Check if we have an enabled focused widget in this window. If not don't handle the event. */ window = GTK_WINDOW (widget); if (!window->focus_widget - || !GTK_WIDGET_IS_SENSITIVE (window->focus_widget) - || !window->focus_widget->window) + || !GTK_WIDGET_IS_SENSITIVE (window->focus_widget) + || !window->focus_widget->window) return FALSE; - - /* TextArea peers are attached to the scrolled window - that contains the GtkTextView, not to the text view - itself. Same for List. */ - if (GTK_IS_TEXT_VIEW (window->focus_widget) - || GTK_IS_CLIST (window->focus_widget)) - { - obj_window = - gtk_widget_get_parent (window->focus_widget)->window; - } - else if (GTK_IS_BUTTON (window->focus_widget)) + + /* TextArea peers are attached to the scrolled window + that contains the GtkTextView, not to the text view + itself. Same for List. */ + if (GTK_IS_TEXT_VIEW (window->focus_widget) + || GTK_IS_CLIST (window->focus_widget)) + { + obj_window = gtk_widget_get_parent (window->focus_widget)->window; + } + else if (GTK_IS_BUTTON (window->focus_widget)) /* GtkButton events go to the "event_window" and this is what we registered when the button was created. */ - obj_window = GTK_BUTTON (window->focus_widget)->event_window; - else - obj_window = window->focus_widget->window; - - gdk_property_get (obj_window, - gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE), - gdk_atom_intern ("CARDINAL", FALSE), - 0, - sizeof (jobject), - FALSE, - NULL, NULL, NULL, (guchar **) & focus_obj_ptr); - - /* If the window has no jobject attached we can't send anything */ + obj_window = GTK_BUTTON (window->focus_widget)->event_window; + else + obj_window = window->focus_widget->window; + + gdk_property_get (obj_window, + gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE), + gdk_atom_intern ("CARDINAL", FALSE), + 0, + sizeof (jobject), + FALSE, + NULL, + NULL, + NULL, + (guchar **)&focus_obj_ptr); + + /* If the window has no jobject attached we can't send anything */ if (!focus_obj_ptr) return FALSE; - + /* Should we generate an AWT_KEY_TYPED event? */ - generates_key_typed = - generates_key_typed_event (event, window->focus_widget); - } + generates_key_typed = generates_key_typed_event (event, window->focus_widget); + } - if (event->type == GDK_KEY_PRESS) + if (event->type == GDK_KEY_PRESS) { + (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr, + postKeyEventID, + (jint) AWT_KEY_PRESSED, + (jlong) event->key.time, + keyevent_state_to_awt_mods (event), + keysym_to_awt_keycode (event), + keyevent_to_awt_keychar (event), + keysym_to_awt_keylocation (event)); + + if (generates_key_typed) + { + (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr, + postKeyEventID, + (jint) AWT_KEY_TYPED, + (jlong) event->key.time, + state_to_awt_mods (event->key.state), + VK_UNDEFINED, + keyevent_to_awt_keychar (event), + AWT_KEY_LOCATION_UNKNOWN); + } + } + else /* GDK_KEY_RELEASE */ + { (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr, - postKeyEventID, - (jint) AWT_KEY_PRESSED, - (jlong) event->key.time, - keyevent_state_to_awt_mods (event), - keysym_to_awt_keycode (event), - keyevent_to_awt_keychar (event), - keysym_to_awt_keylocation (event)); - - if (generates_key_typed) - { - (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr, - postKeyEventID, - (jint) AWT_KEY_TYPED, - (jlong) event->key.time, - state_to_awt_mods (event->key. - state), - VK_UNDEFINED, - keyevent_to_awt_keychar (event), - AWT_KEY_LOCATION_UNKNOWN); - } - } - else /* GDK_KEY_RELEASE */ - { - (*gdk_env)->CallVoidMethod (gdk_env, *focus_obj_ptr, - postKeyEventID, - (jint) AWT_KEY_RELEASED, - (jlong) event->key.time, - keyevent_state_to_awt_mods (event), - keysym_to_awt_keycode (event), - keyevent_to_awt_keychar (event), - keysym_to_awt_keylocation (event)); + postKeyEventID, + (jint) AWT_KEY_RELEASED, + (jlong) event->key.time, + keyevent_state_to_awt_mods (event), + keysym_to_awt_keycode (event), + keyevent_to_awt_keychar (event), + keysym_to_awt_keylocation (event)); } } break; default: break; } - + return FALSE; } static void -attach_jobject (GdkWindow * window, jobject *obj) +attach_jobject (GdkWindow *window, jobject *obj) { GdkAtom addr_atom = gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE); GdkAtom type_atom = gdk_atom_intern ("CARDINAL", FALSE); - gdk_window_set_events (window, + gdk_window_set_events (window, gdk_window_get_events (window) | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK @@ -1165,7 +1178,8 @@ attach_jobject (GdkWindow * window, jobject *obj) | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK - | GDK_KEY_PRESS_MASK | GDK_FOCUS_CHANGE_MASK); + | GDK_KEY_PRESS_MASK + | GDK_FOCUS_CHANGE_MASK); // g_print("storing obj %p property on window %p\n", obj, window); gdk_property_change (window, @@ -1173,7 +1187,8 @@ attach_jobject (GdkWindow * window, jobject *obj) type_atom, 8, GDK_PROP_MODE_REPLACE, - (guchar *) obj, sizeof (jobject)); + (guchar *)obj, + sizeof (jobject)); } void @@ -1189,12 +1204,13 @@ connect_awt_hook (JNIEnv *env, jobject peer_obj, int nwindows, ...) va_start (ap, nwindows); { - int i; - for (i = 0; i < nwindows; i++) - { - GdkWindow *attach = (va_arg (ap, GdkWindow *)); - attach_jobject (attach, obj); - } + int i; + for (i = 0; i < nwindows; i++) + { + GdkWindow* attach = (va_arg (ap, GdkWindow *)); + attach_jobject(attach, obj); + } } va_end (ap); } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c index 3a1a79206..9b9a3dd93 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c @@ -40,17 +40,20 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include "gnu_java_awt_peer_gtk_GtkFileDialogPeer.h" -static void window_closed (GtkDialog * dialog, - gint responseId, jobject peer_obj); -static void ok_clicked (GtkButton * button, jobject peer_obj); -static void cancel_clicked (GtkButton * button, jobject peer_obj); +static void window_closed (GtkDialog *dialog, + gint responseId, + jobject peer_obj); +static void ok_clicked (GtkButton *button, + jobject peer_obj); +static void cancel_clicked (GtkButton *button, + jobject peer_obj); /* * Make a new file selection dialog */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create (JNIEnv *env, jobject obj) { gpointer widget; @@ -59,7 +62,7 @@ JNIEXPORT void JNICALL NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + widget = gtk_file_selection_new (""); /* GtkFileSelect is not modal by default */ gtk_window_set_modal (GTK_WINDOW (widget), TRUE); @@ -74,7 +77,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject +Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); @@ -88,8 +91,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); @@ -103,14 +106,17 @@ JNIEXPORT void JNICALL /* connect buttons to handlers */ g_signal_connect (G_OBJECT (GTK_DIALOG (ptr)), - "response", GTK_SIGNAL_FUNC (window_closed), *gref); + "response", + GTK_SIGNAL_FUNC (window_closed), *gref); g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (ptr)->ok_button), - "clicked", GTK_SIGNAL_FUNC (ok_clicked), *gref); + "clicked", + GTK_SIGNAL_FUNC (ok_clicked), *gref); g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (ptr)->cancel_button), - "clicked", GTK_SIGNAL_FUNC (cancel_clicked), *gref); - + "clicked", + GTK_SIGNAL_FUNC (cancel_clicked), *gref); + gdk_threads_leave (); /* Connect the superclass signals. */ @@ -121,17 +127,17 @@ JNIEXPORT void JNICALL * Set the filename in the file selection dialog. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile - (JNIEnv *env, jobject obj, jstring filename) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile + (JNIEnv *env, jobject obj, jstring filename) { void *ptr; const char *str; ptr = NSA_GET_PTR (env, obj); - + str = (*env)->GetStringUTFChars (env, filename, 0); - + gdk_threads_enter (); gtk_file_selection_set_filename (GTK_FILE_SELECTION (ptr), str); @@ -142,8 +148,9 @@ JNIEXPORT void JNICALL } static void -window_closed (GtkDialog * dialog __attribute__ ((unused)), - gint responseId, jobject peer_obj) +window_closed (GtkDialog *dialog __attribute__((unused)), + gint responseId, + jobject peer_obj) { static int isIDSet = 0; static jmethodID disposeID; @@ -154,15 +161,14 @@ window_closed (GtkDialog * dialog __attribute__ ((unused)), return; ptr = NSA_GET_PTR (gdk_env, peer_obj); - + if (!isIDSet) { jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj); - disposeID = - (*gdk_env)->GetMethodID (gdk_env, cx, "gtkDisposeFileDialog", "()V"); + disposeID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkDisposeFileDialog", "()V"); isIDSet = 1; } - + gdk_threads_leave (); /* We can dispose of the dialog now (and unblock show) */ @@ -172,7 +178,8 @@ window_closed (GtkDialog * dialog __attribute__ ((unused)), } static void -ok_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) +ok_clicked (GtkButton *button __attribute__((unused)), + jobject peer_obj) { static int isIDSet = 0; static jmethodID gtkSetFilenameID; @@ -182,27 +189,24 @@ ok_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) jstring str_fileName; ptr = NSA_GET_PTR (gdk_env, peer_obj); - - fileName = - gtk_file_selection_get_filename (GTK_FILE_SELECTION (GTK_WIDGET (ptr))); - + + fileName = gtk_file_selection_get_filename ( + GTK_FILE_SELECTION (GTK_WIDGET (ptr))); + if (!isIDSet) { jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj); - hideID = - (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); - gtkSetFilenameID = - (*gdk_env)->GetMethodID (gdk_env, cx, "gtkSetFilename", - "(Ljava.lang.String;)V"); + hideID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); + gtkSetFilenameID = (*gdk_env)->GetMethodID (gdk_env, cx, + "gtkSetFilename", "(Ljava.lang.String;)V"); isIDSet = 1; } - + gdk_threads_leave (); - + /* Set the Java object field 'file' with this value. */ str_fileName = (*gdk_env)->NewStringUTF (gdk_env, fileName); - (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, gtkSetFilenameID, - str_fileName); + (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, gtkSetFilenameID, str_fileName); /* We can hide the dialog now (and unblock show) */ (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, hideID); @@ -211,7 +215,8 @@ ok_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) } static void -cancel_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) +cancel_clicked (GtkButton *button __attribute__((unused)), + jobject peer_obj) { static int isIDSet = 0; static jmethodID gtkSetFilenameID; @@ -219,18 +224,16 @@ cancel_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) void *ptr; ptr = NSA_GET_PTR (gdk_env, peer_obj); - + if (!isIDSet) { jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj); - hideID = - (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); - gtkSetFilenameID = - (*gdk_env)->GetMethodID (gdk_env, cx, "gtkSetFilename", - "(Ljava.lang.String;)V"); + hideID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", "()V"); + gtkSetFilenameID = (*gdk_env)->GetMethodID (gdk_env, cx, + "gtkSetFilename", "(Ljava.lang.String;)V"); isIDSet = 1; } - + gdk_threads_leave (); /* Set the Java object field 'file' with the null value. */ @@ -241,3 +244,5 @@ cancel_clicked (GtkButton * button __attribute__ ((unused)), jobject peer_obj) gdk_threads_enter (); } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c index 267b77621..f4e9c3599 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c @@ -44,10 +44,10 @@ exception statement from your version. */ (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24)) JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels - (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject gc_obj, - jint bg_red, jint bg_green, jint bg_blue, jint x, jint y, jint width, - jint height, jintArray jpixels, jint offset, jint scansize, - jdoubleArray jaffine) +(JNIEnv *env, jobject obj __attribute__((unused)), jobject gc_obj, + jint bg_red, jint bg_green, jint bg_blue, jint x, jint y, jint width, + jint height, jintArray jpixels, jint offset, jint scansize, + jdoubleArray jaffine) { struct graphics *g; jint *pixels, *elems; @@ -60,17 +60,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels elems = (*env)->GetIntArrayElements (env, jpixels, NULL); num_pixels = (*env)->GetArrayLength (env, jpixels); - + /* get a copy of the pixel data so we can modify it */ pixels = malloc (sizeof (jint) * num_pixels); memcpy (pixels, elems, sizeof (jint) * num_pixels); - + (*env)->ReleaseIntArrayElements (env, jpixels, elems, 0); #ifndef WORDS_BIGENDIAN /* convert pixels from 0xBBGGRRAA to 0xAARRGGBB */ for (i = 0; i < num_pixels; i++) - pixels[i] = SWAPU32 ((unsigned) pixels[i]); + pixels[i] = SWAPU32 ((unsigned)pixels[i]); #endif packed = (guchar *) malloc (sizeof (guchar) * 3 * num_pixels); @@ -85,7 +85,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels switch (ialpha) { - case 0: /* full transparency */ + case 0: /* full transparency */ *c_rgb++ = bg_red; *c_rgb++ = bg_green; *c_rgb++ = bg_blue; @@ -100,7 +100,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels { jfloat alpha = ialpha / 255.0; jfloat comp_alpha = 1.0 - alpha; - + *c_rgb++ = *j_rgba++ * alpha + bg_red * comp_alpha; *c_rgb++ = *j_rgba++ * alpha + bg_green * comp_alpha; *c_rgb++ = *j_rgba++ * alpha + bg_blue * comp_alpha; @@ -121,19 +121,21 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels new_width = abs (width * affine[0]); new_height = abs (height * affine[3]); - dst = - (art_u8 *) malloc (sizeof (art_u8) * 3 * (new_width * new_height)); - - art_rgb_affine (dst, + dst = (art_u8 *) malloc (sizeof (art_u8) * 3 * (new_width * new_height)); + + art_rgb_affine (dst, 0, 0, new_width, new_height, new_width * 3, (art_u8 *) packed + offset * 3, width, height, - scansize * 3, affine, ART_FILTER_NEAREST, alphagamma); + scansize * 3, + affine, + ART_FILTER_NEAREST, + alphagamma); (*env)->ReleaseDoubleArrayElements (env, jaffine, affine, JNI_ABORT); - + free (packed); packed = (guchar *) dst; @@ -146,13 +148,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels gdk_draw_rgb_image (g->drawable, g->gc, - x + g->x_offset, - y + g->y_offset, + x + g->x_offset, + y + g->y_offset, width, height, GDK_RGB_DITHER_NORMAL, packed + offset * 3, scansize * 3); gdk_threads_leave (); - free (pixels); + free (pixels); free (packed); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c index da9064ccb..c5848baa1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c @@ -40,7 +40,7 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkLabelPeer.h" JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create +Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject obj, jstring text, jfloat xalign) { GtkWidget *label; @@ -54,7 +54,7 @@ JNIEXPORT void JNICALL str = (*env)->GetStringUTFChars (env, text, 0); gdk_threads_enter (); - + ebox = gtk_event_box_new (); ebox_container = GTK_CONTAINER (ebox); label = gtk_label_new (str); @@ -70,7 +70,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont +Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -80,14 +80,14 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); - label = gtk_bin_get_child (GTK_BIN (ptr)); + label = gtk_bin_get_child (GTK_BIN(ptr)); if (!label) - return; + return; font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -98,17 +98,17 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - gtk_widget_modify_font (GTK_WIDGET (label), font_desc); + gtk_widget_modify_font (GTK_WIDGET(label), font_desc); pango_font_description_free (font_desc); - gdk_threads_leave (); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, name, font_name); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText +Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject obj, jstring text) { const char *str; @@ -121,7 +121,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); - label = gtk_bin_get_child (GTK_BIN (ptr)); + label = gtk_bin_get_child (GTK_BIN(ptr)); gtk_label_set_label (GTK_LABEL (label), str); @@ -131,7 +131,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment +Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject obj, jfloat xalign) { void *ptr; @@ -141,7 +141,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); - label = gtk_bin_get_child (GTK_BIN (ptr)); + label = gtk_bin_get_child (GTK_BIN(ptr)); gtk_misc_set_alignment (GTK_MISC (label), xalign, 0.5); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c index 05846b3d7..ac6f389f8 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c @@ -40,20 +40,21 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include "gnu_java_awt_peer_gtk_GtkListPeer.h" -static void item_select (GtkCList * list __attribute__ ((unused)), - int row, int col __attribute__ ((unused)), - GdkEventButton * event __attribute__ ((unused)), - jobject peer_obj); -static void item_unselect (GtkCList * list __attribute__ ((unused)), - int row, - int col __attribute__ ((unused)), - GdkEventButton * event __attribute__ ((unused)), - jobject peer_obj); +static void item_select (GtkCList *list __attribute__((unused)), + int row, int col __attribute__((unused)), + GdkEventButton *event __attribute__((unused)), + jobject peer_obj); +static void item_unselect (GtkCList *list __attribute__((unused)), + int row, + int col __attribute__((unused)), + GdkEventButton *event __attribute__((unused)), + jobject peer_obj); #define CLIST_FROM_SW(obj) (GTK_CLIST(GTK_SCROLLED_WINDOW (obj)->container.child)) -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkListPeer_create + (JNIEnv *env, jobject obj) { GtkWidget *list, *sw; @@ -61,12 +62,13 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject obj) NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + list = gtk_clist_new (1); gtk_widget_show (list); sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (sw), list); gdk_threads_leave (); @@ -74,8 +76,8 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv *env, jobject obj) NSA_SET_PTR (env, obj, sw); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr; @@ -91,8 +93,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals (JNIEnv *env, jobject obj) { GtkCList *list; @@ -105,27 +107,27 @@ JNIEXPORT void JNICALL gtk_widget_realize (GTK_WIDGET (ptr)); /* connect selectable hook */ - + list = CLIST_FROM_SW (ptr); - g_signal_connect (G_OBJECT (list), "select_row", - GTK_SIGNAL_FUNC (item_select), *gref); + g_signal_connect (G_OBJECT (list), "select_row", + GTK_SIGNAL_FUNC (item_select), *gref); - g_signal_connect (G_OBJECT (list), "unselect_row", - GTK_SIGNAL_FUNC (item_unselect), *gref); + g_signal_connect (G_OBJECT (list), "unselect_row", + GTK_SIGNAL_FUNC (item_unselect), *gref); /* Connect the superclass signals. */ /* FIXME: Cannot do that here or it will get the sw and not the list. We must a generic way of doing this. */ /* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, peer_obj); */ - g_signal_connect (GTK_OBJECT (list), "event", - G_CALLBACK (pre_event_handler), *gref); + g_signal_connect (GTK_OBJECT (list), "event", + G_CALLBACK (pre_event_handler), *gref); gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_append +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkListPeer_append (JNIEnv *env, jobject obj, jobjectArray items) { void *ptr; @@ -138,7 +140,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); list = CLIST_FROM_SW (ptr); - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { const char *text; jobject item; @@ -146,7 +148,7 @@ JNIEXPORT void JNICALL item = (*env)->GetObjectArrayElement (env, items, i); text = (*env)->GetStringUTFChars (env, item, NULL); - gtk_clist_append (list, (char **) &text); + gtk_clist_append (list, (char **)&text); (*env)->ReleaseStringUTFChars (env, item, text); } @@ -155,17 +157,17 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_add +Java_gnu_java_awt_peer_gtk_GtkListPeer_add (JNIEnv *env, jobject obj, jstring text, jint index) { void *ptr; const char *str; - + ptr = NSA_GET_PTR (env, obj); str = (*env)->GetStringUTFChars (env, text, NULL); gdk_threads_enter (); - gtk_clist_insert (CLIST_FROM_SW (ptr), index, (char **) &str); + gtk_clist_insert (CLIST_FROM_SW (ptr), index, (char **)&str); gdk_threads_leave (); (*env)->ReleaseStringUTFChars (env, text, str); @@ -173,13 +175,13 @@ JNIEXPORT void JNICALL JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_delItems +Java_gnu_java_awt_peer_gtk_GtkListPeer_delItems (JNIEnv *env, jobject obj, jint start, jint end) { void *ptr; GtkCList *list; jint i; - + ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); @@ -191,7 +193,7 @@ JNIEXPORT void JNICALL { gtk_clist_freeze (list); for (i = end; i >= start; i--) - gtk_clist_remove (list, i); + gtk_clist_remove (list, i); gtk_clist_thaw (list); } @@ -199,11 +201,11 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_select +Java_gnu_java_awt_peer_gtk_GtkListPeer_select (JNIEnv *env, jobject obj, jint index) { void *ptr; - + ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); @@ -212,7 +214,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_deselect +Java_gnu_java_awt_peer_gtk_GtkListPeer_deselect (JNIEnv *env, jobject obj, jint index) { void *ptr; @@ -225,7 +227,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize +Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv *env, jobject obj, jint rows, jintArray jdims) { void *ptr; @@ -246,10 +248,10 @@ JNIEXPORT void JNICALL list = GTK_WIDGET (CLIST_FROM_SW (ptr)); sw = GTK_SCROLLED_WINDOW (ptr); - gtk_widget_size_request (GTK_WIDGET (sw), &myreq); - dims[1] = myreq.height; - dims[0] = myreq.width; - + gtk_widget_size_request(GTK_WIDGET(sw), &myreq); + dims[1]=myreq.height; + dims[0]=myreq.width; + gdk_threads_leave (); (*env)->ReleaseIntArrayElements (env, jdims, dims, 0); @@ -257,7 +259,7 @@ JNIEXPORT void JNICALL JNIEXPORT jintArray JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_getSelectedIndexes +Java_gnu_java_awt_peer_gtk_GtkListPeer_getSelectedIndexes (JNIEnv *env, jobject obj) { void *ptr; @@ -274,7 +276,7 @@ JNIEXPORT jintArray JNICALL count = g_list_length (list->selection); selection = (*env)->NewIntArray (env, count); - sel = (*env)->GetIntArrayElements (env, selection, NULL); + sel = (*env)->GetIntArrayElements (env, selection, NULL); for (i = 0, child = list->selection; i < count; i++) { @@ -289,7 +291,7 @@ JNIEXPORT jintArray JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_makeVisible +Java_gnu_java_awt_peer_gtk_GtkListPeer_makeVisible (JNIEnv *env, jobject obj, jint index) { void *ptr; @@ -302,41 +304,44 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkListPeer_setMultipleMode +Java_gnu_java_awt_peer_gtk_GtkListPeer_setMultipleMode (JNIEnv *env, jobject obj, jboolean mode) { void *ptr; - + ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); gtk_clist_set_selection_mode (CLIST_FROM_SW (ptr), - mode ? GTK_SELECTION_MULTIPLE : - GTK_SELECTION_SINGLE); + mode ? GTK_SELECTION_MULTIPLE : + GTK_SELECTION_SINGLE); gdk_threads_leave (); } static void -item_select (GtkCList * list __attribute__ ((unused)), - int row, int col __attribute__ ((unused)), - GdkEventButton * event __attribute__ ((unused)), +item_select (GtkCList *list __attribute__((unused)), + int row, int col __attribute__((unused)), + GdkEventButton *event __attribute__((unused)), jobject peer_obj) { //g_print ("select_row\n"); (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, postListItemEventID, - row, (jint) AWT_ITEM_SELECTED); + row, + (jint) AWT_ITEM_SELECTED); } static void -item_unselect (GtkCList * list __attribute__ ((unused)), +item_unselect (GtkCList *list __attribute__((unused)), int row, - int col __attribute__ ((unused)), - GdkEventButton * event __attribute__ ((unused)), + int col __attribute__((unused)), + GdkEventButton *event __attribute__((unused)), jobject peer_obj) { //g_print ("unselect_row\n"); (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, postListItemEventID, - row, (jint) AWT_ITEM_DESELECTED); + row, + (jint) AWT_ITEM_DESELECTED); } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c index c1375a6a7..0b4c6fee4 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c @@ -41,8 +41,8 @@ exception statement from your version. */ #include "gthread-jni.h" #ifdef JVM_SUN -struct state_table *native_state_table; -struct state_table *native_global_ref_table; + struct state_table *native_state_table; + struct state_table *native_global_ref_table; #endif jmethodID setBoundsCallbackID; @@ -74,15 +74,15 @@ GtkWindowGroup *global_gtk_window_group; * gtk calls. */ -JNIEXPORT void JNICALL +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz) { int argc = 1; char **argv; char *homedir, *rcpath = NULL; /* jclass gtkgenericpeer; */ - jclass gtkcomponentpeer, gtkchoicepeer, gtkwindowpeer, gtkscrollbarpeer, - gtklistpeer, gtkmenuitempeer, gtktextcomponentpeer, window; + jclass gtkcomponentpeer, gtkchoicepeer, gtkwindowpeer, gtkscrollbarpeer, gtklistpeer, + gtkmenuitempeer, gtktextcomponentpeer, window; NSA_INIT (env, clazz); @@ -96,15 +96,15 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz) /* until we have JDK 1.2 JNI, assume we have a VM with threads that match what GLIB was compiled for */ #ifdef PORTABLE_NATIVE_SYNC - (*env)->GetJavaVM (env, &gdk_vm); - g_thread_init (&g_thread_jni_functions); - printf ("called gthread init\n"); + (*env)->GetJavaVM( env, &gdk_vm ); + g_thread_init ( &g_thread_jni_functions ); + printf("called gthread init\n"); #else - g_thread_init (NULL); + g_thread_init ( NULL ); #endif /* From GDK 2.0 onwards we have to explicitly call gdk_threads_init */ - gdk_threads_init (); + gdk_threads_init(); gtk_init (&argc, &argv); @@ -117,14 +117,14 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz) atexit (gdk_threads_enter); gdk_env = env; - gdk_event_handler_set ((GdkEventFunc) awt_event_handler, NULL, NULL); + gdk_event_handler_set ((GdkEventFunc)awt_event_handler, NULL, NULL); if ((homedir = getenv ("HOME"))) { rcpath = (char *) malloc (strlen (homedir) + strlen (RC_FILE) + 2); sprintf (rcpath, "%s/%s", homedir, RC_FILE); } - + gtk_rc_parse ((rcpath) ? rcpath : RC_FILE); if (rcpath) @@ -139,18 +139,18 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz) window = (*env)->FindClass (env, "java/awt/Window"); gtkcomponentpeer = (*env)->FindClass (env, - "gnu/java/awt/peer/gtk/GtkComponentPeer"); + "gnu/java/awt/peer/gtk/GtkComponentPeer"); gtkchoicepeer = (*env)->FindClass (env, "gnu/java/awt/peer/gtk/GtkChoicePeer"); gtkwindowpeer = (*env)->FindClass (env, "gnu/java/awt/peer/gtk/GtkWindowPeer"); - gtkscrollbarpeer = (*env)->FindClass (env, - "gnu/java/awt/peer/gtk/GtkScrollbarPeer"); + gtkscrollbarpeer = (*env)->FindClass (env, + "gnu/java/awt/peer/gtk/GtkScrollbarPeer"); gtklistpeer = (*env)->FindClass (env, "gnu/java/awt/peer/gtk/GtkListPeer"); gtkmenuitempeer = (*env)->FindClass (env, - "gnu/java/awt/peer/gtk/GtkMenuItemPeer"); + "gnu/java/awt/peer/gtk/GtkMenuItemPeer"); gtktextcomponentpeer = (*env)->FindClass (env, - "gnu/java/awt/peer/gtk/GtkTextComponentPeer"); + "gnu/java/awt/peer/gtk/GtkTextComponentPeer"); /* gdkColor = (*env)->FindClass (env, */ /* "gnu/java/awt/peer/gtk/GdkColor"); */ /* gdkColorID = (*env)->GetMethodID (env, gdkColor, "<init>", "(III)V"); */ @@ -159,46 +159,49 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz) /* "(Ljava/lang/String;I)V"); */ setBoundsCallbackID = (*env)->GetMethodID (env, window, - "setBoundsCallback", "(IIII)V"); + "setBoundsCallback", + "(IIII)V"); postMenuActionEventID = (*env)->GetMethodID (env, gtkmenuitempeer, - "postMenuActionEvent", "()V"); - postMouseEventID = (*env)->GetMethodID (env, gtkcomponentpeer, + "postMenuActionEvent", + "()V"); + postMouseEventID = (*env)->GetMethodID (env, gtkcomponentpeer, "postMouseEvent", "(IJIIIIZ)V"); - postConfigureEventID = (*env)->GetMethodID (env, gtkwindowpeer, - "postConfigureEvent", - "(IIII)V"); - postWindowEventID = - (*env)->GetMethodID (env, gtkwindowpeer, "postWindowEvent", - "(ILjava/awt/Window;I)V"); - postExposeEventID = - (*env)->GetMethodID (env, gtkcomponentpeer, "postExposeEvent", "(IIII)V"); - postKeyEventID = - (*env)->GetMethodID (env, gtkcomponentpeer, "postKeyEvent", "(IJIICI)V"); - postFocusEventID = - (*env)->GetMethodID (env, gtkcomponentpeer, "postFocusEvent", "(IZ)V"); - postAdjustmentEventID = - (*env)->GetMethodID (env, gtkscrollbarpeer, "postAdjustmentEvent", - "(II)V"); - postItemEventID = - (*env)->GetMethodID (env, gtkcomponentpeer, "postItemEvent", - "(Ljava/lang/Object;I)V"); - choicePostItemEventID = - (*env)->GetMethodID (env, gtkchoicepeer, "choicePostItemEvent", - "(Ljava/lang/String;I)V"); - postListItemEventID = - (*env)->GetMethodID (env, gtklistpeer, "postItemEvent", "(II)V"); - postTextEventID = - (*env)->GetMethodID (env, gtktextcomponentpeer, "postTextEvent", "()V"); + postConfigureEventID = (*env)->GetMethodID (env, gtkwindowpeer, + "postConfigureEvent", "(IIII)V"); + postWindowEventID = (*env)->GetMethodID (env, gtkwindowpeer, + "postWindowEvent", + "(ILjava/awt/Window;I)V"); + postExposeEventID = (*env)->GetMethodID (env, gtkcomponentpeer, + "postExposeEvent", "(IIII)V"); + postKeyEventID = (*env)->GetMethodID (env, gtkcomponentpeer, + "postKeyEvent", "(IJIICI)V"); + postFocusEventID = (*env)->GetMethodID (env, gtkcomponentpeer, + "postFocusEvent", "(IZ)V"); + postAdjustmentEventID = (*env)->GetMethodID (env, gtkscrollbarpeer, + "postAdjustmentEvent", + "(II)V"); + postItemEventID = (*env)->GetMethodID (env, gtkcomponentpeer, + "postItemEvent", + "(Ljava/lang/Object;I)V"); + choicePostItemEventID = (*env)->GetMethodID (env, gtkchoicepeer, + "choicePostItemEvent", + "(Ljava/lang/String;I)V"); + postListItemEventID = (*env)->GetMethodID (env, gtklistpeer, + "postItemEvent", + "(II)V"); + postTextEventID = (*env)->GetMethodID (env, gtktextcomponentpeer, + "postTextEvent", + "()V"); global_gtk_window_group = gtk_window_group_new (); } /* * Run gtk_main and block. - */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused))) + */ +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { gdk_threads_enter (); gtk_main (); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c index 2d6a8aeb2..48509a5d3 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c @@ -48,7 +48,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + widget = gtk_menu_bar_new (); gtk_widget_show (widget); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c index 7676387b1..c30ac29c9 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c @@ -47,10 +47,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose is removed from the Frame. So we avoid the widget destruction in GtkGenericPeer dispose() by overriding it here. */ - + /* However, references to the Java objects still exist in the state tables, so we still have to remove those. */ - + NSA_DEL_GLOBAL_REF (env, obj); - NSA_DEL_PTR (env, obj); + NSA_DEL_PTR (env, obj); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c index 664db6d40..4984760f9 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c @@ -40,8 +40,8 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkMenuItemPeer.h" #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" -static void item_activate (GtkMenuItem * item __attribute__ ((unused)), - jobject *peer_obj); +static void item_activate (GtkMenuItem *item __attribute__((unused)), + jobject *peer_obj); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create (JNIEnv *env, jobject obj, jstring label) @@ -57,15 +57,15 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create str = (*env)->GetStringUTFChars (env, label, NULL); gdk_threads_enter (); - - if (strcmp (str, "-") == 0) /* "-" signals that we need a separator */ + + if (strcmp (str, "-") == 0) /* "-" signals that we need a separator */ widget = gtk_menu_item_new (); else widget = gtk_menu_item_new_with_label (str); /* Connect activate hook */ - g_signal_connect (G_OBJECT (widget), "activate", - GTK_SIGNAL_FUNC (item_activate), *gref); + g_signal_connect (G_OBJECT (widget), "activate", + GTK_SIGNAL_FUNC (item_activate), *gref); gtk_widget_show (widget); @@ -88,7 +88,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel gdk_threads_enter (); - if (strcmp (str, "-") == 0) /* "-" signals that we need a separator */ + if (strcmp (str, "-") == 0) /* "-" signals that we need a separator */ gtk_container_remove (GTK_CONTAINER (ptr), GTK_BIN (ptr)->child); else { @@ -104,7 +104,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel } static void -item_activate (GtkMenuItem * item __attribute__ ((unused)), jobject *peer_obj) +item_activate (GtkMenuItem *item __attribute__((unused)), jobject *peer_obj) { - (*gdk_env)->CallVoidMethod (gdk_env, *peer_obj, postMenuActionEventID); + (*gdk_env)->CallVoidMethod (gdk_env, *peer_obj, + postMenuActionEventID); } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c index 599e51c46..63e6a7401 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c @@ -40,15 +40,14 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkMenuPeer.h" static void -accel_attach (GtkMenuItem * menu_item, - gpointer * user_data __attribute__ ((unused))) +accel_attach (GtkMenuItem *menu_item, + gpointer *user_data __attribute__((unused))) { GtkAccelGroup *accel; accel = gtk_menu_get_accel_group (GTK_MENU (menu_item->submenu)); - _gtk_accel_group_attach (accel, - G_OBJECT (gtk_widget_get_toplevel - (GTK_WIDGET (menu_item)))); + _gtk_accel_group_attach (accel, + G_OBJECT (gtk_widget_get_toplevel (GTK_WIDGET(menu_item)))); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup @@ -61,27 +60,28 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup gdk_threads_enter (); if (!parent) { - gtk_menu_set_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu), + gtk_menu_set_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu), gtk_accel_group_new ()); if (GTK_WIDGET_REALIZED (GTK_WIDGET (ptr1))) accel_attach (GTK_MENU_ITEM (ptr1), NULL); else g_signal_connect (G_OBJECT (ptr1), - "realize", GTK_SIGNAL_FUNC (accel_attach), NULL); + "realize", + GTK_SIGNAL_FUNC (accel_attach), + NULL); } else { GtkAccelGroup *parent_accel; ptr2 = NSA_GET_PTR (env, parent); - parent_accel = - gtk_menu_get_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr2)->submenu)); - + parent_accel = gtk_menu_get_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr2)->submenu)); + gtk_menu_set_accel_group (GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu), parent_accel); } - + gdk_threads_leave (); } @@ -98,9 +98,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create str = (*env)->GetStringUTFChars (env, label, NULL); gdk_threads_enter (); - + menu = gtk_menu_new (); - + menu_title = gtk_menu_item_new_with_label (str); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_title), menu); @@ -131,9 +131,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem if (key) { gtk_widget_add_accelerator (GTK_WIDGET (ptr2), "activate", - gtk_menu_get_accel_group (menu), key, + gtk_menu_get_accel_group (menu), key, (GDK_CONTROL_MASK - | ((shift) ? GDK_SHIFT_MASK : 0)), + | ((shift) ? GDK_SHIFT_MASK : 0)), GTK_ACCEL_VISIBLE); } @@ -154,3 +154,5 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem gtk_container_remove (GTK_CONTAINER (ptr), GTK_WIDGET (list->data)); gdk_threads_leave (); } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c index a9e881bc5..62fff4d8a 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c @@ -40,8 +40,9 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include "gnu_java_awt_peer_gtk_GtkPanelPeer.h" -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create + (JNIEnv *env, jobject obj) { gpointer widget; @@ -49,7 +50,7 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject obj) NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + widget = gtk_layout_new (NULL, NULL); gdk_threads_leave (); @@ -57,17 +58,16 @@ Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create (JNIEnv *env, jobject obj) NSA_SET_PTR (env, obj, widget); } -typedef struct _GtkLayoutChild GtkLayoutChild; +typedef struct _GtkLayoutChild GtkLayoutChild; -struct _GtkLayoutChild -{ +struct _GtkLayoutChild { GtkWidget *widget; gint x; gint y; }; -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr; @@ -81,8 +81,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectSignals (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); @@ -106,9 +106,9 @@ JNIEXPORT void JNICALL /* * Make a new panel. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkPanelPeer_gtkPanelNew - (JNIEnv *env, jobject obj, jobject parent_obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkPanelPeer_gtkPanelNew + (JNIEnv *env, jobject obj, jobject parent_obj) { GtkWidget *layout; void *parent; @@ -121,7 +121,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); layout = gtk_layout_new (NULL, NULL); - + set_parent (layout, GTK_CONTAINER (parent)); gtk_widget_realize (layout); @@ -134,3 +134,5 @@ JNIEXPORT void JNICALL NSA_SET_PTR (env, obj, layout); } + + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c index 12a35fe27..c5a223037 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c @@ -45,9 +45,11 @@ struct pos gint y; }; -void -menu_pos (GtkMenu * menu __attribute__ ((unused)), - gint * x, gint * y, gboolean * push_in, gpointer user_data) +void +menu_pos (GtkMenu *menu __attribute__((unused)), + gint *x, gint *y, + gboolean *push_in, + gpointer user_data) { struct pos *p = (struct pos *) user_data; @@ -67,17 +69,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show p = g_malloc (sizeof (struct pos)); p->x = x; p->y = y; - + gdk_threads_enter (); - gtk_menu_popup (GTK_MENU (GTK_MENU_ITEM (ptr)->submenu), + gtk_menu_popup (GTK_MENU (GTK_MENU_ITEM (ptr)->submenu), NULL, NULL, menu_pos, p, 3, time); gdk_threads_leave (); g_free (p); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup (JNIEnv *env, jobject obj, jobject parent) { void *ptr1, *ptr2; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c index cd0b31291..c916b3fe1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c @@ -40,12 +40,12 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h" -static void post_change_event (GtkRange * range, jobject peer); +static void post_change_event (GtkRange *range, jobject peer); -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create - (JNIEnv *env, jobject obj, jint orientation, jint value, - jint min, jint max, jint step_incr, jint page_incr, jint visible_amount) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create +(JNIEnv *env, jobject obj, jint orientation, jint value, + jint min, jint max, jint step_incr, jint page_incr, jint visible_amount) { GtkWidget *scrollbar; GtkObject *adj; @@ -54,15 +54,16 @@ JNIEXPORT void JNICALL NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + adj = gtk_adjustment_new ((gdouble) value, - (gdouble) min, - (gdouble) max, + (gdouble) min, + (gdouble) max, (gdouble) step_incr, - (gdouble) page_incr, (gdouble) visible_amount); + (gdouble) page_incr, + (gdouble) visible_amount); scrollbar = (orientation) ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj)) : - gtk_hscrollbar_new (GTK_ADJUSTMENT (adj)); + gtk_hscrollbar_new (GTK_ADJUSTMENT (adj)); GTK_RANGE (scrollbar)->round_digits = 0; /* These calls seem redundant but they are not. They clamp values @@ -77,7 +78,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr; @@ -94,7 +95,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); @@ -104,7 +105,7 @@ JNIEXPORT void JNICALL gdk_threads_enter (); g_signal_connect (G_OBJECT (ptr), "value-changed", - G_CALLBACK (post_change_event), *gref); + G_CALLBACK (post_change_event), *gref); gdk_threads_leave (); @@ -113,9 +114,9 @@ JNIEXPORT void JNICALL } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement - (JNIEnv *env, jobject obj, jint amount) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement + (JNIEnv *env, jobject obj, jint amount) { void *ptr; GtkAdjustment *adj; @@ -131,9 +132,9 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement - (JNIEnv *env, jobject obj, jint amount) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement + (JNIEnv *env, jobject obj, jint amount) { void *ptr; GtkAdjustment *adj; @@ -149,9 +150,9 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues - (JNIEnv *env, jobject obj, jint value, jint visible, jint min, jint max) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues + (JNIEnv *env, jobject obj, jint value, jint visible, jint min, jint max) { void *ptr; GtkAdjustment *adj; @@ -172,10 +173,10 @@ JNIEXPORT void JNICALL } static void -post_change_event (GtkRange * range, jobject peer) +post_change_event (GtkRange *range, jobject peer) { GtkAdjustment *adj; adj = gtk_range_get_adjustment (range); (*gdk_env)->CallVoidMethod (gdk_env, peer, postAdjustmentEventID, - AWT_ADJUSTMENT_TRACK, (jint) adj->value); + AWT_ADJUSTMENT_TRACK, (jint) adj->value); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c index 657cdb4f4..79e5082bb 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c @@ -39,8 +39,8 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkScrollPanePeer.h" -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject obj, int width, int height) { GtkWidget *sw; @@ -49,7 +49,7 @@ JNIEXPORT void JNICALL NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + sw = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_size_request (sw, width, height); @@ -59,8 +59,8 @@ JNIEXPORT void JNICALL NSA_SET_PTR (env, obj, sw); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setScrollPosition +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setScrollPosition (JNIEnv *env, jobject obj, jint x, jint y) { GtkAdjustment *hadj, *vadj; @@ -80,8 +80,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject obj, jint u) { GtkAdjustment *hadj; @@ -91,7 +91,7 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); - sw = GTK_SCROLLED_WINDOW (ptr); + sw = GTK_SCROLLED_WINDOW(ptr); hadj = gtk_scrolled_window_get_hadjustment (sw); hadj->step_increment = u; @@ -99,8 +99,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject obj, jint u) { GtkAdjustment *vadj; @@ -110,7 +110,7 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); - sw = GTK_SCROLLED_WINDOW (ptr); + sw = GTK_SCROLLED_WINDOW(ptr); vadj = gtk_scrolled_window_get_hadjustment (sw); vadj->step_increment = u; @@ -118,8 +118,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight (JNIEnv *env, jobject obj) { void *ptr; @@ -142,8 +142,8 @@ JNIEXPORT jint JNICALL return height; } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject obj) { void *ptr; @@ -167,7 +167,7 @@ JNIEXPORT jint JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy +Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy (JNIEnv *env, jobject obj, jint policy) { void *ptr; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c index e7f6ff5cb..704273c08 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c @@ -40,10 +40,10 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkTextAreaPeer.h" #define TEXT_FROM_SW(obj) (GTK_TEXT_VIEW(GTK_SCROLLED_WINDOW (obj)->container.child)) -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create (JNIEnv *env, jobject obj, - jint textview_width, jint textview_height, jint scroll) + jint textview_width, jint textview_height, jint scroll) { GtkWidget *text, *sw; @@ -60,30 +60,27 @@ JNIEXPORT void JNICALL gtk_container_add (GTK_CONTAINER (sw), text); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - /* horizontal scrollbar */ - (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH - || scroll == - AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY) ? - GTK_POLICY_ALWAYS : GTK_POLICY_NEVER, - /* vertical scrollbar */ - (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH - || scroll == - AWT_TEXTAREA_SCROLLBARS_VERTICAL_ONLY) ? - GTK_POLICY_ALWAYS : GTK_POLICY_NEVER); + /* horizontal scrollbar */ + (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH + || scroll == AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY) ? + GTK_POLICY_ALWAYS : GTK_POLICY_NEVER, + /* vertical scrollbar */ + (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH + || scroll == AWT_TEXTAREA_SCROLLBARS_VERTICAL_ONLY) ? + GTK_POLICY_ALWAYS : GTK_POLICY_NEVER); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text), (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH - || scroll == - AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY) ? - GTK_WRAP_NONE : GTK_WRAP_WORD); + || scroll == AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY) + ? GTK_WRAP_NONE : GTK_WRAP_WORD); gdk_threads_leave (); NSA_SET_PTR (env, obj, sw); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert (JNIEnv *env, jobject obj, jstring contents, jint position) { GtkTextBuffer *buf; @@ -91,11 +88,11 @@ JNIEXPORT void JNICALL GtkWidget *text; void *ptr; const char *str; - int pos = position; + int pos=position; ptr = NSA_GET_PTR (env, obj); str = (*env)->GetStringUTFChars (env, contents, NULL); - + gdk_threads_enter (); text = GTK_WIDGET (TEXT_FROM_SW (ptr)); @@ -109,8 +106,8 @@ JNIEXPORT void JNICALL (*env)->ReleaseStringUTFChars (env, contents, str); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (JNIEnv *env, jobject obj, jstring contents, jint start, jint end) { GtkWidget *text; @@ -123,9 +120,9 @@ JNIEXPORT void JNICALL ptr = NSA_GET_PTR (env, obj); str = (*env)->GetStringUTFChars (env, contents, NULL); - + gdk_threads_enter (); - + text = GTK_WIDGET (TEXT_FROM_SW (ptr)); buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); @@ -135,14 +132,14 @@ JNIEXPORT void JNICALL gtk_text_buffer_delete (buf, &startIter, &endIter); gtk_text_buffer_get_iter_at_offset (buf, &iter, mystart); - gtk_text_buffer_insert (buf, &iter, str, strlen (str)); + gtk_text_buffer_insert(buf, &iter, str, strlen (str)); gdk_threads_leave (); (*env)->ReleaseStringUTFChars (env, contents, str); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -156,7 +153,7 @@ JNIEXPORT void JNICALL font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -167,17 +164,17 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - gtk_widget_modify_font (GTK_WIDGET (text), font_desc); + gtk_widget_modify_font (GTK_WIDGET(text), font_desc); pango_font_description_free (font_desc); - gdk_threads_leave (); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, name, font_name); } JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight (JNIEnv *env, jobject obj) { void *ptr; @@ -194,8 +191,7 @@ JNIEXPORT jint JNICALL if (sw) { gtk_widget_size_request (sw->hscrollbar, &requisition); - gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, - NULL); + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); height = requisition.height + spacing; } @@ -204,8 +200,8 @@ JNIEXPORT jint JNICALL return height; } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth (JNIEnv *env, jobject obj) { void *ptr; @@ -222,8 +218,7 @@ JNIEXPORT jint JNICALL if (sw) { gtk_widget_size_request (sw->vscrollbar, &requisition); - gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, - NULL); + gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL); width = requisition.width + spacing; } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c index d3b4176e5..2ec87f012 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c @@ -40,13 +40,15 @@ exception statement from your version. */ #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h" #include "gnu_java_awt_peer_gtk_GtkTextComponentPeer.h" -static void textcomponent_commit_cb (GtkIMContext * context, - const gchar * str, jobject peer); +static void textcomponent_commit_cb (GtkIMContext *context, + const gchar *str, + jobject peer); -static void textcomponent_changed_cb (GtkEditable * editable, jobject peer); +static void textcomponent_changed_cb (GtkEditable *editable, + jobject peer); JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals (JNIEnv *env, jobject obj) { GtkTextView *text = NULL; @@ -57,13 +59,13 @@ JNIEXPORT void JNICALL gdk_threads_enter (); - if (GTK_IS_ENTRY (ptr)) + if (GTK_IS_ENTRY(ptr)) { g_signal_connect (GTK_ENTRY (ptr)->im_context, "commit", - G_CALLBACK (textcomponent_commit_cb), *gref); + G_CALLBACK (textcomponent_commit_cb), *gref); g_signal_connect (GTK_EDITABLE (ptr), "changed", - G_CALLBACK (textcomponent_changed_cb), *gref); + G_CALLBACK (textcomponent_changed_cb), *gref); gdk_threads_leave (); @@ -74,7 +76,7 @@ JNIEXPORT void JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child); + text = GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -83,35 +85,35 @@ JNIEXPORT void JNICALL if (text) { - g_signal_connect (text->im_context, "commit", - G_CALLBACK (textcomponent_commit_cb), *gref); - - buf = gtk_text_view_get_buffer (text); - if (buf) - g_signal_connect (buf, "changed", - G_CALLBACK (textcomponent_changed_cb), *gref); - - /* Connect the superclass signals. */ - /* FIXME: Cannot do that here or it will get the sw and not the list. - We must a generic way of doing this. */ - /* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, - obj); */ - g_signal_connect (GTK_OBJECT (text), "event", - G_CALLBACK (pre_event_handler), *gref); - - gdk_threads_leave (); + g_signal_connect (text->im_context, "commit", + G_CALLBACK (textcomponent_commit_cb), *gref); + + buf = gtk_text_view_get_buffer (text); + if (buf) + g_signal_connect (buf, "changed", + G_CALLBACK (textcomponent_changed_cb), *gref); + + /* Connect the superclass signals. */ + /* FIXME: Cannot do that here or it will get the sw and not the list. + We must a generic way of doing this. */ + /* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, + obj); */ + g_signal_connect (GTK_OBJECT (text), "event", + G_CALLBACK (pre_event_handler), *gref); + + gdk_threads_leave (); } } } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, jobject obj) { void *ptr; int pos = 0; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextMark *mark; GtkTextIter iter; @@ -129,9 +131,7 @@ JNIEXPORT jint JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -148,17 +148,17 @@ JNIEXPORT jint JNICALL } gdk_threads_leave (); - + return pos; } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition (JNIEnv *env, jobject obj, jint pos) { void *ptr; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextIter iter; @@ -174,9 +174,7 @@ JNIEXPORT void JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -194,14 +192,14 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, jobject obj) { void *ptr; int pos = 0; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextIter start; GtkTextIter end; @@ -219,15 +217,13 @@ JNIEXPORT jint JNICALL if (gtk_editable_get_selection_bounds (editable, &starti, &endi)) pos = starti; else - pos = gtk_editable_get_position (editable); + pos = gtk_editable_get_position (editable); } else { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -237,14 +233,14 @@ JNIEXPORT jint JNICALL if (text) { buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); - if (gtk_text_buffer_get_selection_bounds (buf, &start, &end)) + if (gtk_text_buffer_get_selection_bounds(buf, &start, &end)) pos = gtk_text_iter_get_offset (&start); - else - { - mark = gtk_text_buffer_get_insert (buf); - gtk_text_buffer_get_iter_at_mark (buf, &iter, mark); - pos = gtk_text_iter_get_offset (&iter); - } + else + { + mark = gtk_text_buffer_get_insert (buf); + gtk_text_buffer_get_iter_at_mark (buf, &iter, mark); + pos = gtk_text_iter_get_offset (&iter); + } } } @@ -253,14 +249,14 @@ JNIEXPORT jint JNICALL return pos; } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd (JNIEnv *env, jobject obj) { void *ptr; int pos = 0; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextIter start; GtkTextIter end; @@ -278,15 +274,13 @@ JNIEXPORT jint JNICALL if (gtk_editable_get_selection_bounds (editable, &starti, &endi)) pos = endi; else - pos = gtk_editable_get_position (editable); + pos = gtk_editable_get_position (editable); } else { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -296,14 +290,14 @@ JNIEXPORT jint JNICALL if (text) { buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); - if (gtk_text_buffer_get_selection_bounds (buf, &start, &end)) + if (gtk_text_buffer_get_selection_bounds(buf, &start, &end)) pos = gtk_text_iter_get_offset (&end); - else - { - mark = gtk_text_buffer_get_insert (buf); - gtk_text_buffer_get_iter_at_mark (buf, &iter, mark); - pos = gtk_text_iter_get_offset (&iter); - } + else + { + mark = gtk_text_buffer_get_insert (buf); + gtk_text_buffer_get_iter_at_mark (buf, &iter, mark); + pos = gtk_text_iter_get_offset (&iter); + } } } @@ -312,13 +306,13 @@ JNIEXPORT jint JNICALL return pos; } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_select +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_select (JNIEnv *env, jobject obj, jint start, jint end) { void *ptr; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextIter iter; @@ -336,9 +330,7 @@ JNIEXPORT void JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -351,7 +343,7 @@ JNIEXPORT void JNICALL gtk_text_buffer_get_iter_at_offset (buf, &iter, start); /* quickly move both 'insert' and 'selection_bound' to the same position */ - gtk_text_buffer_place_cursor (buf, &iter); + gtk_text_buffer_place_cursor (buf, &iter); gtk_text_buffer_get_iter_at_offset (buf, &iter, end); gtk_text_buffer_move_mark_by_name (buf, "selection_bound", &iter); } @@ -360,13 +352,13 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setEditable +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setEditable (JNIEnv *env, jobject obj, jboolean state) { void *ptr; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) ptr = NSA_GET_PTR (env, obj); @@ -381,9 +373,7 @@ JNIEXPORT void JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -400,19 +390,19 @@ JNIEXPORT void JNICALL } JNIEXPORT jstring JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText (JNIEnv *env, jobject obj) { void *ptr; char *contents = NULL; jstring jcontents; - GtkEditable *editable; // type of GtkEntry (TextField) - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkEditable *editable; // type of GtkEntry (TextField) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; GtkTextIter start, end; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); if (GTK_IS_EDITABLE (ptr)) @@ -424,9 +414,7 @@ JNIEXPORT jstring JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -450,18 +438,18 @@ JNIEXPORT jstring JNICALL return jcontents; } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText (JNIEnv *env, jobject obj, jstring contents) { void *ptr; const char *str; - GtkWidget *text = NULL; // type of GtkTextView (TextArea) + GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; ptr = NSA_GET_PTR (env, obj); str = (*env)->GetStringUTFChars (env, contents, NULL); - + gdk_threads_enter (); if (GTK_IS_EDITABLE (ptr)) @@ -472,9 +460,7 @@ JNIEXPORT void JNICALL { if (GTK_IS_SCROLLED_WINDOW (ptr)) { - text = - GTK_WIDGET (GTK_TEXT_VIEW - (GTK_SCROLLED_WINDOW (ptr)->container.child)); + text = GTK_WIDGET (GTK_TEXT_VIEW (GTK_SCROLLED_WINDOW (ptr)->container.child)); } else if (GTK_IS_TEXT_VIEW (ptr)) { @@ -494,8 +480,9 @@ JNIEXPORT void JNICALL } static void -textcomponent_commit_cb (GtkIMContext * context __attribute__ ((unused)), - const gchar * str, jobject peer) +textcomponent_commit_cb (GtkIMContext *context __attribute__((unused)), + const gchar *str, + jobject peer) { /* str is a \0-terminated UTF-8 encoded character. */ gunichar2 *jc = g_utf8_to_utf16 (str, -1, NULL, NULL, NULL); @@ -503,18 +490,19 @@ textcomponent_commit_cb (GtkIMContext * context __attribute__ ((unused)), if (jc) (*gdk_env)->CallVoidMethod (gdk_env, peer, - postKeyEventID, - (jint) AWT_KEY_TYPED, - (jlong) event->key.time, - keyevent_state_to_awt_mods (event), - VK_UNDEFINED, - (jchar) jc[0], AWT_KEY_LOCATION_UNKNOWN); + postKeyEventID, + (jint) AWT_KEY_TYPED, + (jlong) event->key.time, + keyevent_state_to_awt_mods (event), + VK_UNDEFINED, + (jchar) jc[0], + AWT_KEY_LOCATION_UNKNOWN); g_free (jc); gdk_event_free (event); } static void -textcomponent_changed_cb (GtkEditable * editable __attribute__ ((unused)), +textcomponent_changed_cb (GtkEditable *editable __attribute__((unused)), jobject peer) { (*gdk_env)->CallVoidMethod (gdk_env, peer, postTextEventID); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c index 47f4e12c3..e2429bcd1 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c @@ -39,10 +39,11 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkTextFieldPeer.h" -static jint get_border_width (GtkWidget * entry); +static jint +get_border_width (GtkWidget *entry); -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject obj, jint text_width) { GtkWidget *entry; @@ -62,7 +63,7 @@ JNIEXPORT void JNICALL } JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth +Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv *env, jobject obj) { void *ptr; @@ -84,7 +85,7 @@ JNIEXPORT jint JNICALL #define INNER_BORDER 2 static jint -get_border_width (GtkWidget * entry) +get_border_width (GtkWidget *entry) { gint focus_width; gboolean interior_focus; @@ -92,7 +93,8 @@ get_border_width (GtkWidget * entry) gtk_widget_style_get (entry, "interior-focus", &interior_focus, - "focus-line-width", &focus_width, NULL); + "focus-line-width", &focus_width, + NULL); if (GTK_ENTRY (entry)->has_frame) x_border_width += entry->style->xthickness; @@ -105,8 +107,8 @@ get_border_width (GtkWidget * entry) #undef INNER_BORDER -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar (JNIEnv *env, jobject obj, jchar c) { void *ptr; @@ -121,8 +123,8 @@ JNIEXPORT void JNICALL if (c != 0) { /* FIXME: use gtk_entry_set_invisible_char (GtkEntry *entry, - gunichar ch) here. That means we must convert from jchar - (utf16) to gunichar (ucs4). */ + gunichar ch) here. That means we must convert from jchar + (utf16) to gunichar (ucs4). */ gtk_entry_set_visibility (entry, FALSE); } else @@ -132,7 +134,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont +Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring name, jint style, jint size) { const char *font_name; @@ -145,7 +147,7 @@ JNIEXPORT void JNICALL entry = GTK_WIDGET (ptr); font_name = (*env)->GetStringUTFChars (env, name, NULL); - gdk_threads_enter (); + gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); pango_font_description_set_size (font_desc, size * PANGO_SCALE); @@ -156,11 +158,11 @@ JNIEXPORT void JNICALL if (style & AWT_STYLE_ITALIC) pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE); - gtk_widget_modify_font (GTK_WIDGET (entry), font_desc); + gtk_widget_modify_font (GTK_WIDGET(entry), font_desc); pango_font_description_free (font_desc); - gdk_threads_leave (); + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, name, font_name); } diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c index 8c90fbb34..37c369062 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c @@ -39,30 +39,30 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkToolkit.h" -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkToolkit_beep - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused))) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkToolkit_beep + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { gdk_threads_enter (); gdk_beep (); gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkToolkit_sync - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused))) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkToolkit_sync + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { gdk_threads_enter (); gdk_flush (); gdk_threads_leave (); } -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)), +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jintArray jdims) { - jint *dims = (*env)->GetIntArrayElements (env, jdims, 0); + jint *dims = (*env)->GetIntArrayElements (env, jdims, 0); gdk_threads_enter (); @@ -71,12 +71,12 @@ JNIEXPORT void JNICALL gdk_threads_leave (); - (*env)->ReleaseIntArrayElements (env, jdims, dims, 0); + (*env)->ReleaseIntArrayElements(env, jdims, dims, 0); } -JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused))) +JNIEXPORT jint JNICALL +Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused))) { jint res; @@ -87,3 +87,4 @@ JNIEXPORT jint JNICALL gdk_threads_leave (); return res; } + diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c index 1ee508f48..80d9d5bfb 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c @@ -46,40 +46,42 @@ exception statement from your version. */ static int filter_added = 0; -static GdkFilterReturn window_wm_protocols_filter (GdkXEvent * xev, - GdkEvent * event, - gpointer data); +static GdkFilterReturn window_wm_protocols_filter (GdkXEvent *xev, + GdkEvent *event, + gpointer data); -static void window_get_frame_extents (GtkWidget * window, - int *top, int *left, - int *bottom, int *right); +static void window_get_frame_extents (GtkWidget *window, + int *top, int *left, + int *bottom, int *right); -static void request_frame_extents (GtkWidget * window); +static void request_frame_extents (GtkWidget *window); -static int property_notify_predicate (Display * xdisplay, - XEvent * event, XPointer window_id); +static int property_notify_predicate (Display *xdisplay, + XEvent *event, + XPointer window_id); -static void window_delete_cb (GtkWidget * widget, GdkEvent * event, +static void window_delete_cb (GtkWidget *widget, GdkEvent *event, jobject peer); -static void window_destroy_cb (GtkWidget * widget, GdkEvent * event, +static void window_destroy_cb (GtkWidget *widget, GdkEvent *event, jobject peer); -static void window_show_cb (GtkWidget * widget, jobject peer); -static void window_focus_or_active_state_change_cb (GtkWidget * widget, - GParamSpec * pspec, - jobject peer); -static gboolean window_window_state_cb (GtkWidget * widget, - GdkEvent * event, jobject peer); -static jint window_get_new_state (GtkWidget * widget); -static gboolean window_property_changed_cb (GtkWidget * widget, - GdkEventProperty * event, +static void window_show_cb (GtkWidget *widget, jobject peer); +static void window_focus_or_active_state_change_cb (GtkWidget *widget, + GParamSpec *pspec, + jobject peer); +static gboolean window_window_state_cb (GtkWidget *widget, + GdkEvent *event, + jobject peer); +static jint window_get_new_state (GtkWidget *widget); +static gboolean window_property_changed_cb (GtkWidget *widget, + GdkEventProperty *event, jobject peer); /* * Make a new window. */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create (JNIEnv *env, jobject obj, jint type, jboolean decorated, jint width, jint height, jobject parent, jintArray jinsets) { @@ -101,7 +103,7 @@ JNIEXPORT void JNICALL NSA_SET_GLOBAL_REF (env, obj); gdk_threads_enter (); - + window_widget = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = GTK_WINDOW (window_widget); @@ -109,7 +111,7 @@ JNIEXPORT void JNICALL if (parent) { window_parent = NSA_GET_PTR (env, parent); - gtk_window_set_transient_for (window, GTK_WINDOW (window_parent)); + gtk_window_set_transient_for (window, GTK_WINDOW(window_parent)); } gtk_window_set_decorated (window, decorated); @@ -154,10 +156,11 @@ JNIEXPORT void JNICALL if (!filter_added) { GdkAtom wm_protocols_atom = - gdk_x11_xatom_to_atom (gdk_x11_get_xatom_by_name ("WM_PROTOCOLS")); + gdk_x11_xatom_to_atom (gdk_x11_get_xatom_by_name ("WM_PROTOCOLS")); gdk_add_client_message_filter (wm_protocols_atom, - window_wm_protocols_filter, NULL); + window_wm_protocols_filter, + NULL); filter_added = 1; } @@ -169,7 +172,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible (JNIEnv *env, jobject obj, jboolean visible) { void *ptr; @@ -189,29 +192,29 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject obj) { void *ptr; - GtkWidget *vbox, *layout; - GList *children; + GtkWidget* vbox, *layout; + GList* children; ptr = NSA_GET_PTR (env, obj); gdk_threads_enter (); - children = gtk_container_get_children (GTK_CONTAINER (ptr)); + children = gtk_container_get_children(GTK_CONTAINER(ptr)); vbox = children->data; - g_assert (GTK_IS_VBOX (vbox)); + g_assert (GTK_IS_VBOX(vbox)); - children = gtk_container_get_children (GTK_CONTAINER (vbox)); + children = gtk_container_get_children(GTK_CONTAINER(vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); - g_assert (GTK_IS_LAYOUT (layout)); + g_assert (GTK_IS_LAYOUT(layout)); gtk_widget_realize (layout); @@ -225,13 +228,13 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject obj) { void *ptr = NSA_GET_PTR (env, obj); jobject *gref = NSA_GET_GLOBAL_REF (env, obj); - GtkWidget *vbox, *layout; - GList *children; + GtkWidget* vbox, *layout; + GList* children; g_assert (gref); gdk_threads_enter (); @@ -239,20 +242,20 @@ JNIEXPORT void JNICALL gtk_widget_realize (ptr); /* Receive events from the GtkLayout too */ - children = gtk_container_get_children (GTK_CONTAINER (ptr)); - vbox = children->data; + children = gtk_container_get_children(GTK_CONTAINER(ptr)); + vbox = children->data; g_assert (GTK_IS_VBOX (vbox)); - children = gtk_container_get_children (GTK_CONTAINER (vbox)); + children = gtk_container_get_children(GTK_CONTAINER(vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); g_assert (GTK_IS_LAYOUT (layout)); - g_signal_connect (GTK_OBJECT (layout), "event", + g_signal_connect (GTK_OBJECT (layout), "event", G_CALLBACK (pre_event_handler), *gref); /* Connect signals for window event support. */ @@ -266,8 +269,7 @@ JNIEXPORT void JNICALL G_CALLBACK (window_show_cb), *gref); g_signal_connect (G_OBJECT (ptr), "notify", - G_CALLBACK (window_focus_or_active_state_change_cb), - *gref); + G_CALLBACK (window_focus_or_active_state_change_cb), *gref); g_signal_connect (G_OBJECT (ptr), "window-state-event", G_CALLBACK (window_window_state_cb), *gref); @@ -285,21 +287,21 @@ JNIEXPORT void JNICALL * Set a frame's title */ -JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setTitle +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setTitle (JNIEnv *env, jobject obj, jstring title) { void *ptr; const char *str; ptr = NSA_GET_PTR (env, obj); - + str = (*env)->GetStringUTFChars (env, title, NULL); - + gdk_threads_enter (); gtk_window_set_title (GTK_WINDOW (ptr), str); gdk_threads_leave (); - + (*env)->ReleaseStringUTFChars (env, title, str); } @@ -307,12 +309,13 @@ JNIEXPORT void JNICALL * Lower the z-level of a window. */ -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, + jobject obj) { void *ptr; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gdk_window_lower (GTK_WIDGET (ptr)->window); @@ -324,12 +327,13 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject obj) * Raise the z-level of a window. */ -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject obj) +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, + jobject obj) { void *ptr; ptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); gdk_window_raise (GTK_WIDGET (ptr)->window); @@ -338,8 +342,8 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env, jobject obj) } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBoundsCallback - (JNIEnv *env __attribute__ ((unused)), jobject obj __attribute__ ((unused)), +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBoundsCallback + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), jobject window, jint x, jint y, jint width, jint height) { /* Circumvent package-private access to call Window's @@ -349,7 +353,7 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setSize +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setSize (JNIEnv *env, jobject obj, jint width, jint height) { void *ptr = NSA_GET_PTR (env, obj); @@ -359,12 +363,12 @@ JNIEXPORT void JNICALL height = (height < 1) ? 1 : height; gdk_threads_enter (); - gtk_widget_set_size_request (GTK_WIDGET (ptr), width, height); + gtk_widget_set_size_request (GTK_WIDGET(ptr), width, height); gdk_threads_leave (); } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds +Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetBounds (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height) { void *ptr = NSA_GET_PTR (env, obj); @@ -374,9 +378,9 @@ JNIEXPORT void JNICALL height = (height < 1) ? 1 : height; gdk_threads_enter (); - gtk_window_move (GTK_WINDOW (ptr), x, y); + gtk_window_move (GTK_WINDOW(ptr), x, y); /* Need to change the widget's request size. */ - gtk_widget_set_size_request (GTK_WIDGET (ptr), width, height); + gtk_widget_set_size_request (GTK_WIDGET(ptr), width, height); /* Also need to call gtk_window_resize. If the resize is requested by the program and the window's "resizable" property is true then the size request will not be honoured. */ @@ -385,45 +389,45 @@ JNIEXPORT void JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer +Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject obj) { void *wptr; GtkWidget *box; GtkWidget *mptr; - GList *children; + GList* children; wptr = NSA_GET_PTR (env, obj); - + gdk_threads_enter (); box = GTK_BIN (wptr)->child; - + children = gtk_container_get_children (GTK_CONTAINER (box)); - - while (children != NULL && !GTK_IS_MENU_SHELL (children->data)) - { - children = children->next; - } - + + while (children != NULL && !GTK_IS_MENU_SHELL (children->data)) + { + children = children->next; + } + /* If there isn't a MenuBar in this Frame's list of children then we can just return. */ if (!GTK_IS_MENU_SHELL (children->data)) return; else mptr = children->data; - + /* This will actually destroy the MenuBar. By removing it from its parent, the reference count for the MenuBar widget will decrement to 0. The widget will be automatically destroyed by Gtk. */ - gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (mptr)); - - gdk_threads_leave (); -} - + gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (mptr)); + + gdk_threads_leave(); +} + JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer +Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject obj, jobject menubar) { void *wptr; @@ -432,26 +436,26 @@ JNIEXPORT void JNICALL wptr = NSA_GET_PTR (env, obj); mptr = NSA_GET_PTR (env, menubar); - + gdk_threads_enter (); - box = GTK_BIN (wptr)->child; + box = GTK_BIN (wptr)->child; gtk_box_pack_start (GTK_BOX (box), mptr, 0, 0, 0); - + gtk_widget_show (mptr); - + gdk_threads_leave (); } JNIEXPORT jint JNICALL - Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight - (JNIEnv *env, jobject obj __attribute__ ((unused)), jobject menubar) +Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight + (JNIEnv *env, jobject obj __attribute__((unused)), jobject menubar) { GtkWidget *ptr; jint height; GtkRequisition gtkreq; - + ptr = NSA_GET_PTR (env, menubar); gdk_threads_enter (); @@ -463,14 +467,14 @@ JNIEXPORT jint JNICALL } JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout +Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout (JNIEnv *env, jobject obj, jint offset) { - void *ptr; - GList *children; - GtkBox *vbox; - GtkLayout *layout; - GtkWidget *widget; + void* ptr; + GList* children; + GtkBox* vbox; + GtkLayout* layout; + GtkWidget* widget; ptr = NSA_GET_PTR (env, obj); @@ -482,33 +486,33 @@ JNIEXPORT void JNICALL children = gtk_container_get_children (GTK_CONTAINER (vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); - g_assert (GTK_IS_LAYOUT (layout)); + g_assert (GTK_IS_LAYOUT (layout)); children = gtk_container_get_children (GTK_CONTAINER (layout)); - + while (children != NULL) - { - widget = children->data; - gtk_layout_move (layout, widget, widget->allocation.x, - widget->allocation.y + offset); - children = children->next; - } - + { + widget = children->data; + gtk_layout_move (layout, widget, widget->allocation.x, + widget->allocation.y+offset); + children = children->next; + } + gdk_threads_leave (); } - + JNIEXPORT void JNICALL - Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible +Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible (JNIEnv *env, jobject obj, jboolean vis) { - void *ptr; - GList *children; - GtkBox *vbox; - GtkLayout *layout; + void* ptr; + GList* children; + GtkBox* vbox; + GtkLayout* layout; ptr = NSA_GET_PTR (env, obj); @@ -520,13 +524,13 @@ JNIEXPORT void JNICALL children = gtk_container_get_children (GTK_CONTAINER (vbox)); do - { - layout = children->data; - children = children->next; - } + { + layout = children->data; + children = children->next; + } while (!GTK_IS_LAYOUT (layout) && children != NULL); - g_assert (GTK_IS_LAYOUT (layout)); - + g_assert (GTK_IS_LAYOUT (layout)); + if (vis) gtk_widget_show (GTK_WIDGET (layout)); else @@ -534,8 +538,8 @@ JNIEXPORT void JNICALL gdk_threads_leave (); } static void -window_get_frame_extents (GtkWidget * window, - int *top, int *left, int *bottom, int *right) +window_get_frame_extents (GtkWidget *window, + int *top, int *left, int *bottom, int *right) { unsigned long *extents = NULL; @@ -552,16 +556,20 @@ window_get_frame_extents (GtkWidget * window, /* Attempt to retrieve window's frame extents. */ if (gdk_property_get (window->window, - gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE), - gdk_atom_intern ("CARDINAL", FALSE), - 0, - sizeof (unsigned long) * 4, - FALSE, NULL, NULL, NULL, (guchar **) & extents)) + gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE), + gdk_atom_intern ("CARDINAL", FALSE), + 0, + sizeof (unsigned long) * 4, + FALSE, + NULL, + NULL, + NULL, + (guchar **)&extents)) { - *left = extents[0]; - *right = extents[1]; - *top = extents[2]; - *bottom = extents[3]; + *left = extents [0]; + *right = extents [1]; + *top = extents [2]; + *bottom = extents [3]; } } @@ -570,7 +578,7 @@ static Atom extents_atom = 0; /* Requests that the window manager set window's _NET_FRAME_EXTENTS property. */ static void -request_frame_extents (GtkWidget * window) +request_frame_extents (GtkWidget *window) { const char *request_str = "_NET_REQUEST_FRAME_EXTENTS"; GdkAtom request_extents = gdk_atom_intern (request_str, FALSE); @@ -591,8 +599,7 @@ request_frame_extents (GtkWidget * window) XEvent xevent; XEvent notify_xevent; - unsigned long window_id = - GDK_WINDOW_XID (GDK_DRAWABLE (window->window)); + unsigned long window_id = GDK_WINDOW_XID (GDK_DRAWABLE(window->window)); if (!extents_atom) { @@ -614,30 +621,32 @@ request_frame_extents (GtkWidget * window) XSendEvent (xdisplay, xroot_window, False, (SubstructureRedirectMask | SubstructureNotifyMask), - &xevent); + &xevent); - XIfEvent (xdisplay, ¬ify_xevent, - property_notify_predicate, (XPointer) & window_id); + XIfEvent(xdisplay, ¬ify_xevent, + property_notify_predicate, (XPointer) &window_id); } } static int -property_notify_predicate (Display * xdisplay __attribute__ ((unused)), - XEvent * event, XPointer window_id) +property_notify_predicate (Display *xdisplay __attribute__((unused)), + XEvent *event, + XPointer window_id) { unsigned long *window = (unsigned long *) window_id; if (event->xany.type == PropertyNotify && event->xany.window == *window && event->xproperty.atom == extents_atom) - return True; + return True; return False; } static void -window_delete_cb (GtkWidget * widget __attribute__ ((unused)), - GdkEvent * event __attribute__ ((unused)), jobject peer) +window_delete_cb (GtkWidget *widget __attribute__((unused)), + GdkEvent *event __attribute__((unused)), + jobject peer) { (*gdk_env)->CallVoidMethod (gdk_env, peer, postWindowEventID, @@ -646,8 +655,9 @@ window_delete_cb (GtkWidget * widget __attribute__ ((unused)), } static void -window_destroy_cb (GtkWidget * widget __attribute__ ((unused)), - GdkEvent * event __attribute__ ((unused)), jobject peer) +window_destroy_cb (GtkWidget *widget __attribute__((unused)), + GdkEvent *event __attribute__((unused)), + jobject peer) { (*gdk_env)->CallVoidMethod (gdk_env, peer, postWindowEventID, @@ -656,7 +666,8 @@ window_destroy_cb (GtkWidget * widget __attribute__ ((unused)), } static void -window_show_cb (GtkWidget * widget __attribute__ ((unused)), jobject peer) +window_show_cb (GtkWidget *widget __attribute__((unused)), + jobject peer) { (*gdk_env)->CallVoidMethod (gdk_env, peer, postWindowEventID, @@ -665,39 +676,42 @@ window_show_cb (GtkWidget * widget __attribute__ ((unused)), jobject peer) } static void -window_focus_or_active_state_change_cb (GtkWidget * widget, - GParamSpec * pspec, jobject peer) +window_focus_or_active_state_change_cb (GtkWidget *widget, + GParamSpec *pspec, + jobject peer) { if (!strcmp (g_param_spec_get_name (pspec), "is-active")) { if (GTK_WINDOW (widget)->is_active) - (*gdk_env)->CallVoidMethod (gdk_env, peer, - postWindowEventID, - (jint) AWT_WINDOW_GAINED_FOCUS, - (jobject) NULL, (jint) 0); + (*gdk_env)->CallVoidMethod (gdk_env, peer, + postWindowEventID, + (jint) AWT_WINDOW_GAINED_FOCUS, + (jobject) NULL, (jint) 0); else - (*gdk_env)->CallVoidMethod (gdk_env, peer, - postWindowEventID, - (jint) AWT_WINDOW_DEACTIVATED, - (jobject) NULL, (jint) 0); + (*gdk_env)->CallVoidMethod (gdk_env, peer, + postWindowEventID, + (jint) AWT_WINDOW_DEACTIVATED, + (jobject) NULL, (jint) 0); } else if (!strcmp (g_param_spec_get_name (pspec), "has-toplevel-focus")) { if (GTK_WINDOW (widget)->has_toplevel_focus) - (*gdk_env)->CallVoidMethod (gdk_env, peer, - postWindowEventID, - (jint) AWT_WINDOW_ACTIVATED, - (jobject) NULL, (jint) 0); + (*gdk_env)->CallVoidMethod (gdk_env, peer, + postWindowEventID, + (jint) AWT_WINDOW_ACTIVATED, + (jobject) NULL, (jint) 0); else - (*gdk_env)->CallVoidMethod (gdk_env, peer, - postWindowEventID, - (jint) AWT_WINDOW_LOST_FOCUS, - (jobject) NULL, (jint) 0); + (*gdk_env)->CallVoidMethod (gdk_env, peer, + postWindowEventID, + (jint) AWT_WINDOW_LOST_FOCUS, + (jobject) NULL, (jint) 0); } } static gboolean -window_window_state_cb (GtkWidget * widget, GdkEvent * event, jobject peer) +window_window_state_cb (GtkWidget *widget, + GdkEvent *event, + jobject peer) { jint new_state; @@ -740,9 +754,9 @@ window_window_state_cb (GtkWidget * widget, GdkEvent * event, jobject peer) } static jint -window_get_new_state (GtkWidget * widget) +window_get_new_state (GtkWidget *widget) { - GdkDisplay *display = gtk_widget_get_display (widget); + GdkDisplay *display = gtk_widget_get_display(widget); jint new_state = AWT_FRAME_STATE_NORMAL; Atom type; gint format; @@ -751,30 +765,26 @@ window_get_new_state (GtkWidget * widget) Atom *atom_list = NULL; gulong i; - XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), - GDK_WINDOW_XID (widget->window), - gdk_x11_get_xatom_by_name_for_display (display, - "_NET_WM_STATE"), - 0, G_MAXLONG, False, XA_ATOM, &type, &format, - &atom_count, &bytes_after, (guchar **) & atom_list); + XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (widget->window), + gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"), + 0, G_MAXLONG, False, XA_ATOM, &type, &format, &atom_count, + &bytes_after, (guchar **)&atom_list); if (type != None) { - Atom maxvert = gdk_x11_get_xatom_by_name_for_display (display, - "_NET_WM_STATE_MAXIMIZED_VERT"); - Atom maxhorz = gdk_x11_get_xatom_by_name_for_display (display, - "_NET_WM_STATE_MAXIMIZED_HORZ"); + Atom maxvert = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_MAXIMIZED_VERT"); + Atom maxhorz = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_MAXIMIZED_HORZ"); i = 0; while (i < atom_count) - { + { if (atom_list[i] == maxhorz) new_state |= AWT_FRAME_STATE_MAXIMIZED_HORIZ; - else if (atom_list[i] == maxvert) + else if (atom_list[i] == maxvert) new_state |= AWT_FRAME_STATE_MAXIMIZED_VERT; - ++i; - } + ++i; + } XFree (atom_list); } @@ -782,8 +792,9 @@ window_get_new_state (GtkWidget * widget) } static gboolean -window_property_changed_cb (GtkWidget * widget __attribute__ ((unused)), - GdkEventProperty * event, jobject peer) +window_property_changed_cb (GtkWidget *widget __attribute__((unused)), + GdkEventProperty *event, + jobject peer) { unsigned long *extents; @@ -793,38 +804,43 @@ window_property_changed_cb (GtkWidget * widget __attribute__ ((unused)), if (!id_set) { jclass gtkwindowpeer = (*gdk_env)->FindClass (gdk_env, - "gnu/java/awt/peer/gtk/GtkWindowPeer"); + "gnu/java/awt/peer/gtk/GtkWindowPeer"); postInsetsChangedEventID = (*gdk_env)->GetMethodID (gdk_env, - gtkwindowpeer, - "postInsetsChangedEvent", - "(IIII)V"); + gtkwindowpeer, + "postInsetsChangedEvent", + "(IIII)V"); id_set = 1; } if (gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE) == event->atom && gdk_property_get (event->window, - gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE), - gdk_atom_intern ("CARDINAL", FALSE), - 0, - sizeof (unsigned long) * 4, - FALSE, NULL, NULL, NULL, (guchar **) & extents)) - (*gdk_env)->CallVoidMethod (gdk_env, peer, postInsetsChangedEventID, (jint) extents[2], /* top */ - (jint) extents[0], /* left */ - (jint) extents[3], /* bottom */ - (jint) extents[1]); /* right */ + gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE), + gdk_atom_intern ("CARDINAL", FALSE), + 0, + sizeof (unsigned long) * 4, + FALSE, + NULL, + NULL, + NULL, + (guchar **)&extents)) + (*gdk_env)->CallVoidMethod (gdk_env, peer, + postInsetsChangedEventID, + (jint) extents[2], /* top */ + (jint) extents[0], /* left */ + (jint) extents[3], /* bottom */ + (jint) extents[1]); /* right */ return FALSE; } static GdkFilterReturn -window_wm_protocols_filter (GdkXEvent * xev, - GdkEvent * event __attribute__ ((unused)), - gpointer data __attribute__ ((unused))) +window_wm_protocols_filter (GdkXEvent *xev, + GdkEvent *event __attribute__((unused)), + gpointer data __attribute__((unused))) { - XEvent *xevent = (XEvent *) xev; + XEvent *xevent = (XEvent *)xev; - if ((Atom) xevent->xclient.data.l[0] == - gdk_x11_get_xatom_by_name ("WM_TAKE_FOCUS")) + if ((Atom) xevent->xclient.data.l[0] == gdk_x11_get_xatom_by_name ("WM_TAKE_FOCUS")) return GDK_FILTER_REMOVE; return GDK_FILTER_CONTINUE; diff --git a/native/jni/gtk-peer/gthread-jni.c b/native/jni/gtk-peer/gthread-jni.c index cff16acdd..a762b4e56 100644 --- a/native/jni/gtk-peer/gthread-jni.c +++ b/native/jni/gtk-peer/gthread-jni.c @@ -88,36 +88,30 @@ JavaVM *gdk_vm; * case some calling piece of code does not expect the exception being * thrown) and to include the given extra message. */ -static void -maybe_rethrow (JNIEnv *gdk_env, char *message, char *file, int line) -{ +static void maybe_rethrow(JNIEnv *gdk_env, char *message, char *file, int line) { jthrowable cause; /* rethrow if an exception happened */ - if ((cause = (*gdk_env)->ExceptionOccurred (gdk_env)) != NULL) - { - jstring jmessage; - jclass obj_class; - jobject obj; - jmethodID ctor; - - /* allocate local message in Java */ - int len = strlen (message) + strlen (file) + 25; - char buf[len]; - bzero (buf, len); - sprintf (buf, "%s (at %s:%d)", message, file, line); - jmessage = (*gdk_env)->NewStringUTF (gdk_env, buf); - - /* create RuntimeException wrapper object */ - obj_class = - (*gdk_env)->FindClass (gdk_env, "java/lang/RuntimeException"); - ctor = - (*gdk_env)->GetMethodID (gdk_env, obj_class, "<init>", - "(Ljava/langString;Ljava/lang/Throwable)V"); - obj = (*gdk_env)->NewObject (gdk_env, obj_class, ctor, jmessage, cause); - - /* throw it */ - (*gdk_env)->Throw (gdk_env, (jthrowable) obj); + if ((cause = (*gdk_env)->ExceptionOccurred(gdk_env)) != NULL) { + jstring jmessage; + jclass obj_class; + jobject obj; + jmethodID ctor; + + /* allocate local message in Java */ + int len = strlen(message) + strlen(file) + 25; + char buf[ len ]; + bzero(buf, len); + sprintf(buf, "%s (at %s:%d)", message, file, line); + jmessage = (*gdk_env)->NewStringUTF(gdk_env, buf); + + /* create RuntimeException wrapper object */ + obj_class = (*gdk_env)->FindClass (gdk_env, "java/lang/RuntimeException"); + ctor = (*gdk_env)->GetMethodID(gdk_env, obj_class, "<init>", "(Ljava/langString;Ljava/lang/Throwable)V"); + obj = (*gdk_env)->NewObject (gdk_env, obj_class, ctor, jmessage, cause); + + /* throw it */ + (*gdk_env)->Throw(gdk_env, (jthrowable)obj); } } @@ -134,47 +128,42 @@ maybe_rethrow(_class, _message, __FILE__, __LINE__) * which this method allocates and returns a global ref. Note that global * refs must be explicitly freed (isn't C fun?). */ -static jobject * -allocatePlainObject () -{ +static jobject *allocatePlainObject() { jclass obj_class; jobject *obj; JNIEnv *gdk_env; jmethodID ctor; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); obj_class = (*gdk_env)->FindClass (gdk_env, "java/lang/Object"); - MAYBE_RETHROW (gdk_env, "cannot find Object"); + MAYBE_RETHROW(gdk_env, "cannot find Object"); - ctor = (*gdk_env)->GetMethodID (gdk_env, obj_class, "<init>", "()V"); - MAYBE_RETHROW (gdk_env, "cannot find constructor"); + ctor = (*gdk_env)->GetMethodID(gdk_env, obj_class, "<init>", "()V"); + MAYBE_RETHROW(gdk_env, "cannot find constructor"); obj = (jobject *) g_malloc (sizeof (jobject)); *obj = (*gdk_env)->NewObject (gdk_env, obj_class, ctor); - MAYBE_RETHROW (gdk_env, "cannot allocate object"); - + MAYBE_RETHROW(gdk_env, "cannot allocate object"); + *obj = (*gdk_env)->NewGlobalRef (gdk_env, *obj); - MAYBE_RETHROW (gdk_env, "cannot make global ref"); + MAYBE_RETHROW(gdk_env, "cannot make global ref"); return obj; } /* Frees a Java object given a global ref (isn't C fun?) */ -static void -freePlainObject (jobject *obj) -{ +static void freePlainObject(jobject *obj) { JNIEnv *gdk_env; - if (obj) - { - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); - - (*gdk_env)->DeleteGlobalRef (gdk_env, *obj); - MAYBE_RETHROW (gdk_env, "cannot delete global ref"); + if (obj) { + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); - g_free (obj); - } + (*gdk_env)->DeleteGlobalRef (gdk_env, *obj); + MAYBE_RETHROW(gdk_env, "cannot delete global ref"); + + g_free (obj); + } } @@ -183,37 +172,29 @@ freePlainObject (jobject *obj) /************************************************************************/ /* Lock a Java object */ -static void -takeLock (JNIEnv *gdk_env, void *mutex) -{ - (*gdk_env)->MonitorEnter (gdk_env, *((jobject *) mutex)); - MAYBE_RETHROW (gdk_env, "cannot get lock"); +static void takeLock(JNIEnv *gdk_env, void *mutex) { + (*gdk_env)->MonitorEnter (gdk_env, *((jobject *)mutex)); + MAYBE_RETHROW(gdk_env, "cannot get lock"); } /* Unlock a Java object */ -static void -releaseLock (JNIEnv *gdk_env, void *mutex) -{ - (*gdk_env)->MonitorExit (gdk_env, *((jobject *) mutex)); - MAYBE_RETHROW (gdk_env, "cannot release lock"); +static void releaseLock(JNIEnv *gdk_env, void *mutex) { + (*gdk_env)->MonitorExit (gdk_env, *((jobject *)mutex)); + MAYBE_RETHROW(gdk_env, "cannot release lock"); } /* Create a mutex, which is a java.lang.Object for us */ -static GMutex * -g_mutex_new_jni_impl (void) -{ - return (GMutex *) allocatePlainObject (); +static GMutex *g_mutex_new_jni_impl (void) { + return (GMutex*) allocatePlainObject(); } /* Lock a mutex. */ -static void -g_mutex_lock_jni_impl (GMutex * mutex __attribute__ ((unused))) -{ +static void g_mutex_lock_jni_impl (GMutex *mutex __attribute__((unused))) { JNIEnv *gdk_env; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); - takeLock (gdk_env, mutex); + takeLock(gdk_env, mutex); } /* Try to lock a mutex. Actually, do not try because Java objects @@ -221,28 +202,25 @@ g_mutex_lock_jni_impl (GMutex * mutex __attribute__ ((unused))) * pretend we tried and failed. */ static gboolean g_mutex_trylock_jni_impl - (GMutex * mutex __attribute__ ((unused))) + (GMutex *mutex __attribute__((unused))) { // Shall we implement this in a JikesRVM-specific way under a flag? return FALSE; } /* Unlock a mutex. */ -static void -g_mutex_unlock_jni_impl (GMutex * mutex) -{ +static void g_mutex_unlock_jni_impl (GMutex *mutex) { JNIEnv *gdk_env; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); - releaseLock (gdk_env, mutex); + releaseLock(gdk_env, mutex); } /* Free a mutex (isn't C fun?) */ -static void -g_mutex_free_jni_impl (GMutex * mutex) +static void g_mutex_free_jni_impl (GMutex *mutex) { - freePlainObject ((jobject *) mutex); + freePlainObject( (jobject*)mutex ); } @@ -251,65 +229,58 @@ g_mutex_free_jni_impl (GMutex * mutex) /************************************************************************/ /* Create a new condition variable. This is a java.lang.Object for us. */ -static GCond * -g_cond_new_jni_impl () -{ - return (GCond *) allocatePlainObject (); +static GCond *g_cond_new_jni_impl () { + return (GCond*)allocatePlainObject(); } /* Signal on a condition variable. This is simply calling Object.notify * for us. */ -static void -g_cond_signal_jni_impl (GCond * cond) -{ +static void g_cond_signal_jni_impl (GCond *cond) { jclass lcl_class; jmethodID signal_mth; JNIEnv *gdk_env; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Object"); - MAYBE_RETHROW (gdk_env, "cannot find Object"); - - signal_mth = (*gdk_env)->GetMethodID (gdk_env, lcl_class, "notify", "()V"); - MAYBE_RETHROW (gdk_env, "cannot find Object.<notify>"); + MAYBE_RETHROW(gdk_env, "cannot find Object"); + + signal_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "notify", "()V"); + MAYBE_RETHROW(gdk_env, "cannot find Object.<notify>"); /* Must have locked an object to call notify */ - takeLock (gdk_env, cond); + takeLock(gdk_env, cond); - (*gdk_env)->CallVoidMethod (gdk_env, *(jobject *) cond, signal_mth); - MAYBE_RETHROW (gdk_env, "cannot signal mutex"); + (*gdk_env)->CallVoidMethod(gdk_env, *(jobject*)cond, signal_mth); + MAYBE_RETHROW(gdk_env, "cannot signal mutex"); - releaseLock (gdk_env, cond); + releaseLock(gdk_env, cond); } /* Broadcast to all waiting on a condition variable. This is simply * calling Object.notifyAll for us. */ -static void -g_cond_broadcast_jni_impl (GCond * cond) -{ +static void g_cond_broadcast_jni_impl (GCond *cond) { jclass lcl_class; jmethodID bcast_mth; JNIEnv *gdk_env; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Object"); - MAYBE_RETHROW (gdk_env, "cannot find Object"); - - bcast_mth = - (*gdk_env)->GetMethodID (gdk_env, lcl_class, "notifyAll", "()V"); - MAYBE_RETHROW (gdk_env, "cannot find Object.<notifyAll>"); + MAYBE_RETHROW(gdk_env, "cannot find Object"); + + bcast_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "notifyAll", "()V"); + MAYBE_RETHROW(gdk_env, "cannot find Object.<notifyAll>"); /* Must have locked an object to call notifyAll */ - takeLock (gdk_env, cond); + takeLock(gdk_env, cond); - (*gdk_env)->CallVoidMethod (gdk_env, *(jobject *) cond, bcast_mth); - MAYBE_RETHROW (gdk_env, "cannot broadcast to mutex"); + (*gdk_env)->CallVoidMethod(gdk_env, *(jobject*)cond, bcast_mth); + MAYBE_RETHROW(gdk_env, "cannot broadcast to mutex"); - releaseLock (gdk_env, cond); + releaseLock(gdk_env, cond); } @@ -317,27 +288,27 @@ g_cond_broadcast_jni_impl (GCond * cond) * Object.wait. */ static void g_cond_wait_jni_impl - (GCond * cond, GMutex * mutex __attribute__ ((unused))) + (GCond *cond, GMutex *mutex __attribute__((unused))) { jclass lcl_class; jmethodID wait_mth; JNIEnv *gdk_env; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Object"); - MAYBE_RETHROW (gdk_env, "cannot find Object"); - - wait_mth = (*gdk_env)->GetMethodID (gdk_env, lcl_class, "wait", "()V"); - MAYBE_RETHROW (gdk_env, "cannot find Object.<wait>"); + MAYBE_RETHROW(gdk_env, "cannot find Object"); + + wait_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "wait", "()V"); + MAYBE_RETHROW(gdk_env, "cannot find Object.<wait>"); /* Must have locked an object to call wait */ - takeLock (gdk_env, cond); + takeLock(gdk_env, cond); - (*gdk_env)->CallVoidMethod (gdk_env, *(jobject *) cond, wait_mth); - MAYBE_RETHROW (gdk_env, "cannot wait on mutex"); + (*gdk_env)->CallVoidMethod(gdk_env, *(jobject*)cond, wait_mth); + MAYBE_RETHROW(gdk_env, "cannot wait on mutex"); - releaseLock (gdk_env, cond); + releaseLock(gdk_env, cond); } /* Wait on a condition vairable until a timeout. This is a little tricky @@ -346,8 +317,9 @@ static void g_cond_wait_jni_impl * so, that is Java-speak for wait timing out. */ static gboolean - g_cond_timed_wait_jni_impl - (GCond * cond, GMutex * mutex __attribute__ ((unused)), GTimeVal * end_time) +g_cond_timed_wait_jni_impl + (GCond *cond, GMutex *mutex __attribute__((unused)), + GTimeVal *end_time) { jclass lcl_class; jmethodID wait_mth; @@ -355,47 +327,40 @@ static gboolean jlong time; jthrowable cause; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Object"); - MAYBE_RETHROW (gdk_env, "cannot find Object"); + MAYBE_RETHROW(gdk_env, "cannot find Object"); + + wait_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "wait", "(J)V"); + MAYBE_RETHROW(gdk_env, "cannot find Object.<wait(J)>"); + + time = end_time->tv_sec*1000; + time += end_time->tv_usec/1000; - wait_mth = (*gdk_env)->GetMethodID (gdk_env, lcl_class, "wait", "(J)V"); - MAYBE_RETHROW (gdk_env, "cannot find Object.<wait(J)>"); + /* Must have locked an object to call wait */ + takeLock(gdk_env, cond); - time = end_time->tv_sec * 1000; - time += end_time->tv_usec / 1000; + (*gdk_env)->CallVoidMethod(gdk_env, *(jobject*)cond, wait_mth, time); - /* Must have locked an object to call wait */ - takeLock (gdk_env, cond); - - (*gdk_env)->CallVoidMethod (gdk_env, *(jobject *) cond, wait_mth, time); - - if ((cause = (*gdk_env)->ExceptionOccurred (gdk_env)) != NULL) - { - jclass intr = - (*gdk_env)->FindClass (gdk_env, "java.lang.InterruptedException"); - if ((*gdk_env)->IsInstanceOf (gdk_env, cause, intr)) - { - releaseLock (gdk_env, cond); - return FALSE; - } - else - { - MAYBE_RETHROW (gdk_env, "error in timed wait"); - } + if ((cause = (*gdk_env)->ExceptionOccurred(gdk_env)) != NULL) { + jclass intr = (*gdk_env)->FindClass (gdk_env, "java.lang.InterruptedException"); + if ( (*gdk_env)->IsInstanceOf(gdk_env, cause, intr) ) { + releaseLock(gdk_env, cond); + return FALSE; + } else { + MAYBE_RETHROW(gdk_env, "error in timed wait"); } + } - releaseLock (gdk_env, cond); + releaseLock(gdk_env, cond); return TRUE; } /* Free a condition variable. (isn't C fun?) */ -static void -g_cond_free_jni_impl (GCond * cond) -{ - freePlainObject ((jobject *) cond); +static void g_cond_free_jni_impl (GCond *cond) { + freePlainObject( (jobject*)cond ); } @@ -407,37 +372,35 @@ g_cond_free_jni_impl (GCond * cond) * for this. */ static GPrivate *g_private_new_jni_impl - (GDestroyNotify notify __attribute__ ((unused))) + (GDestroyNotify notify __attribute__((unused))) { jclass lcl_class; jobject *local; JNIEnv *gdk_env; jmethodID ctor; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.ThreadLocal"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal"); - ctor = (*gdk_env)->GetMethodID (gdk_env, lcl_class, "<init>", "()V"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal.<init>"); + ctor = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "<init>", "()V"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal.<init>"); local = (jobject *) g_malloc (sizeof (jobject)); - *local = (*gdk_env)->NewObject (gdk_env, lcl_class, ctor); - MAYBE_RETHROW (gdk_env, "cannot allocate a ThreadLocal"); - + *local = (*gdk_env)->NewObject(gdk_env, lcl_class, ctor); + MAYBE_RETHROW(gdk_env, "cannot allocate a ThreadLocal"); + *local = ((*gdk_env)->NewGlobalRef (gdk_env, *local)); - MAYBE_RETHROW (gdk_env, "cannot create a GlobalRef"); + MAYBE_RETHROW(gdk_env, "cannot create a GlobalRef"); - return (GPrivate *) local; + return (GPrivate*) local; } /* Get this thread's value for a thread-local key. This is simply * ThreadLocal.get for us. */ -static gpointer -g_private_get_jni_impl (GPrivate * private) -{ +static gpointer g_private_get_jni_impl (GPrivate *private) { jclass lcl_class; jobject lcl_obj; JNIEnv *gdk_env; @@ -446,28 +409,25 @@ g_private_get_jni_impl (GPrivate * private) jmethodID val_mth; jint int_val; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.ThreadLocal"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal"); - get_mth = - (*gdk_env)->GetMethodID (gdk_env, lcl_class, "get", - "()Ljava/lang/Object;"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal.<get>"); + get_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "get", "()Ljava/lang/Object;"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal.<get>"); - lcl_obj = - (*gdk_env)->CallObjectMethod (gdk_env, *(jobject *) private, get_mth); - MAYBE_RETHROW (gdk_env, "cannot find thread-local object"); + lcl_obj = (*gdk_env)->CallObjectMethod(gdk_env, *(jobject*)private, get_mth); + MAYBE_RETHROW(gdk_env, "cannot find thread-local object"); int_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Integer"); - MAYBE_RETHROW (gdk_env, "cannot find Integer"); + MAYBE_RETHROW(gdk_env, "cannot find Integer"); - val_mth = (*gdk_env)->GetMethodID (gdk_env, int_class, "intValue", "()I"); - MAYBE_RETHROW (gdk_env, "cannot find Integer.<intValue>"); + val_mth = (*gdk_env)->GetMethodID(gdk_env, int_class, "intValue", "()I"); + MAYBE_RETHROW(gdk_env, "cannot find Integer.<intValue>"); - int_val = (*gdk_env)->CallIntMethod (gdk_env, lcl_obj, val_mth); - MAYBE_RETHROW (gdk_env, "cannot get thread local value"); + int_val = (*gdk_env)->CallIntMethod(gdk_env, lcl_obj, val_mth); + MAYBE_RETHROW(gdk_env, "cannot get thread local value"); return (gpointer) int_val; } @@ -475,36 +435,31 @@ g_private_get_jni_impl (GPrivate * private) /* Set this thread's value for a thread-local key. This is simply * ThreadLocal.set for us. */ -static void -g_private_set_jni_impl (GPrivate * private, gpointer data) -{ +static void g_private_set_jni_impl (GPrivate *private, gpointer data) { jclass lcl_class, int_class; jobject lcl_obj; JNIEnv *gdk_env; jmethodID new_int, set_mth; - (*gdk_vm)->GetEnv (gdk_vm, (void **) &gdk_env, JNI_VERSION_1_1); + (*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1); int_class = (*gdk_env)->FindClass (gdk_env, "java.lang.Integer"); - MAYBE_RETHROW (gdk_env, "cannot find Integer"); + MAYBE_RETHROW(gdk_env, "cannot find Integer"); - new_int = (*gdk_env)->GetMethodID (gdk_env, int_class, "<init>", "(I)V"); - MAYBE_RETHROW (gdk_env, "cannot find Integer.<init>"); + new_int = (*gdk_env)->GetMethodID(gdk_env, int_class, "<init>", "(I)V"); + MAYBE_RETHROW(gdk_env, "cannot find Integer.<init>"); - lcl_obj = (*gdk_env)->NewObject (gdk_env, int_class, new_int, (jint) data); - MAYBE_RETHROW (gdk_env, "cannot create an Integer"); + lcl_obj = (*gdk_env)->NewObject(gdk_env, int_class, new_int, (jint)data); + MAYBE_RETHROW(gdk_env, "cannot create an Integer"); lcl_class = (*gdk_env)->FindClass (gdk_env, "java.lang.ThreadLocal"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal"); - set_mth = - (*gdk_env)->GetMethodID (gdk_env, lcl_class, "set", - "(Ljava/lang/Object;)V"); - MAYBE_RETHROW (gdk_env, "cannot find ThreadLocal.<set>"); + set_mth = (*gdk_env)->GetMethodID(gdk_env, lcl_class, "set", "(Ljava/lang/Object;)V"); + MAYBE_RETHROW(gdk_env, "cannot find ThreadLocal.<set>"); - (*gdk_env)->CallVoidMethod (gdk_env, *(jobject *) private, set_mth, - lcl_obj); - MAYBE_RETHROW (gdk_env, "cannot set thread local value"); + (*gdk_env)->CallVoidMethod(gdk_env, *(jobject*)private, set_mth, lcl_obj); + MAYBE_RETHROW(gdk_env, "cannot set thread local value"); } @@ -513,21 +468,22 @@ g_private_set_jni_impl (GPrivate * private, gpointer data) /************************************************************************/ /* set of function pointers to give to glib. */ -GThreadFunctions g_thread_jni_functions = { - g_mutex_new_jni_impl, /* mutex_new */ - g_mutex_lock_jni_impl, /* mutex_lock */ - g_mutex_trylock_jni_impl, /* mutex_try_lock */ - g_mutex_unlock_jni_impl, /* mutex_unlock */ - g_mutex_free_jni_impl, /* mutex_free */ - g_cond_new_jni_impl, /* cond_new */ - g_cond_signal_jni_impl, /* cond_signal */ - g_cond_broadcast_jni_impl, /* cond_broadcast */ - g_cond_wait_jni_impl, /* cond_wait */ - g_cond_timed_wait_jni_impl, /* cond_timed_wait */ - g_cond_free_jni_impl, /* cond_free */ - g_private_new_jni_impl, /* private_new */ - g_private_get_jni_impl, /* private_get */ - g_private_set_jni_impl, /* private_set */ +GThreadFunctions g_thread_jni_functions = +{ + g_mutex_new_jni_impl, /* mutex_new */ + g_mutex_lock_jni_impl, /* mutex_lock */ + g_mutex_trylock_jni_impl, /* mutex_try_lock */ + g_mutex_unlock_jni_impl, /* mutex_unlock */ + g_mutex_free_jni_impl, /* mutex_free */ + g_cond_new_jni_impl, /* cond_new */ + g_cond_signal_jni_impl, /* cond_signal */ + g_cond_broadcast_jni_impl, /* cond_broadcast */ + g_cond_wait_jni_impl, /* cond_wait */ + g_cond_timed_wait_jni_impl, /* cond_timed_wait */ + g_cond_free_jni_impl, /* cond_free */ + g_private_new_jni_impl, /* private_new */ + g_private_get_jni_impl, /* private_get */ + g_private_set_jni_impl, /* private_set */ NULL, NULL, NULL, @@ -538,8 +494,6 @@ GThreadFunctions g_thread_jni_functions = { }; /* ??? */ -void -gdk_threads_wake () -{ +void gdk_threads_wake () { } diff --git a/native/jni/gtk-peer/gtkpeer.h b/native/jni/gtk-peer/gtkpeer.h index 96cbadf98..d552e687c 100644 --- a/native/jni/gtk-peer/gtkpeer.h +++ b/native/jni/gtk-peer/gtkpeer.h @@ -55,7 +55,7 @@ exception statement from your version. */ #define __GTKPEER_H__ #ifndef __GNUC__ -#define __attribute__(x) /* nothing */ +#define __attribute__(x) /* nothing */ #endif #ifdef JVM_SUN @@ -158,7 +158,7 @@ struct graphics #define AWT_ITEM_SELECTED 1 #define AWT_ITEM_DESELECTED 2 - + #define AWT_KEY_TYPED 400 #define AWT_KEY_PRESSED 401 #define AWT_KEY_RELEASED 402 @@ -408,18 +408,19 @@ extern JNIEnv *gdk_env; extern GtkWindowGroup *global_gtk_window_group; -void awt_event_handler (GdkEvent * event); +void awt_event_handler (GdkEvent *event); -gboolean pre_event_handler (GtkWidget * widget, - GdkEvent * event, jobject peer); +gboolean pre_event_handler (GtkWidget *widget, + GdkEvent *event, + jobject peer); void connect_awt_hook (JNIEnv *env, jobject peer_obj, int nwindows, ...); -void set_visible (GtkWidget * widget, jboolean visible); -void set_parent (GtkWidget * widget, GtkContainer * parent); -GtkLayout *find_gtk_layout (GtkWidget * parent); +void set_visible (GtkWidget *widget, jboolean visible); +void set_parent (GtkWidget *widget, GtkContainer *parent); +GtkLayout *find_gtk_layout (GtkWidget *parent); -jint keyevent_state_to_awt_mods (GdkEvent * event); +jint keyevent_state_to_awt_mods (GdkEvent *event); struct item_event_hook_info { diff --git a/native/jni/java-awt/.cvsignore b/native/jni/java-awt/.cvsignore index 9fb985742..282522db0 100644 --- a/native/jni/java-awt/.cvsignore +++ b/native/jni/java-awt/.cvsignore @@ -1,6 +1,2 @@ -*.la -*.lo -.deps -.libs Makefile Makefile.in diff --git a/native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c b/native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c index a256bdd86..d6a5272ce 100644 --- a/native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c +++ b/native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c @@ -46,30 +46,22 @@ exception statement from your version. */ #define AWT_EXCEPTION "java/awt/AWTException" JNIEXPORT void JNICALL -Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject obj, - jobject peer) +Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject obj, jobject peer) { jclass clazz; jfieldID fid; + + if (!peer) { + clazz = (*env)->FindClass (env, "java.awt.Component"); + if (clazz == NULL) { + JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error"); + } - if (!peer) - { - clazz = (*env)->FindClass (env, "java.awt.Component"); - if (clazz == NULL) - { - JCL_ThrowException (env, AWT_EXCEPTION, - "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error"); - } - - fid = - (*env)->GetFieldID (env, clazz, "peer", - "[java.awt.peer.ComponentPeer"); - if (fid == NULL) - { - JCL_ThrowException (env, AWT_EXCEPTION, - "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error"); - } - - (*env)->SetObjectField (env, obj, fid, peer); + fid = (*env)->GetFieldID (env, clazz, "peer", "[java.awt.peer.ComponentPeer"); + if (fid == NULL) { + JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error"); } + + (*env)->SetObjectField (env, obj, fid, peer); + } } diff --git a/native/jni/java-io/FileDescriptor.c b/native/jni/java-io/FileDescriptor.c index 0a56ef31f..d0a36d97b 100644 --- a/native/jni/java-io/FileDescriptor.c +++ b/native/jni/java-io/FileDescriptor.c @@ -59,7 +59,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_FILESYSTEM -#include "target_native_file.h" + #include "target_native_file.h" #endif #include "target_native_math_int.h" @@ -100,13 +100,13 @@ exception statement from your version. */ * static initialization. */ JNIEXPORT void JNICALL -Java_java_io_FileDescriptor_nativeInit (JNIEnv *env, jclass clazz) +Java_java_io_FileDescriptor_nativeInit(JNIEnv *env, jclass clazz) { jfieldID field, filedes_field; jobject filedes; - filedes_field = (*env)->GetFieldID (env, clazz, "nativeFd", "J"); - if (!filedes_field) + filedes_field = (*env)->GetFieldID(env, clazz, "nativeFd", "J"); + if (! filedes_field) return; #define INIT_FIELD(FIELDNAME, FDVALUE) \ @@ -133,49 +133,44 @@ Java_java_io_FileDescriptor_nativeInit (JNIEnv *env, jclass clazz) * Open the specified file and return a native file descriptor */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeOpen (JNIEnv *env, jobject obj, - jstring name, jint jflags) +Java_java_io_FileDescriptor_nativeOpen(JNIEnv *env, jobject obj, jstring name, + jint jflags) { const char *filename; - int flags; - int permissions; - int native_fd; - int result; + int flags; + int permissions; + int native_fd; + int result; - filename = JCL_jstring_to_cstring (env, name); + filename = JCL_jstring_to_cstring(env, name); if (filename == NULL) - return (-1); /* Exception will already have been thrown */ + return(-1); /* Exception will already have been thrown */ /* get file/permission flags for open() */ - if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_READ) - && (jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_WRITE)) + if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_READ) && (jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_WRITE)) { /* read/write */ - flags = - TARGET_NATIVE_FILE_FILEFLAG_CREATE | - TARGET_NATIVE_FILE_FILEFLAG_READWRITE; + flags = TARGET_NATIVE_FILE_FILEFLAG_CREATE | TARGET_NATIVE_FILE_FILEFLAG_READWRITE; permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL; } else if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_READ)) { /* read */ - flags = TARGET_NATIVE_FILE_FILEFLAG_READ; + flags = TARGET_NATIVE_FILE_FILEFLAG_READ; permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL; } else { /* write */ - flags = - TARGET_NATIVE_FILE_FILEFLAG_CREATE | - TARGET_NATIVE_FILE_FILEFLAG_WRITE; + flags = TARGET_NATIVE_FILE_FILEFLAG_CREATE | TARGET_NATIVE_FILE_FILEFLAG_WRITE; if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_APPEND)) - { - flags |= TARGET_NATIVE_FILE_FILEFLAG_APPEND; - } + { + flags |= TARGET_NATIVE_FILE_FILEFLAG_APPEND; + } else - { - flags |= TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE; - } + { + flags |= TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE; + } permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL; } @@ -192,19 +187,19 @@ Java_java_io_FileDescriptor_nativeOpen (JNIEnv *env, jobject obj, flags |= TARGET_NATIVE_FILE_FILEFLAG_BINARY; #endif - TARGET_NATIVE_FILE_OPEN (filename, native_fd, flags, permissions, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_OPEN(filename,native_fd,flags,permissions,result); + (*env)->ReleaseStringUTFChars(env, name, filename); if (result != TARGET_NATIVE_OK) { /* We can only throw FileNotFoundException. */ - JCL_ThrowException (env, - "java/io/FileNotFoundException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/FileNotFoundException", + TARGET_NATIVE_LAST_ERROR_STRING()); return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1; } - return CONVERT_INT_TO_JLONG (native_fd); + return CONVERT_INT_TO_JLONG(native_fd); } /*************************************************************************/ @@ -213,23 +208,23 @@ Java_java_io_FileDescriptor_nativeOpen (JNIEnv *env, jobject obj, * Exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeClose (JNIEnv *env, jobject obj, jlong fd) +Java_java_io_FileDescriptor_nativeClose(JNIEnv *env, jobject obj, jlong fd) { int native_fd; int result; - native_fd = CONVERT_JLONG_TO_INT (fd); - - TARGET_NATIVE_FILE_CLOSE (native_fd, result); + native_fd = CONVERT_JLONG_TO_INT(fd); + + TARGET_NATIVE_FILE_CLOSE(native_fd,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } /*************************************************************************/ @@ -238,34 +233,32 @@ Java_java_io_FileDescriptor_nativeClose (JNIEnv *env, jobject obj, jlong fd) * Return status code, exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeWriteByte (JNIEnv *env, jobject obj, - jlong fd, jint b) +Java_java_io_FileDescriptor_nativeWriteByte(JNIEnv *env, jobject obj, + jlong fd, jint b) { - int native_fd; - char native_data; + int native_fd; + char native_data; ssize_t bytes_written; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); - native_data = (char) (CONVERT_JINT_TO_INT (b) & 0xFF); + native_fd = CONVERT_JLONG_TO_INT(fd); + native_data = (char)(CONVERT_JINT_TO_INT(b) & 0xFF); do { - TARGET_NATIVE_FILE_WRITE (native_fd, &native_data, 1, bytes_written, - result); + TARGET_NATIVE_FILE_WRITE(native_fd, &native_data, 1, bytes_written, result); if ((result != TARGET_NATIVE_OK) - && (TARGET_NATIVE_LAST_ERROR () != - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } } while (result != TARGET_NATIVE_OK); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } /*************************************************************************/ @@ -274,46 +267,44 @@ Java_java_io_FileDescriptor_nativeWriteByte (JNIEnv *env, jobject obj, * Return status code, exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeWriteBuf (JNIEnv *env, jobject obj, - jlong fd, jbyteArray buf, - jint offset, jint len) +Java_java_io_FileDescriptor_nativeWriteBuf(JNIEnv *env, jobject obj, + jlong fd, jbyteArray buf, + jint offset, jint len) { - int native_fd; - jbyte *bufptr; + int native_fd; + jbyte *bufptr; ssize_t bytes_written; ssize_t n; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - bufptr = (*env)->GetByteArrayElements (env, buf, 0); + bufptr = (*env)->GetByteArrayElements(env, buf, 0); if (!bufptr) { - JCL_ThrowException (env, "java/io/IOException", "Unexpected JNI error"); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, "java/io/IOException", "Unexpected JNI error"); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } bytes_written = 0; - while (bytes_written < CONVERT_JINT_TO_SSIZE_T (len)) + while (bytes_written < CONVERT_JINT_TO_SSIZE_T(len)) { - TARGET_NATIVE_FILE_WRITE (native_fd, (bufptr + offset + bytes_written), - (len - bytes_written), n, result); + TARGET_NATIVE_FILE_WRITE(native_fd, (bufptr + offset + bytes_written), (len - bytes_written), n, result); if ((result != TARGET_NATIVE_OK) - && (TARGET_NATIVE_LAST_ERROR () != - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } bytes_written += n; } - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } /*************************************************************************/ @@ -322,37 +313,35 @@ Java_java_io_FileDescriptor_nativeWriteBuf (JNIEnv *env, jobject obj, * Return byte read or -1 on eof, exception on error */ JNIEXPORT jint JNICALL -Java_java_io_FileDescriptor_nativeReadByte (JNIEnv *env, jobject obj, - jlong fd) +Java_java_io_FileDescriptor_nativeReadByte(JNIEnv *env, jobject obj, jlong fd) { - int native_fd; - char data; + int native_fd; + char data; ssize_t bytes_read; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); bytes_read = 0; do { - TARGET_NATIVE_FILE_READ (native_fd, &data, 1, bytes_read, result); + TARGET_NATIVE_FILE_READ(native_fd, &data, 1, bytes_read, result); if ((result == TARGET_NATIVE_OK) && (bytes_read == 0)) - { - return (-1); - } + { + return(-1); + } if ((result != TARGET_NATIVE_OK) - && (TARGET_NATIVE_LAST_ERROR () != - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (-1); + && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(-1); } } while (bytes_read != 1); - return ((jint) (data & 0xFF)); + return((jint)(data & 0xFF)); } /*************************************************************************/ @@ -361,53 +350,51 @@ Java_java_io_FileDescriptor_nativeReadByte (JNIEnv *env, jobject obj, * Return number of bytes read or -1 on eof, exception on error */ JNIEXPORT jint JNICALL -Java_java_io_FileDescriptor_nativeReadBuf (JNIEnv *env, jobject obj, - jlong fd, jarray buf, jint offset, - jint len) +Java_java_io_FileDescriptor_nativeReadBuf(JNIEnv *env, jobject obj, + jlong fd, jarray buf, jint offset, + jint len) { - int native_fd; - jbyte *bufptr; + int native_fd; + jbyte *bufptr; ssize_t bytes_read; ssize_t n; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - bufptr = (*env)->GetByteArrayElements (env, buf, 0); + bufptr = (*env)->GetByteArrayElements(env, buf, 0); if (!bufptr) { - JCL_ThrowException (env, "java/io/IOException", "Unexpected JNI error"); - return (-1); + JCL_ThrowException(env, "java/io/IOException", "Unexpected JNI error"); + return(-1); } bytes_read = 0; while (bytes_read < len) { - TARGET_NATIVE_FILE_READ (native_fd, (bufptr + offset + bytes_read), - (len - bytes_read), n, result); + TARGET_NATIVE_FILE_READ(native_fd, (bufptr + offset + bytes_read), (len - bytes_read), n, result); if ((result == TARGET_NATIVE_OK) && (n == 0)) - { - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); - if (bytes_read == 0) - return (-1); /* Signal end of file to Java */ - else - return (CONVERT_SSIZE_T_TO_JINT (bytes_read)); - } + { + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); + if (bytes_read == 0) + return(-1); /* Signal end of file to Java */ + else + return(CONVERT_SSIZE_T_TO_JINT(bytes_read)); + } if ((result != TARGET_NATIVE_OK) - && (TARGET_NATIVE_LAST_ERROR () != - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); - return (-1); - } + && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)) + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); + return(-1); + } bytes_read += n; } - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); - return (CONVERT_SSIZE_T_TO_JINT (bytes_read)); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); + return(CONVERT_SSIZE_T_TO_JINT(bytes_read)); } /*************************************************************************/ @@ -416,26 +403,25 @@ Java_java_io_FileDescriptor_nativeReadBuf (JNIEnv *env, jobject obj, * Exception on error */ JNIEXPORT jint JNICALL -Java_java_io_FileDescriptor_nativeAvailable (JNIEnv *env, jobject obj, - jlong fd) +Java_java_io_FileDescriptor_nativeAvailable(JNIEnv *env, jobject obj, jlong fd) { - int native_fd; + int native_fd; jlong bytes_available; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - TARGET_NATIVE_FILE_AVAILABLE (native_fd, bytes_available, result); + TARGET_NATIVE_FILE_AVAILABLE(native_fd,bytes_available,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); } // FIXME NYI ??? why only jint and not jlong? - return (TARGET_NATIVE_MATH_INT_INT64_TO_INT32 (bytes_available)); + return(TARGET_NATIVE_MATH_INT_INT64_TO_INT32(bytes_available)); } /*************************************************************************/ @@ -444,16 +430,16 @@ Java_java_io_FileDescriptor_nativeAvailable (JNIEnv *env, jobject obj, * Exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeSeek (JNIEnv *env, jobject obj, jlong fd, - jlong offset, jint whence, - jboolean stop_at_eof) +Java_java_io_FileDescriptor_nativeSeek(JNIEnv *env, jobject obj, jlong fd, + jlong offset, jint whence, + jboolean stop_at_eof) { - int native_fd; + int native_fd; jlong file_size; jlong current_offset, new_offset; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); #if 0 /* Should there be such an exception? All native layer macros should @@ -464,79 +450,77 @@ Java_java_io_FileDescriptor_nativeSeek (JNIEnv *env, jobject obj, jlong fd, to handle 64bit-values the system is limited to 32bit at all, thus the application can not do a seek() or something else beyond the 32bit limit. It this true? - */ + */ /* FIXME: What do we do if offset > the max value of off_t on this 32bit * system? How do we detect that and what do we do? */ - if (CONVERT_OFF_T_TO_JLONG (native_offset) != offset) + if (CONVERT_OFF_T_TO_JLONG(native_offset) != offset) { - JCL_ThrowException (env, "java/io/IOException", - "Cannot represent position correctly on this system"); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, "java/io/IOException", + "Cannot represent position correctly on this system"); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } #endif /* 0 */ - + if (stop_at_eof) { /* get file size */ - TARGET_NATIVE_FILE_SIZE (native_fd, file_size, result); + TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + } /* set file read/write position (seek) */ - if (whence == FILEDESCRIPTOR_FILESEEK_SET) - { - if (TARGET_NATIVE_MATH_INT_INT64_GT (offset, file_size)) - offset = file_size; - } + if (whence == FILEDESCRIPTOR_FILESEEK_SET) + { + if (TARGET_NATIVE_MATH_INT_INT64_GT(offset,file_size)) + offset = file_size; + } else if (whence == FILEDESCRIPTOR_FILESEEK_CUR) - { - TARGET_NATIVE_FILE_TELL (native_fd, current_offset, result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); - } - if (TARGET_NATIVE_MATH_INT_INT64_GT - (TARGET_NATIVE_MATH_INT_INT64_ADD (current_offset, offset), - file_size)) - { - offset = file_size; - whence = FILEDESCRIPTOR_FILESEEK_SET; - } - } - else if (TARGET_NATIVE_MATH_INT_INT64_GT (offset, 0)) /* Default to END case */ - { - offset = TARGET_NATIVE_MATH_INT_INT64_CONST_0; - } + { + TARGET_NATIVE_FILE_TELL(native_fd, current_offset, result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + } + if (TARGET_NATIVE_MATH_INT_INT64_GT(TARGET_NATIVE_MATH_INT_INT64_ADD(current_offset,offset),file_size)) + { + offset = file_size; + whence = FILEDESCRIPTOR_FILESEEK_SET; + } + } + else if (TARGET_NATIVE_MATH_INT_INT64_GT(offset,0)) /* Default to END case */ + { + offset = TARGET_NATIVE_MATH_INT_INT64_CONST_0; + } } /* Now do it */ result = TARGET_NATIVE_ERROR; new_offset = TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1; if (whence == FILEDESCRIPTOR_FILESEEK_SET) - TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, offset, new_offset, result); + TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, offset, new_offset, result); if (whence == FILEDESCRIPTOR_FILESEEK_CUR) - TARGET_NATIVE_FILE_SEEK_CURRENT (native_fd, offset, new_offset, result); + TARGET_NATIVE_FILE_SEEK_CURRENT(native_fd, offset, new_offset, result); if (whence == FILEDESCRIPTOR_FILESEEK_END) - TARGET_NATIVE_FILE_SEEK_END (native_fd, offset, new_offset, result); + TARGET_NATIVE_FILE_SEEK_END(native_fd, offset, new_offset, result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } - return (new_offset); + return(new_offset); } /*************************************************************************/ @@ -545,25 +529,25 @@ Java_java_io_FileDescriptor_nativeSeek (JNIEnv *env, jobject obj, jlong fd, * Exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeGetFilePointer (JNIEnv *env, jobject obj, - jlong fd) +Java_java_io_FileDescriptor_nativeGetFilePointer(JNIEnv *env, jobject obj, + jlong fd) { - int native_fd; + int native_fd; jlong current_offset; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - TARGET_NATIVE_FILE_TELL (native_fd, current_offset, result); + TARGET_NATIVE_FILE_TELL(native_fd, current_offset, result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } - return (current_offset); + return(current_offset); } /*************************************************************************/ @@ -572,25 +556,24 @@ Java_java_io_FileDescriptor_nativeGetFilePointer (JNIEnv *env, jobject obj, * Exception on error */ JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeGetLength (JNIEnv *env, jobject obj, - jlong fd) +Java_java_io_FileDescriptor_nativeGetLength(JNIEnv *env, jobject obj, jlong fd) { - int native_fd; + int native_fd; jlong file_size; - int result; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - TARGET_NATIVE_FILE_SIZE (native_fd, file_size, result); + TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } - return (file_size); + return(file_size); } /*************************************************************************/ @@ -599,17 +582,17 @@ Java_java_io_FileDescriptor_nativeGetLength (JNIEnv *env, jobject obj, * Exception on error */ JNIEXPORT void JNICALL -Java_java_io_FileDescriptor_nativeSetLength (JNIEnv *env, jobject obj, - jlong fd, jlong len) +Java_java_io_FileDescriptor_nativeSetLength(JNIEnv *env, jobject obj, + jlong fd, jlong len) { - int native_fd; + int native_fd; jlong file_size; - int bytes_written; - jlong save_offset, new_offset; - char data; - int result; + int bytes_written; + jlong save_offset,new_offset; + char data; + int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); #if 0 /* Should there be such an exception? All native layer macros should @@ -620,100 +603,96 @@ Java_java_io_FileDescriptor_nativeSetLength (JNIEnv *env, jobject obj, to handle 64bit-values the system is limited to 32bit at all, thus the application can not do a seek() or something else beyond the 32bit limit. It this true? - */ + */ /* FIXME: What do we do if len > the max value of off_t on this 32bit * system? How do we detect that and what do we do? */ - if (CONVERT_OFF_T_TO_JLONG (native_len) != len) + if (CONVERT_OFF_T_TO_JLONG(native_len) != len) { - JCL_ThrowException (env, "java/io/IOException", - "Cannot represent position correctly on this system"); + JCL_ThrowException(env, "java/io/IOException", + "Cannot represent position correctly on this system"); return; } #endif /* 0 */ /* get file size */ - TARGET_NATIVE_FILE_SIZE (native_fd, file_size, result); + TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); return; } - if (TARGET_NATIVE_MATH_INT_INT64_LT (file_size, len)) + if (TARGET_NATIVE_MATH_INT_INT64_LT(file_size,len)) { /* File is too short -- seek to one byte short of where we want, * then write a byte */ /* Save off current position */ - TARGET_NATIVE_FILE_TELL (native_fd, save_offset, result); + TARGET_NATIVE_FILE_TELL(native_fd, save_offset, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } /* move to position n-1 */ - TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, - TARGET_NATIVE_MATH_INT_INT64_SUB (len, - 1), - new_offset, result); + TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, TARGET_NATIVE_MATH_INT_INT64_SUB(len,1), new_offset, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } /* write a byte Note: This will fail if we somehow get here in read only mode - * That shouldn't happen */ - data = '\0'; - TARGET_NATIVE_FILE_WRITE (native_fd, &data, 1, bytes_written, result); + * That shouldn't happen */ + data='\0'; + TARGET_NATIVE_FILE_WRITE(native_fd, &data, 1, bytes_written, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } /* Reposition file pointer to where we started */ - TARGET_NATIVE_FILE_SEEK_BEGIN (native_fd, save_offset, new_offset, - result); + TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, save_offset, new_offset, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } } - else if (TARGET_NATIVE_MATH_INT_INT64_GT (file_size, len)) + else if (TARGET_NATIVE_MATH_INT_INT64_GT(file_size,len)) { /* File is too long - use ftruncate if available */ #ifdef HAVE_FTRUNCATE - TARGET_NATIVE_FILE_TRUNCATE (native_fd, len, result); + TARGET_NATIVE_FILE_TRUNCATE(native_fd, len, result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } #else /* HAVE_FTRUNCATE */ /* FIXME: Probably operation isn't supported, but this exception * is too harsh as it will probably crash the program without need - JCL_ThrowException(env, "java/lang/UnsupportedOperationException", - "not implemented - can't shorten files on this platform"); - */ - JCL_ThrowException (env, "java/io/IOException", - "Unable to shorten file length"); + JCL_ThrowException(env, "java/lang/UnsupportedOperationException", + "not implemented - can't shorten files on this platform"); + */ + JCL_ThrowException(env, "java/io/IOException", + "Unable to shorten file length"); #endif /* HAVE_FTRUNCATE */ } } @@ -723,16 +702,16 @@ Java_java_io_FileDescriptor_nativeSetLength (JNIEnv *env, jobject obj, * Test file descriptor for validity */ JNIEXPORT jboolean JNICALL -Java_java_io_FileDescriptor_nativeValid (JNIEnv *env, jobject obj, jlong fd) +Java_java_io_FileDescriptor_nativeValid(JNIEnv *env, jobject obj, jlong fd) { int native_fd; int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR (native_fd, result); + TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(native_fd, result); - return ((result == TARGET_NATIVE_OK) ? JNI_TRUE : JNI_FALSE); + return((result == TARGET_NATIVE_OK)?JNI_TRUE:JNI_FALSE); } /*************************************************************************/ @@ -741,25 +720,26 @@ Java_java_io_FileDescriptor_nativeValid (JNIEnv *env, jobject obj, jlong fd) * Exception on error */ JNIEXPORT void JNICALL -Java_java_io_FileDescriptor_nativeSync (JNIEnv *env, jobject obj, jlong fd) +Java_java_io_FileDescriptor_nativeSync(JNIEnv *env, jobject obj, jlong fd) { #ifdef HAVE_FSYNC int native_fd; int result; - native_fd = CONVERT_JLONG_TO_INT (fd); + native_fd = CONVERT_JLONG_TO_INT(fd); - TARGET_NATIVE_FILE_FSYNC (native_fd, result); + TARGET_NATIVE_FILE_FSYNC(native_fd, result); /* FIXME: gcj does not throw an exception on EROFS or EINVAL. * Should we emulate? */ if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, - "java/io/SyncFailedException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - } + { + JCL_ThrowException(env, + "java/io/SyncFailedException", + TARGET_NATIVE_LAST_ERROR_STRING()); + } #else - JCL_ThrowException (env, "java/io/SyncFailedException", - "Sync not supported"); + JCL_ThrowException(env, "java/io/SyncFailedException", + "Sync not supported"); #endif } + diff --git a/native/jni/java-io/java_io_File.c b/native/jni/java-io/java_io_File.c index 52e80fa76..479ec598f 100644 --- a/native/jni/java-io/java_io_File.c +++ b/native/jni/java-io/java_io_File.c @@ -46,7 +46,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_FILESYSTEM -#include "target_native_file.h" + #include "target_native_file.h" #endif #include "target_native_math_int.h" @@ -65,34 +65,34 @@ exception statement from your version. */ */ JNIEXPORT jboolean JNICALL -Java_java_io_File_createInternal (JNIEnv *env, jclass clazz, jstring name) +Java_java_io_File_createInternal(JNIEnv *env, jclass clazz, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int fd; - int result; + int fd; + int result; - filename = JCL_jstring_to_cstring (env, name); + filename = JCL_jstring_to_cstring(env, name); if (filename == NULL) { - return (0); + return(0); } - TARGET_NATIVE_FILE_OPEN_CREATE (filename, fd, result); + TARGET_NATIVE_FILE_OPEN_CREATE(filename,fd,result); if (result != TARGET_NATIVE_OK) { //??? NYI if (errno != EEXIST) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); } - TARGET_NATIVE_FILE_CLOSE (fd, result); + TARGET_NATIVE_FILE_CLOSE(fd,result); - return (1); + return(1); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -107,36 +107,36 @@ Java_java_io_File_createInternal (JNIEnv *env, jclass clazz, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_canReadInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_canReadInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int fd; - int result; + int fd; + int result; /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } - + /* The lazy man's way out. We actually do open the file for reading - briefly to verify it can be done */ - TARGET_NATIVE_FILE_OPEN_READ (filename, fd, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + briefly to verify it can be done */ + TARGET_NATIVE_FILE_OPEN_READ(filename,fd,result); + (*env)->ReleaseStringUTFChars(env, name, filename); if (result != TARGET_NATIVE_OK) { - return (0); + return(0); } - TARGET_NATIVE_FILE_CLOSE (fd, result); + TARGET_NATIVE_FILE_CLOSE(fd,result); - return (1); + return(1); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ -} +} /*************************************************************************/ @@ -149,36 +149,36 @@ Java_java_io_File_canReadInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_canWriteInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_canWriteInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int fd; - int result; + int fd; + int result; /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } - + /* The lazy man's way out. We actually do open the file for writing - briefly to verify it can be done */ - TARGET_NATIVE_FILE_OPEN_READWRITE (filename, fd, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + briefly to verify it can be done */ + TARGET_NATIVE_FILE_OPEN_READWRITE(filename,fd,result); + (*env)->ReleaseStringUTFChars(env, name, filename); if (result != TARGET_NATIVE_OK) { - return (0); + return(0); } - TARGET_NATIVE_FILE_CLOSE (fd, result); + TARGET_NATIVE_FILE_CLOSE(fd,result); - return (1); + return(1); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ -} +} /*************************************************************************/ @@ -191,28 +191,28 @@ Java_java_io_File_canWriteInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_setReadOnlyInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_setReadOnlyInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; + int result; /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } - TARGET_NATIVE_FILE_SET_MODE_READONLY (filename, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_SET_MODE_READONLY(filename,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ -} +} /*************************************************************************/ @@ -225,26 +225,26 @@ Java_java_io_File_setReadOnlyInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_existsInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_existsInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } + + TARGET_NATIVE_FILE_EXISTS(filename,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - TARGET_NATIVE_FILE_EXISTS (filename, result); - (*env)->ReleaseStringUTFChars (env, name, filename); - - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -260,26 +260,26 @@ Java_java_io_File_existsInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_isFileInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_isFileInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } - TARGET_NATIVE_FILE_IS_FILE (filename, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_IS_FILE(filename,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -294,26 +294,26 @@ Java_java_io_File_isFileInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_isDirectoryInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_isDirectoryInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } - TARGET_NATIVE_FILE_IS_DIRECTORY (filename, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_IS_DIRECTORY(filename,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -328,41 +328,40 @@ Java_java_io_File_isDirectoryInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jlong JNICALL -Java_java_io_File_lengthInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_lengthInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int tmpfd; - jlong length; - int result; - + int tmpfd; + jlong length; + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } - + /* open file for reading, get size and close file */ - TARGET_NATIVE_FILE_OPEN_READ (filename, tmpfd, result); + TARGET_NATIVE_FILE_OPEN_READ(filename,tmpfd,result); if (result != TARGET_NATIVE_OK) { - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } - TARGET_NATIVE_FILE_SIZE (tmpfd, length, result); + TARGET_NATIVE_FILE_SIZE(tmpfd,length,result); if (result != TARGET_NATIVE_OK) { - TARGET_NATIVE_FILE_CLOSE (tmpfd, result); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + TARGET_NATIVE_FILE_CLOSE(tmpfd,result); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } - TARGET_NATIVE_FILE_CLOSE (tmpfd, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_CLOSE(tmpfd,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - return ((result == - TARGET_NATIVE_OK) ? length : TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return ((result == TARGET_NATIVE_OK)?length:TARGET_NATIVE_MATH_INT_INT64_CONST_0); #else /* not WITHOUT_FILESYSTEM */ - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -377,29 +376,27 @@ Java_java_io_File_lengthInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jlong JNICALL -Java_java_io_File_lastModifiedInternal (JNIEnv *env, jobject obj, - jstring name) +Java_java_io_File_lastModifiedInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - jlong mtime; - int result; - + jlong mtime; + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); } + + TARGET_NATIVE_FILE_GET_LAST_MODIFIED(filename,mtime,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - TARGET_NATIVE_FILE_GET_LAST_MODIFIED (filename, mtime, result); - (*env)->ReleaseStringUTFChars (env, name, filename); - - return ((result == - TARGET_NATIVE_OK) ? mtime : TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return ((result == TARGET_NATIVE_OK)?mtime:TARGET_NATIVE_MATH_INT_INT64_CONST_0); #else /* not WITHOUT_FILESYSTEM */ - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -414,27 +411,27 @@ Java_java_io_File_lastModifiedInternal (JNIEnv *env, jobject obj, */ JNIEXPORT jboolean JNICALL -Java_java_io_File_setLastModifiedInternal (JNIEnv *env, jobject obj, - jstring name, jlong newtime) +Java_java_io_File_setLastModifiedInternal(JNIEnv *env, jobject obj, + jstring name, jlong newtime) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } + + TARGET_NATIVE_FILE_SET_LAST_MODIFIED(filename,newtime,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - TARGET_NATIVE_FILE_SET_LAST_MODIFIED (filename, newtime, result); - (*env)->ReleaseStringUTFChars (env, name, filename); - - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -450,26 +447,26 @@ Java_java_io_File_setLastModifiedInternal (JNIEnv *env, jobject obj, */ JNIEXPORT jboolean JNICALL -Java_java_io_File_deleteInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_deleteInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - filename = (*env)->GetStringUTFChars (env, name, 0); + filename = (*env)->GetStringUTFChars(env, name, 0); if (filename == NULL) { - return (0); + return(0); } + + TARGET_NATIVE_FILE_DELETE(filename,result); + (*env)->ReleaseStringUTFChars(env, name, filename); - TARGET_NATIVE_FILE_DELETE (filename, result); - (*env)->ReleaseStringUTFChars (env, name, filename); - - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -484,26 +481,26 @@ Java_java_io_File_deleteInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_mkdirInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_mkdirInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *pathname; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - pathname = (*env)->GetStringUTFChars (env, name, 0); + pathname = (*env)->GetStringUTFChars(env, name, 0); if (pathname == NULL) { - return (0); + return(0); } + + TARGET_NATIVE_FILE_MAKE_DIR(pathname,result); + (*env)->ReleaseStringUTFChars(env, name, pathname); - TARGET_NATIVE_FILE_MAKE_DIR (pathname, result); - (*env)->ReleaseStringUTFChars (env, name, pathname); - - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -518,35 +515,34 @@ Java_java_io_File_mkdirInternal (JNIEnv *env, jobject obj, jstring name) */ JNIEXPORT jboolean JNICALL -Java_java_io_File_renameToInternal (JNIEnv *env, jobject obj, jstring t, - jstring d) +Java_java_io_File_renameToInternal(JNIEnv *env, jobject obj, jstring t, jstring d) { #ifndef WITHOUT_FILESYSTEM const char *old_filename, *new_filename; - int result; - + int result; + /* Don't use the JCL convert function because it throws an exception on failure */ - old_filename = (*env)->GetStringUTFChars (env, t, 0); + old_filename = (*env)->GetStringUTFChars(env, t, 0); if (old_filename == NULL) { - return (0); + return(0); } - new_filename = (*env)->GetStringUTFChars (env, d, 0); + new_filename = (*env)->GetStringUTFChars(env, d, 0); if (new_filename == NULL) { - (*env)->ReleaseStringUTFChars (env, t, old_filename); - return (0); + (*env)->ReleaseStringUTFChars(env, t, old_filename); + return(0); } + + TARGET_NATIVE_FILE_RENAME(old_filename,new_filename,result); + (*env)->ReleaseStringUTFChars(env, d, new_filename); + (*env)->ReleaseStringUTFChars(env, t, old_filename); - TARGET_NATIVE_FILE_RENAME (old_filename, new_filename, result); - (*env)->ReleaseStringUTFChars (env, d, new_filename); - (*env)->ReleaseStringUTFChars (env, t, old_filename); - - return ((result == TARGET_NATIVE_OK) ? 1 : 0); + return ((result == TARGET_NATIVE_OK)?1:0); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -562,147 +558,145 @@ Java_java_io_File_renameToInternal (JNIEnv *env, jobject obj, jstring t, */ JNIEXPORT jobjectArray JNICALL -Java_java_io_File_listInternal (JNIEnv *env, jobject obj, jstring name) +Java_java_io_File_listInternal(JNIEnv *env, jobject obj, jstring name) { #ifndef WITHOUT_FILESYSTEM const int REALLOC_SIZE = 10; - const char *dirname; - int result; - char **filelist; - void *handle; - const char *filename; - unsigned long int filelist_count, max_filelist_count; - char **tmp_filelist; - jclass str_clazz; - jobjectArray filearray; + const char *dirname; + int result; + char **filelist; + void *handle; + const char *filename; + unsigned long int filelist_count,max_filelist_count; + char **tmp_filelist; + jclass str_clazz; + jobjectArray filearray; unsigned long int i; - jstring str; + jstring str; /* Don't use the JCL convert function because it throws an exception on failure */ - dirname = (*env)->GetStringUTFChars (env, name, 0); + dirname = (*env)->GetStringUTFChars(env, name, 0); if (dirname == NULL) { - return (0); + return(0); } /* open directory for reading */ - TARGET_NATIVE_FILE_OPEN_DIR (dirname, handle, result); + TARGET_NATIVE_FILE_OPEN_DIR(dirname,handle,result); - (*env)->ReleaseStringUTFChars (env, name, dirname); + (*env)->ReleaseStringUTFChars(env, name, dirname); if (result != TARGET_NATIVE_OK) { - return (0); + return(0); } /* allocate filelist */ - filelist = (char **) JCL_malloc (env, sizeof (char *) * REALLOC_SIZE); - if (filelist == NULL) + filelist = (char **)JCL_malloc(env, sizeof(char *) * REALLOC_SIZE); + if (filelist==NULL) { - TARGET_NATIVE_FILE_CLOSE_DIR (handle, result); - return (0); + TARGET_NATIVE_FILE_CLOSE_DIR(handle,result); + return(0); } - filelist_count = 0; - max_filelist_count = REALLOC_SIZE; + filelist_count=0; + max_filelist_count=REALLOC_SIZE; /* read the files from the directory */ - TARGET_NATIVE_FILE_READ_DIR (handle, filename, result); + TARGET_NATIVE_FILE_READ_DIR(handle,filename,result); while (result == TARGET_NATIVE_OK) { - if ((strcmp (filename, ".") != 0) && (strcmp (filename, "..") != 0)) - { - /* allocate more memory if necessary */ - if (filelist_count >= max_filelist_count) - { - tmp_filelist = (char **) JCL_realloc (env, - filelist, - (max_filelist_count + - REALLOC_SIZE) * - sizeof (char *)); - if (tmp_filelist == NULL) - { - for (i = 0; i < filelist_count; i++) - { - JCL_free (env, filelist[i]); - } - JCL_free (env, filelist); - TARGET_NATIVE_FILE_CLOSE_DIR (handle, result); - return (0); - } - filelist = tmp_filelist; - max_filelist_count += REALLOC_SIZE; - } - - /* save entry in list (avoid strdup, because it is not ANSI C, thus difficult to port) */ - filelist[filelist_count] = - (char *) JCL_malloc (env, strlen (filename) + 1); - assert (filelist[filelist_count] != NULL); - strcpy (filelist[filelist_count], filename); - filelist_count++; - } + if ((strcmp(filename, ".")!=0) && (strcmp(filename, "..")!=0)) + { + /* allocate more memory if necessary */ + if (filelist_count >= max_filelist_count) + { + tmp_filelist = (char**)JCL_realloc(env, + filelist, + (max_filelist_count + REALLOC_SIZE) * sizeof(char*)); + if (tmp_filelist==NULL) + { + for (i = 0; i < filelist_count; i++) + { + JCL_free(env,filelist[i]); + } + JCL_free(env,filelist); + TARGET_NATIVE_FILE_CLOSE_DIR(handle,result); + return(0); + } + filelist = tmp_filelist; + max_filelist_count += REALLOC_SIZE; + } + + /* save entry in list (avoid strdup, because it is not ANSI C, thus difficult to port) */ + filelist[filelist_count]=(char*)JCL_malloc(env,strlen(filename)+1); + assert(filelist[filelist_count]!=NULL); + strcpy(filelist[filelist_count],filename); + filelist_count++; + } /* read next directory entry */ - TARGET_NATIVE_FILE_READ_DIR (handle, filename, result); + TARGET_NATIVE_FILE_READ_DIR(handle,filename,result); } /* close directory */ - TARGET_NATIVE_FILE_CLOSE_DIR (handle, result); + TARGET_NATIVE_FILE_CLOSE_DIR(handle,result); /* put the list of files into a Java String array and return it */ - str_clazz = (*env)->FindClass (env, "java/lang/String"); - if (str_clazz == NULL) + str_clazz = (*env)->FindClass(env, "java/lang/String"); + if (str_clazz==NULL) { for (i = 0; i < filelist_count; i++) - { - JCL_free (env, filelist[i]); - } - JCL_free (env, filelist); - return (0); + { + JCL_free(env,filelist[i]); + } + JCL_free(env,filelist); + return(0); } - filearray = (*env)->NewObjectArray (env, filelist_count, str_clazz, 0); - if (filearray == NULL) + filearray = (*env)->NewObjectArray(env, filelist_count, str_clazz, 0); + if (filearray==NULL) { for (i = 0; i < filelist_count; i++) - { - JCL_free (env, filelist[i]); - } - JCL_free (env, filelist); - return (0); + { + JCL_free(env,filelist[i]); + } + JCL_free(env,filelist); + return(0); } for (i = 0; i < filelist_count; i++) { /* create new string */ - str = (*env)->NewStringUTF (env, filelist[i]); - if (str == NULL) - { - /* We don't clean up everything here, but if this failed, - something serious happened anyway */ - for (i = 0; i < filelist_count; i++) - { - JCL_free (env, filelist[i]); - } - JCL_free (env, filelist); - return (0); - } + str = (*env)->NewStringUTF(env, filelist[i]); + if (str==NULL) + { + /* We don't clean up everything here, but if this failed, + something serious happened anyway */ + for (i = 0; i < filelist_count; i++) + { + JCL_free(env,filelist[i]); + } + JCL_free(env,filelist); + return(0); + } /* save into array */ - (*env)->SetObjectArrayElement (env, filearray, i, str); + (*env)->SetObjectArrayElement(env, filearray, i, str); /* delete local reference */ - (*env)->DeleteLocalRef (env, str); + (*env)->DeleteLocalRef(env, str); } /* free resources */ for (i = 0; i < filelist_count; i++) { - JCL_free (env, filelist[i]); + JCL_free(env,filelist[i]); } - JCL_free (env, filelist); + JCL_free(env,filelist); - return (filearray); + return(filearray); #else /* not WITHOUT_FILESYSTEM */ - return (0); + return(0); #endif /* not WITHOUT_FILESYSTEM */ } + diff --git a/native/jni/java-io/java_io_ObjectInputStream.c b/native/jni/java-io/java_io_ObjectInputStream.c index ddf9bd671..cff298326 100644 --- a/native/jni/java-io/java_io_ObjectInputStream.c +++ b/native/jni/java-io/java_io_ObjectInputStream.c @@ -53,19 +53,19 @@ exception statement from your version. */ * Signature: (Ljava/lang/SecurityManager;)Ljava/lang/ClassLoader; */ JNIEXPORT jobject JNICALL -Java_java_io_ObjectInputStream_currentClassLoader (JNIEnv *env, +Java_java_io_ObjectInputStream_currentClassLoader( JNIEnv * env, jclass clazz, - jobject loader) + jobject loader ) { - jmethodID id = (*env)->GetMethodID (env, - (*env)->GetObjectClass (env, loader), + jmethodID id = (*env)->GetMethodID( env, + (*env)->GetObjectClass( env, loader ), "currentClassLoader", - "()Ljava/lang/ClassLoader;"); - - if (id == NULL) + "()Ljava/lang/ClassLoader;" ); + + if( id == NULL ) return NULL; - - return (*env)->CallObjectMethod (env, loader, id, clazz); + + return (*env)->CallObjectMethod( env, loader, id, clazz ); } @@ -75,10 +75,11 @@ Java_java_io_ObjectInputStream_currentClassLoader (JNIEnv *env, * Signature: (Ljava/lang/Class;)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL -Java_java_io_ObjectInputStream_allocateObject (JNIEnv *env, - jobject self, jclass clazz) +Java_java_io_ObjectInputStream_allocateObject( JNIEnv * env, + jobject self, + jclass clazz ) { - return (*env)->AllocObject (env, clazz); + return (*env)->AllocObject( env, clazz ); } @@ -87,16 +88,16 @@ Java_java_io_ObjectInputStream_allocateObject (JNIEnv *env, * Method: callConstructor * Signature: (Ljava/lang/Class;Ljava/lang/Object;)V */ -JNIEXPORT void JNICALL -Java_java_io_ObjectInputStream_callConstructor (JNIEnv *env, +JNIEXPORT void JNICALL +Java_java_io_ObjectInputStream_callConstructor( JNIEnv * env, jclass clazz, jclass constr_class, - jobject obj) + jobject obj ) { - jmethodID id = (*env)->GetMethodID (env, constr_class, - "<init>", "()V"); - if (id == NULL) + jmethodID id = (*env)->GetMethodID( env, constr_class, + "<init>", "()V" ); + if( id == NULL ) return; - - (*env)->CallNonvirtualVoidMethod (env, obj, constr_class, id); + + (*env)->CallNonvirtualVoidMethod( env, obj, constr_class, id ); } diff --git a/native/jni/java-io/java_io_VMObjectStreamClass.c b/native/jni/java-io/java_io_VMObjectStreamClass.c index 4348f2af2..cb24d9f2a 100644 --- a/native/jni/java-io/java_io_VMObjectStreamClass.c +++ b/native/jni/java-io/java_io_VMObjectStreamClass.c @@ -47,14 +47,14 @@ exception statement from your version. */ * Signature: (Ljava/lang/Class;)Z */ JNIEXPORT jboolean JNICALL -Java_java_io_VMObjectStreamClass_hasClassInitializer (JNIEnv *env, - jclass vmosklass, - jclass klass) +Java_java_io_VMObjectStreamClass_hasClassInitializer( JNIEnv * env, + jclass vmosklass, + jclass klass ) { - jmethodID mid = (*env)->GetStaticMethodID (env, klass, "<clinit>", "()V"); + jmethodID mid = (*env)->GetStaticMethodID(env, klass, "<clinit>", "()V"); if (mid == NULL) { - (*env)->ExceptionClear (env); + (*env)->ExceptionClear(env); return JNI_FALSE; } return JNI_TRUE; diff --git a/native/jni/java-io/javaio.c b/native/jni/java-io/javaio.c index 456e89a24..b9bedc61d 100644 --- a/native/jni/java-io/javaio.c +++ b/native/jni/java-io/javaio.c @@ -46,7 +46,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_FILESYSTEM -#include "target_native_file.h" + #include "target_native_file.h" #endif #include "target_native_math_int.h" @@ -57,35 +57,35 @@ exception statement from your version. */ */ jint -_javaio_open_read (JNIEnv *env, jstring name) +_javaio_open_read(JNIEnv *env, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int fd; - int result; + int fd; + int result; // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); - filename = JCL_jstring_to_cstring (env, name); + filename = JCL_jstring_to_cstring(env, name); if (filename == NULL) - return (-1); + return(-1); - TARGET_NATIVE_FILE_OPEN_READ (filename, fd, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_OPEN_READ(filename,fd,result); + (*env)->ReleaseStringUTFChars(env, name, filename); if (result != TARGET_NATIVE_OK) { - if (TARGET_NATIVE_LAST_ERROR () == TARGET_NATIVE_ERROR_NO_SUCH_FILE) - JCL_ThrowException (env, - "java/io/FileNotFoundException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + if (TARGET_NATIVE_LAST_ERROR() == TARGET_NATIVE_ERROR_NO_SUCH_FILE) + JCL_ThrowException(env, + "java/io/FileNotFoundException", + TARGET_NATIVE_LAST_ERROR_STRING()); else - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); } - return (fd); + return(fd); #else /* not WITHOUT_FILESYSTEM */ - return (-1); + return(-1); #endif /* not WITHOUT_FILESYSTEM */ } @@ -94,35 +94,35 @@ _javaio_open_read (JNIEnv *env, jstring name) */ jint -_javaio_open_readwrite (JNIEnv *env, jstring name) +_javaio_open_readwrite(JNIEnv *env, jstring name) { #ifndef WITHOUT_FILESYSTEM const char *filename; - int fd; - int result; + int fd; + int result; // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); - filename = JCL_jstring_to_cstring (env, name); + filename = JCL_jstring_to_cstring(env, name); if (filename == NULL) - return (-1); + return(-1); - TARGET_NATIVE_FILE_OPEN_READWRITE (filename, fd, result); - (*env)->ReleaseStringUTFChars (env, name, filename); + TARGET_NATIVE_FILE_OPEN_READWRITE(filename,fd,result); + (*env)->ReleaseStringUTFChars(env, name, filename); if (result != TARGET_NATIVE_OK) { - if (TARGET_NATIVE_LAST_ERROR () == TARGET_NATIVE_ERROR_NO_SUCH_FILE) - JCL_ThrowException (env, - "java/io/FileNotFoundException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + if (TARGET_NATIVE_LAST_ERROR() == TARGET_NATIVE_ERROR_NO_SUCH_FILE) + JCL_ThrowException(env, + "java/io/FileNotFoundException", + TARGET_NATIVE_LAST_ERROR_STRING()); else - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); } - return (fd); + return(fd); #else /* not WITHOUT_FILESYSTEM */ - return (-1); + return(-1); #endif /* not WITHOUT_FILESYSTEM */ } @@ -133,18 +133,18 @@ _javaio_open_readwrite (JNIEnv *env, jstring name) */ void -_javaio_close (JNIEnv *env, jint fd) +_javaio_close(JNIEnv *env, jint fd) { #ifndef WITHOUT_FILESYSTEM int result; if (fd != -1) { - TARGET_NATIVE_FILE_CLOSE (fd, result); + TARGET_NATIVE_FILE_CLOSE(fd,result); if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); } #else /* not WITHOUT_FILESYSTEM */ #endif /* not WITHOUT_FILESYSTEM */ @@ -157,29 +157,28 @@ _javaio_close (JNIEnv *env, jint fd) */ jlong -_javaio_skip_bytes (JNIEnv *env, jint fd, jlong num_bytes) +_javaio_skip_bytes(JNIEnv *env, jint fd, jlong num_bytes) { #ifndef WITHOUT_FILESYSTEM jlong current_offset, new_offset; - int result; + int result; // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); - TARGET_NATIVE_FILE_SEEK_CURRENT (fd, TARGET_NATIVE_MATH_INT_INT64_CONST_0, - current_offset, result); + TARGET_NATIVE_FILE_SEEK_CURRENT(fd,TARGET_NATIVE_MATH_INT_INT64_CONST_0,current_offset,result); if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); - TARGET_NATIVE_FILE_SEEK_CURRENT (fd, num_bytes, new_offset, result); + TARGET_NATIVE_FILE_SEEK_CURRENT(fd,num_bytes,new_offset,result); if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); - return (TARGET_NATIVE_MATH_INT_INT64_SUB (new_offset, current_offset)); + return(TARGET_NATIVE_MATH_INT_INT64_SUB(new_offset,current_offset)); #else /* not WITHOUT_FILESYSTEM */ - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -190,25 +189,25 @@ _javaio_skip_bytes (JNIEnv *env, jint fd, jlong num_bytes) */ jlong -_javaio_get_file_length (JNIEnv *env, jint fd) +_javaio_get_file_length(JNIEnv *env, jint fd) { #ifndef WITHOUT_FILESYSTEM jlong length; - int result; + int result; // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); - TARGET_NATIVE_FILE_SIZE (fd, length, result); + TARGET_NATIVE_FILE_SIZE(fd,length,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1); } - return (length); + return(length); #else /* not WITHOUT_FILESYSTEM */ - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); #endif /* not WITHOUT_FILESYSTEM */ } @@ -219,77 +218,75 @@ _javaio_get_file_length (JNIEnv *env, jint fd) */ jint -_javaio_read (JNIEnv *env, jobject obj, jint fd, jarray buf, jint offset, - jint len) +_javaio_read(JNIEnv *env, jobject obj, jint fd, jarray buf, jint offset, + jint len) { #ifndef WITHOUT_FILESYSTEM jbyte *bufptr; - int bytesRead; - int result; + int bytesRead; + int result; - assert (offset >= 0); - assert (len >= 0); + assert(offset>=0); + assert(len>=0); // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); if (len == 0) - return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ + return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ - bufptr = (*env)->GetByteArrayElements (env, buf, JNI_FALSE); + bufptr = (*env)->GetByteArrayElements(env, buf, JNI_FALSE); if (bufptr == NULL) { - JCL_ThrowException (env, "java/io/IOException", - "Internal Error: get byte array fail"); - return (-1); + JCL_ThrowException(env, "java/io/IOException", "Internal Error: get byte array fail"); + return(-1); } - TARGET_NATIVE_FILE_READ (fd, (bufptr + offset), len, bytesRead, result); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); + TARGET_NATIVE_FILE_READ(fd,(bufptr + offset),len,bytesRead,result); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); if (bytesRead == 0) - return (-1); + return(-1); - return (bytesRead); + return(bytesRead); #else /* not WITHOUT_FILESYSTEM */ jbyte *bufptr; - int bytesRead; + int bytesRead; - assert (offset >= 0); - assert (len >= 0); + assert(offset>=0); + assert(len>=0); // fprintf(stderr,"call %s (line %d):\n",__FUNCTION__,__LINE__); - if ((fd == 0) || (fd == 1) || (fd == 2)) - { - if (len == 0) - return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ - - bufptr = (*env)->GetByteArrayElements (env, buf, JNI_FALSE); - if (bufptr == NULL) - { - JCL_ThrowException (env, "java/io/IOException", - "Internal Error: get byte array"); - return (-1); - } - - TARGET_NATIVE_FILE_READ (fd, (bufptr + offset), len, bytesRead, result); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); - if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); - - if (bytesRead == 0) - return (-1); - - return (bytesRead); - } + if ((fd==0) || (fd==1) || (fd==2)) + { + if (len == 0) + return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ + + bufptr = (*env)->GetByteArrayElements(env, buf, JNI_FALSE); + if (bufptr == NULL) + { + JCL_ThrowException(env, "java/io/IOException", "Internal Error: get byte array"); + return(-1); + } + + TARGET_NATIVE_FILE_READ(fd,(bufptr + offset),len,bytesRead,result); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); + if (result != TARGET_NATIVE_OK) + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); + + if (bytesRead == 0) + return(-1); + + return(bytesRead); + } else - { - return (-1); - } + { + return(-1); + } #endif /* not WITHOUT_FILESYSTEM */ } @@ -300,70 +297,67 @@ _javaio_read (JNIEnv *env, jobject obj, jint fd, jarray buf, jint offset, */ jint -_javaio_write (JNIEnv *env, jobject obj, jint fd, jarray buf, jint offset, - jint len) +_javaio_write(JNIEnv *env, jobject obj, jint fd, jarray buf, jint offset, + jint len) { #ifndef WITHOUT_FILESYSTEM jbyte *bufptr; - int bytes_written; - int result; + int bytes_written; + int result; if (len == 0) - return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ + return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ - bufptr = (*env)->GetByteArrayElements (env, buf, 0); + bufptr = (*env)->GetByteArrayElements(env, buf, 0); if (bufptr == NULL) { - JCL_ThrowException (env, "java/io/IOException", - "Internal Error: get byte array"); - return (-1); + JCL_ThrowException(env, "java/io/IOException", "Internal Error: get byte array"); + return(-1); } - TARGET_NATIVE_FILE_WRITE (fd, (bufptr + offset), len, bytes_written, - result); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); + TARGET_NATIVE_FILE_WRITE(fd,(bufptr + offset),len,bytes_written,result); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); if (result != TARGET_NATIVE_OK) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); if (bytes_written == 0) - return (-1); + return(-1); - return (bytes_written); + return(bytes_written); #else /* not WITHOUT_FILESYSTEM */ jbyte *bufptr; - int bytesWritten; + int bytesWritten; - if ((fd == 0) || (fd == 1) || (fd == 2)) - { - if (len == 0) - return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ + if ((fd==0) || (fd==1) || (fd==2)) + { + if (len == 0) + return 0; /* Nothing todo, and GetByteArrayElements() seems undefined. */ - bufptr = (*env)->GetByteArrayElements (env, buf, 0); - if (bufptr == NULL) - { - JCL_ThrowException (env, "java/io/IOException", "Internal Error"); - return (-1); - } + bufptr = (*env)->GetByteArrayElements(env, buf, 0); + if (bufptr==NULL) + { + JCL_ThrowException(env, "java/io/IOException", "Internal Error"); + return(-1); + } - TARGET_NATIVE_FILE_WRITE (fd, (bufptr + offset), len, bytes_written, - result); - (*env)->ReleaseByteArrayElements (env, buf, bufptr, 0); + TARGET_NATIVE_FILE_WRITE(fd,(bufptr + offset),len,bytes_written,result); + (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0); - if (bytes_written == -1) - JCL_ThrowException (env, - "java/io/IOException", - TARGET_NATIVE_LAST_ERROR_STRING ()); + if (bytes_written == -1) + JCL_ThrowException(env, + "java/io/IOException", + TARGET_NATIVE_LAST_ERROR_STRING()); - if (bytes_written == 0) - return (-1); + if (bytes_written == 0) + return(-1); - return (bytes_written); - } + return(bytes_written); + } else - { - return (-1); - } + { + return(-1); + } #endif /* not WITHOUT_FILESYSTEM */ } diff --git a/native/jni/java-io/javaio.h b/native/jni/java-io/javaio.h index 8e93cf5d5..815b6e61a 100644 --- a/native/jni/java-io/javaio.h +++ b/native/jni/java-io/javaio.h @@ -45,11 +45,12 @@ exception statement from your version. */ * Function Prototypes */ -extern jlong _javaio_get_file_length (JNIEnv *, jint); -extern jlong _javaio_skip_bytes (JNIEnv *, jint, jlong); -extern jint _javaio_open (JNIEnv *, jstring, int); -extern void _javaio_close (JNIEnv *, jint fd); -extern jint _javaio_read (JNIEnv *, jobject obj, jint, jarray, jint, jint); -extern jint _javaio_write (JNIEnv *, jobject obj, jint, jarray, jint, jint); +extern jlong _javaio_get_file_length(JNIEnv *, jint); +extern jlong _javaio_skip_bytes(JNIEnv *, jint, jlong); +extern jint _javaio_open(JNIEnv *, jstring, int); +extern void _javaio_close(JNIEnv *, jint fd); +extern jint _javaio_read(JNIEnv *, jobject obj, jint, jarray, jint, jint); +extern jint _javaio_write(JNIEnv *, jobject obj, jint, jarray, jint, jint); #endif /* JAVAIO_H_INCLUDED */ + diff --git a/native/jni/java-lang/java_lang_Double.c b/native/jni/java-lang/java_lang_Double.c index 38dffe5c0..a3166b9e6 100644 --- a/native/jni/java-lang/java_lang_Double.c +++ b/native/jni/java-lang/java_lang_Double.c @@ -56,37 +56,38 @@ static jdouble POSITIVE_INFINITY; * Method: initIDs * Signature: ()V */ -JNIEXPORT void JNICALL -Java_java_lang_Double_initIDs (JNIEnv *env, jclass cls) +JNIEXPORT void JNICALL Java_java_lang_Double_initIDs + (JNIEnv *env, jclass cls) { jfieldID negInfID; jfieldID posInfID; - isNaNID = (*env)->GetStaticMethodID (env, cls, "isNaN", "(D)Z"); + isNaNID = (*env)->GetStaticMethodID(env, cls, "isNaN", "(D)Z"); if (isNaNID == NULL) { - DBG ("unable to determine method id of isNaN\n") return; + DBG("unable to determine method id of isNaN\n") + return; } - negInfID = (*env)->GetStaticFieldID (env, cls, "NEGATIVE_INFINITY", "D"); + negInfID = (*env)->GetStaticFieldID(env, cls, "NEGATIVE_INFINITY", "D"); if (negInfID == NULL) { - DBG ("unable to determine field id of NEGATIVE_INFINITY\n") return; + DBG("unable to determine field id of NEGATIVE_INFINITY\n") + return; } - posInfID = (*env)->GetStaticFieldID (env, cls, "POSITIVE_INFINITY", "D"); + posInfID = (*env)->GetStaticFieldID(env, cls, "POSITIVE_INFINITY", "D"); if (posInfID == NULL) { - DBG ("unable to determine field id of POSITIVE_INFINITY\n") return; + DBG("unable to determine field id of POSITIVE_INFINITY\n") + return; } - POSITIVE_INFINITY = (*env)->GetStaticDoubleField (env, cls, posInfID); - NEGATIVE_INFINITY = (*env)->GetStaticDoubleField (env, cls, negInfID); + POSITIVE_INFINITY = (*env)->GetStaticDoubleField(env, cls, posInfID); + NEGATIVE_INFINITY = (*env)->GetStaticDoubleField(env, cls, negInfID); #ifdef DEBUG - fprintf (stderr, "java.lang.Double.initIDs() POSITIVE_INFINITY = %g\n", - POSITIVE_INFINITY); - fprintf (stderr, "java.lang.Double.initIDs() NEGATIVE_INFINITY = %g\n", - NEGATIVE_INFINITY); + fprintf(stderr, "java.lang.Double.initIDs() POSITIVE_INFINITY = %g\n", POSITIVE_INFINITY); + fprintf(stderr, "java.lang.Double.initIDs() NEGATIVE_INFINITY = %g\n", NEGATIVE_INFINITY); #endif -} +} /* * Class: java_lang_Double @@ -94,7 +95,7 @@ Java_java_lang_Double_initIDs (JNIEnv *env, jclass cls) * Signature: (DZ)Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString - (JNIEnv *env, jclass cls, jdouble value, jboolean isFloat) + (JNIEnv * env, jclass cls, jdouble value, jboolean isFloat) { char buffer[50], result[50]; int decpt, sign; @@ -105,16 +106,16 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString fprintf (stderr, "java.lang.Double.toString (%g)\n", value); #endif - if ((*env)->CallStaticBooleanMethod (env, cls, isNaNID, value)) - return (*env)->NewStringUTF (env, "NaN"); - + if ((*env)->CallStaticBooleanMethod(env, cls, isNaNID, value)) + return (*env)->NewStringUTF(env, "NaN"); + if (value == POSITIVE_INFINITY) - return (*env)->NewStringUTF (env, "Infinity"); + return (*env)->NewStringUTF(env, "Infinity"); if (value == NEGATIVE_INFINITY) - return (*env)->NewStringUTF (env, "-Infinity"); + return (*env)->NewStringUTF(env, "-Infinity"); - _dtoa (value, 0, 20, &decpt, &sign, NULL, buffer, (int) isFloat); + _dtoa (value, 0, 20, &decpt, &sign, NULL, buffer, (int)isFloat); value = fabs (value); @@ -144,22 +145,22 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString *d++ = '0'; decpt++; } - + while (decpt++ < 0) - *d++ = '0'; - + *d++ = '0'; + while (*s) *d++ = *s++; *d = 0; - return (*env)->NewStringUTF (env, result); + return (*env)->NewStringUTF(env, result); } *d++ = *s++; decpt--; *d++ = '.'; - + if (*s == 0) *d++ = '0'; @@ -167,7 +168,7 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString *d++ = *s++; *d++ = 'E'; - + if (decpt < 0) { *d++ = '-'; @@ -177,7 +178,7 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString { char exp[4]; char *e = exp + sizeof exp; - + *--e = 0; do { @@ -189,10 +190,10 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString while (*e) *d++ = *e++; } - + *d = 0; - return (*env)->NewStringUTF (env, result); + return (*env)->NewStringUTF(env, result); } /* @@ -201,7 +202,7 @@ JNIEXPORT jstring JNICALL Java_java_lang_Double_toString * Signature: (Ljava/lang/String;)D */ JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble - (JNIEnv *env, jclass cls, jstring str) + (JNIEnv * env, jclass cls, jstring str) { jboolean isCopy; char *buf, *endptr; @@ -213,7 +214,7 @@ JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble return val; } - buf = (char *) (*env)->GetStringUTFChars (env, str, &isCopy); + buf = (char *) (*env)->GetStringUTFChars(env, str, &isCopy); if (buf == NULL) { /* OutOfMemoryError already thrown */ @@ -222,29 +223,29 @@ JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble { unsigned char *p = buf, *end, *last_non_ws; int ok = 1; - + #ifdef DEBUG fprintf (stderr, "java.lang.Double.parseDouble (%s)\n", buf); #endif /* Trim the buffer, similar to String.trim(). First the leading - characters. */ + characters. */ while (*p && *p <= ' ') - ++p; + ++p; /* Find the last non-whitespace character. This method is safe - even with multi-byte UTF-8 characters. */ + even with multi-byte UTF-8 characters. */ end = p; last_non_ws = NULL; while (*end) - { - if (*end > ' ') - last_non_ws = end; - ++end; - } + { + if (*end > ' ') + last_non_ws = end; + ++end; + } if (last_non_ws == NULL) - last_non_ws = p + strlen (p); + last_non_ws = p + strlen (p); else { /* Skip past the last non-whitespace character. */ @@ -255,18 +256,19 @@ JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble if (last_non_ws > p && (last_non_ws[-1] == 'f' || last_non_ws[-1] == 'F' - || last_non_ws[-1] == 'd' || last_non_ws[-1] == 'D')) + || last_non_ws[-1] == 'd' + || last_non_ws[-1] == 'D')) --last_non_ws; if (last_non_ws > p) - { - struct _Jv_reent reent; - memset (&reent, 0, sizeof reent); + { + struct _Jv_reent reent; + memset (&reent, 0, sizeof reent); #ifdef KISSME_LINUX_USER - val = strtod (p, &endptr); + val = strtod (p, &endptr); #else - val = _strtod_r (&reent, p, &endptr); + val = _strtod_r (&reent, p, &endptr); #endif #ifdef DEBUG @@ -274,19 +276,19 @@ JNIEXPORT jdouble JNICALL Java_java_lang_Double_parseDouble fprintf (stderr, "java.lang.Double.parseDouble %i != %i ???\n", endptr, last_non_ws); #endif - if ((unsigned char *) endptr != last_non_ws) - ok = 0; - } + if ((unsigned char *) endptr != last_non_ws) + ok = 0; + } else - ok = 0; - - if (!ok) - { - val = 0.0; - JCL_ThrowException (env, - "java/lang/NumberFormatException", - "unable to parse double"); - } + ok = 0; + + if (! ok) + { + val = 0.0; + JCL_ThrowException (env, + "java/lang/NumberFormatException", + "unable to parse double"); + } (*env)->ReleaseStringUTFChars (env, str, buf); } diff --git a/native/jni/java-lang/java_lang_Math.c b/native/jni/java-lang/java_lang_Math.c index 904533ea1..130c15e01 100644 --- a/native/jni/java-lang/java_lang_Math.c +++ b/native/jni/java-lang/java_lang_Math.c @@ -40,93 +40,78 @@ exception statement from your version. */ #include <java_lang_Math.h> #include <fdlibm.h> -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_sin (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_sin (JNIEnv *env, jclass cls, jdouble x) { return sin (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_cos (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_cos (JNIEnv *env, jclass cls, jdouble x) { return cos (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_tan (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_tan (JNIEnv *env, jclass cls, jdouble x) { return tan (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_asin (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_asin (JNIEnv *env, jclass cls, jdouble x) { return asin (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_acos (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_acos (JNIEnv *env, jclass cls, jdouble x) { return acos (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_atan (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan (JNIEnv *env, jclass cls, jdouble x) { return atan (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_atan2 (JNIEnv *env, jclass cls, jdouble y, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_atan2 (JNIEnv *env, jclass cls, jdouble y, jdouble x) { return atan2 (y, x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_exp (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_exp (JNIEnv *env, jclass cls, jdouble x) { return exp (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_log (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_log (JNIEnv *env, jclass cls, jdouble x) { return log (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_sqrt (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_sqrt (JNIEnv *env, jclass cls, jdouble x) { return sqrt (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_pow (JNIEnv *env, jclass cls, jdouble x, jdouble y) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_pow (JNIEnv *env, jclass cls, jdouble x, jdouble y) { return pow (x, y); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_IEEEremainder (JNIEnv *env, jclass cls, jdouble x, - jdouble y) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_IEEEremainder (JNIEnv *env, jclass cls, jdouble x, jdouble y) { return remainder (x, y); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_ceil (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_ceil (JNIEnv *env, jclass cls, jdouble x) { return ceil (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_floor (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_floor (JNIEnv *env, jclass cls, jdouble x) { return floor (x); } -JNIEXPORT jdouble JNICALL -Java_java_lang_Math_rint (JNIEnv *env, jclass cls, jdouble x) +JNIEXPORT jdouble JNICALL Java_java_lang_Math_rint (JNIEnv *env, jclass cls, jdouble x) { return rint (x); } + diff --git a/native/jni/java-lang/java_lang_Object.c b/native/jni/java-lang/java_lang_Object.c index 614cef4d2..42080dffe 100644 --- a/native/jni/java-lang/java_lang_Object.c +++ b/native/jni/java-lang/java_lang_Object.c @@ -44,7 +44,7 @@ exception statement from your version. */ * Signature: ()Ljava/lang/Class; */ JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass - (JNIEnv *env, jobject thisObj) -{ - return (*env)->GetObjectClass (env, thisObj); + (JNIEnv * env, jobject thisObj) { + return (*env)->GetObjectClass(env,thisObj); } + diff --git a/native/jni/java-lang/java_lang_VMDouble.c b/native/jni/java-lang/java_lang_VMDouble.c index 10f301629..ceea7a192 100644 --- a/native/jni/java-lang/java_lang_VMDouble.c +++ b/native/jni/java-lang/java_lang_VMDouble.c @@ -46,15 +46,15 @@ exception statement from your version. */ * Signature: (D)J */ JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits - (JNIEnv *env, jclass cls, jdouble doubleValue) + (JNIEnv * env, jclass cls, jdouble doubleValue) { jvalue val; jlong e, f; val.d = doubleValue; - + e = val.j & 0x7ff0000000000000LL; f = val.j & 0x000fffffffffffffLL; - + if (e == 0x7ff0000000000000LL && f != 0L) val.j = 0x7ff8000000000000LL; @@ -67,7 +67,7 @@ JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits * Signature: (D)J */ JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits - (JNIEnv *env, jclass cls, jdouble doubleValue) + (JNIEnv * env, jclass cls, jdouble doubleValue) { jvalue val; val.d = doubleValue; @@ -80,9 +80,10 @@ JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits * Signature: (J)D */ JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_longBitsToDouble - (JNIEnv *env, jclass cls, jlong longValue) + (JNIEnv * env, jclass cls, jlong longValue) { jvalue val; val.j = longValue; return val.d; } + diff --git a/native/jni/java-lang/java_lang_VMFloat.c b/native/jni/java-lang/java_lang_VMFloat.c index 0f67c9467..5630a1352 100644 --- a/native/jni/java-lang/java_lang_VMFloat.c +++ b/native/jni/java-lang/java_lang_VMFloat.c @@ -46,18 +46,18 @@ exception statement from your version. */ * Signature: (F)I */ JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToIntBits - (JNIEnv *env, jclass cls, jfloat value) + (JNIEnv * env, jclass cls, jfloat value) { - jvalue u; - jint e, f; - u.f = value; - e = u.i & 0x7f800000; - f = u.i & 0x007fffff; - - if (e == 0x7f800000 && f != 0) - u.i = 0x7fc00000; + jvalue u; + jint e, f; + u.f = value; + e = u.i & 0x7f800000; + f = u.i & 0x007fffff; - return u.i; + if (e == 0x7f800000 && f != 0) + u.i = 0x7fc00000; + + return u.i; } /* @@ -66,7 +66,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToIntBits * Signature: (F)I */ JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToRawIntBits - (JNIEnv *env, jclass cls, jfloat value) + (JNIEnv * env, jclass cls, jfloat value) { jvalue u; u.f = value; @@ -79,9 +79,10 @@ JNIEXPORT jint JNICALL Java_java_lang_VMFloat_floatToRawIntBits * Signature: (I)F */ JNIEXPORT jfloat JNICALL Java_java_lang_VMFloat_intBitsToFloat - (JNIEnv *env, jclass cls, jint bits) + (JNIEnv * env, jclass cls, jint bits) { - jvalue u; - u.i = bits; - return u.f; + jvalue u; + u.i = bits; + return u.f; } + diff --git a/native/jni/java-lang/java_lang_VMSystem.c b/native/jni/java-lang/java_lang_VMSystem.c index 3c2278aa2..7259f67b9 100644 --- a/native/jni/java-lang/java_lang_VMSystem.c +++ b/native/jni/java-lang/java_lang_VMSystem.c @@ -45,19 +45,20 @@ exception statement from your version. */ * Signature: (Ljava/io/InputStream;)V */ JNIEXPORT void JNICALL -Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass thisClass, jobject obj) +Java_java_lang_VMSystem_setIn (JNIEnv * env, jclass thisClass, jobject obj) { jclass cls; jfieldID field; - cls = JCL_FindClass (env, "java/lang/System"); + cls = JCL_FindClass(env, "java/lang/System"); if (!cls) return; - field = (*env)->GetStaticFieldID (env, cls, "in", "Ljava/io/InputStream;"); + field = (*env)->GetStaticFieldID(env, cls, "in", + "Ljava/io/InputStream;"); if (!field) return; - (*env)->SetStaticObjectField (env, cls, field, obj); + (*env)->SetStaticObjectField(env, cls, field, obj); } /* @@ -66,19 +67,20 @@ Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass thisClass, jobject obj) * Signature: (Ljava/io/PrintStream;)V */ JNIEXPORT void JNICALL -Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass thisClass, jobject obj) +Java_java_lang_VMSystem_setOut (JNIEnv * env, jclass thisClass, jobject obj) { jclass cls; jfieldID field; - cls = JCL_FindClass (env, "java/lang/System"); + cls = JCL_FindClass(env, "java/lang/System"); if (!cls) return; - field = (*env)->GetStaticFieldID (env, cls, "out", "Ljava/io/PrintStream;"); + field = (*env)->GetStaticFieldID(env, cls, "out", + "Ljava/io/PrintStream;"); if (!field) return; - (*env)->SetStaticObjectField (env, cls, field, obj); + (*env)->SetStaticObjectField(env, cls, field, obj); } /* @@ -87,19 +89,20 @@ Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass thisClass, jobject obj) * Signature: (Ljava/io/PrintStream;)V */ JNIEXPORT void JNICALL -Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass thisClass, jobject obj) +Java_java_lang_VMSystem_setErr (JNIEnv * env, jclass thisClass, jobject obj) { jclass cls; jfieldID field; - cls = JCL_FindClass (env, "java/lang/System"); + cls = JCL_FindClass(env, "java/lang/System"); if (!cls) return; - field = (*env)->GetStaticFieldID (env, cls, "err", "Ljava/io/PrintStream;"); + field = (*env)->GetStaticFieldID(env, cls, "err", + "Ljava/io/PrintStream;"); if (!field) return; - (*env)->SetStaticObjectField (env, cls, field, obj); + (*env)->SetStaticObjectField(env, cls, field, obj); } /* @@ -108,23 +111,23 @@ Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass thisClass, jobject obj) * Signature: ()J */ JNIEXPORT jlong JNICALL -Java_java_lang_VMSystem_currentTimeMillis (JNIEnv *env, jclass thisClass) +Java_java_lang_VMSystem_currentTimeMillis (JNIEnv * env, jclass thisClass) { /* Note: this implementation copied directly from Japhar's, by Chris Toshok. */ jlong result; struct timeval tp; - if (gettimeofday (&tp, NULL) == -1) - (*env)->FatalError (env, "gettimeofday call failed."); + if (gettimeofday(&tp, NULL) == -1) + (*env)->FatalError(env, "gettimeofday call failed."); - result = (jlong) tp.tv_sec; + result = (jlong)tp.tv_sec; result *= 1000; result += (tp.tv_usec / 1000); return result; } -JNIEXPORT jboolean JNICALL +JNIEXPORT jboolean JNICALL Java_java_lang_VMSystem_isWordsBigEndian (JNIEnv *env, jclass clazz) { /* Are we little or big endian? From Harbison&Steele. */ diff --git a/native/jni/java-lang/java_lang_reflect_Array.c b/native/jni/java-lang/java_lang_reflect_Array.c index f14bf0b6d..16319a3b5 100644 --- a/native/jni/java-lang/java_lang_reflect_Array.c +++ b/native/jni/java-lang/java_lang_reflect_Array.c @@ -50,9 +50,8 @@ exception statement from your version. */ * Signature: (Ljava/lang/Object;)I */ JNIEXPORT jint JNICALL Java_java_lang_reflect_Array_getLength - (JNIEnv *env, jclass thisClass, jobject arr) -{ - return (*env)->GetArrayLength (env, arr); + (JNIEnv * env, jclass thisClass, jobject arr) { + return (*env)->GetArrayLength(env, arr); } /* @@ -61,7 +60,6 @@ JNIEXPORT jint JNICALL Java_java_lang_reflect_Array_getLength * Signature: (Ljava/lang/Class;I)Ljava/lang/Object; */ JNIEXPORT jobject JNICALL Java_java_lang_reflect_Array_createObjectArray - (JNIEnv *env, jclass thisClass, jclass arrayType, jint arrayLength) -{ - return (jobject) (*env)->NewObjectArray (env, arrayLength, arrayType, NULL); + (JNIEnv * env, jclass thisClass, jclass arrayType, jint arrayLength) { + return (jobject)(*env)->NewObjectArray(env,arrayLength,arrayType,NULL); } diff --git a/native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c b/native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c index 480dc7f75..779ad5679 100644 --- a/native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c +++ b/native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c @@ -50,7 +50,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_NETWORK -#include "target_native_network.h" + #include "target_native_network.h" #endif /* WITHOUT_NETWORK */ #include "gnu_java_net_PlainDatagramSocketImpl.h" @@ -67,13 +67,13 @@ exception statement from your version. */ * Creates a new datagram socket */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_create (JNIEnv *env, jobject this) +Java_gnu_java_net_PlainDatagramSocketImpl_create(JNIEnv *env, jobject this) { - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - _javanet_create (env, this, 0); + _javanet_create(env, this, 0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -84,13 +84,13 @@ Java_gnu_java_net_PlainDatagramSocketImpl_create (JNIEnv *env, jobject this) * Close the socket. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_close (JNIEnv *env, jobject this) +Java_gnu_java_net_PlainDatagramSocketImpl_close(JNIEnv *env, jobject this) { - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - _javanet_close (env, this, 0); + _javanet_close(env, this, 0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -103,14 +103,14 @@ Java_gnu_java_net_PlainDatagramSocketImpl_close (JNIEnv *env, jobject this) * variables. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_bind (JNIEnv *env, jobject this, - jint port, jobject addr) +Java_gnu_java_net_PlainDatagramSocketImpl_bind(JNIEnv *env, jobject this, + jint port, jobject addr) { - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - _javanet_bind (env, this, addr, port, 0); + _javanet_bind(env, this, addr, port, 0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -121,16 +121,14 @@ Java_gnu_java_net_PlainDatagramSocketImpl_bind (JNIEnv *env, jobject this, * This method sets the specified option for a socket */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_setOption (JNIEnv *env, - jobject this, - jint option_id, - jobject val) +Java_gnu_java_net_PlainDatagramSocketImpl_setOption(JNIEnv *env, jobject this, + jint option_id, jobject val) { - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - _javanet_set_option (env, this, option_id, val); + _javanet_set_option(env, this, option_id, val); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -141,15 +139,14 @@ Java_gnu_java_net_PlainDatagramSocketImpl_setOption (JNIEnv *env, * This method sets the specified option for a socket */ JNIEXPORT jobject JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_getOption (JNIEnv *env, - jobject this, - jint option_id) +Java_gnu_java_net_PlainDatagramSocketImpl_getOption(JNIEnv *env, jobject this, + jint option_id) { - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - return (_javanet_get_option (env, this, option_id)); + return(_javanet_get_option(env, this, option_id)); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -160,183 +157,182 @@ Java_gnu_java_net_PlainDatagramSocketImpl_getOption (JNIEnv *env, * Reads a buffer from a remote host */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_receive0 (JNIEnv *env, jobject this, - jobject packet) +Java_gnu_java_net_PlainDatagramSocketImpl_receive0(JNIEnv *env, jobject this, + jobject packet) { #ifndef WITHOUT_NETWORK - unsigned int addr, port, maxlen, offset, bytes_read; - jclass cls, addr_cls; - jmethodID mid; - jarray arr; + unsigned int addr, port, maxlen, offset, bytes_read; + jclass cls, addr_cls; + jmethodID mid; + jarray arr; unsigned char octets[4]; - char ip_str[16]; - jobject ip_str_obj, addr_obj; + char ip_str[16]; + jobject ip_str_obj, addr_obj; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - addr = 0; - port = 0; - maxlen = 0; - offset = 0; + addr = 0; + port = 0; + maxlen = 0; + offset = 0; bytes_read = 0; - if (packet == NULL) + if(packet == NULL) { - JCL_ThrowException (env, "java/lang/NullPointerException", - "Null datagram packet"); + JCL_ThrowException(env, "java/lang/NullPointerException", "Null datagram packet"); return; } /* Get the buffer from the packet */ - cls = (*env)->GetObjectClass (env, packet); + cls = (*env)->GetObjectClass(env, packet); if (cls == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; } - mid = (*env)->GetMethodID (env, cls, "getData", "()[B"); + mid = (*env)->GetMethodID(env, cls, "getData", "()[B"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: getData"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: getData"); return; } - arr = (*env)->CallObjectMethod (env, packet, mid); - if ((arr == NULL) || (*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: call getData"); + arr = (*env)->CallObjectMethod(env, packet, mid); + if ((arr == NULL) || (*env)->ExceptionOccurred(env)) + { + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call getData"); return; } /* Now get the offset from the packet */ - mid = (*env)->GetMethodID (env, cls, "getOffset", "()I"); + mid = (*env)->GetMethodID(env, cls, "getOffset", "()I"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: getOffset"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: getOffset"); return; } - offset = (*env)->CallIntMethod (env, packet, mid); - if ((*env)->ExceptionOccurred (env)) + offset = (*env)->CallIntMethod(env, packet, mid); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: call getOffset"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call getOffset"); return; } - DBG ("PlainDatagramSocketImpl.receive(): Got the offset\n"); + DBG("PlainDatagramSocketImpl.receive(): Got the offset\n"); /* Now get the maximal available length from the packet */ - maxlen = (*env)->GetArrayLength (env, arr) - offset; + maxlen = (*env)->GetArrayLength(env,arr) - offset; /* Receive the packet */ /* should we try some sort of validation on the length? */ - bytes_read = - _javanet_recvfrom (env, this, arr, offset, maxlen, &addr, &port); - if ((bytes_read == -1) || (*env)->ExceptionOccurred (env)) + bytes_read = _javanet_recvfrom(env, this, arr, offset, maxlen, &addr, &port); + if ((bytes_read == -1) || (*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: receive"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: receive"); return; } - DBG ("PlainDatagramSocketImpl.receive(): Received packet\n"); - + DBG("PlainDatagramSocketImpl.receive(): Received packet\n"); + /* Store the address */ - TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (addr, - octets[0], - octets[1], - octets[2], octets[3]); - sprintf (ip_str, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); - ip_str_obj = (*env)->NewStringUTF (env, ip_str); + TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(addr, + octets[0], + octets[1], + octets[2], + octets[3] + ); + sprintf(ip_str, "%d.%d.%d.%d", + octets[0], + octets[1], + octets[2], + octets[3] + ); + ip_str_obj = (*env)->NewStringUTF(env, ip_str); if (ip_str_obj == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: new string"); + { + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: new string"); return; } - addr_cls = (*env)->FindClass (env, "java/net/InetAddress"); + addr_cls = (*env)->FindClass(env, "java/net/InetAddress"); if (addr_cls == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: InetAddress class"); + { + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: InetAddress class"); return; } - DBG ("PlainDatagramSocketImpl.receive(): Found InetAddress class\n"); + DBG("PlainDatagramSocketImpl.receive(): Found InetAddress class\n"); - mid = (*env)->GetStaticMethodID (env, addr_cls, "getByName", - "(Ljava/lang/String;)Ljava/net/InetAddress;"); + mid = (*env)->GetStaticMethodID(env, addr_cls, "getByName", + "(Ljava/lang/String;)Ljava/net/InetAddress;"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal Error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal Error"); return; } - DBG - ("PlainDatagramSocketImpl.receive(): Found InetAddress.getByName method\n"); + DBG("PlainDatagramSocketImpl.receive(): Found InetAddress.getByName method\n"); - addr_obj = (*env)->CallStaticObjectMethod (env, addr_cls, mid, ip_str_obj); - if ((*env)->ExceptionOccurred (env)) + addr_obj = (*env)->CallStaticObjectMethod(env, addr_cls, mid, ip_str_obj); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: call getByName"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call getByName"); return; } - mid = (*env)->GetMethodID (env, cls, "setAddress", - "(Ljava/net/InetAddress;)V"); + mid = (*env)->GetMethodID(env, cls, "setAddress", + "(Ljava/net/InetAddress;)V"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: setAddress"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: setAddress"); return; } - (*env)->CallVoidMethod (env, packet, mid, addr_obj); - if ((*env)->ExceptionOccurred (env)) + (*env)->CallVoidMethod(env, packet, mid, addr_obj); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: call setAddress"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call setAddress"); return; } - - DBG ("PlainDatagramSocketImpl.receive(): Stored the address\n"); + + DBG("PlainDatagramSocketImpl.receive(): Stored the address\n"); /* Store the port */ - port = ntohs (((unsigned short) port)); + port = ntohs(((unsigned short)port)); - mid = (*env)->GetMethodID (env, cls, "setPort", "(I)V"); + mid = (*env)->GetMethodID(env, cls, "setPort", "(I)V"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: setPort"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: setPort"); return; } - (*env)->CallVoidMethod (env, packet, mid, port); - if ((*env)->ExceptionOccurred (env)) + (*env)->CallVoidMethod(env, packet, mid, port); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: call setPort"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call setPort"); return; } - DBG ("PlainDatagramSocketImpl.receive(): Stored the port\n"); + DBG("PlainDatagramSocketImpl.receive(): Stored the port\n"); /* Store back the length */ - mid = (*env)->GetMethodID (env, cls, "setLength", "(I)V"); + mid = (*env)->GetMethodID(env, cls, "setLength", "(I)V"); if (mid == NULL) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: setLength"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: setLength"); return; } - - (*env)->CallVoidMethod (env, packet, mid, bytes_read); - if ((*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: call setLength"); + + (*env)->CallVoidMethod(env, packet, mid, bytes_read); + if ((*env)->ExceptionOccurred(env)) + { + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: call setLength"); return; } - DBG ("PlainDatagramSocketImpl.receive(): Stored the length\n"); + DBG("PlainDatagramSocketImpl.receive(): Stored the length\n"); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -347,35 +343,27 @@ Java_gnu_java_net_PlainDatagramSocketImpl_receive0 (JNIEnv *env, jobject this, * Writes a buffer to the remote host */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_sendto (JNIEnv *env, jobject this, - jobject addr, jint port, - jarray buf, jint offset, - jint len) +Java_gnu_java_net_PlainDatagramSocketImpl_sendto(JNIEnv *env, jobject this, + jobject addr, jint port, jarray buf, + jint offset, jint len) { #ifndef WITHOUT_NETWORK jint netAddress; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - netAddress = _javanet_get_netaddr (env, addr); - if ((*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: get network address"); - return; - } + netAddress = _javanet_get_netaddr(env, addr); + if ((*env)->ExceptionOccurred(env)) + { JCL_ThrowException(env, IO_EXCEPTION, "Internal error: get network address"); return; } - DBG ("PlainDatagramSocketImpl.sendto(): have addr\n"); + DBG("PlainDatagramSocketImpl.sendto(): have addr\n"); - _javanet_sendto (env, this, buf, offset, len, netAddress, port); - if ((*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error: send data"); - return; - } + _javanet_sendto(env, this, buf, offset, len, netAddress, port); + if ((*env)->ExceptionOccurred(env)) + { JCL_ThrowException(env, IO_EXCEPTION, "Internal error: send data"); return; } - DBG ("PlainDatagramSocketImpl.sendto(): finished\n"); + DBG("PlainDatagramSocketImpl.sendto(): finished\n"); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -386,44 +374,42 @@ Java_gnu_java_net_PlainDatagramSocketImpl_sendto (JNIEnv *env, jobject this, * Joins a multicast group */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_join (JNIEnv *env, jobject this, - jobject addr) +Java_gnu_java_net_PlainDatagramSocketImpl_join(JNIEnv *env, jobject this, + jobject addr) { #ifndef WITHOUT_NETWORK jint netAddress; - int fd; - int result; + int fd; + int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - netAddress = _javanet_get_netaddr (env, addr); - if ((*env)->ExceptionOccurred (env)) + netAddress = _javanet_get_netaddr(env, addr); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; } - fd = _javanet_get_int_field (env, this, "native_fd"); - if ((*env)->ExceptionOccurred (env)) + fd = _javanet_get_int_field(env, this, "native_fd"); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; } - DBG ("PlainDatagramSocketImpl.join(): have native fd\n"); + DBG("PlainDatagramSocketImpl.join(): have native fd\n"); - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP (fd, netAddress, - result); + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP(fd,netAddress,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - DBG ("PlainDatagramSocketImpl.join(): finished\n"); + DBG("PlainDatagramSocketImpl.join(): finished\n"); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -434,43 +420,38 @@ Java_gnu_java_net_PlainDatagramSocketImpl_join (JNIEnv *env, jobject this, * Leaves a multicast group */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainDatagramSocketImpl_leave (JNIEnv *env, jobject this, - jobject addr) +Java_gnu_java_net_PlainDatagramSocketImpl_leave(JNIEnv *env, jobject this, + jobject addr) { #ifndef WITHOUT_NETWORK jint netAddress; - int fd; - int result; + int fd; + int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - netAddress = _javanet_get_netaddr (env, addr); - if ((*env)->ExceptionOccurred (env)) + netAddress = _javanet_get_netaddr(env, addr); + if ((*env)->ExceptionOccurred(env)) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; } - fd = _javanet_get_int_field (env, this, "native_fd"); - if ((*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, "Internal error"); - return; - } + fd = _javanet_get_int_field(env, this, "native_fd"); + if ((*env)->ExceptionOccurred(env)) + { JCL_ThrowException(env, IO_EXCEPTION, "Internal error"); return; } - DBG ("PlainDatagramSocketImpl.leave(): have native fd\n"); + DBG("PlainDatagramSocketImpl.leave(): have native fd\n"); - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP (fd, netAddress, - result); - if (result != TARGET_NATIVE_OK) + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP(fd,netAddress,result); + if (result!=TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - DBG ("PlainDatagramSocketImpl.leave(): finished\n"); + DBG("PlainDatagramSocketImpl.leave(): finished\n"); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } diff --git a/native/jni/java-net/gnu_java_net_PlainSocketImpl.c b/native/jni/java-net/gnu_java_net_PlainSocketImpl.c index 868308fb5..e823810ac 100644 --- a/native/jni/java-net/gnu_java_net_PlainSocketImpl.c +++ b/native/jni/java-net/gnu_java_net_PlainSocketImpl.c @@ -42,7 +42,7 @@ exception statement from your version. */ #include <stdio.h> #include <string.h> #include <assert.h> - + #include <jni.h> #include <jcl.h> @@ -50,7 +50,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_NETWORK -#include "target_native_network.h" + #include "target_native_network.h" #endif /* WITHOUT_NETWORK */ #include "gnu_java_net_PlainSocketImpl.h" @@ -68,14 +68,13 @@ exception statement from your version. */ * Creates a new stream or datagram socket */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject this, - jboolean stream) +Java_gnu_java_net_PlainSocketImpl_create(JNIEnv *env, jobject this, jboolean stream) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_create (env, this, stream); + _javanet_create(env, this, stream); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -87,13 +86,13 @@ Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject this, * action as well. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_close (JNIEnv *env, jobject this) +Java_gnu_java_net_PlainSocketImpl_close(JNIEnv *env, jobject this) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_close (env, this, 1); + _javanet_close(env, this, 1); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -104,14 +103,14 @@ Java_gnu_java_net_PlainSocketImpl_close (JNIEnv *env, jobject this) * Connects to the specified destination. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject this, - jobject addr, jint port) +Java_gnu_java_net_PlainSocketImpl_connect(JNIEnv *env, jobject this, + jobject addr, jint port) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_connect (env, this, addr, port); + _javanet_connect(env, this, addr, port); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -124,14 +123,14 @@ Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject this, * variables. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject this, - jobject addr, jint port) +Java_gnu_java_net_PlainSocketImpl_bind(JNIEnv *env, jobject this, jobject addr, + jint port) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_bind (env, this, addr, port, 1); + _javanet_bind(env, this, addr, port, 1); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -143,14 +142,13 @@ Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject this, * connections allowed. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject this, - jint queuelen) +Java_gnu_java_net_PlainSocketImpl_listen(JNIEnv *env, jobject this, jint queuelen) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_listen (env, this, queuelen); + _javanet_listen(env, this, queuelen); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -162,14 +160,13 @@ Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject this, * object. Note that we assume this is a PlainSocketImpl just like us. */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject this, - jobject impl) +Java_gnu_java_net_PlainSocketImpl_accept(JNIEnv *env, jobject this, jobject impl) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_accept (env, this, impl); + _javanet_accept(env, this, impl); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -177,39 +174,38 @@ Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject this, /*************************************************************************/ JNIEXPORT jint JNICALL -Java_gnu_java_net_PlainSocketImpl_available (JNIEnv *env, jobject this) +Java_gnu_java_net_PlainSocketImpl_available(JNIEnv *env, jobject this) { #ifndef WITHOUT_NETWORK - jclass cls; + jclass cls; jfieldID fid; - int fd; - int bytesAvailable; - int result; - - assert (env != NULL); - assert ((*env) != NULL); - - cls = (*env)->GetObjectClass (env, this); + int fd; + int bytesAvailable; + int result; + + assert(env!=NULL); + assert((*env)!=NULL); + + cls = (*env)->GetObjectClass(env, this); if (cls == 0) { - JCL_ThrowException (env, IO_EXCEPTION, "internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "internal error"); return 0; } - - fid = (*env)->GetFieldID (env, cls, "native_fd", "I"); + + fid = (*env)->GetFieldID(env, cls, "native_fd", "I"); if (fid == 0) { - JCL_ThrowException (env, IO_EXCEPTION, "internal error"); + JCL_ThrowException(env, IO_EXCEPTION, "internal error"); return 0; } - fd = (*env)->GetIntField (env, this, fid); - - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE (fd, bytesAvailable, result); + fd = (*env)->GetIntField(env, this, fid); + + TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(fd,bytesAvailable,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return 0; } @@ -224,14 +220,14 @@ Java_gnu_java_net_PlainSocketImpl_available (JNIEnv *env, jobject this) * This method sets the specified option for a socket */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject this, - jint option_id, jobject val) +Java_gnu_java_net_PlainSocketImpl_setOption(JNIEnv *env, jobject this, + jint option_id, jobject val) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_set_option (env, this, option_id, val); + _javanet_set_option(env, this, option_id, val); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -242,14 +238,14 @@ Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject this, * This method sets the specified option for a socket */ JNIEXPORT jobject JNICALL -Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject this, - jint option_id) +Java_gnu_java_net_PlainSocketImpl_getOption(JNIEnv *env, jobject this, + jint option_id) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - return (_javanet_get_option (env, this, option_id)); + return(_javanet_get_option(env, this, option_id)); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -260,14 +256,14 @@ Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject this, * Reads a buffer from a remote host */ JNIEXPORT jint JNICALL -Java_gnu_java_net_PlainSocketImpl_read (JNIEnv *env, jobject this, jarray buf, - jint offset, jint len) +Java_gnu_java_net_PlainSocketImpl_read(JNIEnv *env, jobject this, jarray buf, + jint offset, jint len) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - return (_javanet_recvfrom (env, this, buf, offset, len, 0, 0)); + return(_javanet_recvfrom(env, this, buf, offset, len, 0, 0)); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -278,14 +274,14 @@ Java_gnu_java_net_PlainSocketImpl_read (JNIEnv *env, jobject this, jarray buf, * Writes a buffer to the remote host */ JNIEXPORT void JNICALL -Java_gnu_java_net_PlainSocketImpl_write (JNIEnv *env, jobject this, - jarray buf, jint offset, jint len) +Java_gnu_java_net_PlainSocketImpl_write(JNIEnv *env, jobject this, jarray buf, + jint offset, jint len) { #ifndef WITHOUT_NETWORK - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - _javanet_sendto (env, this, buf, offset, len, 0, 0); + _javanet_sendto(env, this, buf, offset, len, 0, 0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } diff --git a/native/jni/java-net/java_net_InetAddress.c b/native/jni/java-net/java_net_InetAddress.c index e123462c7..8fa722fd0 100644 --- a/native/jni/java-net/java_net_InetAddress.c +++ b/native/jni/java-net/java_net_InetAddress.c @@ -50,7 +50,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_NETWORK -#include "target_native_network.h" + #include "target_native_network.h" #endif /* WITHOUT_NETWORK */ #include "java_net_InetAddress.h" @@ -61,28 +61,28 @@ exception statement from your version. */ * Function to return the local hostname */ JNIEXPORT jstring JNICALL -Java_java_net_InetAddress_getLocalHostname (JNIEnv *env, jclass class) +Java_java_net_InetAddress_getLocalHostname(JNIEnv *env, jclass class) { - char hostname[256]; - int result; + char hostname[256]; + int result; jstring retval; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); #ifndef WITHOUT_NETWORK - TARGET_NATIVE_NETWORK_GET_HOSTNAME (hostname, sizeof (hostname), result); + TARGET_NATIVE_NETWORK_GET_HOSTNAME(hostname,sizeof(hostname),result); if (result != TARGET_NATIVE_OK) { - strcpy (hostname, "localhost"); + strcpy(hostname,"localhost"); } #else /* not WITHOUT_NETWORK */ - strcpy (hostname, "localhost"); + strcpy(hostname, "localhost"); #endif /* not WITHOUT_NETWORK */ - retval = (*env)->NewStringUTF (env, hostname); + retval = (*env)->NewStringUTF(env, hostname); - return (retval); + return(retval); } /*************************************************************************/ @@ -91,39 +91,41 @@ Java_java_net_InetAddress_getLocalHostname (JNIEnv *env, jclass class) * Returns the value of the special IP address INADDR_ANY */ JNIEXPORT jarray JNICALL -Java_java_net_InetAddress_lookupInaddrAny (JNIEnv *env, jclass class) +Java_java_net_InetAddress_lookupInaddrAny(JNIEnv *env, jclass class) { - jarray IParray; - jbyte *octets; + jarray IParray; + jbyte *octets; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Allocate an array for the IP address */ - IParray = (*env)->NewByteArray (env, 4); - if (IParray == NULL) - { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); - return (jarray) NULL; + IParray = (*env)->NewByteArray(env, 4); + if (IParray == NULL) + { + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); + return (jarray)NULL; } /* Copy in the values */ - octets = (*env)->GetByteArrayElements (env, IParray, 0); + octets = (*env)->GetByteArrayElements(env, IParray, 0); #ifndef WITHOUT_NETWORK - TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (INADDR_ANY, - octets[0], - octets[1], - octets[2], octets[3]); - (*env)->ReleaseByteArrayElements (env, IParray, octets, 0); + TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(INADDR_ANY, + octets[0], + octets[1], + octets[2], + octets[3] + ); + (*env)->ReleaseByteArrayElements(env, IParray, octets, 0); #else /* not WITHOUT_NETWORK */ - octets[0] = 0; - octets[1] = 0; - octets[2] = 0; - octets[3] = 0; + octets[0]=0; + octets[1]=0; + octets[2]=0; + octets[3]=0; #endif /* not WITHOUT_NETWORK */ - return (IParray); + return(IParray); } /*************************************************************************/ @@ -133,141 +135,144 @@ Java_java_net_InetAddress_lookupInaddrAny (JNIEnv *env, jclass class) * in as a byte array */ JNIEXPORT jstring JNICALL -Java_java_net_InetAddress_getHostByAddr (JNIEnv *env, jclass class, - jarray arr) +Java_java_net_InetAddress_getHostByAddr(JNIEnv *env, jclass class, jarray arr) { #ifndef WITHOUT_NETWORK - jbyte *octets; - jsize len; - int addr; - char hostname[255]; - int result; + jbyte *octets; + jsize len; + int addr; + char hostname[255]; + int result; jstring retval; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Grab the byte[] array with the IP out of the input data */ - len = (*env)->GetArrayLength (env, arr); + len = (*env)->GetArrayLength(env, arr); if (len != 4) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address"); - return (jstring) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address"); + return (jstring)NULL; } - octets = (*env)->GetByteArrayElements (env, arr, 0); + octets = (*env)->GetByteArrayElements(env, arr, 0); if (!octets) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address"); - return (jstring) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Bad IP Address"); + return (jstring)NULL; } /* Convert it to a 32 bit address */ - TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0], - octets[1], - octets[2], octets[3], addr); + TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(octets[0], + octets[1], + octets[2], + octets[3], + addr + ); /* Release some memory */ - (*env)->ReleaseByteArrayElements (env, arr, octets, 0); + (*env)->ReleaseByteArrayElements(env, arr, octets, 0); /* Resolve the address and return the name */ - TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS (addr, hostname, - sizeof (hostname), result); + TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS(addr,hostname,sizeof(hostname),result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Bad IP address"); - return (jstring) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Bad IP address"); + return (jstring)NULL; } - retval = (*env)->NewStringUTF (env, hostname); + retval = (*env)->NewStringUTF(env, hostname); - return (retval); + return(retval); #else /* not WITHOUT_NETWORK */ - return (jstring) NULL; + return (jstring)NULL; #endif /* not WITHOUT_NETWORK */ } /*************************************************************************/ JNIEXPORT jobjectArray JNICALL -Java_java_net_InetAddress_getHostByName (JNIEnv *env, jclass class, - jstring host) +Java_java_net_InetAddress_getHostByName(JNIEnv *env, jclass class, jstring host) { #ifndef WITHOUT_NETWORK - const char *hostname; + const char *hostname; /* FIXME: limitation of max. 64 addresses - how to make it more flexibale? */ - int addresses[64]; - jsize addresses_count; - int result; - jclass arr_class; - jobjectArray addrs; - int i; - jbyte *octets; - jarray ret_octets; - - assert (env != NULL); - assert ((*env) != NULL); + int addresses[64]; + jsize addresses_count; + int result; + jclass arr_class; + jobjectArray addrs; + int i; + jbyte *octets; + jarray ret_octets; + + assert(env!=NULL); + assert((*env)!=NULL); /* Grab the hostname string */ - hostname = (*env)->GetStringUTFChars (env, host, 0); - if (!hostname) + hostname = (*env)->GetStringUTFChars(env, host, 0); + if (!hostname) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Null hostname"); - return (jobjectArray) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Null hostname"); + return (jobjectArray)NULL; } /* Look up the host */ - TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME (hostname, - addresses, - sizeof (addresses) / - sizeof (addresses[0]), - addresses_count, result); + TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME(hostname, + addresses, + sizeof(addresses)/sizeof(addresses[0]), + addresses_count, + result + ); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, (char *) hostname); - return (jobjectArray) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, (char*)hostname); + return (jobjectArray)NULL; } - (*env)->ReleaseStringUTFChars (env, host, hostname); + (*env)->ReleaseStringUTFChars(env, host, hostname); - arr_class = (*env)->FindClass (env, "[B"); + arr_class = (*env)->FindClass(env,"[B"); if (!arr_class) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); - return (jobjectArray) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); + return (jobjectArray)NULL; } - addrs = (*env)->NewObjectArray (env, addresses_count, arr_class, 0); + addrs = (*env)->NewObjectArray(env, addresses_count, arr_class, 0); if (!addrs) { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); - return (jobjectArray) NULL; + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); + return (jobjectArray)NULL; } /* Now loop and copy in each address */ for (i = 0; i < addresses_count; i++) { - ret_octets = (*env)->NewByteArray (env, 4); - if (!ret_octets) - { - JCL_ThrowException (env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); - return (jobjectArray) NULL; - } + ret_octets = (*env)->NewByteArray(env, 4); + if (!ret_octets) + { + JCL_ThrowException(env, UNKNOWN_HOST_EXCEPTION, "Internal Error"); + return (jobjectArray)NULL; + } - octets = (*env)->GetByteArrayElements (env, ret_octets, 0); + octets = (*env)->GetByteArrayElements(env, ret_octets, 0); - TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (addresses[i], - octets[0], - octets[1], - octets[2], octets[3]); + TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(addresses[i], + octets[0], + octets[1], + octets[2], + octets[3] + ); - (*env)->ReleaseByteArrayElements (env, ret_octets, octets, 0); + (*env)->ReleaseByteArrayElements(env, ret_octets, octets, 0); - (*env)->SetObjectArrayElement (env, addrs, i, ret_octets); + (*env)->SetObjectArrayElement(env, addrs, i, ret_octets); } - return (addrs); + return(addrs); #else /* not WITHOUT_NETWORK */ - return (jobjectArray) NULL; + return (jobjectArray)NULL; #endif /* not WITHOUT_NETWORK */ } diff --git a/native/jni/java-net/java_net_NetworkInterface.c b/native/jni/java-net/java_net_NetworkInterface.c index 1b38681e4..6c51f872f 100644 --- a/native/jni/java-net/java_net_NetworkInterface.c +++ b/native/jni/java-net/java_net_NetworkInterface.c @@ -54,11 +54,9 @@ exception statement from your version. */ * Returns all local network interfaces as vector */ JNIEXPORT jobject JNICALL -Java_java_net_NetworkInterface_getRealNetworkInterfaces (JNIEnv *env, - jclass class) +Java_java_net_NetworkInterface_getRealNetworkInterfaces (JNIEnv* env, jclass class) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.net.NetworkInterface.getRealNetworkInterfaces(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.net.NetworkInterface.getRealNetworkInterfaces(): not implemented"); return 0; } diff --git a/native/jni/java-net/javanet.c b/native/jni/java-net/javanet.c index 712432f44..38bad1824 100644 --- a/native/jni/java-net/javanet.c +++ b/native/jni/java-net/javanet.c @@ -50,7 +50,7 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_NETWORK -#include "target_native_network.h" + #include "target_native_network.h" #endif /* WITHOUT_NETWORK */ #ifndef WITHOUT_NETWORK @@ -71,24 +71,24 @@ exception statement from your version. */ * Sets an integer field in the specified object. */ static void -_javanet_set_int_field (JNIEnv *env, jobject obj, char *class, char *field, - int val) +_javanet_set_int_field(JNIEnv *env, jobject obj, char *class, char *field, + int val) { - jclass cls; + jclass cls; jfieldID fid; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - cls = (*env)->FindClass (env, class); + cls = (*env)->FindClass(env, class); if (cls == NULL) return; - fid = (*env)->GetFieldID (env, cls, field, "I"); + fid = (*env)->GetFieldID(env, cls, field, "I"); if (fid == NULL) return; - (*env)->SetIntField (env, obj, fid, val); + (*env)->SetIntField(env, obj, fid, val); return; } @@ -100,27 +100,27 @@ _javanet_set_int_field (JNIEnv *env, jobject obj, char *class, char *field, * -1 if an error occurs. */ int -_javanet_get_int_field (JNIEnv *env, jobject obj, const char *field) +_javanet_get_int_field(JNIEnv *env, jobject obj, const char *field) { jclass cls = 0; jfieldID fid; int fd; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_get_int_field(): Entered _javanet_get_int_field\n"); + DBG("_javanet_get_int_field(): Entered _javanet_get_int_field\n"); - cls = (*env)->GetObjectClass (env, obj); + cls = (*env)->GetObjectClass(env, obj); if (cls == NULL) return -1; - fid = (*env)->GetFieldID (env, cls, field, "I"); + fid = (*env)->GetFieldID(env, cls, field, "I"); if (fid == NULL) return -1; - DBG ("_javanet_get_int_field(): Found field id\n"); + DBG("_javanet_get_int_field(): Found field id\n"); - fd = (*env)->GetIntField (env, obj, fid); + fd = (*env)->GetIntField(env, obj, fid); return fd; } @@ -133,51 +133,51 @@ _javanet_get_int_field (JNIEnv *env, jobject obj, const char *field) * need to include it. */ static void -_javanet_create_localfd (JNIEnv *env, jobject this) +_javanet_create_localfd(JNIEnv *env, jobject this) { - jclass this_cls, fd_cls; - jfieldID fid; + jclass this_cls, fd_cls; + jfieldID fid; jmethodID mid; - jobject fd_obj; + jobject fd_obj; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_create_localfd(): Entered _javanet_create_localfd\n"); + DBG("_javanet_create_localfd(): Entered _javanet_create_localfd\n"); /* Look up the fd field */ - this_cls = (*env)->FindClass (env, "java/net/SocketImpl"); + this_cls = (*env)->FindClass(env, "java/net/SocketImpl"); if (this_cls == NULL) return; - fid = (*env)->GetFieldID (env, this_cls, "fd", "Ljava/io/FileDescriptor;"); + fid = (*env)->GetFieldID(env, this_cls, "fd", "Ljava/io/FileDescriptor;"); if (fid == NULL) return; - DBG ("_javanet_create_localfd(): Found fd variable\n"); + DBG("_javanet_create_localfd(): Found fd variable\n"); /* Create a FileDescriptor */ - fd_cls = (*env)->FindClass (env, "java/io/FileDescriptor"); + fd_cls = (*env)->FindClass(env, "java/io/FileDescriptor"); if (fd_cls == NULL) return; - DBG ("_javanet_create_localfd(): Found FileDescriptor class\n"); + DBG("_javanet_create_localfd(): Found FileDescriptor class\n"); - mid = (*env)->GetMethodID (env, fd_cls, "<init>", "()V"); + mid = (*env)->GetMethodID(env, fd_cls, "<init>", "()V"); if (mid == NULL) return; - DBG ("_javanet_create_localfd(): Found FileDescriptor constructor\n"); + DBG("_javanet_create_localfd(): Found FileDescriptor constructor\n"); - fd_obj = (*env)->NewObject (env, fd_cls, mid); + fd_obj = (*env)->NewObject(env, fd_cls, mid); if (fd_obj == NULL) return; - DBG ("_javanet_create_localfd(): Created FileDescriptor\n"); + DBG("_javanet_create_localfd(): Created FileDescriptor\n"); /* Now set the pointer to the new FileDescriptor */ - (*env)->SetObjectField (env, this, fid, fd_obj); - DBG ("_javanet_create_localfd(): Set fd field\n"); + (*env)->SetObjectField(env, this, fid, fd_obj); + DBG("_javanet_create_localfd(): Set fd field\n"); return; } @@ -188,24 +188,24 @@ _javanet_create_localfd (JNIEnv *env, jobject this) * Returns a Boolean object with the specfied value */ static jobject -_javanet_create_boolean (JNIEnv *env, jboolean val) +_javanet_create_boolean(JNIEnv *env, jboolean val) { - jclass cls; + jclass cls; jmethodID mid; - jobject obj; + jobject obj; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - cls = (*env)->FindClass (env, "java/lang/Boolean"); + cls = (*env)->FindClass(env, "java/lang/Boolean"); if (cls == NULL) return NULL; - mid = (*env)->GetMethodID (env, cls, "<init>", "(Z)V"); + mid = (*env)->GetMethodID(env, cls, "<init>", "(Z)V"); if (mid == NULL) return NULL; - obj = (*env)->NewObject (env, cls, mid, val); + obj = (*env)->NewObject(env, cls, mid, val); if (obj == NULL) return NULL; @@ -218,24 +218,24 @@ _javanet_create_boolean (JNIEnv *env, jboolean val) * Returns an Integer object with the specfied value */ static jobject -_javanet_create_integer (JNIEnv *env, jint val) +_javanet_create_integer(JNIEnv *env, jint val) { jclass cls; jmethodID mid; jobject obj; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - cls = (*env)->FindClass (env, "java/lang/Integer"); + cls = (*env)->FindClass(env, "java/lang/Integer"); if (cls == NULL) return NULL; - mid = (*env)->GetMethodID (env, cls, "<init>", "(I)V"); + mid = (*env)->GetMethodID(env, cls, "<init>", "(I)V"); if (mid == NULL) return NULL; - obj = (*env)->NewObject (env, cls, mid, val); + obj = (*env)->NewObject(env, cls, mid, val); if (obj == NULL) return NULL; @@ -248,58 +248,65 @@ _javanet_create_integer (JNIEnv *env, jint val) * Builds an InetAddress object from a 32 bit address in host byte order */ static jobject -_javanet_create_inetaddress (JNIEnv *env, int netaddr) +_javanet_create_inetaddress(JNIEnv *env, int netaddr) { #ifndef WITHOUT_NETWORK unsigned char octets[4]; - char buf[16]; - jclass ia_cls; - jmethodID mid; - jstring ip_str; - jobject ia; + char buf[16]; + jclass ia_cls; + jmethodID mid; + jstring ip_str; + jobject ia; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Build a string IP address */ - TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES (netaddr, - octets[0], - octets[1], - octets[2], octets[3]); - sprintf (buf, "%d.%d.%d.%d", octets[0], octets[1], octets[2], octets[3]); - DBG ("_javanet_create_inetaddress(): Created ip addr string\n"); + TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(netaddr, + octets[0], + octets[1], + octets[2], + octets[3] + ); + sprintf(buf, "%d.%d.%d.%d", + octets[0], + octets[1], + octets[2], + octets[3] + ); + DBG("_javanet_create_inetaddress(): Created ip addr string\n"); /* Get an InetAddress object for this IP */ - ia_cls = (*env)->FindClass (env, "java/net/InetAddress"); + ia_cls = (*env)->FindClass(env, "java/net/InetAddress"); if (ia_cls == NULL) { return NULL; } - DBG ("_javanet_create_inetaddress(): Found InetAddress class\n"); + DBG("_javanet_create_inetaddress(): Found InetAddress class\n"); - mid = (*env)->GetStaticMethodID (env, ia_cls, "getByName", - "(Ljava/lang/String;)Ljava/net/InetAddress;"); + mid = (*env)->GetStaticMethodID(env, ia_cls, "getByName", + "(Ljava/lang/String;)Ljava/net/InetAddress;"); if (mid == NULL) { return NULL; } - DBG ("_javanet_create_inetaddress(): Found getByName method\n"); + DBG("_javanet_create_inetaddress(): Found getByName method\n"); - ip_str = (*env)->NewStringUTF (env, buf); + ip_str = (*env)->NewStringUTF(env, buf); if (ip_str == NULL) { return NULL; } - ia = (*env)->CallStaticObjectMethod (env, ia_cls, mid, ip_str); + ia = (*env)->CallStaticObjectMethod(env, ia_cls, mid, ip_str); if (ia == NULL) { return NULL; } - DBG ("_javanet_create_inetaddress(): Called getByName method\n"); + DBG("_javanet_create_inetaddress(): Called getByName method\n"); return ia; #else /* not WITHOUT_NETWORK */ @@ -310,28 +317,27 @@ _javanet_create_inetaddress (JNIEnv *env, int netaddr) /*************************************************************************/ static void -_javanet_set_remhost_addr (JNIEnv *env, jobject this, jobject ia) +_javanet_set_remhost_addr(JNIEnv *env, jobject this, jobject ia) { - jclass this_cls; + jclass this_cls; jfieldID fid; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Set the variable in the object */ - this_cls = (*env)->FindClass (env, "java/net/SocketImpl"); + this_cls = (*env)->FindClass(env, "java/net/SocketImpl"); if (this_cls == NULL) return; - fid = - (*env)->GetFieldID (env, this_cls, "address", "Ljava/net/InetAddress;"); + fid = (*env)->GetFieldID(env, this_cls, "address", "Ljava/net/InetAddress;"); if (fid == NULL) return; - DBG ("_javanet_set_remhost_addr(): Found address field\n"); + DBG("_javanet_set_remhost_addr(): Found address field\n"); - (*env)->SetObjectField (env, this, fid, ia); - DBG ("_javanet_set_remhost_addr(): Set field\n"); + (*env)->SetObjectField(env, this, fid, ia); + DBG("_javanet_set_remhost_addr(): Set field\n"); } /* @@ -339,21 +345,21 @@ _javanet_set_remhost_addr (JNIEnv *env, jobject this, jobject ia) * InetAddress for the specified addr */ static void -_javanet_set_remhost (JNIEnv *env, jobject this, int netaddr) +_javanet_set_remhost(JNIEnv *env, jobject this, int netaddr) { jobject ia; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_set_remhost(): Entered _javanet_set_remhost\n"); + DBG("_javanet_set_remhost(): Entered _javanet_set_remhost\n"); /* Get an InetAddress object */ - ia = _javanet_create_inetaddress (env, netaddr); + ia = _javanet_create_inetaddress(env, netaddr); if (ia == NULL) return; - _javanet_set_remhost_addr (env, this, ia); + _javanet_set_remhost_addr(env, this, ia); } @@ -363,61 +369,63 @@ _javanet_set_remhost (JNIEnv *env, jobject this, int netaddr) * Returns a 32 bit Internet address for the passed in InetAddress object */ int -_javanet_get_netaddr (JNIEnv *env, jobject addr) +_javanet_get_netaddr(JNIEnv *env, jobject addr) { #ifndef WITHOUT_NETWORK - jclass cls = 0; + jclass cls = 0; jmethodID mid; - jarray arr = 0; - jbyte *octets; - int netaddr, len; + jarray arr = 0; + jbyte *octets; + int netaddr, len; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_get_netaddr(): Entered _javanet_get_netaddr\n"); + DBG("_javanet_get_netaddr(): Entered _javanet_get_netaddr\n"); /* Call the getAddress method on the object to retrieve the IP address */ - cls = (*env)->GetObjectClass (env, addr); + cls = (*env)->GetObjectClass(env, addr); if (cls == NULL) return 0; - mid = (*env)->GetMethodID (env, cls, "getAddress", "()[B"); + mid = (*env)->GetMethodID(env, cls, "getAddress", "()[B"); if (mid == NULL) return 0; - DBG ("_javanet_get_netaddr(): Got getAddress method\n"); + DBG("_javanet_get_netaddr(): Got getAddress method\n"); - arr = (*env)->CallObjectMethod (env, addr, mid); + arr = (*env)->CallObjectMethod(env, addr, mid); if (arr == NULL) return 0; - DBG ("_javanet_get_netaddr(): Got the address\n"); + DBG("_javanet_get_netaddr(): Got the address\n"); /* Turn the IP address into a 32 bit Internet address in network byte order */ - len = (*env)->GetArrayLength (env, arr); + len = (*env)->GetArrayLength(env, arr); if (len != 4) { - JCL_ThrowException (env, IO_EXCEPTION, "Internal Error"); + JCL_ThrowException(env, IO_EXCEPTION, "Internal Error"); return 0; } - DBG ("_javanet_get_netaddr(): Length ok\n"); + DBG("_javanet_get_netaddr(): Length ok\n"); - octets = (*env)->GetByteArrayElements (env, arr, 0); + octets = (*env)->GetByteArrayElements(env, arr, 0); if (octets == NULL) return 0; - DBG ("_javanet_get_netaddr(): Grabbed bytes\n"); + DBG("_javanet_get_netaddr(): Grabbed bytes\n"); - TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0], - octets[1], - octets[2], - octets[3], netaddr); + TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(octets[0], + octets[1], + octets[2], + octets[3], + netaddr + ); - (*env)->ReleaseByteArrayElements (env, arr, octets, 0); - DBG ("_javanet_get_netaddr(): Done getting addr\n"); + (*env)->ReleaseByteArrayElements(env, arr, octets, 0); + DBG("_javanet_get_netaddr(): Done getting addr\n"); - return netaddr; + return netaddr; #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -428,51 +436,48 @@ _javanet_get_netaddr (JNIEnv *env, jobject addr) * Creates a new stream or datagram socket */ void -_javanet_create (JNIEnv *env, jobject this, jboolean stream) +_javanet_create(JNIEnv *env, jobject this, jboolean stream) { #ifndef WITHOUT_NETWORK int fd; int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); if (stream) { /* create a stream socket */ - TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM(fd,result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } } else { /* create a datagram socket, set broadcast option */ - TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM(fd,result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST (fd, 1, result); + { + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST(fd,1,result); if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; - } + { + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return; + } } - + if (stream) - _javanet_set_int_field (env, this, "gnu/java/net/PlainSocketImpl", - "native_fd", fd); + _javanet_set_int_field(env, this, "gnu/java/net/PlainSocketImpl", + "native_fd", fd); else - _javanet_set_int_field (env, this, "gnu/java/net/PlainDatagramSocketImpl", - "native_fd", fd); + _javanet_set_int_field(env, this, "gnu/java/net/PlainDatagramSocketImpl", + "native_fd", fd); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -484,27 +489,27 @@ _javanet_create (JNIEnv *env, jobject this, jboolean stream) * action as well. */ void -_javanet_close (JNIEnv *env, jobject this, int stream) +_javanet_close(JNIEnv *env, jobject this, int stream) { #ifndef WITHOUT_NETWORK int fd; int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) return; - - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); + + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); if (stream) - _javanet_set_int_field (env, this, "gnu/java/net/PlainSocketImpl", - "native_fd", -1); + _javanet_set_int_field(env, this, "gnu/java/net/PlainSocketImpl", + "native_fd", -1); else - _javanet_set_int_field (env, this, "gnu/java/net/PlainDatagramSocketImpl", - "native_fd", -1); + _javanet_set_int_field(env, this, "gnu/java/net/PlainDatagramSocketImpl", + "native_fd", -1); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -514,110 +519,105 @@ _javanet_close (JNIEnv *env, jobject this, int stream) /* * Connects to the specified destination. */ -void -_javanet_connect (JNIEnv *env, jobject this, jobject addr, jint port) +void +_javanet_connect(JNIEnv *env, jobject this, jobject addr, jint port) { #ifndef WITHOUT_NETWORK int netaddr, fd; int result; - int local_address, local_port; - int remote_address, remote_port; + int local_address,local_port; + int remote_address,remote_port; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_connect(): Entered _javanet_connect\n"); + DBG("_javanet_connect(): Entered _javanet_connect\n"); /* Pre-process input variables */ - netaddr = _javanet_get_netaddr (env, addr); - if ((*env)->ExceptionOccurred (env)) + netaddr = _javanet_get_netaddr(env, addr); + if ((*env)->ExceptionOccurred(env)) return; if (port == -1) port = 0; - DBG ("_javanet_connect(): Got network address\n"); + DBG("_javanet_connect(): Got network address\n"); /* Grab the real socket file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_connect(): no native file descriptor"); - return; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_connect(): no native file descriptor"); + return; } - DBG ("_javanet_connect(): Got native fd\n"); + DBG("_javanet_connect(): Got native fd\n"); /* Connect up */ - TARGET_NATIVE_NETWORK_SOCKET_CONNECT (fd, netaddr, port, result); + TARGET_NATIVE_NETWORK_SOCKET_CONNECT(fd,netaddr,port,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return; + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return; } - DBG ("_javanet_connect(): Connected successfully\n"); + DBG("_javanet_connect(): Connected successfully\n"); /* Populate instance variables */ - TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port, - result); + TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(fd,local_address,local_port,result); if (result != TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - _javanet_create_localfd (env, this); - if ((*env)->ExceptionOccurred (env)) + _javanet_create_localfd(env, this); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); return; } - DBG ("_javanet_connect(): Created fd\n"); + DBG("_javanet_connect(): Created fd\n"); - _javanet_set_int_field (env, this, "java/net/SocketImpl", "localport", - local_port); - if ((*env)->ExceptionOccurred (env)) + _javanet_set_int_field(env, this, "java/net/SocketImpl", "localport", + local_port); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); return; } - DBG ("_javanet_connect(): Set the local port\n"); - - TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO (fd, remote_address, - remote_port, result); + DBG("_javanet_connect(): Set the local port\n"); + + TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO(fd,remote_address,remote_port,result); if (result != TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } if (remote_address == netaddr) { - _javanet_set_remhost_addr (env, this, addr); + _javanet_set_remhost_addr(env, this, addr); } else { - _javanet_set_remhost (env, this, remote_address); + _javanet_set_remhost(env, this, remote_address); } - if ((*env)->ExceptionOccurred (env)) + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); return; } - DBG ("_javanet_connect(): Set the remote host\n"); + DBG("_javanet_connect(): Set the remote host\n"); - _javanet_set_int_field (env, this, "java/net/SocketImpl", "port", - remote_port); - if ((*env)->ExceptionOccurred (env)) + _javanet_set_int_field(env, this, "java/net/SocketImpl", "port", + remote_port); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); return; } - DBG ("_javanet_connect(): Set the remote port\n"); + DBG("_javanet_connect(): Set the remote port\n"); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -630,100 +630,95 @@ _javanet_connect (JNIEnv *env, jobject this, jobject addr, jint port) * port public instance variables. */ void -_javanet_bind (JNIEnv *env, jobject this, jobject addr, jint port, int stream) +_javanet_bind(JNIEnv *env, jobject this, jobject addr, jint port, int stream) { #ifndef WITHOUT_NETWORK - jclass cls; - jmethodID mid; + jclass cls; + jmethodID mid; jbyteArray arr = 0; - jbyte *octets; - jint fd; - int tmpaddr; - int result; - int local_address, local_port; + jbyte *octets; + jint fd; + int tmpaddr; + int result; + int local_address,local_port; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_bind(): Entering native bind()\n"); + DBG("_javanet_bind(): Entering native bind()\n"); /* Get the address to connect to */ - cls = (*env)->GetObjectClass (env, addr); + cls = (*env)->GetObjectClass(env, addr); if (cls == NULL) return; - mid = (*env)->GetMethodID (env, cls, "getAddress", "()[B"); + mid = (*env)->GetMethodID(env, cls, "getAddress", "()[B"); if (mid == NULL) return; - DBG ("_javanet_bind(): Past getAddress method id\n"); + DBG("_javanet_bind(): Past getAddress method id\n"); - arr = (*env)->CallObjectMethod (env, addr, mid); - if ((arr == NULL) || (*env)->ExceptionOccurred (env)) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_bind()"); - return; - } + arr = (*env)->CallObjectMethod(env, addr, mid); + if ((arr == NULL) || (*env)->ExceptionOccurred(env)) + { JCL_ThrowException(env, IO_EXCEPTION, "Internal error: _javanet_bind()"); return; } - DBG ("_javanet_bind(): Past call object method\n"); + DBG("_javanet_bind(): Past call object method\n"); - octets = (*env)->GetByteArrayElements (env, arr, 0); + octets = (*env)->GetByteArrayElements(env, arr, 0); if (octets == NULL) return; - DBG ("_javanet_bind(): Past grab array\n"); + DBG("_javanet_bind(): Past grab array\n"); /* Get the native socket file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) { - (*env)->ReleaseByteArrayElements (env, arr, octets, 0); - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_bind(): no native file descriptor"); + (*env)->ReleaseByteArrayElements(env, arr, octets, 0); + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_bind(): no native file descriptor"); return; } - DBG ("_javanet_bind(): Past native_fd lookup\n"); + DBG("_javanet_bind(): Past native_fd lookup\n"); // NYI ??? - _javanet_set_option (env, this, SOCKOPT_SO_REUSEADDR, + _javanet_set_option (env, this, SOCKOPT_SO_REUSEADDR, _javanet_create_boolean (env, JNI_TRUE)); /* Bind the socket */ - TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0], - octets[1], - octets[2], - octets[3], tmpaddr); - TARGET_NATIVE_NETWORK_SOCKET_BIND (fd, tmpaddr, port, result); + TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(octets[0], + octets[1], + octets[2], + octets[3], + tmpaddr + ); + TARGET_NATIVE_NETWORK_SOCKET_BIND(fd,tmpaddr,port,result); - (*env)->ReleaseByteArrayElements (env, arr, octets, 0); + (*env)->ReleaseByteArrayElements(env, arr, octets, 0); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - DBG ("_javanet_bind(): Past bind\n"); - + DBG("_javanet_bind(): Past bind\n"); + /* Update instance variables, specifically the local port number */ - TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port, - result); + TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(fd,local_address,local_port,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } if (stream) - _javanet_set_int_field (env, this, "java/net/SocketImpl", - "localport", local_port); + _javanet_set_int_field(env, this, "java/net/SocketImpl", + "localport", local_port); else - _javanet_set_int_field (env, this, "java/net/DatagramSocketImpl", - "localPort", local_port); - DBG ("_javanet_bind(): Past update port number\n"); + _javanet_set_int_field(env, this, "java/net/DatagramSocketImpl", + "localPort", local_port); + DBG("_javanet_bind(): Past update port number\n"); return; #else /* not WITHOUT_NETWORK */ @@ -736,31 +731,30 @@ _javanet_bind (JNIEnv *env, jobject this, jobject addr, jint port, int stream) * Starts listening on a socket with the specified number of pending * connections allowed. */ -void -_javanet_listen (JNIEnv *env, jobject this, jint queuelen) +void +_javanet_listen(JNIEnv *env, jobject this, jint queuelen) { #ifndef WITHOUT_NETWORK int fd; int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_listen(): no native file descriptor"); - return; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_listen(): no native file descriptor"); + return; } /* Start listening */ - TARGET_NATIVE_NETWORK_SOCKET_LISTEN (fd, queuelen, result); - if (result != TARGET_NATIVE_OK) + TARGET_NATIVE_NETWORK_SOCKET_LISTEN(fd,queuelen,result); + if (result!=TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } #else /* not WITHOUT_NETWORK */ @@ -773,94 +767,89 @@ _javanet_listen (JNIEnv *env, jobject this, jint queuelen) * Accepts a new connection and assigns it to the passed in SocketImpl * object. Note that we assume this is a PlainSocketImpl just like us */ -void -_javanet_accept (JNIEnv *env, jobject this, jobject impl) +void +_javanet_accept(JNIEnv *env, jobject this, jobject impl) { #ifndef WITHOUT_NETWORK int fd, newfd; int result; - int local_address, local_port; - int remote_address, remote_port; + int local_address,local_port; + int remote_address,remote_port; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_accept(): no native file descriptor"); - return; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_accept(): no native file descriptor"); + return; } /* Accept the connection */ /******* Do we need to look for EINTR? */ - TARGET_NATIVE_NETWORK_SOCKET_ACCEPT (fd, newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_ACCEPT(fd,newfd,result); if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_accept(): "); - return; + JCL_ThrowException(env, IO_EXCEPTION, "Internal error: _javanet_accept(): "); + return; } - /* Populate instance variables */ - _javanet_set_int_field (env, impl, "gnu/java/net/PlainSocketImpl", - "native_fd", newfd); + /* Populate instance variables */ + _javanet_set_int_field(env, impl, "gnu/java/net/PlainSocketImpl", "native_fd", + newfd); - if ((*env)->ExceptionOccurred (env)) + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); return; } - TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (newfd, local_address, - local_port, result); - if (result != TARGET_NATIVE_OK) + TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(newfd,local_address,local_port,result); + if (result!=TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - _javanet_create_localfd (env, impl); - if ((*env)->ExceptionOccurred (env)) + _javanet_create_localfd(env, impl); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); return; } - _javanet_set_int_field (env, impl, "java/net/SocketImpl", "localport", - local_port); - if ((*env)->ExceptionOccurred (env)) + _javanet_set_int_field(env, impl, "java/net/SocketImpl", "localport", + local_port); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); return; } - - TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO (newfd, remote_address, - remote_port, result); - if (result != TARGET_NATIVE_OK) + + TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO(newfd,remote_address,remote_port,result); + if (result!=TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } - _javanet_set_remhost (env, impl, remote_address); - if ((*env)->ExceptionOccurred (env)) + _javanet_set_remhost(env, impl, remote_address); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); return; } - _javanet_set_int_field (env, impl, "java/net/SocketImpl", "port", - remote_port); - if ((*env)->ExceptionOccurred (env)) + _javanet_set_int_field(env, impl, "java/net/SocketImpl", "port", + remote_port); + if ((*env)->ExceptionOccurred(env)) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (newfd, result); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(newfd,result); return; } #else /* not WITHOUT_NETWORK */ @@ -884,68 +873,59 @@ _javanet_accept (JNIEnv *env, jobject this, jobject impl) * The actual number of bytes read is returned. */ int -_javanet_recvfrom (JNIEnv *env, jobject this, jarray buf, int offset, int len, - int *addr, int *port) +_javanet_recvfrom(JNIEnv *env, jobject this, jarray buf, int offset, int len, + int *addr, int *port) { #ifndef WITHOUT_NETWORK - int fd; + int fd; jbyte *p; - int from_address, from_port; - int received_bytes; + int from_address,from_port; + int received_bytes; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); - DBG ("_javanet_recvfrom(): Entered _javanet_recvfrom\n"); + DBG("_javanet_recvfrom(): Entered _javanet_recvfrom\n"); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_recvfrom(): no native file descriptor"); - return 0; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_recvfrom(): no native file descriptor"); + return 0; } - DBG ("_javanet_recvfrom(): Got native_fd\n"); + DBG("_javanet_recvfrom(): Got native_fd\n"); /* Get a pointer to the buffer */ - p = (*env)->GetByteArrayElements (env, buf, 0); + p = (*env)->GetByteArrayElements(env, buf, 0); if (p == NULL) return 0; - DBG ("_javanet_recvfrom(): Got buffer\n"); + DBG("_javanet_recvfrom(): Got buffer\n"); /* Read the data */ from_address = 0; - from_port = 0; - do - { - if (addr != NULL) - { - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT (fd, - p + offset, - len, - from_address, - from_port, - received_bytes); - } - else - { - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE (fd, p + offset, len, - received_bytes); - } - } - while ((received_bytes == -1) && - (TARGET_NATIVE_LAST_ERROR () == - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)); - - (*env)->ReleaseByteArrayElements (env, buf, p, 0); + from_port = 0; + do { + if (addr != NULL) + { + TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT(fd,p+offset,len,from_address,from_port,received_bytes); + } + else + { + TARGET_NATIVE_NETWORK_SOCKET_RECEIVE(fd,p+offset,len,received_bytes); + } + } while ((received_bytes == -1) && + (TARGET_NATIVE_LAST_ERROR() == TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL) + ); + + (*env)->ReleaseByteArrayElements(env, buf, p, 0); if (received_bytes == -1) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return 0; + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return 0; } /* Handle return addr case */ @@ -953,10 +933,10 @@ _javanet_recvfrom (JNIEnv *env, jobject this, jarray buf, int offset, int len, { (*addr) = from_address; if (port != NULL) - (*port) = from_port; + (*port) = from_port; } - return (received_bytes); + return(received_bytes); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } @@ -972,53 +952,50 @@ _javanet_recvfrom (JNIEnv *env, jobject this, jarray buf, int offset, int len, * addr - The 32bit address to send to (may be 0) * port - The port number to send to (may be 0) */ -void -_javanet_sendto (JNIEnv *env, jobject this, jarray buf, int offset, int len, - int addr, int port) +void +_javanet_sendto(JNIEnv *env, jobject this, jarray buf, int offset, int len, + int addr, int port) { #ifndef WITHOUT_NETWORK - int fd; + int fd; jbyte *p; - int bytes_sent; + int bytes_sent; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_sendto(): no native file descriptor"); - return; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_sendto(): no native file descriptor"); + return; } /* Get a pointer to the buffer */ - p = (*env)->GetByteArrayElements (env, buf, 0); + p = (*env)->GetByteArrayElements(env, buf, 0); if (p == NULL) return; /* Send the data */ if (addr == 0) { - DBG ("_javanet_sendto(): Sending....\n"); - TARGET_NATIVE_NETWORK_SOCKET_SEND (fd, p + offset, len, bytes_sent); + DBG("_javanet_sendto(): Sending....\n"); + TARGET_NATIVE_NETWORK_SOCKET_SEND(fd,p+offset,len,bytes_sent); } else { - DBG ("_javanet_sendto(): Sending....\n"); - TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT (fd, p + offset, - len, addr, port, - bytes_sent); + DBG("_javanet_sendto(): Sending....\n"); + TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT(fd,p+offset,len,addr,port,bytes_sent); } - (*env)->ReleaseByteArrayElements (env, buf, p, 0); + (*env)->ReleaseByteArrayElements(env, buf, p, 0); /***** Do we need to check EINTR? */ - if (bytes_sent < 0) + if (bytes_sent<0) { - JCL_ThrowException (env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } #else /* not WITHOUT_NETWORK */ @@ -1030,31 +1007,31 @@ _javanet_sendto (JNIEnv *env, jobject this, jarray buf, int offset, int len, /* * Sets the specified option for a socket */ -void -_javanet_set_option (JNIEnv *env, jobject this, jint option_id, jobject val) +void +_javanet_set_option(JNIEnv *env, jobject this, jint option_id, jobject val) { #ifndef WITHOUT_NETWORK - int fd; - int optval; - jclass cls; + int fd; + int optval; + jclass cls; jmethodID mid; - int address; - int result; + int address; + int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option(): no native file descriptor"); - return; + { + JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option(): no native file descriptor"); + return; } /* We need a class object for all cases below */ - cls = (*env)->GetObjectClass (env, val); + cls = (*env)->GetObjectClass(env, val); if (cls == NULL) return; @@ -1063,180 +1040,151 @@ _javanet_set_option (JNIEnv *env, jobject this, jint option_id, jobject val) switch (option_id) { /* TCP_NODELAY case. val is a Boolean that tells us what to do */ - case SOCKOPT_TCP_NODELAY: - mid = (*env)->GetMethodID (env, cls, "booleanValue", "()Z"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); + case SOCKOPT_TCP_NODELAY: + mid = (*env)->GetMethodID(env, cls, "booleanValue", "()Z"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } + + /* Should be a 0 or a 1 */ + optval = (*env)->CallBooleanMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) return; - } - - /* Should be a 0 or a 1 */ - optval = (*env)->CallBooleanMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY (fd, optval, - result); - break; + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY(fd,optval,result); + break; /* SO_LINGER case. If val is a boolean, then it will always be set to false indicating disable linger, otherwise it will be an integer that contains the linger value */ - case SOCKOPT_SO_LINGER: - mid = (*env)->GetMethodID (env, cls, "booleanValue", "()Z"); - if (mid) - { - /* We are disabling linger */ - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER (fd, 1, 0, - result); - } - else - { - /* Clear exception if thrown for failure to do method lookup - above */ - if ((*env)->ExceptionOccurred (env)) - (*env)->ExceptionClear (env); - - mid = (*env)->GetMethodID (env, cls, "intValue", "()I"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); - return; - } + case SOCKOPT_SO_LINGER: + mid = (*env)->GetMethodID(env, cls, "booleanValue", "()Z"); + if (mid) + { + /* We are disabling linger */ + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER(fd,1,0,result); + } + else + { + /* Clear exception if thrown for failure to do method lookup + above */ + if ((*env)->ExceptionOccurred(env)) + (*env)->ExceptionClear(env); + + mid = (*env)->GetMethodID(env, cls, "intValue", "()I"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } - optval = (*env)->CallIntMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; + optval= (*env)->CallIntMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) + return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER (fd, 0, optval, - result); - } - break; + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER(fd,0,optval,result); + } + break; /* SO_TIMEOUT case. Val will be an integer with the new value */ /* Not writable on Linux */ - case SOCKOPT_SO_TIMEOUT: + case SOCKOPT_SO_TIMEOUT: #ifdef SO_TIMEOUT - mid = (*env)->GetMethodID (env, cls, "intValue", "()I"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); - return; - } + mid = (*env)->GetMethodID(env, cls, "intValue", "()I"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } - optval = (*env)->CallIntMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; + optval = (*env)->CallIntMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) + return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT (fd, optval, result); + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT(fd,optval,result); #endif - result = TARGET_NATIVE_OK; // ignore errors and do not throw an exception - break; + result = TARGET_NATIVE_OK; // ignore errors and do not throw an exception + break; - case SOCKOPT_SO_SNDBUF: - case SOCKOPT_SO_RCVBUF: - mid = (*env)->GetMethodID (env, cls, "intValue", "()I"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); - return; - } + case SOCKOPT_SO_SNDBUF: + case SOCKOPT_SO_RCVBUF: + mid = (*env)->GetMethodID(env, cls, "intValue", "()I"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } - optval = (*env)->CallIntMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; - - if (option_id == SOCKOPT_SO_SNDBUF) - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF (fd, optval, - result); - else - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF (fd, optval, - result); - break; + optval = (*env)->CallIntMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) + return; + + if (option_id == SOCKOPT_SO_SNDBUF) + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF(fd,optval,result); + else + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF(fd,optval,result); + break; /* TTL case. Val with be an Integer with the new time to live value */ - case SOCKOPT_IP_TTL: - mid = (*env)->GetMethodID (env, cls, "intValue", "()I"); - if (!mid) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); + case SOCKOPT_IP_TTL: + mid = (*env)->GetMethodID(env, cls, "intValue", "()I"); + if (!mid) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } + + optval = (*env)->CallIntMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) return; - } - - optval = (*env)->CallIntMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; - - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL (fd, optval, result); - break; + + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL(fd,optval,result); + break; /* Multicast Interface case - val is InetAddress object */ - case SOCKOPT_IP_MULTICAST_IF: - address = _javanet_get_netaddr (env, val); + case SOCKOPT_IP_MULTICAST_IF: + address = _javanet_get_netaddr(env, val); - if ((*env)->ExceptionOccurred (env)) - return; + if ((*env)->ExceptionOccurred(env)) + return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF (fd, address, - result); - break; + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF(fd,address,result); + break; - case SOCKOPT_SO_REUSEADDR: - mid = (*env)->GetMethodID (env, cls, "booleanValue", "()Z"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); - return; - } + case SOCKOPT_SO_REUSEADDR: + mid = (*env)->GetMethodID(env, cls, "booleanValue", "()Z"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } - /* Should be a 0 or a 1 */ - optval = (*env)->CallBooleanMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; + /* Should be a 0 or a 1 */ + optval = (*env)->CallBooleanMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) + return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS (fd, optval, - result); - break; + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS(fd,optval,result); + break; case SOCKOPT_SO_KEEPALIVE: - mid = (*env)->GetMethodID (env, cls, "booleanValue", "()Z"); - if (mid == NULL) - { - JCL_ThrowException (env, IO_EXCEPTION, - "Internal error: _javanet_set_option()"); + mid = (*env)->GetMethodID(env, cls, "booleanValue", "()Z"); + if (mid == NULL) + { JCL_ThrowException(env, IO_EXCEPTION, + "Internal error: _javanet_set_option()"); return; } + + /* Should be a 0 or a 1 */ + optval = (*env)->CallBooleanMethod(env, val, mid); + if ((*env)->ExceptionOccurred(env)) return; - } - - /* Should be a 0 or a 1 */ - optval = (*env)->CallBooleanMethod (env, val, mid); - if ((*env)->ExceptionOccurred (env)) - return; - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE (fd, optval, result); + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE(fd,optval,result); break; - + case SOCKOPT_SO_BINDADDR: - JCL_ThrowException (env, SOCKET_EXCEPTION, "This option cannot be set"); + JCL_ThrowException(env, SOCKET_EXCEPTION, "This option cannot be set"); break; default: - JCL_ThrowException (env, SOCKET_EXCEPTION, "Unrecognized option"); + JCL_ThrowException(env, SOCKET_EXCEPTION, "Unrecognized option"); return; } /* Check to see if above operations succeeded */ if (result != TARGET_NATIVE_OK) { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); return; } #else /* not WITHOUT_NETWORK */ @@ -1248,183 +1196,167 @@ _javanet_set_option (JNIEnv *env, jobject this, jint option_id, jobject val) /* * Retrieves the specified option values for a socket */ -jobject -_javanet_get_option (JNIEnv *env, jobject this, jint option_id) +jobject +_javanet_get_option(JNIEnv *env, jobject this, jint option_id) { #ifndef WITHOUT_NETWORK int fd; - int flag, optval; + int flag,optval; int address; int result; - assert (env != NULL); - assert ((*env) != NULL); + assert(env!=NULL); + assert((*env)!=NULL); /* Get the real file descriptor */ - fd = _javanet_get_int_field (env, this, "native_fd"); + fd = _javanet_get_int_field(env, this, "native_fd"); if (fd == -1) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - "Internal error: _javanet_get_option(): no native file descriptor"); - return (0); + { + JCL_ThrowException(env, SOCKET_EXCEPTION, + "Internal error: _javanet_get_option(): no native file descriptor"); + return(0); } /* Process the option requested */ switch (option_id) { /* TCP_NODELAY case. Return a Boolean indicating on or off */ - case SOCKOPT_TCP_NODELAY: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY (fd, optval, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - if (optval) - return (_javanet_create_boolean (env, JNI_TRUE)); - else - return (_javanet_create_boolean (env, JNI_FALSE)); - - break; + case SOCKOPT_TCP_NODELAY: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + if (optval) + return(_javanet_create_boolean(env, JNI_TRUE)); + else + return(_javanet_create_boolean(env, JNI_FALSE)); + + break; /* SO_LINGER case. If disabled, return a Boolean object that represents false, else return an Integer that is the value of SO_LINGER */ - case SOCKOPT_SO_LINGER: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER (fd, flag, optval, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } + case SOCKOPT_SO_LINGER: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER(fd,flag,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } - if (optval) - return (_javanet_create_integer (env, JNI_TRUE)); - else - return (_javanet_create_boolean (env, JNI_FALSE)); + if (optval) + return(_javanet_create_integer(env, JNI_TRUE)); + else + return(_javanet_create_boolean(env, JNI_FALSE)); - break; + break; /* SO_TIMEOUT case. Return an Integer object with the timeout value */ - case SOCKOPT_SO_TIMEOUT: + case SOCKOPT_SO_TIMEOUT: #ifdef SO_TIMEOUT - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT (fd, optval, result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - return (_javanet_create_integer (env, optval)); + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + return(_javanet_create_integer(env, optval)); #else - JCL_ThrowException (env, SOCKET_EXCEPTION, - "SO_TIMEOUT not supported on this platform"); - return (0); + JCL_ThrowException(env, SOCKET_EXCEPTION, + "SO_TIMEOUT not supported on this platform"); + return(0); #endif /* not SO_TIMEOUT */ - break; - - case SOCKOPT_SO_SNDBUF: - case SOCKOPT_SO_RCVBUF: - if (option_id == SOCKOPT_SO_SNDBUF) - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF (fd, optval, - result); - else - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF (fd, optval, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - return (_javanet_create_integer (env, optval)); - break; + break; + + case SOCKOPT_SO_SNDBUF: + case SOCKOPT_SO_RCVBUF: + if (option_id == SOCKOPT_SO_SNDBUF) + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF(fd,optval,result); + else + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + return(_javanet_create_integer(env, optval)); + break; /* The TTL case. Return an Integer with the Time to Live value */ - case SOCKOPT_IP_TTL: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL (fd, optval, result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } + case SOCKOPT_IP_TTL: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } - return (_javanet_create_integer (env, optval)); - break; + return(_javanet_create_integer(env, optval)); + break; /* Multicast interface case */ - case SOCKOPT_IP_MULTICAST_IF: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF (fd, address, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - return (_javanet_create_inetaddress (env, address)); - break; - - case SOCKOPT_SO_BINDADDR: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS (fd, address, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - return (_javanet_create_inetaddress (env, address)); - break; - - case SOCKOPT_SO_REUSEADDR: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS (fd, optval, - result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - if (optval) - return (_javanet_create_boolean (env, JNI_TRUE)); - else - return (_javanet_create_boolean (env, JNI_FALSE)); - - break; - - case SOCKOPT_SO_KEEPALIVE: - TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE (fd, optval, result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException (env, SOCKET_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING ()); - return (0); - } - - if (optval) - return (_javanet_create_boolean (env, JNI_TRUE)); - else - return (_javanet_create_boolean (env, JNI_FALSE)); - - break; - - default: - JCL_ThrowException (env, SOCKET_EXCEPTION, "No such option"); - return (0); + case SOCKOPT_IP_MULTICAST_IF: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF(fd,address,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + return(_javanet_create_inetaddress(env, address)); + break; + + case SOCKOPT_SO_BINDADDR: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS(fd,address,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + return(_javanet_create_inetaddress(env, address)); + break; + + case SOCKOPT_SO_REUSEADDR: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + if (optval) + return(_javanet_create_boolean(env, JNI_TRUE)); + else + return(_javanet_create_boolean(env, JNI_FALSE)); + + break; + + case SOCKOPT_SO_KEEPALIVE: + TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE(fd,optval,result); + if (result != TARGET_NATIVE_OK) + { + JCL_ThrowException(env, SOCKET_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + return(0); + } + + if (optval) + return(_javanet_create_boolean(env, JNI_TRUE)); + else + return(_javanet_create_boolean(env, JNI_FALSE)); + + break; + + default: + JCL_ThrowException(env, SOCKET_EXCEPTION, "No such option" ); + return(0); } - return (0); + return(0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } diff --git a/native/jni/java-net/javanet.h b/native/jni/java-net/javanet.h index 2c6cf5591..f27f811e2 100644 --- a/native/jni/java-net/javanet.h +++ b/native/jni/java-net/javanet.h @@ -37,7 +37,7 @@ exception statement from your version. */ #ifndef _JAVANET_LOADED -#define _JAVANET_LOADED +#define _JAVANET_LOADED #include <jni.h> @@ -87,20 +87,20 @@ exception statement from your version. */ * Function Prototypes */ -extern int _javanet_get_int_field (JNIEnv *, jobject, const char *); -extern int _javanet_get_netaddr (JNIEnv *, jobject); -extern void _javanet_create (JNIEnv *, jobject, jboolean); -extern void _javanet_close (JNIEnv *, jobject, int); -extern void _javanet_connect (JNIEnv *, jobject, jobject, jint); -extern void _javanet_bind (JNIEnv *, jobject, jobject, jint, int); -extern void _javanet_listen (JNIEnv *, jobject, jint); -extern void _javanet_accept (JNIEnv *, jobject, jobject); -extern int _javanet_recvfrom (JNIEnv *, jobject, jarray, int, int, int *, - int *); -extern void _javanet_sendto (JNIEnv *, jobject, jarray, int, int, int, int); -extern jobject _javanet_get_option (JNIEnv *, jobject, jint); -extern void _javanet_set_option (JNIEnv *, jobject, jint, jobject); +extern int _javanet_get_int_field(JNIEnv *, jobject, const char *); +extern int _javanet_get_netaddr(JNIEnv *, jobject); +extern void _javanet_create(JNIEnv *, jobject, jboolean); +extern void _javanet_close(JNIEnv *, jobject, int); +extern void _javanet_connect(JNIEnv *, jobject, jobject, jint); +extern void _javanet_bind(JNIEnv *, jobject, jobject, jint, int); +extern void _javanet_listen(JNIEnv *, jobject, jint); +extern void _javanet_accept(JNIEnv *, jobject, jobject); +extern int _javanet_recvfrom(JNIEnv *, jobject, jarray, int, int, int *, int *); +extern void _javanet_sendto(JNIEnv *, jobject, jarray, int, int, int, int); +extern jobject _javanet_get_option(JNIEnv *, jobject, jint); +extern void _javanet_set_option(JNIEnv *, jobject, jint, jobject); /*************************************************************************/ #endif /* not _JAVANET_H_LOADED */ + diff --git a/native/jni/java-nio/gnu_java_nio_NIOServerSocket.c b/native/jni/java-nio/gnu_java_nio_NIOServerSocket.c index 81451ab50..ad6ad37dd 100644 --- a/native/jni/java-nio/gnu_java_nio_NIOServerSocket.c +++ b/native/jni/java-nio/gnu_java_nio_NIOServerSocket.c @@ -46,9 +46,7 @@ exception statement from your version. */ #define IO_EXCEPTION "java/io/IOException" JNIEXPORT jobject JNICALL -Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, - jclass class) +Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jclass class) { - JCL_ThrowException (env, IO_EXCEPTION, - "gnu.java.nio.NIOServerSocket.getPlainSocketImpl(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.NIOServerSocket.getPlainSocketImpl(): not implemented"); } diff --git a/native/jni/java-nio/java_nio.c b/native/jni/java-nio/java_nio.c index 170c97d47..351014015 100644 --- a/native/jni/java-nio/java_nio.c +++ b/native/jni/java-nio/java_nio.c @@ -47,14 +47,14 @@ exception statement from your version. */ #include "target_native.h" #ifndef WITHOUT_NETWORK -#include "target_native_network.h" + #include "target_native_network.h" #endif /* WITHOUT_NETWORK */ #include "java_nio_channels_FileChannelImpl.h" #include "javaio.h" -#define NIO_DEBUG(X) /* no debug */ +#define NIO_DEBUG(X) /* no debug */ //#define NIO_DEBUG(X) X /*************************************** @@ -64,69 +64,78 @@ exception statement from your version. */ *************/ -static char * -compare (int i, int lim, char *buffer) +static char *compare(int i, int lim, char *buffer) { - sprintf (buffer, "(%d >= %d)", i, lim); + sprintf(buffer, "(%d >= %d)", i, lim); return buffer; } -static inline int -convert_Int (int X) -{ - unsigned char *a = (unsigned char *) &X; - int res = - (((int) a[0]) << 24) + - (((int) a[1]) << 16) + (((int) a[2]) << 8) + (((int) a[3]) << 0); - return res; +static inline +int convert_Int(int X) +{ + unsigned char *a = (unsigned char*)&X; + int res = + (((int)a[0]) << 24) + + (((int)a[1]) << 16) + + (((int)a[2]) << 8) + + (((int)a[3]) << 0); + return res; } -static inline jlong -convert_Long (jlong X) -{ - unsigned char *a = (unsigned char *) &X; - int res1 = - (((int) a[0]) << 24) + - (((int) a[1]) << 16) + (((int) a[2]) << 8) + (((int) a[3]) << 0); +static inline +jlong convert_Long(jlong X) +{ + unsigned char *a = (unsigned char*)&X; + int res1 = + (((int)a[0]) << 24) + + (((int)a[1]) << 16) + + (((int)a[2]) << 8) + + (((int)a[3]) << 0); int res2; a += 4; - res2 = - (((int) a[0]) << 24) + - (((int) a[1]) << 16) + (((int) a[2]) << 8) + (((int) a[3]) << 0); - return ((jlong) res1) | ((jlong) res2) << 32LL; + res2 = + (((int)a[0]) << 24) + + (((int)a[1]) << 16) + + (((int)a[2]) << 8) + + (((int)a[3]) << 0); + return ((jlong)res1) | ((jlong)res2) << 32LL; } -static inline short -convert_Short (short X) -{ - unsigned char *a = (unsigned char *) &X; - int res = (((int) a[2]) << 8) + (((int) a[3]) << 0); - return res; +static inline +short convert_Short(short X) +{ + unsigned char *a =(unsigned char*) &X; + int res = + (((int)a[2]) << 8) + + (((int)a[3]) << 0); + return res; } -static inline short -convert_Char (short X) -{ - unsigned char *a = (unsigned char *) &X; - int res = (((int) a[2]) << 8) + (((int) a[3]) << 0); - return res; +static inline +short convert_Char(short X) +{ + unsigned char *a =(unsigned char*) &X; + int res = + (((int)a[2]) << 8) + + (((int)a[3]) << 0); + return res; } -static inline unsigned char -convert_Byte (unsigned char X) -{ - return X; +static inline +unsigned char convert_Byte(unsigned char X) +{ + return X; } -static inline float -convert_Float (float X) -{ - return X; +static inline +float convert_Float(float X) +{ + return X; } -static inline double -convert_Double (double X) -{ - return X; +static inline +double convert_Double(double X) +{ + return X; } @@ -185,120 +194,130 @@ void Java_gnu_java_nio_MappedByteFileBuffer_nio_1put_1 ## TYPE(JNIEnv *env, jcla } -READ_WRITE_MMAPED_FILE (Byte, u_int8_t); -READ_WRITE_MMAPED_FILE (Char, u_int16_t); -READ_WRITE_MMAPED_FILE (Short, u_int16_t); -READ_WRITE_MMAPED_FILE (Int, u_int32_t); -READ_WRITE_MMAPED_FILE (Long, u_int64_t); -READ_WRITE_MMAPED_FILE (Float, float); -READ_WRITE_MMAPED_FILE (Double, double); +READ_WRITE_MMAPED_FILE(Byte,u_int8_t); +READ_WRITE_MMAPED_FILE(Char,u_int16_t); +READ_WRITE_MMAPED_FILE(Short,u_int16_t); +READ_WRITE_MMAPED_FILE(Int,u_int32_t); +READ_WRITE_MMAPED_FILE(Long,u_int64_t); +READ_WRITE_MMAPED_FILE(Float,float); +READ_WRITE_MMAPED_FILE(Double,double); JNIEXPORT jlong JNICALL -Java_gnu_java_nio_FileChannelImpl_lengthInternal (JNIEnv *env, jobject obj, - jint fd) +Java_gnu_java_nio_FileChannelImpl_lengthInternal(JNIEnv *env, jobject obj, jint fd) { - return (_javaio_get_file_length (env, fd)); + return(_javaio_get_file_length(env, fd)); } -u_int64_t -nio_mmap_file (jint fd, jlong pos, jint size, jint jflags) +u_int64_t nio_mmap_file(jint fd, + jlong pos, + jint size, + jint jflags) { #ifdef HAVE_MMAP u_int64_t ret = 0; void *address; + + int flags = (jflags != 2) ? MAP_SHARED : MAP_PRIVATE; + int prot = PROT_READ; - int flags = (jflags != 2) ? MAP_SHARED : MAP_PRIVATE; - int prot = PROT_READ; - - if (jflags == 1) + if (jflags == 1) prot |= PROT_WRITE; // fprintf(stderr, "mapping file: %d\n", fd); - address = mmap (0, size, prot, flags, fd, pos); + address = mmap(0, + size, + prot, + flags, + fd, + pos); - if (address == (void *) -1) + if (address == (void*)-1) { - perror ("mapping file failed"); + perror("mapping file failed"); return 0; } // fprintf(stderr, "address = %p, fd = %d, pos=%lld, size=%d\n", address, fd, pos, size); - + *(void **) &ret = address; return ret; #else /* not HAVE_MMAP */ - return (TARGET_NATIVE_MATH_INT_INT64_CONST_0); + return(TARGET_NATIVE_MATH_INT_INT64_CONST_0); #endif /* not HAVE_MMAP */ } -void -nio_msync (int fd, jlong jaddress, int size) +void nio_msync(int fd, + jlong jaddress, + int size) { #ifdef HAVE_MMAP int res; - char *address = *(void **) &jaddress; + char *address = *(void **) &jaddress; // fprintf(stderr, "synchronizing with file (%p -> %d bytes (%s))\n", address, size, address); - res = msync (address, size, MS_SYNC | MS_INVALIDATE); + res = msync(address, size, MS_SYNC | MS_INVALIDATE); if (res == -1) { - perror ("synchronize with file failed"); + perror("synchronize with file failed"); } #else /* not HAVE_MMAP */ #endif /* not HAVE_MMAP */ } -void -nio_unmmap_file (int fd, jlong jaddress, int size) +void nio_unmmap_file(int fd, + jlong jaddress, + int size) { #ifdef HAVE_MMAP int res = 0; - char *address = *(void **) &jaddress; + char *address = *(void **) &jaddress; // nio_msync(fd, jaddress, size); // fprintf(stderr, "unmapping (%p -> %d bytes)\n", address, size); - - res = munmap (address, size); + + res = munmap(address, size); if (res == -1) { - perror ("un-mapping file failed"); + perror("un-mapping file failed"); } #else /* not HAVE_MMAP */ #endif /* not HAVE_MMAP */ } -jlong -Java_gnu_java_nio_FileChannelImpl_nio_1mmap_1file (JNIEnv *env, - jclass c, - jint fd, - jlong pos, - jint size, jint jflags) +jlong Java_gnu_java_nio_FileChannelImpl_nio_1mmap_1file(JNIEnv *env, + jclass c, + jint fd, + jlong pos, + jint size, + jint jflags) { // fprintf(stderr, "fd=%d, pos=%lld, size=%d, flags=%d\n", fd, pos, size, jflags); - return nio_mmap_file (fd, pos, size, jflags); + return nio_mmap_file(fd, pos, size, jflags); } -void -Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file (JNIEnv *env, - jclass c, - jint fd, - jlong pos, jint size) +void Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file(JNIEnv *env, + jclass c, + jint fd, + jlong pos, + jint size) { // fprintf(stderr, "size=%d, fd=%d, pos=%p\n", fd, size, (void*)pos); - nio_unmmap_file (fd, pos, size); + nio_unmmap_file(fd, + pos, + size); } @@ -316,8 +335,8 @@ Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file (JNIEnv *env, * It's a copy to avoid a link error in orp. */ -static int -socket_channel_get_net_addr (JNIEnv *env, jobject addr) +static +int socket_channel_get_net_addr(JNIEnv *env, jobject addr) { #ifndef WITHOUT_NETWORK jclass cls = 0; @@ -326,93 +345,88 @@ socket_channel_get_net_addr (JNIEnv *env, jobject addr) jbyte *octets; int netaddr, len; - DBG - ("socket_channel_get_net_addr(): Entered socket_channel_get_net_addr\n"); + DBG("socket_channel_get_net_addr(): Entered socket_channel_get_net_addr\n"); /* Call the getAddress method on the object to retrieve the IP address */ - cls = (*env)->GetObjectClass (env, addr); + cls = (*env)->GetObjectClass(env, addr); if (cls == NULL) - return (0); + return(0); - mid = (*env)->GetMethodID (env, cls, "getAddress", "()[B"); + mid = (*env)->GetMethodID(env, cls, "getAddress", "()[B"); if (mid == NULL) - return (0); + return(0); - DBG ("socket_channel_get_net_addr(): Got getAddress method\n"); + DBG("socket_channel_get_net_addr(): Got getAddress method\n"); - arr = (*env)->CallObjectMethod (env, addr, mid); + arr = (*env)->CallObjectMethod(env, addr, mid); if (arr == NULL) - return (0); + return(0); - DBG ("socket_channel_get_net_addr(): Got the address\n"); + DBG("socket_channel_get_net_addr(): Got the address\n"); /* Turn the IP address into a 32 bit Internet address in network byte order */ - len = (*env)->GetArrayLength (env, arr); + len = (*env)->GetArrayLength(env, arr); if (len != 4) { - JCL_ThrowException (env, "java/io/IOException", - "Internal Error: invalid byte array length"); - return (0); + JCL_ThrowException(env, "java/io/IOException", "Internal Error: invalid byte array length"); + return(0); } - DBG ("socket_channel_get_net_addr(): Length ok\n"); + DBG("socket_channel_get_net_addr(): Length ok\n"); - octets = (*env)->GetByteArrayElements (env, arr, 0); + octets = (*env)->GetByteArrayElements(env, arr, 0); if (octets == NULL) - return (0); + return(0); - DBG ("socket_channel_get_net_addr(): Grabbed bytes\n"); + DBG("socket_channel_get_net_addr(): Grabbed bytes\n"); - TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT (octets[0], - octets[1], - octets[2], - octets[3], netaddr); + TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(octets[0], + octets[1], + octets[2], + octets[3], + netaddr + ); - (*env)->ReleaseByteArrayElements (env, arr, octets, 0); - DBG ("socket_channel_get_net_addr(): Done getting addr\n"); + (*env)->ReleaseByteArrayElements(env, arr, octets, 0); + DBG("socket_channel_get_net_addr(): Done getting addr\n"); - return netaddr; + return netaddr; #else /* not WITHOUT_NETWORK */ - return (0); + return(0); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketCreate (JNIEnv *env, jclass c) +int Java_gnu_java_nio_SocketChannelImpl_SocketCreate(JNIEnv *env,jclass c) { #ifndef WITHOUT_NETWORK int fd; int result; - - TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM (fd, result); + + TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM(fd, result); if (result != TARGET_NATIVE_OK) { - return (0); + return(0); } - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS (fd, 1, result); + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS(fd, 1, result); if (result != TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); - return (0); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd,result); + return(0); } - TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY (fd, 1, result); + TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY(fd, 1, result); if (result != TARGET_NATIVE_OK) { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); - return (0); + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd, result); + return(0); } - return (fd); + return(fd); #else /* not WITHOUT_NETWORK */ - return (-1); + return(-1); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketConnect (JNIEnv *env, jclass c, - int fd, - jobject InetAddress, - int port) +int Java_gnu_java_nio_SocketChannelImpl_SocketConnect(JNIEnv *env,jclass c,int fd, jobject InetAddress, int port) { #ifndef WITHOUT_NETWORK int inet_addr; @@ -420,40 +434,36 @@ Java_gnu_java_nio_SocketChannelImpl_SocketConnect (JNIEnv *env, jclass c, int local_address; int local_port; - inet_addr = socket_channel_get_net_addr (env, InetAddress); + inet_addr = socket_channel_get_net_addr(env, InetAddress); /* connect */ do { - TARGET_NATIVE_NETWORK_SOCKET_CONNECT (fd, inet_addr, inet_addr, result); - } - while ((result != TARGET_NATIVE_OK) && - (TARGET_NATIVE_LAST_ERROR () == - TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL)); + TARGET_NATIVE_NETWORK_SOCKET_CONNECT(fd, inet_addr, inet_addr, result); + } while ((result != TARGET_NATIVE_OK) && + (TARGET_NATIVE_LAST_ERROR() == TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL) + ); if (result != TARGET_NATIVE_OK) { - return (-1); + return(-1); } /* get local address info */ - TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port, - result); + TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(fd, local_address, local_port, result); if (result != TARGET_NATIVE_OK) { //??? NYI - perror ("getsockname: "); - return (-1); + perror("getsockname: "); + return(-1); } - return (local_port); + return(local_port); #else /* not WITHOUT_NETWORK */ - return (-1); + return(-1); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketBind (JNIEnv *env, jclass c, int fd, - jobject InetAddress, int port) +int Java_gnu_java_nio_SocketChannelImpl_SocketBind(JNIEnv *env,jclass c,int fd, jobject InetAddress, int port) { #ifndef WITHOUT_NETWORK int inet_addr; @@ -461,134 +471,119 @@ Java_gnu_java_nio_SocketChannelImpl_SocketBind (JNIEnv *env, jclass c, int fd, int local_address; int local_port; - inet_addr = socket_channel_get_net_addr (env, InetAddress); + inet_addr = socket_channel_get_net_addr(env, InetAddress); - TARGET_NATIVE_NETWORK_SOCKET_BIND (fd, inet_addr, port, result); + TARGET_NATIVE_NETWORK_SOCKET_BIND(fd, inet_addr, port, result); if (result != TARGET_NATIVE_OK) { //??? NYI - perror ("BIND"); + perror("BIND"); return -1; } if (port == 0) { /* get local address info */ - TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, - local_port, result); + TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(fd, local_address, local_port, result); if (result != TARGET_NATIVE_OK) - { + { //??? NYI - perror ("getsockname: "); - return -1; - } + perror("getsockname: "); + return -1; + } } else { local_port = port; } - return (local_port); + return(local_port); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketListen (JNIEnv *env, jclass c, - int fd, int backlog) +int Java_gnu_java_nio_SocketChannelImpl_SocketListen(JNIEnv *env,jclass c,int fd, int backlog) { #ifndef WITHOUT_NETWORK int result; - TARGET_NATIVE_NETWORK_SOCKET_LISTEN (fd, backlog, result); + TARGET_NATIVE_NETWORK_SOCKET_LISTEN(fd, backlog, result); if (result != TARGET_NATIVE_OK) - { - return (-1); - } + { + return(-1); + } - return (0); + return(0); #else /* not WITHOUT_NETWORK */ - return (-1); + return(-1); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketAvailable (JNIEnv *env, jclass c, - int fd) +int Java_gnu_java_nio_SocketChannelImpl_SocketAvailable(JNIEnv *env,jclass c,int fd) { #ifndef WITHOUT_NETWORK int bytes_available; int result; - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE (fd, bytes_available, - result); - if (result != TARGET_NATIVE_OK) - { - return (0); - } + TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(fd, bytes_available, result); + if (result!=TARGET_NATIVE_OK) + { + return(0); + } - return (bytes_available); + return(bytes_available); #else /* not WITHOUT_NETWORK */ - return (0); + return(0); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketClose (JNIEnv *env, jclass c, - int fd) +int Java_gnu_java_nio_SocketChannelImpl_SocketClose(JNIEnv *env,jclass c,int fd) { #ifndef WITHOUT_NETWORK int result; - if (fd >= 0) - { - TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result); - } + if (fd >= 0) { + TARGET_NATIVE_NETWORK_SOCKET_CLOSE(fd, result); + } - return (0); + return(0); #else /* not WITHOUT_NETWORK */ - return (0); + return(0); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketRead (JNIEnv *env, jclass c, int fd, - jarray buf, int off, int len) +int Java_gnu_java_nio_SocketChannelImpl_SocketRead(JNIEnv *env,jclass c,int fd, jarray buf, int off, int len) { #ifndef WITHOUT_NETWORK jbyte *buffer; - int bytes_received; + int bytes_received; - buffer = (*env)->GetByteArrayElements (env, buf, 0); - assert (buffer != NULL); + buffer = (*env)->GetByteArrayElements(env, buf, 0); + assert(buffer != NULL); - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE (fd, buffer + off, len, - bytes_received); + TARGET_NATIVE_NETWORK_SOCKET_RECEIVE(fd, buffer + off, len, bytes_received); - (*env)->ReleaseByteArrayElements (env, buf, buffer, 0); + (*env)->ReleaseByteArrayElements(env, buf, buffer, 0); - return (bytes_received); + return(bytes_received); #else /* not WITHOUT_NETWORK */ - return (0); + return(0); #endif /* not WITHOUT_NETWORK */ } -int -Java_gnu_java_nio_SocketChannelImpl_SocketWrite (JNIEnv *env, jclass c, - int fd, jarray buf, int off, - int len) +int Java_gnu_java_nio_SocketChannelImpl_SocketWrite(JNIEnv *env,jclass c,int fd, jarray buf, int off, int len) { #ifndef WITHOUT_NETWORK jbyte *buffer; - int bytes_sent; + int bytes_sent; - buffer = (*env)->GetByteArrayElements (env, buf, 0); + buffer = (*env)->GetByteArrayElements(env, buf, 0); - TARGET_NATIVE_NETWORK_SOCKET_SEND (fd, buffer + off, len, bytes_sent); + TARGET_NATIVE_NETWORK_SOCKET_SEND(fd, buffer + off, len, bytes_sent); - (*env)->ReleaseByteArrayElements (env, buf, buffer, 0); + (*env)->ReleaseByteArrayElements(env, buf, buffer, 0); - return (bytes_sent); + return(bytes_sent); #else /* not WITHOUT_NETWORK */ - return (0); + return(0); #endif /* not WITHOUT_NETWORK */ } diff --git a/native/jni/java-nio/java_nio_DirectByteBufferImpl.c b/native/jni/java-nio/java_nio_DirectByteBufferImpl.c index dac016908..37402f2cd 100644 --- a/native/jni/java-nio/java_nio_DirectByteBufferImpl.c +++ b/native/jni/java-nio/java_nio_DirectByteBufferImpl.c @@ -46,44 +46,33 @@ exception statement from your version. */ #define IO_EXCEPTION "java/io/IOException" JNIEXPORT jobject JNICALL -Java_java_nio_DirectByteBufferImpl_allocateImpl (JNIEnv *env, jclass class, - jint size) +Java_java_nio_DirectByteBufferImpl_allocateImpl (JNIEnv *env, jclass class, jint size) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.DirectByteBufferImpl.allocateImpl(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.allocateImpl(): not implemented"); return 0; } JNIEXPORT void JNICALL -Java_java_nio_DirectByteBufferImpl_freeImpl (JNIEnv *env, jclass class, - jobject address) +Java_java_nio_DirectByteBufferImpl_freeImpl (JNIEnv *env, jclass class, jobject address) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.DirectByteBufferImpl.freeImpl(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.freeImpl(): not implemented"); } JNIEXPORT jbyte JNICALL -Java_java_nio_DirectByteBufferImpl_getImpl (JNIEnv *env, jclass class, - jint index) +Java_java_nio_DirectByteBufferImpl_getImpl (JNIEnv *env, jclass class, jint index) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.DirectByteBufferImpl.getImpl(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.getImpl(): not implemented"); return 0; } JNIEXPORT void JNICALL -Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jclass class, - jint index, jbyte value) +Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jclass class, jint index, jbyte value) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.DirectByteBufferImpl.putImpl(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.putImpl(): not implemented"); } JNIEXPORT void JNICALL -Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject obj, - jint src_offset, - jint dst_offset, jint count) +Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject obj, jint src_offset, jint dst_offset, jint count) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.DirectByteBufferImpl.shiftDown(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.shiftDown(): not implemented"); } diff --git a/native/jni/java-nio/java_nio_FileChannelImpl.c b/native/jni/java-nio/java_nio_FileChannelImpl.c index 165fd848d..26633d49c 100644 --- a/native/jni/java-nio/java_nio_FileChannelImpl.c +++ b/native/jni/java-nio/java_nio_FileChannelImpl.c @@ -51,87 +51,63 @@ exception statement from your version. */ JNIEXPORT jlong JNICALL Java_java_nio_channels_FileChannelImpl_size (JNIEnv *env, jclass clazz) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.(): not implemented"); return TARGET_NATIVE_MATH_INT_INT64_CONST_0; } JNIEXPORT jlong JNICALL -Java_java_nio_channels_FileChannelImpl_implPosition__ (JNIEnv *env, - jclass clazz) +Java_java_nio_channels_FileChannelImpl_implPosition__ (JNIEnv *env, jclass clazz) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.implPosition(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.implPosition(): not implemented"); return TARGET_NATIVE_MATH_INT_INT64_CONST_0; } JNIEXPORT jobject JNICALL -Java_java_nio_channels_FileChannelImpl_implPosition__J (JNIEnv *env, - jclass clazz, - jlong newPosition) +Java_java_nio_channels_FileChannelImpl_implPosition__J (JNIEnv *env, jclass clazz, jlong newPosition) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.implPosition(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.implPosition(): not implemented"); return 0; } JNIEXPORT jobject JNICALL -Java_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv *env, - jclass clazz, jlong size) +Java_java_nio_channels_FileChannelImpl_implTruncate (JNIEnv *env, jclass clazz, jlong size) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.implTruncate(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.implTruncate(): not implemented"); return 0; } JNIEXPORT jobject JNICALL -Java_java_nio_channels_FileChannelImpl_nio_1mmap_1file (JNIEnv *env, - jclass clazz, - jlong pos, jlong size, - jint mode) +Java_java_nio_channels_FileChannelImpl_nio_1mmap_1file (JNIEnv *env, jclass clazz, jlong pos, jlong size, jint mode) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.nio_mmap_file(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.nio_mmap_file(): not implemented"); return 0; } JNIEXPORT void JNICALL -Java_java_nio_channels_FileChannelImpl_nio_1unmmap_1file (JNIEnv *env, - jclass clazz, - jobject map_address, - jint size) +Java_java_nio_channels_FileChannelImpl_nio_1unmmap_1file (JNIEnv *env, jclass clazz, jobject map_address, jint size) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.nio_unmmap_file(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.nio_unmmap_file(): not implemented"); return 0; } JNIEXPORT void JNICALL -Java_java_nio_channels_FileChannelImpl_nio_1msync (JNIEnv *env, jclass clazz, - jobject map_address, - jint length) +Java_java_nio_channels_FileChannelImpl_nio_1msync (JNIEnv *env, jclass clazz, jobject map_address, jint length) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.nio_msync(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.nio_msync(): not implemented"); return 0; } JNIEXPORT jint JNICALL -Java_java_nio_channels_FileChannelImpl_implRead (JNIEnv *env, jclass clazz, - jbyteArray buffer, - jint offset, jint length) +Java_java_nio_channels_FileChannelImpl_implRead (JNIEnv *env, jclass clazz, jbyteArray buffer, jint offset, jint length) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.implRead(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.implRead(): not implemented"); return 0; } JNIEXPORT jint JNICALL -Java_java_nio_channels_FileChannelImpl_implWrite (JNIEnv *env, jclass clazz, - jbyteArray buffer, - jint offset, jint length) +Java_java_nio_channels_FileChannelImpl_implWrite (JNIEnv *env, jclass clazz, jbyteArray buffer, jint offset, jint length) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.implWrite(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.implWrite(): not implemented"); return 0; } + diff --git a/native/jni/java-nio/java_nio_FileLockImpl.c b/native/jni/java-nio/java_nio_FileLockImpl.c index a43c9021f..c068be94a 100644 --- a/native/jni/java-nio/java_nio_FileLockImpl.c +++ b/native/jni/java-nio/java_nio_FileLockImpl.c @@ -48,6 +48,6 @@ exception statement from your version. */ JNIEXPORT void JNICALL Java_gnu_java_nio_FileLockImpl_releaseImpl (JNIEnv *env, jclass class) { - JCL_ThrowException (env, IO_EXCEPTION, - "java.nio.FileChannelImpl.(): not implemented"); + JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.(): not implemented"); } + diff --git a/native/jni/java-util/java_util_TimeZone.c b/native/jni/java-util/java_util_TimeZone.c index bec409541..1c8cf5d2f 100644 --- a/native/jni/java-util/java_util_TimeZone.c +++ b/native/jni/java-util/java_util_TimeZone.c @@ -59,19 +59,20 @@ exception statement from your version. */ * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_java_util_TimeZone_getDefaultTimeZoneId (JNIEnv *env, jclass clazz) +Java_java_util_TimeZone_getDefaultTimeZoneId(JNIEnv *env, jclass clazz) { #ifdef HAVE_TZNAME - char buffer[128]; - int result; + char buffer[128]; + int result; jstring retval; - TARGET_NATIVE_MISC_GET_TIMEZONE_STRING (buffer, sizeof (buffer), result); + TARGET_NATIVE_MISC_GET_TIMEZONE_STRING(buffer,sizeof(buffer),result); - retval = (*env)->NewStringUTF (env, buffer); - - return (retval); + retval = (*env)->NewStringUTF(env, buffer); + + return(retval); #else - return (0); /* added this statement (crashes without..:-) --Fridi. */ + return(0); /* added this statement (crashes without..:-) --Fridi. */ #endif /* HAVE_TZNAME */ } + diff --git a/native/target/Linux/target_native.h b/native/target/Linux/target_native.h index 9c45351b1..3192b016e 100644 --- a/native/target/Linux/target_native.h +++ b/native/target/Linux/target_native.h @@ -62,8 +62,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -74,6 +73,7 @@ extern "C" another position!) */ #include "target_generic.h" -#endif /* __TARGET_NATIVE__ */ +#endif /* __TARGET_NATIVE__ */ /* end of file */ + diff --git a/native/target/Linux/target_native_file.h b/native/target/Linux/target_native_file.h index 477b5234a..f066c5a67 100644 --- a/native/target/Linux/target_native_file.h +++ b/native/target/Linux/target_native_file.h @@ -62,8 +62,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -74,6 +73,7 @@ extern "C" another position!) */ #include "target_generic_file.h" -#endif /* __TARGET_NATIVE_FILE__ */ +#endif /* __TARGET_NATIVE_FILE__ */ /* end of file */ + diff --git a/native/target/Linux/target_native_io.h b/native/target/Linux/target_native_io.h index e3f07a992..dec0c803d 100644 --- a/native/target/Linux/target_native_io.h +++ b/native/target/Linux/target_native_io.h @@ -62,8 +62,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -74,6 +73,6 @@ extern "C" another position!) */ #include "target_generic_io.h" -#endif /* __TARGET_NATIVE_MISC__ */ +#endif /* __TARGET_NATIVE_MISC__ */ /* end of file */ diff --git a/native/target/Linux/target_native_math_float.h b/native/target/Linux/target_native_math_float.h index f45b29d78..6b9e18ea6 100644 --- a/native/target/Linux/target_native_math_float.h +++ b/native/target/Linux/target_native_math_float.h @@ -63,8 +63,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -75,6 +74,7 @@ extern "C" another position!) */ #include "target_generic_math_float.h" -#endif /* __TARGET_NATIVE_MATH_FLOAT__ */ +#endif /* __TARGET_NATIVE_MATH_FLOAT__ */ /* end of file */ + diff --git a/native/target/Linux/target_native_math_int.h b/native/target/Linux/target_native_math_int.h index 41688cf8f..e21c5aa64 100644 --- a/native/target/Linux/target_native_math_int.h +++ b/native/target/Linux/target_native_math_int.h @@ -63,8 +63,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -75,6 +74,7 @@ extern "C" another position!) */ #include "target_generic_math_int.h" -#endif /* __TARGET_NATIVE_MATH_INT__ */ +#endif /* __TARGET_NATIVE_MATH_INT__ */ /* end of file */ + diff --git a/native/target/Linux/target_native_misc.h b/native/target/Linux/target_native_misc.h index 62c0cb8d1..a6ff2a705 100644 --- a/native/target/Linux/target_native_misc.h +++ b/native/target/Linux/target_native_misc.h @@ -62,8 +62,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -74,6 +73,7 @@ extern "C" another position!) */ #include "target_generic_misc.h" -#endif /* __TARGET_NATIVE_MISC__ */ +#endif /* __TARGET_NATIVE_MISC__ */ /* end of file */ + diff --git a/native/target/Linux/target_native_network.h b/native/target/Linux/target_native_network.h index cb30fc00e..9698b5f47 100644 --- a/native/target/Linux/target_native_network.h +++ b/native/target/Linux/target_native_network.h @@ -62,8 +62,7 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus @@ -74,6 +73,7 @@ extern "C" another position!) */ #include "target_generic_network.h" -#endif /* __TARGET_NATIVE_NETWORK__ */ +#endif /* __TARGET_NATIVE_NETWORK__ */ /* end of file */ + diff --git a/native/target/generic/target_generic.h b/native/target/generic/target_generic.h index 4d8aef365..d767985c4 100644 --- a/native/target/generic/target_generic.h +++ b/native/target/generic/target_generic.h @@ -45,7 +45,7 @@ Systems : all /* check if target_native_network.h included */ #ifndef __TARGET_NATIVE__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -62,46 +62,46 @@ Systems : all #define TARGET_NATIVE_ERROR 0 #ifndef TARGET_NATIVE_ERROR_PERMISION_DENIED -#define TARGET_NATIVE_ERROR_PERMISION_DENIED EACCES + #define TARGET_NATIVE_ERROR_PERMISION_DENIED EACCES #endif #ifndef TARGET_NATIVE_ERROR_BAD_FILE_DESCRIPTOR -#define TARGET_NATIVE_ERROR_BAD_FILE_DESCRIPTOR EBADF + #define TARGET_NATIVE_ERROR_BAD_FILE_DESCRIPTOR EBADF #endif #ifndef TARGET_NATIVE_ERROR_FILE_EXISTS -#define TARGET_NATIVE_ERROR_FILE_EXISTS EEXIST + #define TARGET_NATIVE_ERROR_FILE_EXISTS EEXIST #endif #ifndef TARGET_NATIVE_ERROR_INPUT_OUTPUT -#define TARGET_NATIVE_ERROR_INPUT_OUTPUT EIO + #define TARGET_NATIVE_ERROR_INPUT_OUTPUT EIO #endif #ifndef TARGET_NATIVE_ERROR_TOO_MANY_OPEN_FILES -#define TARGET_NATIVE_ERROR_TOO_MANY_OPEN_FILES EMFILE + #define TARGET_NATIVE_ERROR_TOO_MANY_OPEN_FILES EMFILE #endif #ifndef TARGET_NATIVE_ERROR_FILENAME_TO_LONG -#define TARGET_NATIVE_ERROR_FILENAME_TO_LONG ENAMETOOLONG + #define TARGET_NATIVE_ERROR_FILENAME_TO_LONG ENAMETOOLONG #endif #ifndef TARGET_NATIVE_ERROR_NO_SUCH_DEVICE -#define TARGET_NATIVE_ERROR_NO_SUCH_DEVICE ENODEV + #define TARGET_NATIVE_ERROR_NO_SUCH_DEVICE ENODEV #endif #ifndef TARGET_NATIVE_ERROR_NO_SUCH_FILE -#define TARGET_NATIVE_ERROR_NO_SUCH_FILE ENOENT + #define TARGET_NATIVE_ERROR_NO_SUCH_FILE ENOENT #endif #ifndef TARGET_NATIVE_ERROR_NO_SPACE_LEFT -#define TARGET_NATIVE_ERROR_NO_SPACE_LEFT ENOSPC + #define TARGET_NATIVE_ERROR_NO_SPACE_LEFT ENOSPC #endif #ifndef TARGET_NATIVE_ERROR_DIRECTORY_NOT_EMPTY -#define TARGET_NATIVE_ERROR_DIRECTORY_NOT_EMPTY ENOTEMPTY + #define TARGET_NATIVE_ERROR_DIRECTORY_NOT_EMPTY ENOTEMPTY #endif #ifndef TARGET_NATIVE_ERROR_OPERATION_NOT_PERMITTED -#define TARGET_NATIVE_ERROR_OPERATION_NOT_PERMITTED EPERM + #define TARGET_NATIVE_ERROR_OPERATION_NOT_PERMITTED EPERM #endif #ifndef TARGET_NATIVE_ERROR_READ_ONLY_FILE_SYSTEM -#define TARGET_NATIVE_ERROR_READ_ONLY_FILE_SYSTEM EROFS + #define TARGET_NATIVE_ERROR_READ_ONLY_FILE_SYSTEM EROFS #endif #ifndef TARGET_NATIVE_ERROR_INVALID_SEEK -#define TARGET_NATIVE_ERROR_INVALID_SEEK ESPIPE + #define TARGET_NATIVE_ERROR_INVALID_SEEK ESPIPE #endif #ifndef TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL -#define TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL EINTR + #define TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL EINTR #endif /***************************** Datatypes *******************************/ @@ -121,8 +121,8 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_LAST_ERROR -#include <errno.h> -#define TARGET_NATIVE_LAST_ERROR() \ + #include <errno.h> + #define TARGET_NATIVE_LAST_ERROR() \ errno #endif @@ -137,16 +137,16 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_LAST_ERROR_STRING -#include <string.h> -#include <errno.h> -#define TARGET_NATIVE_LAST_ERROR_STRING() \ + #include <string.h> + #include <errno.h> + #define TARGET_NATIVE_LAST_ERROR_STRING() \ strerror(errno) #endif #ifndef TARGET_NATIVE_LAST_ERROR_STRING_FORMAT -#include <string.h> -#include <errno.h> -#define TARGET_NATIVE_LAST_ERROR_STRING_FORMAT(buffer,bufferSize,format) \ + #include <string.h> + #include <errno.h> + #define TARGET_NATIVE_LAST_ERROR_STRING_FORMAT(buffer,bufferSize,format) \ do { \ sprintf(buffer,format); \ strcat(" (error: "); \ @@ -158,14 +158,14 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC__ */ +#endif /* __TARGET_GENERIC__ */ /* end of file */ + diff --git a/native/target/generic/target_generic_file.h b/native/target/generic/target_generic_file.h index cd453f3e0..d2e3159ea 100644 --- a/native/target/generic/target_generic_file.h +++ b/native/target/generic/target_generic_file.h @@ -44,13 +44,12 @@ Systems : all #define __TARGET_GENERIC_FILE__ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* check if target_native_file.h included */ #ifndef __TARGET_NATIVE_FILE__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -68,57 +67,57 @@ extern "C" /***************************** Constants *******************************/ #ifndef TARGET_NATIVE_FILE_FILEFLAG_NONE -#define TARGET_NATIVE_FILE_FILEFLAG_NONE 0 + #define TARGET_NATIVE_FILE_FILEFLAG_NONE 0 #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_CREATE -#define TARGET_NATIVE_FILE_FILEFLAG_CREATE O_CREAT + #define TARGET_NATIVE_FILE_FILEFLAG_CREATE O_CREAT #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_CREATE_FORCE -#define TARGET_NATIVE_FILE_FILEFLAG_CREATE_FORCE (O_CREAT|O_EXCL) + #define TARGET_NATIVE_FILE_FILEFLAG_CREATE_FORCE (O_CREAT|O_EXCL) #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_READ -#define TARGET_NATIVE_FILE_FILEFLAG_READ O_RDONLY + #define TARGET_NATIVE_FILE_FILEFLAG_READ O_RDONLY #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_WRITE -#define TARGET_NATIVE_FILE_FILEFLAG_WRITE O_WRONLY + #define TARGET_NATIVE_FILE_FILEFLAG_WRITE O_WRONLY #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_READWRITE -#define TARGET_NATIVE_FILE_FILEFLAG_READWRITE O_RDWR + #define TARGET_NATIVE_FILE_FILEFLAG_READWRITE O_RDWR #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE -#define TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE O_TRUNC + #define TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE O_TRUNC #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_APPEND -#define TARGET_NATIVE_FILE_FILEFLAG_APPEND O_APPEND + #define TARGET_NATIVE_FILE_FILEFLAG_APPEND O_APPEND #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_SYNC -#if !defined (O_SYNC) && defined (O_FSYNC) -#define TARGET_NATIVE_FILE_FILEFLAG_SYNC O_FSYNC -#else -#define TARGET_NATIVE_FILE_FILEFLAG_SYNC O_SYNC -#endif + #if !defined (O_SYNC) && defined (O_FSYNC) + #define TARGET_NATIVE_FILE_FILEFLAG_SYNC O_FSYNC + #else + #define TARGET_NATIVE_FILE_FILEFLAG_SYNC O_SYNC + #endif #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_DSYNC -#ifdef O_DSYNC -#define TARGET_NATIVE_FILE_FILEFLAG_DSYNC 0 -#else -#define TARGET_NATIVE_FILE_FILEFLAG_DSYNC TARGET_NATIVE_FILE_FILEFLAG_SYNC -#endif + #ifdef O_DSYNC + #define TARGET_NATIVE_FILE_FILEFLAG_DSYNC 0 + #else + #define TARGET_NATIVE_FILE_FILEFLAG_DSYNC TARGET_NATIVE_FILE_FILEFLAG_SYNC + #endif #endif #ifndef TARGET_NATIVE_FILE_FILEFLAG_BINARY -#define TARGET_NATIVE_FILE_FILEFLAG_BINARY O_BINARY + #define TARGET_NATIVE_FILE_FILEFLAG_BINARY O_BINARY #endif #ifndef TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL -#define TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) + #define TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) #endif -#ifndef TARGET_NATIVE_FILE_FILEPERMISSION_PRIVATE -#define TARGET_NATIVE_FILE_FILEPERMISSION_PRIVATE (S_IRUSR | S_IWUSR) +#ifndef TARGET_NATIVE_FILE_FILEPERMISSION_PRIVATE + #define TARGET_NATIVE_FILE_FILEPERMISSION_PRIVATE (S_IRUSR | S_IWUSR) #endif #ifndef TARGET_NATIVE_FILE_FILEPERMISSION_READONLY -#define TARGET_NATIVE_FILE_FILEPERMISSION_READONLY (~(S_IWRITE|S_IWGRP|S_IWOTH)) + #define TARGET_NATIVE_FILE_FILEPERMISSION_READONLY (~(S_IWRITE|S_IWGRP|S_IWOTH)) #endif /***************************** Datatypes *******************************/ @@ -138,10 +137,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#define TARGET_NATIVE_FILE_OPEN(filename,filedescriptor,flags,permissions,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> + #define TARGET_NATIVE_FILE_OPEN(filename,filedescriptor,flags,permissions,result) \ do { \ filedescriptor=open(filename, \ flags, \ @@ -164,7 +163,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_CREATE -#define TARGET_NATIVE_FILE_OPEN_CREATE(filename,filedescriptor,result) \ + #define TARGET_NATIVE_FILE_OPEN_CREATE(filename,filedescriptor,result) \ TARGET_NATIVE_FILE_OPEN(filename,\ filedescriptor,\ TARGET_NATIVE_FILE_FILEFLAG_CREATE_FORCE, \ @@ -184,7 +183,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_READ -#define TARGET_NATIVE_FILE_OPEN_READ(filename,filedescriptor,result) \ + #define TARGET_NATIVE_FILE_OPEN_READ(filename,filedescriptor,result) \ TARGET_NATIVE_FILE_OPEN(filename, \ filedescriptor,\ TARGET_NATIVE_FILE_FILEFLAG_READ, \ @@ -204,7 +203,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_WRITE -#define TARGET_NATIVE_FILE_OPEN_WRITE(filename,filedescriptor,result) \ + #define TARGET_NATIVE_FILE_OPEN_WRITE(filename,filedescriptor,result) \ TARGET_NATIVE_FILE_OPEN(filename, \ filedescriptor, \ TARGET_NATIVE_FILE_FILEFLAG_WRITE, \ @@ -224,7 +223,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_READWRITE -#define TARGET_NATIVE_FILE_OPEN_READWRITE(filename,filedescriptor,result) \ + #define TARGET_NATIVE_FILE_OPEN_READWRITE(filename,filedescriptor,result) \ TARGET_NATIVE_FILE_OPEN(filename, \ filedescriptor, \ TARGET_NATIVE_FILE_FILEFLAG_READWRITE, \ @@ -244,7 +243,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_APPEND -#define TARGET_NATIVE_FILE_OPEN_APPEND(filename,filedescriptor,result) \ + #define TARGET_NATIVE_FILE_OPEN_APPEND(filename,filedescriptor,result) \ TARGET_NATIVE_FILE_OPEN_APPEND(filename, \ filedescriptor, \ TARGET_NATIVE_FILE_FILEFLAG_CREATE_FORCE|TARGET_NATIVE_FILE_FILEFLAG_APPEND, \ @@ -264,8 +263,8 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_CLOSE -#include <unistd.h> -#define TARGET_NATIVE_FILE_CLOSE(filedescriptor,result) \ + #include <unistd.h> + #define TARGET_NATIVE_FILE_CLOSE(filedescriptor,result) \ do { \ result=(close(filedescriptor)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -282,26 +281,26 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR -#if defined(HAVE_FCNTL) -#include <unistd.h> -#include <fcntl.h> -#define TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(filedescriptor,result) \ + #if defined(HAVE_FCNTL) + #include <unistd.h> + #include <fcntl.h> + #define TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(filedescriptor,result) \ do { \ result=(fcntl(filedescriptor,F_GETFL,0)!=-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while(0) -#elif defined(HAVE_FSTAT) -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(filedescriptor,result) \ + #elif defined(HAVE_FSTAT) + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(filedescriptor,result) \ do { \ struct stat __stat; \ \ result=(fstat(filedescriptor,&__stat)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while(0) -#else -#error fcntl() nor fstat() available for checking if file descriptor is valid -#endif + #else + #error fcntl() nor fstat() available for checking if file descriptor is valid + #endif #endif /***********************************************************************\ @@ -315,9 +314,9 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_TELL -#include <sys/types.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_TELL(filedescriptor,offset,result) \ + #include <sys/types.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_TELL(filedescriptor,offset,result) \ do { \ offset=lseek(filedescriptor,TARGET_NATIVE_MATH_INT_INT64_CONST_0,SEEK_CUR); \ result=((offset)!=(off_t)-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ @@ -335,27 +334,27 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_SEEK_BEGIN -#include <sys/types.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_SEEK_BEGIN(filedescriptor,offset,newoffset,result) \ + #include <sys/types.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_SEEK_BEGIN(filedescriptor,offset,newoffset,result) \ do { \ newoffset=lseek(filedescriptor,offset,SEEK_SET); \ result=((newoffset)!=(off_t)-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) #endif #ifndef TARGET_NATIVE_FILE_SEEK_CURRENT -#include <sys/types.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_SEEK_CURRENT(filedescriptor,offset,newoffset,result) \ + #include <sys/types.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_SEEK_CURRENT(filedescriptor,offset,newoffset,result) \ do { \ newoffset=lseek(filedescriptor,offset,SEEK_CUR); \ result=((newoffset)!=(off_t)-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) #endif #ifndef TARGET_NATIVE_FILE_SEEK_END -#include <sys/types.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_SEEK_END(filedescriptor,offset,newoffset,result) \ + #include <sys/types.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_SEEK_END(filedescriptor,offset,newoffset,result) \ do { \ newoffset=lseek(filedescriptor,offset,SEEK_END); \ result=((newoffset)!=(off_t)-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ @@ -373,8 +372,8 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_TRUNCATE -#include <unistd.h> -#define TARGET_NATIVE_FILE_TRUNCATE(filedescriptor,offset,result) \ + #include <unistd.h> + #define TARGET_NATIVE_FILE_TRUNCATE(filedescriptor,offset,result) \ do { \ result=(ftruncate(filedescriptor,offset)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -391,10 +390,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_SIZE -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_SIZE(filedescriptor,length,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_SIZE(filedescriptor,length,result) \ do { \ struct stat __statBuffer; \ \ @@ -414,26 +413,26 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_AVAILABLE -#if defined(HAVE_FIONREAD) -#ifdef HAVE_SYS_IOCTL -#define BSD_COMP /* Get FIONREAD on Solaris2 */ -#include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO /* Get FIONREAD on Solaris 2.5 */ -#include <sys/filio.h> -#endif -#define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ + #if defined(HAVE_FIONREAD) + #ifdef HAVE_SYS_IOCTL + #define BSD_COMP /* Get FIONREAD on Solaris2 */ + #include <sys/ioctl.h> + #endif + #ifdef HAVE_SYS_FILIO /* Get FIONREAD on Solaris 2.5 */ + #include <sys/filio.h> + #endif + #define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ do { \ ssize_t __n; \ \ result=(ioctl(filedescriptor,FIONREAD,(char*)&__n)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ length=TARGET_NATIVE_MATH_INT_INT32_TO_INT64(__n); \ } while (0) -#elif defined(HAVE_FSTAT) -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ + #elif defined(HAVE_FSTAT) + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ do { \ struct stat __statBuffer; \ off_t __n; \ @@ -458,10 +457,10 @@ extern "C" result=TARGET_NATIVE_ERROR; \ } \ } while (0) -#elif defined(HAVE_SELECT) -#include <string.h> -#include <sys/select.h> -#define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ + #elif defined(HAVE_SELECT) + #include <string.h> + #include <sys/select.h> + #define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ do { \ fd_set __filedescriptset; \ struct timeval __timeval; \ @@ -478,14 +477,14 @@ extern "C" default: length=JNI_JLONG_CONST_1; result=TARGET_NATIVE_OK; break; \ } \ } while (0) -#else -#define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ + #else + #define TARGET_NATIVE_FILE_AVAILABLE(filedescriptor,length,result) \ do { \ errno=TARGET_NATIVE_ERROR_OPERATION_NOT_PERMITTED; \ length=0; \ result=TARGET_NATIVE_ERROR; \ } while (0) -#endif + #endif #endif /***********************************************************************\ @@ -499,16 +498,16 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_READ -#include <unistd.h> -#define TARGET_NATIVE_FILE_READ(filedescriptor,buffer,length,bytesRead,result) \ + #include <unistd.h> + #define TARGET_NATIVE_FILE_READ(filedescriptor,buffer,length,bytesRead,result) \ do { \ bytesRead=read(filedescriptor,buffer,length); \ result=(bytesRead!=-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) #endif #ifndef TARGET_NATIVE_FILE_WRITE -#include <unistd.h> -#define TARGET_NATIVE_FILE_WRITE(filedescriptor,buffer,length,bytesWritten,result) \ + #include <unistd.h> + #define TARGET_NATIVE_FILE_WRITE(filedescriptor,buffer,length,bytesWritten,result) \ do { \ bytesWritten=write(filedescriptor,buffer,length); \ result=(bytesWritten!=-1)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ @@ -526,10 +525,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_SET_MODE_READONLY -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_SET_MODE_READONLY(filename,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_SET_MODE_READONLY(filename,result) \ do { \ struct stat __statBuffer; \ \ @@ -552,10 +551,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_EXISTS -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_EXISTS(filename,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_EXISTS(filename,result) \ do { \ struct stat __statBuffer; \ \ @@ -574,10 +573,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_IS_FILE -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_IS_FILE(filename,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_IS_FILE(filename,result) \ do { \ struct stat __statBuffer; \ \ @@ -596,10 +595,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_IS_DIRECTORY -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_IS_DIRECTORY(filename,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_IS_DIRECTORY(filename,result) \ do { \ struct stat __statBuffer; \ \ @@ -618,10 +617,10 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_GET_LAST_MODIFIED -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#define TARGET_NATIVE_FILE_GET_LAST_MODIFIED(filename,time,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #define TARGET_NATIVE_FILE_GET_LAST_MODIFIED(filename,time,result) \ do { \ struct stat __statBuffer; \ \ @@ -648,17 +647,17 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_SET_LAST_MODIFIED -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#ifdef HAVE_UTIME_H -#include <utime.h> -#elif HAVE_SYS_UTIME_H -#include <sys/utime.h> -#else -#error utime.h not found. Please check configuration. -#endif -#define TARGET_NATIVE_FILE_SET_LAST_MODIFIED(filename,time,result) \ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> + #ifdef HAVE_UTIME_H + #include <utime.h> + #elif HAVE_SYS_UTIME_H + #include <sys/utime.h> + #else + #error utime.h not found. Please check configuration. + #endif + #define TARGET_NATIVE_FILE_SET_LAST_MODIFIED(filename,time,result) \ do { \ struct stat __statBuffer; \ struct utimbuf __utimeBuffer; \ @@ -687,7 +686,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_DELETE -#define TARGET_NATIVE_FILE_DELETE(filename,result) \ + #define TARGET_NATIVE_FILE_DELETE(filename,result) \ do { \ result=((unlink(filename)==0) || (rmdir(filename)==0))?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -704,7 +703,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_RENAME -#define TARGET_NATIVE_FILE_RENAME(oldfilename,newfilename,result) \ + #define TARGET_NATIVE_FILE_RENAME(oldfilename,newfilename,result) \ do { \ result=(rename(oldfilename,newfilename)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -721,8 +720,8 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_MAKE_DIR -#include <sys/stat.h> -#define TARGET_NATIVE_FILE_MAKE_DIR(name,result) \ + #include <sys/stat.h> + #define TARGET_NATIVE_FILE_MAKE_DIR(name,result) \ do { \ result=((mkdir(name,(S_IRWXO|S_IRWXG|S_IRWXU))==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR); \ } while (0) @@ -739,8 +738,8 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_GET_CWD -#include <unistd.h> -#define TARGET_NATIVE_FILE_GET_CWD(path,maxPathLength,result) \ + #include <unistd.h> + #define TARGET_NATIVE_FILE_GET_CWD(path,maxPathLength,result) \ do {\ result=(getcwd(path,maxPathLength)!=NULL)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -757,9 +756,9 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_OPEN_DIR -#include <sys/types.h> -#include <dirent.h> -#define TARGET_NATIVE_FILE_OPEN_DIR(filename,handle,result) \ + #include <sys/types.h> + #include <dirent.h> + #define TARGET_NATIVE_FILE_OPEN_DIR(filename,handle,result) \ do { \ handle=(void*)opendir(filename); \ result=(handle!=NULL)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ @@ -777,9 +776,9 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_CLOSE_DIR -#include <sys/types.h> -#include <dirent.h> -#define TARGET_NATIVE_FILE_CLOSE_DIR(handle,result) \ + #include <sys/types.h> + #include <dirent.h> + #define TARGET_NATIVE_FILE_CLOSE_DIR(handle,result) \ do { \ closedir((DIR*)handle); \ result=TARGET_NATIVE_OK; \ @@ -798,9 +797,9 @@ extern "C" //??? name als buffer? #ifndef TARGET_NATIVE_FILE_READ_DIR -#include <sys/types.h> -#include <dirent.h> -#define TARGET_NATIVE_FILE_READ_DIR(handle,name,result) \ + #include <sys/types.h> + #include <dirent.h> + #define TARGET_NATIVE_FILE_READ_DIR(handle,name,result) \ do { \ struct dirent *__direntBuffer; \ \ @@ -827,7 +826,7 @@ extern "C" \***********************************************************************/ #ifndef TARGET_NATIVE_FILE_FSYNC -#define TARGET_NATIVE_FILE_FSYNC(filedescriptor,result) \ + #define TARGET_NATIVE_FILE_FSYNC(filedescriptor,result) \ do { \ result=(fsync(filedescriptor)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while(0) @@ -839,6 +838,7 @@ extern "C" } #endif -#endif /* __TARGET_GENERIC_FILE__ */ +#endif /* __TARGET_GENERIC_FILE__ */ /* end of file */ + diff --git a/native/target/generic/target_generic_io.h b/native/target/generic/target_generic_io.h index 00ba9c8f0..46450604f 100644 --- a/native/target/generic/target_generic_io.h +++ b/native/target/generic/target_generic_io.h @@ -45,7 +45,7 @@ Systems : all /* check if target_native_io.h included */ #ifndef __TARGET_NATIVE_IO__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -71,13 +71,12 @@ Systems : all #ifdef __cplusplus extern "C" -{ #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC_IO__ */ +#endif /* __TARGET_GENERIC_IO__ */ /* end of file */ diff --git a/native/target/generic/target_generic_math_float.h b/native/target/generic/target_generic_math_float.h index 5c9196441..23316a068 100644 --- a/native/target/generic/target_generic_math_float.h +++ b/native/target/generic/target_generic_math_float.h @@ -46,7 +46,7 @@ Systems : all /* check if target_native_math_float.h included */ #ifndef __TARGET_NATIVE_MATH_FLOAT__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -70,61 +70,61 @@ Systems : all /* test float/double values for NaN,Inf */ #ifndef TARGET_NATIVE_MATH_FLOAT_FLOAT_ISNAN -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_FLOAT_ISNAN(f) isnan(f) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_FLOAT_ISNAN(f) isnan(f) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_FLOAT_ISINF -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_FLOAT_ISINF(f) isinf(f) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_FLOAT_ISINF(f) isinf(f) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_FLOAT_FINITE -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_FLOAT_FINITE(f) finite(f) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_FLOAT_FINITE(f) finite(f) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISNAN -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISNAN(d) isnan(d) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISNAN(d) isnan(d) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISINF -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISINF(d) isinf(d) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_DOUBLE_ISINF(d) isinf(d) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_DOUBLE_FINITE -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_DOUBLE_FINITE(d) finite(d) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_DOUBLE_FINITE(d) finite(d) #endif /* division, modulo operations (used to avoid unexcepted exceptions on some targets; generic codes are direct operations without checks) */ #ifndef TARGET_NATIVE_MATH_FLOAT_FLOAT_DIV -#define TARGET_NATIVE_MATH_FLOAT_FLOAT_DIV(f0,f1) ((f0)/(f1)) + #define TARGET_NATIVE_MATH_FLOAT_FLOAT_DIV(f0,f1) ((f0)/(f1)) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_FLOAT_MOD -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_FLOAT_MOD(f0,f1) ((jfloat)fmod((jdouble)(f0),(jdouble)(f1))) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_FLOAT_MOD(f0,f1) ((jfloat)fmod((jdouble)(f0),(jdouble)(f1))) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_DOUBLE_DIV -#define TARGET_NATIVE_MATH_FLOAT_DOUBLE_DIV(d0,d1) ((d0)/(d1)) + #define TARGET_NATIVE_MATH_FLOAT_DOUBLE_DIV(d0,d1) ((d0)/(d1)) #endif #ifndef TARGET_NATIVE_MATH_FLOAT_DOUBLE_MOD -#include <math.h> -#define TARGET_NATIVE_MATH_FLOAT_DOUBLE_MOD(d0,d1) fmod(d0,d1) + #include <math.h> + #define TARGET_NATIVE_MATH_FLOAT_DOUBLE_MOD(d0,d1) fmod(d0,d1) #endif /***************************** Functions *******************************/ #ifdef __cplusplus extern "C" -{ #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC_MATH_FLOAT__ */ +#endif /* __TARGET_GENERIC_MATH_FLOAT__ */ /* end of file */ + diff --git a/native/target/generic/target_generic_math_int.h b/native/target/generic/target_generic_math_int.h index b0d1a8153..f88de7579 100644 --- a/native/target/generic/target_generic_math_int.h +++ b/native/target/generic/target_generic_math_int.h @@ -46,7 +46,7 @@ Systems : all /* check if target_native_math_int.h included */ #ifndef __TARGET_NATIVE_MATH_INT__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -60,13 +60,13 @@ Systems : all /***************************** Constants *******************************/ #ifndef TARGET_NATIVE_MATH_INT_INT64_CONST_0 -#define TARGET_NATIVE_MATH_INT_INT64_CONST_0 0LL + #define TARGET_NATIVE_MATH_INT_INT64_CONST_0 0LL #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_CONST_1 -#define TARGET_NATIVE_MATH_INT_INT64_CONST_1 1LL + #define TARGET_NATIVE_MATH_INT_INT64_CONST_1 1LL #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1 -#define TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1 -1LL + #define TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1 -1LL #endif /***************************** Datatypes *******************************/ @@ -77,167 +77,167 @@ Systems : all /* math operations */ #ifndef TARGET_NATIVE_MATH_INT_INT64_ADD -#define TARGET_NATIVE_MATH_INT_INT64_ADD(v1,v2) ((v1)+(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_ADD(v1,v2) ((v1)+(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_SUB -#define TARGET_NATIVE_MATH_INT_INT64_SUB(v1,v2) ((v1)-(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_SUB(v1,v2) ((v1)-(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_MUL -#define TARGET_NATIVE_MATH_INT_INT64_MUL(v1,v2) ((v1)*(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_MUL(v1,v2) ((v1)*(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_DIV -#define TARGET_NATIVE_MATH_INT_INT64_DIV(v1,v2) ((v1)/(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_DIV(v1,v2) ((v1)/(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_MOD -#define TARGET_NATIVE_MATH_INT_INT64_MOD(v1,v2) ((v1)%(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_MOD(v1,v2) ((v1)%(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_ADD -#define TARGET_NATIVE_MATH_INT_UINT64_ADD(v1,v2) ((v1)+(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_ADD(v1,v2) ((v1)+(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_SUB -#define TARGET_NATIVE_MATH_INT_UINT64_SUB(v1,v2) ((v1)-(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_SUB(v1,v2) ((v1)-(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_MUL -#define TARGET_NATIVE_MATH_INT_UINT64_MUL(v1,v2) ((v1)*(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_MUL(v1,v2) ((v1)*(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_DIV -#define TARGET_NATIVE_MATH_INT_UINT64_DIV(v1,v2) ((v1)/(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_DIV(v1,v2) ((v1)/(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_MOD -#define TARGET_NATIVE_MATH_INT_UINT64_MOD(v1,v2) ((v1)%(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_MOD(v1,v2) ((v1)%(v2)) #endif /* bit operations */ #ifndef TARGET_NATIVE_MATH_INT_INT64_AND -#define TARGET_NATIVE_MATH_INT_INT64_AND(v1,v2) ((v1)&(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_AND(v1,v2) ((v1)&(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_OR -#define TARGET_NATIVE_MATH_INT_INT64_OR(v1,v2) ((v1)|(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_OR(v1,v2) ((v1)|(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_XOR -#define TARGET_NATIVE_MATH_INT_INT64_XOR(v1,v2) ((v1)^(v2)) + #define TARGET_NATIVE_MATH_INT_INT64_XOR(v1,v2) ((v1)^(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_AND -#define TARGET_NATIVE_MATH_INT_UINT64_AND(v1,v2) ((v1)&(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_AND(v1,v2) ((v1)&(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_OR -#define TARGET_NATIVE_MATH_INT_UINT64_OR(v1,v2) ((v1)|(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_OR(v1,v2) ((v1)|(v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_XOR -#define TARGET_NATIVE_MATH_INT_UINT64_XOR(v1,v2) ((v1)^(v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_XOR(v1,v2) ((v1)^(v2)) #endif /* shift operations */ #ifndef TARGET_NATIVE_MATH_INT_INT64_SHIFTL -#define TARGET_NATIVE_MATH_INT_INT64_SHIFTL(v,l) ((v)<<(l)) + #define TARGET_NATIVE_MATH_INT_INT64_SHIFTL(v,l) ((v)<<(l)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_SHIFTR -#define TARGET_NATIVE_MATH_INT_INT64_SHIFTR(v,l) (((v)>>(l)) | (((v)>=0) ? 0 : (0xffffFFFFffffFFFFLL << (64-(l))))) + #define TARGET_NATIVE_MATH_INT_INT64_SHIFTR(v,l) (((v)>>(l)) | (((v)>=0) ? 0 : (0xffffFFFFffffFFFFLL << (64-(l))))) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_SHIFTR -#define TARGET_NATIVE_MATH_INT_UINT64_SHIFTR(v,l) (((v)>>(l)) & ~(((v)>=0) ? 0 : (0xffffFFFFffffFFFFLL << (64-(l))))) + #define TARGET_NATIVE_MATH_INT_UINT64_SHIFTR(v,l) (((v)>>(l)) & ~(((v)>=0) ? 0 : (0xffffFFFFffffFFFFLL << (64-(l))))) #endif /* negation */ #ifndef TARGET_NATIVE_MATH_INT_INT64_NEG -#define TARGET_NATIVE_MATH_INT_INT64_NEG(v) (-(v)) + #define TARGET_NATIVE_MATH_INT_INT64_NEG(v) (-(v)) #endif /* increment/decrement routines */ #ifndef TARGET_NATIVE_MATH_INT_INT64_INC -#define TARGET_NATIVE_MATH_INT_INT64_INC(v) { v++; } + #define TARGET_NATIVE_MATH_INT_INT64_INC(v) { v++; } #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_DEC -#define TARGET_NATIVE_MATH_INT_INT64_DEC(v) { v--; } + #define TARGET_NATIVE_MATH_INT_INT64_DEC(v) { v--; } #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_INC -#define TARGET_NATIVE_MATH_INT_UINT64_INC(v) { v++; } + #define TARGET_NATIVE_MATH_INT_UINT64_INC(v) { v++; } #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_DEC -#define TARGET_NATIVE_MATH_INT_UINT64_DEC(v) { v--; } + #define TARGET_NATIVE_MATH_INT_UINT64_DEC(v) { v--; } #endif /* comparison routines */ #ifndef TARGET_NATIVE_MATH_INT_INT64_EQ -#define TARGET_NATIVE_MATH_INT_INT64_EQ(v1,v2) ((v1) == (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_EQ(v1,v2) ((v1) == (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_NE -#define TARGET_NATIVE_MATH_INT_INT64_NE(v1,v2) ((v1) != (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_NE(v1,v2) ((v1) != (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_LT -#define TARGET_NATIVE_MATH_INT_INT64_LT(v1,v2) ((v1) < (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_LT(v1,v2) ((v1) < (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_LE -#define TARGET_NATIVE_MATH_INT_INT64_LE(v1,v2) ((v1) <= (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_LE(v1,v2) ((v1) <= (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_GT -#define TARGET_NATIVE_MATH_INT_INT64_GT(v1,v2) ((v1) > (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_GT(v1,v2) ((v1) > (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_GE -#define TARGET_NATIVE_MATH_INT_INT64_GE(v1,v2) ((v1) >= (v2)) + #define TARGET_NATIVE_MATH_INT_INT64_GE(v1,v2) ((v1) >= (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_EQ -#define TARGET_NATIVE_MATH_INT_UINT64_EQ(v1,v2) ((v1) == (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_EQ(v1,v2) ((v1) == (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_NE -#define TARGET_NATIVE_MATH_INT_UINT64_NE(v1,v2) ((v1) != (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_NE(v1,v2) ((v1) != (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_LT -#define TARGET_NATIVE_MATH_INT_UINT64_LT(v1,v2) ((v1) < (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_LT(v1,v2) ((v1) < (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_LE -#define TARGET_NATIVE_MATH_INT_UINT64_LE(v1,v2) ((v1) <= (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_LE(v1,v2) ((v1) <= (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_GT -#define TARGET_NATIVE_MATH_INT_UINT64_GT(v1,v2) ((v1) > (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_GT(v1,v2) ((v1) > (v2)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_GE -#define TARGET_NATIVE_MATH_INT_UINT64_GE(v1,v2) ((v1) >= (v2)) + #define TARGET_NATIVE_MATH_INT_UINT64_GE(v1,v2) ((v1) >= (v2)) #endif /* type conversion routines */ #ifndef TARGET_NATIVE_MATH_INT_INT32_TO_INT64 -#define TARGET_NATIVE_MATH_INT_INT32_TO_INT64(v) ((jlong)(v)) + #define TARGET_NATIVE_MATH_INT_INT32_TO_INT64(v) ((jlong)(v)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT32_TO_UINT64 -#define TARGET_NATIVE_MATH_INT_UINT32_TO_UINT64(v) ((jlong)(v)) + #define TARGET_NATIVE_MATH_INT_UINT32_TO_UINT64(v) ((jlong)(v)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_TO_INT32 -#define TARGET_NATIVE_MATH_INT_INT64_TO_INT32(v) ((jint )(v)) + #define TARGET_NATIVE_MATH_INT_INT64_TO_INT32(v) ((jint )(v)) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32 -#define TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32(v) ((jint)(v)) + #define TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32(v) ((jint)(v)) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_TO_DOUBLE -#define TARGET_NATIVE_MATH_INT_INT64_TO_DOUBLE(v) ((jdouble)(v)) + #define TARGET_NATIVE_MATH_INT_INT64_TO_DOUBLE(v) ((jdouble)(v)) #endif /* combine/split int32 low/high values <-> int64 values */ #ifndef TARGET_NATIVE_MATH_INT_INT32_LOW_HIGH_TO_INT64 -#define TARGET_NATIVE_MATH_INT_INT32_LOW_HIGH_TO_INT64(low,high,v) \ + #define TARGET_NATIVE_MATH_INT_INT32_LOW_HIGH_TO_INT64(low,high,v) \ do { \ (v)=((((jlong)(high)) << 32) | ((((jlong)(low)) << 0) & 0x00000000ffffFFFFLL)); \ } while (0) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT32_LOW_HIGH_TO_UINT64 -#define TARGET_NATIVE_MATH_INT_UINT32_LOW_HIGH_TO_UINT64(low,high,v) \ + #define TARGET_NATIVE_MATH_INT_UINT32_LOW_HIGH_TO_UINT64(low,high,v) \ do { \ (v)=((((jlong)(high)) << 32) | ((((jlong)(low)) << 0) & 0x00000000ffffFFFFLL)); \ } while (0) #endif #ifndef TARGET_NATIVE_MATH_INT_INT64_TO_INT32_LOW_HIGH -#define TARGET_NATIVE_MATH_INT_INT64_TO_INT32_LOW_HIGH(v,low,high) \ + #define TARGET_NATIVE_MATH_INT_INT64_TO_INT32_LOW_HIGH(v,low,high) \ do { \ (high)=((v) & 0xFFFFffff00000000L) >> 32; \ (low) =((v) & 0x00000000FFFFffffL) >> 0; \ } while (0) #endif #ifndef TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32_LOW_HIGH -#define TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32_LOW_HIGH(v,low,high) \ + #define TARGET_NATIVE_MATH_INT_UINT64_TO_UINT32_LOW_HIGH(v,low,high) \ do { \ (high)=((v) & 0xFFFFffff00000000L) >> 32; \ (low) =((v) & 0x00000000FFFFffffL) >> 0; \ @@ -248,13 +248,13 @@ Systems : all #ifdef __cplusplus extern "C" -{ #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC_MATH_INT__ */ +#endif /* __TARGET_GENERIC_MATH_INT__ */ /* end of file */ + diff --git a/native/target/generic/target_generic_misc.h b/native/target/generic/target_generic_misc.h index 394cdc3ed..5de629464 100644 --- a/native/target/generic/target_generic_misc.h +++ b/native/target/generic/target_generic_misc.h @@ -45,7 +45,7 @@ Systems : all /* check if target_native_misc.h included */ #ifndef __TARGET_NATIVE_MISC__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -88,15 +88,15 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_MISC_FORMAT_STRING -#ifdef __GNUC__ -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING(buffer,bufferSize,format,args...) \ + #ifdef __GNUC__ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING(buffer,bufferSize,format,args...) \ do { \ snprintf(buffer,bufferSize,format, ## args); \ } while (0) -#else -#error TARGET_NATIVE_MISC_FORMAT_STRING with variable number of arguments is only supported by GNU gcc! Use TARGET_NATIVE_FORMAT_STRING<n> instead. -#endif + #else + #error TARGET_NATIVE_MISC_FORMAT_STRING with variable number of arguments is only supported by GNU gcc! Use TARGET_NATIVE_FORMAT_STRING<n> instead. + #endif #endif /***********************************************************************\ @@ -119,71 +119,71 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_MISC_FORMAT_STRING0 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING0(buffer,bufferSize,format) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING0(buffer,bufferSize,format) \ do { \ snprintf(buffer,bufferSize,format); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING1 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING1(buffer,bufferSize,format,arg1) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING1(buffer,bufferSize,format,arg1) \ do { \ snprintf(buffer,bufferSize,format,arg1); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING2 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING2(buffer,bufferSize,format,arg1,arg2) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING2(buffer,bufferSize,format,arg1,arg2) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING3 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING3(buffer,bufferSize,format,arg1,arg2,arg3) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING3(buffer,bufferSize,format,arg1,arg2,arg3) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING4 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING4(buffer,bufferSize,format,arg1,arg2,arg3,arg4) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING4(buffer,bufferSize,format,arg1,arg2,arg3,arg4) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING5 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING5(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING5(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING6 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING6(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING6(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING7 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING7(buffer,bufferSize,format,arg1,arg2,arg3,arg14,arg5,arg6,arg7) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING7(buffer,bufferSize,format,arg1,arg2,arg3,arg14,arg5,arg6,arg7) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING8 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING8(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING8(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); \ } while (0) #endif #ifndef TARGET_NATIVE_MISC_FORMAT_STRING9 -#include <stdarg.h> -#define TARGET_NATIVE_MISC_FORMAT_STRING9(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) \ + #include <stdarg.h> + #define TARGET_NATIVE_MISC_FORMAT_STRING9(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) \ do { \ snprintf(buffer,bufferSize,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9); \ } while (0) @@ -208,8 +208,8 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_MISC_FORMAT_STRING_ELLIPSE -#include <stdarg.h> -#define TARGET_NATIVE_FORMAT_STRING_ELLIPSE(buffer,bufferSize,format) \ + #include <stdarg.h> + #define TARGET_NATIVE_FORMAT_STRING_ELLIPSE(buffer,bufferSize,format) \ do { \ va_list __arguments; \ \ @@ -233,21 +233,21 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_MISC_GET_TIMEZONE_STRING -#if TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#if HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -#include <string.h> -#ifndef WITH_TIMEZONE_VARIABLE -#define WITH_TIMEZONE_VARIABLE timezone -#endif -#define TARGET_NATIVE_MISC_GET_TIMEZONE_STRING(string,maxStringLength,result) \ + #if TIME_WITH_SYS_TIME + #include <sys/time.h> + #include <time.h> + #else + #if HAVE_SYS_TIME_H + #include <sys/time.h> + #else + #include <time.h> + #endif + #endif + #include <string.h> + #ifndef WITH_TIMEZONE_VARIABLE + #define WITH_TIMEZONE_VARIABLE timezone + #endif + #define TARGET_NATIVE_MISC_GET_TIMEZONE_STRING(string,maxStringLength,result) \ do { \ tzset(); \ \ @@ -273,14 +273,14 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC_MISC__ */ +#endif /* __TARGET_GENERIC_MISC__ */ /* end of file */ + diff --git a/native/target/generic/target_generic_network.h b/native/target/generic/target_generic_network.h index 0a1dbf5eb..3b8c7d9e6 100644 --- a/native/target/generic/target_generic_network.h +++ b/native/target/generic/target_generic_network.h @@ -45,7 +45,7 @@ Systems : all /* check if target_native_network.h included */ #ifndef __TARGET_NATIVE_NETWORK__ -#error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! + #error Do NOT INCLUDE generic target files! Include the corresponding native target files instead! #endif /****************************** Includes *******************************/ @@ -79,7 +79,7 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT -#define TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(n0,n1,n2,n3,i) \ + #define TARGET_NATIVE_NETWORK_IPADDRESS_BYTES_TO_INT(n0,n1,n2,n3,i) \ do { \ i=(((unsigned char)n0) << 24) | \ (((unsigned char)n1) << 16) | \ @@ -100,7 +100,7 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES -#define TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(i,n0,n1,n2,n3) \ + #define TARGET_NATIVE_NETWORK_INT_TO_IPADDRESS_BYTES(i,n0,n1,n2,n3) \ do { \ n0=(i & 0xFF000000) >> 24; \ n1=(i & 0x00FF0000) >> 16; \ @@ -122,8 +122,8 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_GET_HOSTNAME -#include <unistd.h> -#define TARGET_NATIVE_NETWORK_GET_HOSTNAME(name,maxNameLen,result) \ + #include <unistd.h> + #define TARGET_NATIVE_NETWORK_GET_HOSTNAME(name,maxNameLen,result) \ do { \ result=(gethostname(name,maxNameLen-1)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ name[maxNameLen-1]='\0'; \ @@ -145,8 +145,8 @@ Systems : all //NYI??? reentrant? #ifndef TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS -#include <netdb.h> -#define TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS(address,name,maxNameLen,result) \ + #include <netdb.h> + #define TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_ADDRESS(address,name,maxNameLen,result) \ do { \ int __networkAddress; \ struct hostent *__hostEntry; \ @@ -183,8 +183,8 @@ Systems : all //NYI??? reentrant? #ifndef TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME -#include <netdb.h> -#define TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME(name,addresses,maxAddressSize,addressCount,result) \ + #include <netdb.h> + #define TARGET_NATIVE_NETWORK_GET_HOSTNAME_BY_NAME(name,addresses,maxAddressSize,addressCount,result) \ do { \ struct hostent *__hostEntry; \ \ @@ -220,10 +220,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM -#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#define TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM(socketDescriptor,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <fcntl.h> + #define TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM(socketDescriptor,result) \ do { \ socketDescriptor=socket(AF_INET,SOCK_STREAM,0); \ fcntl(socketDescriptor,F_SETFD,FD_CLOEXEC); \ @@ -244,10 +244,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM -#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#define TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM(socketDescriptor,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <fcntl.h> + #define TARGET_NATIVE_NETWORK_SOCKET_OPEN_DATAGRAM(socketDescriptor,result) \ do { \ socketDescriptor=socket(AF_INET,SOCK_DGRAM,0); \ fcntl(socketDescriptor,F_SETFD,FD_CLOEXEC); \ @@ -267,8 +267,8 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_CLOSE -#include <unistd.h> -#define TARGET_NATIVE_NETWORK_SOCKET_CLOSE(socketDescriptor,result) \ + #include <unistd.h> + #define TARGET_NATIVE_NETWORK_SOCKET_CLOSE(socketDescriptor,result) \ do { \ result=(close(socketDescriptor)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -288,10 +288,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_CONNECT -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_CONNECT(socketDescriptor,address,port,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_CONNECT(socketDescriptor,address,port,result) \ do { \ struct sockaddr_in __socketAddress; \ \ @@ -319,10 +319,10 @@ Systems : all //??? address in network byte order? #ifndef TARGET_NATIVE_NETWORK_SOCKET_BIND -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_BIND(socketDescriptor,address,port,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_BIND(socketDescriptor,address,port,result) \ do { \ struct sockaddr_in __socketAddress; \ \ @@ -349,8 +349,8 @@ Systems : all //??? address in network byte order? #ifndef TARGET_NATIVE_NETWORK_SOCKET_LISTEN -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_LISTEN(socketDescriptor,maxQueueLength,result) \ + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_LISTEN(socketDescriptor,maxQueueLength,result) \ do { \ result=(listen(socketDescriptor,maxQueueLength)==0)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \ } while (0) @@ -369,10 +369,10 @@ Systems : all //??? address in network byte order? #ifndef TARGET_NATIVE_NETWORK_SOCKET_ACCEPT -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_ACCEPT(socketDescriptor,newSocketDescriptor,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_ACCEPT(socketDescriptor,newSocketDescriptor,result) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -398,9 +398,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(socketDescriptor,localAddress,localPort,result) \ + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO(socketDescriptor,localAddress,localPort,result) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -433,9 +433,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO(socketDescriptor,remoteAddress,remotePort,result) \ + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_REMOTE_INFO(socketDescriptor,remoteAddress,remotePort,result) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -467,8 +467,8 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE -#include <sys/ioctl.h> -#define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(socketDescriptor,bytesAvailable,result) \ + #include <sys/ioctl.h> + #define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(socketDescriptor,bytesAvailable,result) \ do { \ int __value; \ \ @@ -495,10 +495,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_RECEIVE -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE(socketDescriptor,buffer,maxLength,bytesReceived) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE(socketDescriptor,buffer,maxLength,bytesReceived) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -524,10 +524,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT(socketDescriptor,buffer,maxLength,address,port,bytesReceived) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_WITH_ADDRESS_PORT(socketDescriptor,buffer,maxLength,address,port,bytesReceived) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -557,10 +557,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SEND -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SEND(socketDescriptor,buffer,length,bytesSent) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SEND(socketDescriptor,buffer,length,bytesSent) \ do { \ bytesSent=send(socketDescriptor,buffer,length,0); \ } while (0) @@ -580,10 +580,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT(socketDescriptor,buffer,length,address,port,bytesSent) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SEND_WITH_ADDRESS_PORT(socketDescriptor,buffer,length,address,port,bytesSent) \ do { \ struct sockaddr_in __socketAddress; \ \ @@ -608,10 +608,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/tcp.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY(socketDescriptor,flag,result) \ do { \ int __value; \ \ @@ -634,9 +634,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER(socketDescriptor,flag,value,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_LINGER(socketDescriptor,flag,value,result) \ do { \ struct linger __linger; \ \ @@ -667,9 +667,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_TIMEOUT(socketDescriptor,flag,result) \ do { \ int __value; \ \ @@ -691,9 +691,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF(socketDescriptor,size,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_SNDBUF(socketDescriptor,size,result) \ do { \ int __value; \ \ @@ -715,9 +715,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF(socketDescriptor,size,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_SO_RCDBUF(socketDescriptor,size,result) \ do { \ int __value; \ \ @@ -739,10 +739,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL(socketDescriptor,value,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_TTL(socketDescriptor,value,result) \ do { \ int __value; \ \ @@ -764,10 +764,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF(socketDescriptor,address,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_IP_MULTICAST_IF(socketDescriptor,address,result) \ do { \ struct sockaddr_in __socketAddress; \ \ @@ -791,10 +791,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS(socketDescriptor,flag,result) \ do { \ int __value; \ \ @@ -816,10 +816,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP(socketDescriptor,address,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_ADD_MEMBERSHIP(socketDescriptor,address,result) \ do { \ struct ip_mreq __request; \ \ @@ -843,10 +843,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP(socketDescriptor,address,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_DROP_MEMBERSHIP(socketDescriptor,address,result) \ do { \ struct ip_mreq __request; \ \ @@ -870,10 +870,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_KEEP_ALIVE(socketDescriptor,flag,result) \ do { \ int __value; \ \ @@ -894,11 +894,11 @@ Systems : all * Notes : - \***********************************************************************/ -#ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST(socketDescriptor,flag,result) \ +#ifndef TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/tcp.h> + #define TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_BROADCAST(socketDescriptor,flag,result) \ do { \ int __value; \ \ @@ -922,10 +922,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/tcp.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_TCP_NODELAY(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -956,9 +956,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER(socketDescriptor,flag,value,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_LINGER(socketDescriptor,flag,value,result) \ do { \ struct linger __linger; \ socklen_t __len; \ @@ -990,9 +990,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_TIMEOUT(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1022,9 +1022,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF(socketDescriptor,size,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_SNDBUF(socketDescriptor,size,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1054,9 +1054,9 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF -#include <sys/types.h> -#include <sys/socket.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF(socketDescriptor,size,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_SO_RCDBUF(socketDescriptor,size,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1086,10 +1086,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_TTL(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1119,10 +1119,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF(socketDescriptor,address,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_IP_MULTICAST_IF(socketDescriptor,address,result) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -1155,10 +1155,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS(socketDescriptor,address,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BIND_ADDRESS(socketDescriptor,address,result) \ do { \ struct sockaddr_in __socketAddress; \ socklen_t __socketAddressLength; \ @@ -1189,10 +1189,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_REUSE_ADDRESS(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1222,10 +1222,10 @@ Systems : all \***********************************************************************/ #ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE(socketDescriptor,flag,result) \ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_KEEP_ALIVE(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1254,11 +1254,11 @@ Systems : all * Notes : - \***********************************************************************/ -#ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BROADCAST -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BROADCAST(socketDescriptor,flag,result) \ +#ifndef TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BROADCAST + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/tcp.h> + #define TARGET_NATIVE_NETWORK_SOCKET_GET_OPTION_BROADCAST(socketDescriptor,flag,result) \ do { \ int __value; \ socklen_t __len; \ @@ -1278,14 +1278,14 @@ Systems : all /***************************** Functions *******************************/ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef __cplusplus } #endif -#endif /* __TARGET_GENERIC_NETWORK__ */ +#endif /* __TARGET_GENERIC_NETWORK__ */ /* end of file */ + diff --git a/native/testsuite/guile-jvm.c b/native/testsuite/guile-jvm.c index ee92eb894..c5beb688a 100644 --- a/native/testsuite/guile-jvm.c +++ b/native/testsuite/guile-jvm.c @@ -35,8 +35,9 @@ abort_test (SCM name, char *exception) { (*env)->ExceptionClear (env); return gh_list (name, - gh_symbol2scm ("ERROR"), - gh_str02scm (exception), SCM_UNDEFINED); + gh_symbol2scm ("ERROR"), + gh_str02scm (exception), + SCM_UNDEFINED); } SCM @@ -55,10 +56,10 @@ handle_test_exception (jobject test_name_obj) (*env)->ExceptionClear (env); if (obj_toString_mid == NULL) - obj_toString_mid = (*env)->GetMethodID (env, - (*env)->FindClass (env, - "java/lang/Object"), - "toString", + obj_toString_mid = (*env)->GetMethodID (env, + (*env)->FindClass (env, + "java/lang/Object"), + "toString", "()Ljava/lang/String;"); err_msg_obj = (*env)->CallObjectMethod (env, throwable, obj_toString_mid); @@ -77,7 +78,7 @@ handle_test_exception (jobject test_name_obj) free (test_name); return result; -} +} SCM perform_test (SCM clazz_scm_name) @@ -116,9 +117,9 @@ perform_test (SCM clazz_scm_name) /* Handle an exception if one occurred */ if ((*env)->ExceptionOccurred (env)) - return handle_test_exception (test_name_obj); + return handle_test_exception (test_name_obj); - result_name_obj = (*env)->CallObjectMethod (env, result_obj, + result_name_obj = (*env)->CallObjectMethod (env, result_obj, result_name_mid); msg_obj = (*env)->CallObjectMethod (env, result_obj, result_msg_mid); @@ -146,7 +147,9 @@ perform_test (SCM clazz_scm_name) free (msg); return gh_list (scm_test_name, - scm_result_name, scm_result_msg, SCM_UNDEFINED); + scm_result_name, + scm_result_msg, + SCM_UNDEFINED); } int @@ -177,9 +180,9 @@ init_testing_framework () } result_class = (*env)->NewGlobalRef (env, result_class); - test_mid = (*env)->GetMethodID (env, test_class, "test", + test_mid = (*env)->GetMethodID (env, test_class, "test", "()Lgnu/test/Result;"); - test_name_mid = (*env)->GetMethodID (env, test_class, "getName", + test_name_mid = (*env)->GetMethodID (env, test_class, "getName", "()Ljava/lang/String;"); if (test_mid == NULL || test_name_mid == NULL) { @@ -187,9 +190,9 @@ init_testing_framework () return -1; } - result_name_mid = (*env)->GetMethodID (env, result_class, "getName", + result_name_mid = (*env)->GetMethodID (env, result_class, "getName", "()Ljava/lang/String;"); - result_msg_mid = (*env)->GetMethodID (env, result_class, "getMsg", + result_msg_mid = (*env)->GetMethodID (env, result_class, "getMsg", "()Ljava/lang/String;"); if (result_name_mid == NULL || result_msg_mid == NULL) { diff --git a/native/vmi/vmi.c b/native/vmi/vmi.c index c304acf99..07eef82f9 100755 --- a/native/vmi/vmi.c +++ b/native/vmi/vmi.c @@ -43,117 +43,101 @@ exception statement from your version. */ #include <native-threads.h> JNIEXPORT vmiError JNICALL -VMI_GetFrameClass (JNIEnv *env, jframeID frame, jclass *clazz) -{ - - return VMI_ERROR_NONE; +VMI_GetFrameClass(JNIEnv *env, + jframeID frame, + jclass *clazz) { + + return VMI_ERROR_NONE; } JNIEXPORT vmiError JNICALL -VMI_GetFrameObject (JNIEnv *env, jframeID frame, jobject *obj) -{ - StackFrame *sframe = (StackFrame *) frame; - if (env == NULL || obj == NULL) +VMI_GetFrameObject(JNIEnv *env, + jframeID frame, + jobject *obj) { + StackFrame *sframe = (StackFrame*)frame; + if(env == NULL || obj == NULL) return VMI_ERROR_NULL_POINTER; - if (frame == NULL) + if(frame == NULL) return VMI_ERROR_INVALID_FRAMEID; - *obj = THISPTR (sframe); + *obj = THISPTR(sframe); return VMI_ERROR_NONE; } JNIEXPORT vmiError JNICALL -VMI_GetThisFrame (JNIEnv *env, jframeID *frame) -{ +VMI_GetThisFrame(JNIEnv *env, jframeID *frame) { JThreadInfo *thread_info; - if (env == NULL || frame == NULL) + if(env == NULL || frame == NULL) return VMI_ERROR_NULL_POINTER; - thread_info = THREAD_getJavaInfo (); - *frame = (jframeID) TOPFRAME (thread_info); + thread_info = THREAD_getJavaInfo(); + *frame = (jframeID)TOPFRAME(thread_info); return VMI_ERROR_NONE; } JNIEXPORT vmiError JNICALL -VMI_GetThisThreadObject (JNIEnv *env, jthread *thread) -{ +VMI_GetThisThreadObject(JNIEnv* env, jthread *thread) { JThreadInfo *thread_info; - if (env == NULL || thread == NULL) + if(env == NULL || thread == NULL) return VMI_ERROR_NULL_POINTER; - thread_info = THREAD_getJavaInfo (); - *thread = (jthread) thread_info->java_thread; + thread_info = THREAD_getJavaInfo(); + *thread = (jthread)thread_info->java_thread; return VMI_ERROR_NONE; } JNIEXPORT void JNICALL -VMI_ThrowAppropriateException (JNIEnv *env, vmiError err) -{ - switch (err) - { - case VMI_ERROR_NONE: - JCL_ThrowException (env, "java/lang/InternalError", - "ERROR_NONE passed to VMI exception thrower."); - break; - case VMI_ERROR_NULL_POINTER: - JCL_ThrowException (env, "java/lang/NullPointerException", - "null pointer in VMI detected."); - break; - case VMI_ERROR_OUT_OF_MEMORY: - JCL_ThrowException (env, "java/lang/OutOfMemoryError", - "Out of memory! (in VMI)."); - break; - case VMI_ERROR_INVALID_METHODID: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: INVALID_METHODID"); - break; - case VMI_ERROR_INVALID_CLASS: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: INVALID_CLASS"); - break; - case VMI_ERROR_INVALID_BCI: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: INVALID_BCI"); - break; - case VMI_ERROR_NO_SUCH_BREAKPOINT: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: NO_SUCH_BREAKPOINT"); - break; - case VMI_ERROR_VM_DEAD: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: VM Dead! Kinda makes ya wonder how this exception got thrown, huh?"); - break; - case VMI_ERROR_INVALID_FRAMEID: - JCL_ThrowException (env, "java/lang/IllegalThreadStateException", - "NULL Frame ID detected in VMI."); - break; - case VMI_ERROR_INVALID_SLOT: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: INVALID_SLOT"); - break; - case VMI_ERROR_TYPE_MISMATCH: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: INVALID_SLOT"); - break; - case VMI_ERROR_NATIVE_FRAME: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: NATIVE_FRAME"); - break; - case VMI_ERROR_NO_MORE_FRAMES: - JCL_ThrowException (env, "java/lang/InternalError", - "VMI error: NO_MORE_FRAMES"); - break; - case VMI_ERROR_INVALID_THREAD: - JCL_ThrowException (env, "java/lang/IllegalThreadStateException", - "Invalid thread in VMI."); - break; - case VMI_ERROR_THREAD_NOT_SUSPENDED: - JCL_ThrowException (env, "java/lang/IllegalThreadStateException", - "Attempt to introspect unsuspended thread in VMI."); - break; - default: - JCL_ThrowException (env, "java/lang/UnknownError", - "VMI returned erroneous error value ..."); - break; - } +VMI_ThrowAppropriateException(JNIEnv *env, vmiError err) { + switch(err) { + case VMI_ERROR_NONE: + JCL_ThrowException(env, "java/lang/InternalError", "ERROR_NONE passed to VMI exception thrower."); + break; + case VMI_ERROR_NULL_POINTER: + JCL_ThrowException(env, "java/lang/NullPointerException", "null pointer in VMI detected."); + break; + case VMI_ERROR_OUT_OF_MEMORY: + JCL_ThrowException(env, "java/lang/OutOfMemoryError", "Out of memory! (in VMI)."); + break; + case VMI_ERROR_INVALID_METHODID: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: INVALID_METHODID"); + break; + case VMI_ERROR_INVALID_CLASS: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: INVALID_CLASS"); + break; + case VMI_ERROR_INVALID_BCI: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: INVALID_BCI"); + break; + case VMI_ERROR_NO_SUCH_BREAKPOINT: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: NO_SUCH_BREAKPOINT"); + break; + case VMI_ERROR_VM_DEAD: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: VM Dead! Kinda makes ya wonder how this exception got thrown, huh?"); + break; + case VMI_ERROR_INVALID_FRAMEID: + JCL_ThrowException(env, "java/lang/IllegalThreadStateException", "NULL Frame ID detected in VMI."); + break; + case VMI_ERROR_INVALID_SLOT: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: INVALID_SLOT"); + break; + case VMI_ERROR_TYPE_MISMATCH: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: INVALID_SLOT"); + break; + case VMI_ERROR_NATIVE_FRAME: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: NATIVE_FRAME"); + break; + case VMI_ERROR_NO_MORE_FRAMES: + JCL_ThrowException(env, "java/lang/InternalError", "VMI error: NO_MORE_FRAMES"); + break; + case VMI_ERROR_INVALID_THREAD: + JCL_ThrowException(env, "java/lang/IllegalThreadStateException", "Invalid thread in VMI."); + break; + case VMI_ERROR_THREAD_NOT_SUSPENDED: + JCL_ThrowException(env, "java/lang/IllegalThreadStateException", "Attempt to introspect unsuspended thread in VMI."); + break; + default: + JCL_ThrowException(env, "java/lang/UnknownError", "VMI returned erroneous error value ..."); + break; + } } + + diff --git a/native/vmi/vmi.h b/native/vmi/vmi.h index e3f866f5e..ea4f51783 100755 --- a/native/vmi/vmi.h +++ b/native/vmi/vmi.h @@ -40,12 +40,10 @@ exception statement from your version. */ #include <jni.h> -typedef void *jframeID; -typedef void *jthread; +typedef void * jframeID; +typedef void * jthread; -typedef enum _vmiError_enum vmiError; -enum _vmiError_enum -{ +typedef enum { VMI_ERROR_NONE, VMI_ERROR_NULL_POINTER, VMI_ERROR_OUT_OF_MEMORY, @@ -61,7 +59,7 @@ enum _vmiError_enum VMI_ERROR_NO_MORE_FRAMES, VMI_ERROR_INVALID_THREAD, VMI_ERROR_THREAD_NOT_SUSPENDED -}; +} vmiError; #define VMI_MOD_PUBLIC 0x0001 @@ -77,17 +75,18 @@ enum _vmiError_enum #define VMI_MOD_ABSTRACT 0x0400 JNIEXPORT vmiError JNICALL -VMI_GetFrameClass (JNIEnv *env, jframeID frame, jobject *obj); +VMI_GetFrameClass(JNIEnv *env, jframeID frame, jobject *obj); JNIEXPORT vmiError JNICALL -VMI_GetFrameObject (JNIEnv *env, jframeID frame, jobject *obj); +VMI_GetFrameObject(JNIEnv *env, jframeID frame, jobject *obj); -JNIEXPORT vmiError JNICALL VMI_GetThisFrame (JNIEnv *env, jframeID *frame); +JNIEXPORT vmiError JNICALL +VMI_GetThisFrame(JNIEnv *env, jframeID *frame); JNIEXPORT vmiError JNICALL -VMI_GetThisThreadObject (JNIEnv *env, jthread *thread); +VMI_GetThisThreadObject(JNIEnv *env, jthread *thread); JNIEXPORT void JNICALL -VMI_ThrowAppropriateException (JNIEnv *env, vmiError err); +VMI_ThrowAppropriateException(JNIEnv *env, vmiError err); #endif |