Changeset 7fadb65 in mainline for kernel/generic/src/printf/printf_core.c

Timestamp:

2011-08-23T17:44:33Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

375ab5e, 4cf5ed46

Parents:

7ce7cfb

Message:

fix printout of signed integer arguments (thx Jiri Zarevucky)
synchronize printf implementations between boot, kernel and uspace

File:

• kernel/generic/src/printf/printf_core.c (modified) (5 diffs)

kernel/generic/src/printf/printf_core.c

@@ -75 +75 @@
 #define PRINT_NUMBER_BUFFER_SIZE  (64 + 5)
 
+/** Get signed or unsigned integer argument */
+#define PRINTF_GET_INT_ARGUMENT(type, ap, flags) \
+        ({ \
+                unsigned type res; \
+                \
+                if ((flags) & __PRINTF_FLAG_SIGNED) { \
+                        signed type arg = va_arg((ap), signed type); \
+                        \
+                        if (arg < 0) { \
+                                res = -arg; \
+                                (flags) |= __PRINTF_FLAG_NEGATIVE; \
+                        } else \
+                                res = arg; \
+                } else \
+                        res = va_arg((ap), unsigned type); \
+                \
+                res; \
+        })
+
 /** Enumeration of possible arguments types.
  */
@@ -207 +226 @@
         }
         
-        return (int) (counter + 1);
+        return (int) (counter);
 }
 
@@ -245 +264 @@
         }
         
-        return (int) (counter + 1);
+        return (int) (counter);
 }
 
@@ -832 +851 @@
                         size_t size;
                         uint64_t number;
+                        
                         switch (qualifier) {
                         case PrintfQualifierByte:
                                 size = sizeof(unsigned char);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierShort:
                                 size = sizeof(unsigned short);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierInt:
                                 size = sizeof(unsigned int);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierLong:
                                 size = sizeof(unsigned long);
-                                number = (uint64_t) va_arg(ap, unsigned long);
+                                number = PRINTF_GET_INT_ARGUMENT(long, ap, flags);
                                 break;
                         case PrintfQualifierLongLong:
                                 size = sizeof(unsigned long long);
-                                number = (uint64_t) va_arg(ap, unsigned long long);
+                                number = PRINTF_GET_INT_ARGUMENT(long long, ap, flags);
                                 break;
                         case PrintfQualifierPointer:
@@ -866 +886 @@
                                 counter = -counter;
                                 goto out;
-                        }
-                        
-                        if (flags & __PRINTF_FLAG_SIGNED) {
-                                if (number & (0x1 << (size * 8 - 1))) {
-                                        flags |= __PRINTF_FLAG_NEGATIVE;
-                                        
-                                        if (size == sizeof(uint64_t)) {
-                                                number = -((int64_t) number);
-                                        } else {
-                                                number = ~number;
-                                                number &=
-                                                    ~(0xFFFFFFFFFFFFFFFFll <<
-                                                    (size * 8));
-                                                number++;
-                                        }
-                                }
                         }