Module Name: src
Committed By: christos
Date: Tue Jul 17 00:36:30 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: process_machdep.c sig_machdep.c
sys_machdep.c syscall.c vm_machdep.c
Log Message:
add missing casts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/process_machdep.c \
src/sys/arch/aarch64/aarch64/sig_machdep.c \
src/sys/arch/aarch64/aarch64/sys_machdep.c \
src/sys/arch/aarch64/aarch64/syscall.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/vm_machdep.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/aarch64/aarch64/process_machdep.c
diff -u src/sys/arch/aarch64/aarch64/process_machdep.c:1.2 src/sys/arch/aarch64/aarch64/process_machdep.c:1.3
--- src/sys/arch/aarch64/aarch64/process_machdep.c:1.2 Sun Apr 1 00:35:03 2018
+++ src/sys/arch/aarch64/aarch64/process_machdep.c Mon Jul 16 20:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: process_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: process_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: process_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -60,7 +60,7 @@ process_write_regs(struct lwp *l, const
return EINVAL;
l->l_md.md_utf->tf_regs = *regs;
- l->l_private = regs->r_tpidr;
+ l->l_private = (void *)regs->r_tpidr;
return 0;
}
Index: src/sys/arch/aarch64/aarch64/sig_machdep.c
diff -u src/sys/arch/aarch64/aarch64/sig_machdep.c:1.2 src/sys/arch/aarch64/aarch64/sig_machdep.c:1.3
--- src/sys/arch/aarch64/aarch64/sig_machdep.c:1.2 Sun Apr 1 00:35:03 2018
+++ src/sys/arch/aarch64/aarch64/sig_machdep.c Mon Jul 16 20:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sig_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sig_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -104,7 +104,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
tf->tf_reg[28] = ucp; /* put in a callee saved register */
tf->tf_sp = sp;
- tf->tf_lr = sd->sd_tramp;
+ tf->tf_lr = (uint64_t)sd->sd_tramp;
tf->tf_pc = handler;
/*
Index: src/sys/arch/aarch64/aarch64/sys_machdep.c
diff -u src/sys/arch/aarch64/aarch64/sys_machdep.c:1.2 src/sys/arch/aarch64/aarch64/sys_machdep.c:1.3
--- src/sys/arch/aarch64/aarch64/sys_machdep.c:1.2 Sun Apr 1 00:35:03 2018
+++ src/sys/arch/aarch64/aarch64/sys_machdep.c Mon Jul 16 20:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sys_machdep.c,v 1.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sys_machdep.c,v 1.3 2018/07/17 00:36:30 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -51,6 +51,6 @@ sys_sysarch(struct lwp *l, const struct
int
cpu_lwp_setprivate(lwp_t *l, void *addr)
{
- l->l_private = (register_t)addr;
+ l->l_private = addr;
return 0;
}
Index: src/sys/arch/aarch64/aarch64/syscall.c
diff -u src/sys/arch/aarch64/aarch64/syscall.c:1.2 src/sys/arch/aarch64/aarch64/syscall.c:1.3
--- src/sys/arch/aarch64/aarch64/syscall.c:1.2 Sun Apr 1 00:35:03 2018
+++ src/sys/arch/aarch64/aarch64/syscall.c Mon Jul 16 20:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: syscall.c,v 1.3 2018/07/17 00:36:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#define EMULNAME(x) (x)
#define EMULNAMEU(x) (x)
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.2 2018/04/01 04:35:03 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.3 2018/07/17 00:36:30 christos Exp $");
void
cpu_spawn_return(struct lwp *l)
@@ -103,7 +103,7 @@ EMULNAME(syscall)(struct trapframe *tf)
curcpu()->ci_data.cpu_nsyscall++;
size_t code = tf->tf_esr & 0xffff;
- register_t *params = tf->tf_reg;
+ register_t *params = (void *)tf->tf_reg;
size_t nargs = NARGREG;
switch (code) {
Index: src/sys/arch/aarch64/aarch64/vm_machdep.c
diff -u src/sys/arch/aarch64/aarch64/vm_machdep.c:1.3 src/sys/arch/aarch64/aarch64/vm_machdep.c:1.4
--- src/sys/arch/aarch64/aarch64/vm_machdep.c:1.3 Thu Jul 12 06:46:41 2018
+++ src/sys/arch/aarch64/aarch64/vm_machdep.c Mon Jul 16 20:36:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.3 2018/07/12 10:46:41 maxv Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.4 2018/07/17 00:36:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.3 2018/07/12 10:46:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2018/07/17 00:36:30 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,8 +124,8 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
/* build a new switchframe */
struct trapframe * const ktf = utf - 1;
- ktf->tf_reg[27] = func;
- ktf->tf_reg[28] = arg;
+ ktf->tf_reg[27] = (uint64_t)func;
+ ktf->tf_reg[28] = (uint64_t)arg;
ktf->tf_reg[29] = 0;
KASSERT(reg_daif_read() == 0);
ktf->tf_lr = (uintptr_t)lwp_trampoline;
