Commit: 83794d1cb8e6685ad77f90ec7411f535213f14b8 - mruby_brightv_port (git)

mrubyを超漢字で動作させる

Commit MetaInfo

• Révision: 83794d1cb8e6685ad77f90ec7411f535213f14b8 (tree)
• l'heure: 2017-06-05 22:59:08
• Auteur: ornse01 <ornse01@user...>
• Commiter: ornse01

Message de Log

remove floating value conversion.

Change Summary

• modified: src/fmt_fp.c

Modification

--- a/src/fmt_fp.c
+++ b/src/fmt_fp.c
@@ -83,22 +83,25 @@ fmt_u(uint32_t x, char *s)
   return s;
 }
 
-/* Do not override this check. The floating point printing code below
- * depends on the float.h constants being right. If they are wrong, it
- * may overflow the stack. */
-#if LDBL_MANT_DIG == 53
-//typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)];
+#ifdef MRB_USE_FLOAT
+# define MRB_FLOAT_MANT_DIG FLT_MANT_DIG
+# define MRB_FLOAT_MAX_EXP FLT_MAX_EXP
+# define MRB_FLOAT_EPSILON FLT_EPSILON
+#else
+# define MRB_FLOAT_MANT_DIG DBL_MANT_DIG
+# define MRB_FLOAT_MAX_EXP DBL_MAX_EXP
+# define MRB_FLOAT_EPSILON DBL_EPSILON
 #endif
 
 static int
-fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
+fmt_fp(struct fmt_args *f, mrb_float y, int w, int p, int fl, int t)
 {
-  uint32_t big[(LDBL_MANT_DIG+28)/29 + 1          // mantissa expansion
-    + (LDBL_MAX_EXP+LDBL_MANT_DIG+28+8)/9]; // exponent expansion
+  uint32_t big[(MRB_FLOAT_MANT_DIG+28)/29 + 1          // mantissa expansion
+    + (MRB_FLOAT_MAX_EXP+MRB_FLOAT_MANT_DIG+28+8)/9]; // exponent expansion
   uint32_t *a, *d, *r, *z;
   uint32_t i;
   int e2=0, e, j, l;
-  char buf[9+LDBL_MANT_DIG/4], *s;
+  char buf[9+MRB_FLOAT_MANT_DIG/4], *s;
   const char *prefix="-0X+0X 0X-0x+0x 0x";
   int pl;
   char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
@@ -122,18 +125,18 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
     return MAX(w, 3+pl);
   }
 
-  y = frexp((double)y, &e2) * 2;
+  y = frexp(y, &e2) * 2;
   if (y) e2--;
 
   if ((t|32)=='a') {
-    long double round = 8.0;
+    mrb_float round = 8.0;
     int re;
 
     if (t&32) prefix += 9;
     pl += 2;
 
-    if (p<0 || p>=LDBL_MANT_DIG/4-1) re=0;
-    else re=LDBL_MANT_DIG/4-1-p;
+    if (p<0 || p>=MRB_FLOAT_MANT_DIG/4-1) re=0;
+    else re=MRB_FLOAT_MANT_DIG/4-1-p;
 
     if (re) {
       while (re--) round*=16;
@@ -181,7 +184,7 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
   if (y) y *= 268435456.0, e2-=28;
 
   if (e2<0) a=r=z=big;
-  else a=r=z=big+sizeof(big)/sizeof(*big) - LDBL_MANT_DIG - 1;
+  else a=r=z=big+sizeof(big)/sizeof(*big) - MRB_FLOAT_MANT_DIG - 1;
 
   do {
     *z = y;
@@ -202,7 +205,7 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
   }
   while (e2<0) {
     uint32_t carry=0, *b;
-    int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9;
+    int sh=MIN(9,-e2), need=1+(p+MRB_FLOAT_MANT_DIG/3+8)/9;
     for (d=a; d<z; d++) {
       uint32_t rm = *d & ((1<<sh)-1);
       *d = (*d>>sh) + carry;
@@ -224,15 +227,15 @@ fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
   if (j < 9*(z-r-1)) {
     uint32_t x;
     /* We avoid C's broken division of negative numbers */
-    d = r + 1 + ((j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP);
-    j += 9*LDBL_MAX_EXP;
+    d = r + 1 + ((j+9*MRB_FLOAT_MAX_EXP)/9 - MRB_FLOAT_MAX_EXP);
+    j += 9*MRB_FLOAT_MAX_EXP;
     j %= 9;
     for (i=10, j++; j<9; i*=10, j++);
     x = *d % i;
     /* Are there any significant digits past j? */
     if (x || d+1!=z) {
-      long double round = 2/LDBL_EPSILON;
-      long double small;
+      mrb_float round = 2/MRB_FLOAT_EPSILON;
+      mrb_float small;
       if (*d/i & 1) round += 2;
       if (x<i/2) small=0.5;
       else if (x==i/2 && d+1==z) small=1.0;