Changeset e330da6e in mainline for kernel

Timestamp:

2017-03-30T06:33:22Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

907d91a

Parents:

5b46ec8

git-author:

Supragya Raj <supragyaraj@…> (2017-03-30 06:33:22)

git-committer:

Jakub Jermar <jakub@…> (2017-03-30 06:33:22)

Message:

Add support for printing ptrdiff_t

Location:

kernel

Files:

• generic/include/typedefs.h (modified) (1 diff)
• generic/src/printf/printf_core.c (modified) (1 diff)
• test/print/print2.c (modified) (1 diff)

kernel/generic/include/typedefs.h

@@ -61 +61 @@
 typedef volatile uint32_t ioport32_t;
 
+typedef native_t ptrdiff_t;
+
 #ifdef __32_BITS__
 

kernel/generic/src/printf/printf_core.c

@@ -733 +733 @@
                         
                         switch (uc) {
-                        /** @todo Unimplemented qualifiers:
-                         *        t ptrdiff_t - ISO C 99
-                         */
+                        case 't':
+                                /* ptrdiff_t */
+                                if (sizeof(ptrdiff_t) == sizeof(int32_t))
+                                        qualifier = PrintfQualifierInt;
+                                else
+                                        qualifier = PrintfQualifierLongLong;
                         case 'h':
                                 /* Char or short */

kernel/test/print/print2.c

@@ -52 +52 @@
         TPRINTF("Real output:     [%#x] [%#5.3x] [%#-5.3x] [%#3.5x] [%#-3.5x]\n\n", 17, 18, 19, 20, 21);
         
+        char ch[12];
+        ptrdiff_t d, neg_d;
+        
+        d = &ch[0] - &ch[12];
+        neg_d = (unsigned)(-d);
+        TPRINTF("Testing printf(\"%%td %%tu %%tx %%ti %%to\", d, neg_d, neg_d, d, neg_d):\n");
+        TPRINTF("Expected output: [-12] [12] [c] [-12] [14]\n");
+        TPRINTF("Real output:     [%td] [%tu] [%tx] [%ti] [%to]\n\n", d, neg_d, neg_d, d, neg_d);
+        
         sysarg_t nat = UINTN_C(0x12345678);