CVS commit: src/sys/arch

[Felix Deichmann]

Module Name:    src
Committed By:   flxd
Date:           Sat Jan 27 10:07:41 UTC 2018

Modified Files:
        src/sys/arch/evbppc/mpc85xx: machdep.c
        src/sys/arch/powerpc/booke: trap.c

Log Message:
Fix more printf format strings for mfspr() (hi mrg).


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/booke/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.42 src/sys/arch/evbppc/mpc85xx/machdep.c:1.43
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.42	Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Sat Jan 27 10:07:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.42 2016/12/22 14:47:57 cherry Exp $	*/
+/*	$NetBSD: machdep.c,v 1.43 2018/01/27 10:07:41 flxd Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1245,8 +1245,8 @@ initppc(vaddr_t startkernel, vaddr_t end
 	/*
 	 *
 	 */
-	printf(" hid0=%#lx/%#lx", hid0, mfspr(SPR_HID0));
-	printf(" hid1=%#lx", mfspr(SPR_HID1));
+	printf(" hid0=%#lx/%#jx", hid0, (uintmax_t)mfspr(SPR_HID0));
+	printf(" hid1=%#jx", (uintmax_t)mfspr(SPR_HID1));
 	printf(" pordevsr=%#x", cpu_read_4(GLOBAL_BASE + PORDEVSR));
 	printf(" devdisr=%#x", cpu_read_4(GLOBAL_BASE + DEVDISR));
 

Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.26 src/sys/arch/powerpc/booke/trap.c:1.27
--- src/sys/arch/powerpc/booke/trap.c:1.26	Thu Jul 31 12:11:37 2014
+++ src/sys/arch/powerpc/booke/trap.c	Sat Jan 27 10:07:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.26 2014/07/31 12:11:37 joerg Exp $	*/
+/*	$NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.26 2014/07/31 12:11:37 joerg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.27 2018/01/27 10:07:41 flxd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -734,9 +734,10 @@ trap(enum ppc_booke_exceptions trap_code
 
 	if ((VM_MAX_ADDRESS & 0x80000000) == 0
 	    && usertrap && (tf->tf_fixreg[1] & 0x80000000)) {
-		printf("%s(entry): pid %d.%d (%s): %s invalid sp %#lx (sprg1=%#lx)\n",
-		    __func__, p->p_pid, l->l_lid, p->p_comm,
-		    trap_names[trap_code], tf->tf_fixreg[1], mfspr(SPR_SPRG1));
+		printf("%s(entry): pid %d.%d (%s): %s invalid sp %#lx "
+		    "(sprg1=%#jx)\n", __func__, p->p_pid, l->l_lid, p->p_comm,
+		    trap_names[trap_code], tf->tf_fixreg[1],
+		    (uintmax_t)mfspr(SPR_SPRG1));
 		dump_trapframe(tf, NULL);
 		Debugger();
 	}