Changeset 7e752b2 in mainline for kernel/arch/arm32/src

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

kernel/arch/arm32/src

Files:

• exception.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/page_fault.c (modified) (2 diffs)

kernel/arch/arm32/src/exception.c

@@ -175 +175 @@
 void istate_decode(istate_t *istate)
 {
-        printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
+        printf("r0 =%#0" PRIx32 "\tr1 =%#0" PRIx32 "\t"
+            "r2 =%#0" PRIx32 "\tr3 =%#0" PRIx32 "\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        printf("r4 =%#0.8lx\tr5 =%#0.8lx\tr6 =%#0.8lx\tr7 =%#0.8lx\n",
+        printf("r4 =%#" PRIx32 "\tr5 =%#0" PRIx32 "\t"
+            "r6 =%#0" PRIx32 "\tr7 =%#0" PRIx32 "\n",
             istate->r4, istate->r5, istate->r6, istate->r7);
-        printf("r8 =%#0.8lx\tr9 =%#0.8lx\tr10=%#0.8lx\tfp =%#0.8lx\n",
-            istate->r8, istate->r9, istate->r10, istate->fp);
-        printf("r12=%#0.8lx\tsp =%#0.8lx\tlr =%#0.8lx\tspsr=%#0.8lx\n",
-            istate->r12, istate->sp, istate->lr, istate->spsr);
+        printf("r8 =%#0" PRIx32 "\tr9 =%#0" PRIx32 "\t"
+            "r10=%#0" PRIx32 "\tfp =%p\n",
+            istate->r8, istate->r9, istate->r10,
+            (void *) istate->fp);
+        printf("r12=%#0" PRIx32 "\tsp =%p\tlr =%p\tspsr=%p\n",
+            istate->r12, (void *) istate->sp,
+            (void *) istate->lr, (void *) istate->spsr);
 }
 

kernel/arch/arm32/src/mm/page.c

@@ -93 +93 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size);
+                    (void *) physaddr, size);
         }
         

kernel/arch/arm32/src/mm/page_fault.c

@@ -141 +141 @@
         if (instr.condition == 0xf) {
                 panic("page_fault - instruction does not access memory "
-                    "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+                    "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+                    instr_union.pc, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -160 +161 @@
 
         panic("page_fault - instruction doesn't access memory "
-            "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+            "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+            instr_union.pc, (void *) badvaddr);
 
         return PF_ACCESS_EXEC;