Changes in kernel/generic/src/printf/printf_core.c [7fadb65:1e27d85] in mainline

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.
  */
@@ -226 +207 @@
         }
         
-        return (int) (counter);
+        return (int) (counter + 1);
 }
 
@@ -264 +245 @@
         }
         
-        return (int) (counter);
+        return (int) (counter + 1);
 }
 
@@ -851 +832 @@
                         size_t size;
                         uint64_t number;
-                        
                         switch (qualifier) {
                         case PrintfQualifierByte:
                                 size = sizeof(unsigned char);
-                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierShort:
                                 size = sizeof(unsigned short);
-                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierInt:
                                 size = sizeof(unsigned int);
-                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierLong:
                                 size = sizeof(unsigned long);
-                                number = PRINTF_GET_INT_ARGUMENT(long, ap, flags);
+                                number = (uint64_t) va_arg(ap, unsigned long);
                                 break;
                         case PrintfQualifierLongLong:
                                 size = sizeof(unsigned long long);
-                                number = PRINTF_GET_INT_ARGUMENT(long long, ap, flags);
+                                number = (uint64_t) va_arg(ap, unsigned long long);
                                 break;
                         case PrintfQualifierPointer:
@@ -886 +866 @@
                                 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++;
+                                        }
+                                }
                         }