Changeset 51022e9b in mainline

Timestamp:

2005-09-03T12:56:14Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

544b4bf

Parents:

ffcccf26

Message:

E option in printf added.

Files:

• arch/ia32/src/boot/memmap.S (modified) (1 diff)
• include/print.h (modified) (1 diff)
• src/debug/print.c (modified) (6 diffs)
• test/print/print1/test.c (modified) (1 diff)

arch/ia32/src/boot/memmap.S

@@ -116 +116 @@
 e801memorysize:
         .long   0
-        
+

include/print.h

@@ -37 +37 @@
 #define INT64   8
 
-static void print_double(double num,__u16 precision) ;
+static void print_double(double num, __u8 modifier, __u16 precision) ;
 static void print_str(const char *str);
 static void print_fixed_hex(const __u64 num, const int width);

src/debug/print.c

@@ -42 +42 @@
 #define DEFAULT_DOUBLE_BUFFER_SIZE 128
 
-void print_double(double num, __u16 precision) 
+void print_double(double num, __u8 modifier, __u16 precision) 
 {
         double intval,intval2;
@@ -49 +49 @@
         unsigned char buf[DEFAULT_DOUBLE_BUFFER_SIZE];
         unsigned long in1,in2;  
+        
         /*
         if (fmath_is_nan(num)) {
@@ -61 +62 @@
         
         num=fmath_abs(num);
+
+        if ((modifier=='E')||(modifier=='e')) {
+                intval2=fmath_fint(fmath_get_decimal_exponent(num),&intval);
+                exponent=intval;
+                if ((intval2<0.0)&&(exponent<0)) exponent--;
+                num = num / ((fmath_dpow(10.0,exponent)));
+                
+                print_double(num,modifier+1,precision); //modifier+1 = E => F or e => f
+                putchar(modifier);
+                if (exponent<0) {
+                        putchar('-');
+                        exponent*=-1;
+                        }
+                print_number(exponent,10);
+                return;
+                }
+                
 
         /*
@@ -233 +251 @@
         va_list ap;
         char c; 
-
+        
+        __u16 precision;
+        
         va_start(ap, fmt);
 
@@ -242 +262 @@
                 switch (c) {
 
+                        
+                        
                     /* control character */
                     case '%':
+                    
+                                precision = DEFAULT_DOUBLE_PRECISION;
+                                if (fmt[i]=='.') {
+                                        precision=0;
+                                        c=fmt[++i];
+                                                while((c>='0')&&(c<='9')) {
+                                                        precision = precision*10 + c - '0';
+                                                        c=fmt[++i];
+                                                        }
+                                                
+                                }
+                    
                             switch (c = fmt[i++]) {
 
@@ -299 +333 @@
                                 
                                 case 'F':
+                                        print_double(va_arg(ap, double),'F',precision);
+                                        goto loop;
+                                        
                                 case 'f':
-                                        print_double(va_arg(ap, double),DEFAULT_DOUBLE_PRECISION);
-                                        goto loop;
+                                        print_double(va_arg(ap, double),'f',precision);
+                                        goto loop;
+                                
+                                case 'E':
+                                        print_double(va_arg(ap, double),'E',precision);
+                                        goto loop;
+                                case 'e':
+                                        print_double(va_arg(ap, double),'e',precision);
+                                        goto loop;
+                                
                                 /*
                                  * Decimal and hexadecimal conversions.

test/print/print1/test.c

@@ -39 +39 @@
         printf(" F  %F  %f (123456789.987654321)\n",123456789.987654321,123456789.987654321);
         printf(" F  %F  %f (-123456789.987654321e-10)\n",-123456789.987654321e-10,-123456789.987654321e-10);
+        printf(" E  %E  %e (123456789.987654321)\n",123456789.987654321,123456789.987654321);
+        printf(" E  %.10E %.8e (-123456789.987654321e-12 for precision 10 & 8)\n",-123456789.987654321e-12,-123456789.987654321e-12);
+        printf(" E  %.10E %.8e (-987654321.123456789e-12 for precision 10 & 8)\n",-987654321.123456789e-12,-987654321.123456789e-12);
+        printf(" E  %.10E %.8e (123456789.987654321e-12 for precision 10 & 8)\n",123456789.987654321e-12,123456789.987654321e-12);
+        printf(" E  %.10E %.8e (987654321.123456789e-12 for precision 10 & 8)\n",987654321.123456789e-12,987654321.123456789e-12);
+        printf(" E  %.10E %.8e (-123456789.987654321e12 for precision 10 & 8)\n",-123456789.987654321e12,-123456789.987654321e12);
+        printf(" E  %.10E %.8e (-987654321.123456789e12 for precision 10 & 8)\n",-987654321.123456789e12,-987654321.123456789e12);
+        printf(" E  %.10E %.8e (123456789.987654321e12 for precision 10 & 8)\n",123456789.987654321e12,123456789.987654321e12);
+        printf(" E  %.10E %.8e (987654321.123456789e12 for precision 10 & 8)\n",987654321.123456789e12,987654321.123456789e12);
         return;
 }