Changeset 810a36f in mainline for kernel/generic/src

Timestamp:

2017-10-24T05:29:08Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'types'.

Location:

kernel/generic/src

Files:

• debug/panic.c (modified) (2 diffs)
• lib/ra.c (modified) (2 diffs)
• lib/str.c (modified) (1 diff)
• mm/backend_user.c (modified) (1 diff)
• printf/printf_core.c (modified) (3 diffs)

kernel/generic/src/debug/panic.c

@@ -62 +62 @@
                 printf("\n");
         } else if (cat == PANIC_BADTRAP) {
-                printf("bad trap %" PRIun ". %s\n", address,
+                printf("bad trap %" PRIuPTR ". %s\n", address,
                     BANNER_RIGHT);
                 if (fmt) {
@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pe=%" PRIun " thread=%p task=%p cpu=%p as=%p"
+                printf("pe=%" PRIuPTR " thread=%p task=%p cpu=%p as=%p"
                     " magic=%#" PRIx32 "\n", THE->preemption,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);

kernel/generic/src/lib/ra.c

@@ -353 +353 @@
         link = hash_table_find(&span->used, &key);
         if (!link) {
-                panic("Freeing segment which is not known to be used (base=%"
-                    PRIxn ", size=%" PRIdn ").", base, size);
+                panic("Freeing segment which is not known to be used (base=%zx"
+                    ", size=%zd).", base, size);
         }
         seg = hash_table_get_inst(link, ra_segment_t, uh_link);
@@ -447 +447 @@
         irq_spinlock_unlock(&arena->lock, true);
 
-        panic("Freeing to wrong arena (base=%" PRIxn ", size=%" PRIdn ").",
+        panic("Freeing to wrong arena (base=%" PRIxPTR ", size=%zd).",
             base, size);
 }

kernel/generic/src/lib/str.c

@@ -114 +114 @@
 
 /** Check the condition if wchar_t is signed */
-#ifdef WCHAR_IS_UNSIGNED
+#ifdef __WCHAR_UNSIGNED__
         #define WCHAR_SIGNED_CHECK(cond)  (true)
 #else

kernel/generic/src/mm/backend_user.c

@@ -129 +129 @@
         if (rc != EOK) {
                 log(LF_USPACE, LVL_FATAL,
-                    "Page-in request for page %#" PRIxn
+                    "Page-in request for page %#" PRIxPTR
                     " at pager %d failed with error %d.",
                     upage, pager_info->pager, rc);

kernel/generic/src/printf/printf_core.c

@@ -104 +104 @@
         PrintfQualifierLongLong,
         PrintfQualifierPointer,
-        PrintfQualifierSize
+        PrintfQualifierSize,
+        PrintfQualifierMax
 } qualifier_t;
 
@@ -767 +768 @@
                         case 'z':
                                 qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
+                        case 'j':
+                                qualifier = PrintfQualifierMax;
                                 i = nxt;
                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -892 +898 @@
                                 number = (uint64_t) va_arg(ap, size_t);
                                 break;
+                        case PrintfQualifierMax:
+                                size = sizeof(uintmax_t);
+                                number = (uint64_t) va_arg(ap, uintmax_t);
+                                break;
                         default:
                                 /* Unknown qualifier */