Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/aarch64 - add missing casts



details:   https://anonhg.NetBSD.org/src/rev/3f053c7d8031
branches:  trunk
changeset: 320722:3f053c7d8031
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 17 00:35:51 2018 +0000

description:
- add missing casts
- use PRI?64 instead of ll?

diffstat:

 sys/arch/aarch64/aarch64/trap.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r e26c41ba025b -r 3f053c7d8031 sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c   Tue Jul 17 00:35:03 2018 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c   Tue Jul 17 00:35:51 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.4 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: trap.c,v 1.5 2018/07/17 00:35:51 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.4 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.5 2018/07/17 00:35:51 christos Exp $");
 
 #include "opt_arm_intr_impl.h"
 #include "opt_compat_netbsd32.h"
@@ -217,8 +217,8 @@
        case ESR_EC_SP_ALIGNMENT:
        case ESR_EC_ILL_STATE:
        default:
-               panic("Trap: fatal %s: pc=%016llx sp=%016llx esr=%08x",
-                   trapname, tf->tf_pc, tf->tf_sp, esr);
+               panic("Trap: fatal %s: pc=%016" PRIx64 "sp=%016" PRIx64
+                   "esr=%08x", trapname, tf->tf_pc, tf->tf_sp, esr);
                break;
        }
 }
@@ -256,11 +256,11 @@
                break;
 
        case ESR_EC_PC_ALIGNMENT:
-               do_trapsignal(l, SIGBUS, BUS_ADRALN, tf->tf_pc, esr);
+               do_trapsignal(l, SIGBUS, BUS_ADRALN, (void *)tf->tf_pc, esr);
                userret(l);
                break;
        case ESR_EC_SP_ALIGNMENT:
-               do_trapsignal(l, SIGBUS, BUS_ADRALN, tf->tf_sp, esr);
+               do_trapsignal(l, SIGBUS, BUS_ADRALN, (void *)tf->tf_sp, esr);
                userret(l);
                break;
 
@@ -269,7 +269,7 @@
        case ESR_EC_SW_STEP_EL0:
        case ESR_EC_WTCHPNT_EL0:
                /* XXX notyet */
-               do_trapsignal(l, SIGTRAP, TRAP_BRKPT, tf->tf_pc, esr);
+               do_trapsignal(l, SIGTRAP, TRAP_BRKPT, (void *)tf->tf_pc, esr);
                userret(l);
                break;
 
@@ -277,7 +277,7 @@
                /* XXX notyet */
        case ESR_EC_UNKNOWN:
                /* illegal or not implemented instruction */
-               do_trapsignal(l, SIGILL, ILL_ILLTRP, tf->tf_pc, esr);
+               do_trapsignal(l, SIGILL, ILL_ILLTRP, (void *)tf->tf_pc, esr);
                userret(l);
                break;
        }
@@ -324,11 +324,11 @@
                break;
 
        case ESR_EC_PC_ALIGNMENT:
-               do_trapsignal(l, SIGBUS, BUS_ADRALN, tf->tf_pc, esr);
+               do_trapsignal(l, SIGBUS, BUS_ADRALN, (void *)tf->tf_pc, esr);
                userret(l);
                break;
        case ESR_EC_SP_ALIGNMENT:
-               do_trapsignal(l, SIGBUS, BUS_ADRALN, tf->tf_sp, esr);
+               do_trapsignal(l, SIGBUS, BUS_ADRALN, (void *)tf->tf_sp, esr);
                userret(l);
                break;
 
@@ -345,14 +345,14 @@
        case ESR_EC_BKPT_INSN_A32:
                /* XXX notyet */
                printf("%s:%d: %s\n", __func__, __LINE__, trapname);
-               do_trapsignal(l, SIGILL, ILL_ILLTRP, tf->tf_pc, esr);
+               do_trapsignal(l, SIGILL, ILL_ILLTRP, (void *)tf->tf_pc, esr);
                userret(l);
                break;
 #endif /* COMPAT_NETBSD32 */
        default:
                /* XXX notyet */
                printf("%s:%d: %s\n", __func__, __LINE__, trapname);
-               do_trapsignal(l, SIGILL, ILL_ILLTRP, tf->tf_pc, esr);
+               do_trapsignal(l, SIGILL, ILL_ILLTRP, (void *)tf->tf_pc, esr);
                userret(l);
                break;
        }



Home | Main Index | Thread Index | Old Index