Changeset 35ebd42 in mainline

Timestamp:

2017-10-24T04:55:29Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

8ddaaac

Parents:

b639d56

Message:

Fix up some type casts and format strings.

Location:

kernel

Files:

• arch/ia32/src/interrupt.c (modified) (1 diff)
• generic/src/debug/panic.c (modified) (2 diffs)
• generic/src/lib/ra.c (modified) (2 diffs)
• generic/src/mm/backend_user.c (modified) (1 diff)

kernel/arch/ia32/src/interrupt.c

@@ -88 +88 @@
             istate->esi, istate->edi, istate->ebp,
             istate_from_uspace(istate) ? istate->esp :
-            (uintptr_t) &istate->esp);
+            (uint32_t) &istate->esp);
 }
 

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/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);