[src/trunk]: src/sys/arch/aarch64 s:aarch64/cpufunc.h:arm/cpufunc.h:

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1f69dca4a4f
branches:  trunk
changeset: 1017051:a1f69dca4a4f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Dec 11 18:03:33 2020 +0000

description:
s:aarch64/cpufunc.h:arm/cpufunc.h:

a baby step in the grand arm header unification challenge

diffstat:

 sys/arch/aarch64/aarch64/aarch64_reboot.c   |  7 ++++---
 sys/arch/aarch64/aarch64/cpu.c              |  6 +++---
 sys/arch/aarch64/aarch64/db_disasm.c        |  7 ++++---
 sys/arch/aarch64/aarch64/db_interface.c     |  7 ++++---
 sys/arch/aarch64/aarch64/db_machdep.c       |  6 ++++--
 sys/arch/aarch64/aarch64/db_trace.c         |  7 ++++---
 sys/arch/aarch64/aarch64/exec_machdep.c     |  7 ++++---
 sys/arch/aarch64/aarch64/fault.c            |  7 ++++---
 sys/arch/aarch64/aarch64/fpu.c              |  5 +++--
 sys/arch/aarch64/aarch64/genassym.cf        |  5 +++--
 sys/arch/aarch64/aarch64/kobj_machdep.c     |  6 +++---
 sys/arch/aarch64/aarch64/netbsd32_machdep.c |  7 ++++---
 sys/arch/aarch64/aarch64/pmap.c             |  7 ++++---
 sys/arch/aarch64/aarch64/pmapboot.c         |  7 ++++---
 sys/arch/aarch64/aarch64/trap.c             |  6 ++++--
 sys/arch/aarch64/include/asan.h             |  5 +++--
 sys/arch/aarch64/include/sljit_machdep.h    |  5 +++--
 17 files changed, 62 insertions(+), 45 deletions(-)

diffs (truncated from 479 to 300 lines):

diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/aarch64_reboot.c
--- a/sys/arch/aarch64/aarch64/aarch64_reboot.c Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_reboot.c Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aarch64_reboot.c,v 1.3 2018/11/09 04:05:27 mrg Exp $   */
+/*     $NetBSD: aarch64_reboot.c,v 1.4 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -122,7 +122,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarch64_reboot.c,v 1.3 2018/11/09 04:05:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarch64_reboot.c,v 1.4 2020/12/11 18:03:33 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -136,7 +136,8 @@
 #include <aarch64/machdep.h>
 #include <aarch64/armreg.h>
 #include <aarch64/locore.h>
-#include <aarch64/cpufunc.h>
+
+#include <arm/cpufunc.h>
 
 void (*cpu_reset_address0)(void);
 void (*cpu_reset_address)(void);
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c    Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c    Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.56 2020/10/10 08:22:57 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.57 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.56 2020/10/10 08:22:57 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.57 2020/12/11 18:03:33 skrll Exp $");
 
 #include "locators.h"
 #include "opt_arm_debug.h"
@@ -52,10 +52,10 @@
 
 #include <aarch64/armreg.h>
 #include <aarch64/cpu.h>
-#include <aarch64/cpufunc.h>
 #include <aarch64/cpu_counter.h>
 #include <aarch64/machdep.h>
 
+#include <arm/cpufunc.h>
 #include <arm/cpu_topology.h>
 #ifdef FDT
 #include <arm/fdt/arm_fdtvar.h>
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/db_disasm.c
--- a/sys/arch/aarch64/aarch64/db_disasm.c      Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_disasm.c      Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.10 2020/07/09 23:43:41 ryo Exp $ */
+/* $NetBSD: db_disasm.c,v 1.11 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.10 2020/07/09 23:43:41 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.11 2020/12/11 18:03:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -41,10 +41,11 @@
 #include <ddb/db_access.h>
 #include <ddb/db_user.h>
 
-#include <aarch64/cpufunc.h>
 #include <aarch64/machdep.h>
 #include <arch/aarch64/aarch64/disasm.h>
 
+#include <arm/cpufunc.h>
+
 static uint32_t
 db_disasm_readword(uintptr_t address)
 {
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/db_interface.c
--- a/sys/arch/aarch64/aarch64/db_interface.c   Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_interface.c   Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.10 2020/09/14 10:53:02 ryo Exp $ */
+/* $NetBSD: db_interface.c,v 1.11 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.10 2020/09/14 10:53:02 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.11 2020/12/11 18:03:33 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -38,7 +38,8 @@
 #include <aarch64/db_machdep.h>
 #include <aarch64/machdep.h>
 #include <aarch64/pmap.h>
-#include <aarch64/cpufunc.h>
+
+#include <arm/cpufunc.h>
 
 #include <ddb/db_access.h>
 #include <ddb/db_command.h>
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/db_machdep.c
--- a/sys/arch/aarch64/aarch64/db_machdep.c     Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_machdep.c     Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.29 2020/12/03 07:45:51 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.30 2020/12/11 18:03:33 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.29 2020/12/03 07:45:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.30 2020/12/11 18:03:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -52,6 +52,8 @@
 #include <aarch64/locore.h>
 #include <aarch64/pmap.h>
 
+#include <arm/cpufunc.h>
+
 #include <ddb/db_access.h>
 #include <ddb/db_command.h>
 #include <ddb/db_output.h>
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/db_trace.c
--- a/sys/arch/aarch64/aarch64/db_trace.c       Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_trace.c       Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.12 2020/06/27 00:43:38 rin Exp $ */
+/* $NetBSD: db_trace.c,v 1.13 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -28,17 +28,18 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.12 2020/06/27 00:43:38 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.13 2020/12/11 18:03:33 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
 
-#include <aarch64/cpufunc.h>
 #include <aarch64/db_machdep.h>
 #include <aarch64/machdep.h>
 #include <aarch64/armreg.h>
 #include <aarch64/vmparam.h>
 
+#include <arm/cpufunc.h>
+
 #include <uvm/uvm_extern.h>
 
 #include <ddb/db_access.h>
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/exec_machdep.c
--- a/sys/arch/aarch64/aarch64/exec_machdep.c   Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/exec_machdep.c   Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_machdep.c,v 1.8 2020/10/13 07:04:49 rin Exp $ */
+/* $NetBSD: exec_machdep.c,v 1.9 2020/12/11 18:03:33 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: exec_machdep.c,v 1.8 2020/10/13 07:04:49 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_machdep.c,v 1.9 2020/12/11 18:03:33 skrll Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
@@ -52,10 +52,11 @@
 #endif
 
 #include <aarch64/armreg.h>
-#include <aarch64/cpufunc.h>
 #include <aarch64/frame.h>
 #include <aarch64/machdep.h>
 
+#include <arm/cpufunc.h>
+
 #if EXEC_ELF64
 int
 aarch64_netbsd_elf64_probe(struct lwp *l, struct exec_package *epp, void *eh0,
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/fault.c
--- a/sys/arch/aarch64/aarch64/fault.c  Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/fault.c  Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fault.c,v 1.20 2020/10/15 22:30:34 rin Exp $   */
+/*     $NetBSD: fault.c,v 1.21 2020/12/11 18:03:33 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.20 2020/10/15 22:30:34 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.21 2020/12/11 18:03:33 skrll Exp $");
 
 #include "opt_compat_netbsd32.h"
 #include "opt_ddb.h"
@@ -40,12 +40,13 @@
 
 #include <uvm/uvm.h>
 
-#include <aarch64/cpufunc.h>
 #include <aarch64/frame.h>
 #include <aarch64/machdep.h>
 #include <aarch64/armreg.h>
 #include <aarch64/db_machdep.h>
 
+#include <arm/cpufunc.h>
+
 UVMHIST_DECL(pmaphist);
 
 const char * const fault_status_code[] = {
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/fpu.c
--- a/sys/arch/aarch64/aarch64/fpu.c    Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/fpu.c    Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.10 2020/10/22 07:31:15 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.11 2020/12/11 18:03:33 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.10 2020/10/22 07:31:15 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.11 2020/12/11 18:03:33 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -40,6 +40,7 @@
 #include <sys/lwp.h>
 #include <sys/evcnt.h>
 
+#include <arm/cpufunc.h>
 #include <arm/fpu.h>
 #include <arm/cpufunc.h>
 
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/genassym.cf
--- a/sys/arch/aarch64/aarch64/genassym.cf      Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/genassym.cf      Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.32 2020/11/10 07:51:19 skrll Exp $
+# $NetBSD: genassym.cf,v 1.33 2020/12/11 18:03:33 skrll Exp $
 #-
 # Copyright (c) 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -56,9 +56,10 @@
 include <aarch64/vmparam.h>
 include <aarch64/frame.h>
 include <aarch64/armreg.h>
-include <aarch64/cpufunc.h>
 include <aarch64/pte.h>
 
+include <arm/cpufunc.h>
+
 define __HAVE_FAST_SOFTINTS    1
 
 #ifdef __HAVE_PIC_FAST_SOFTINTS
diff -r b2ec1b16138c -r a1f69dca4a4f sys/arch/aarch64/aarch64/kobj_machdep.c
--- a/sys/arch/aarch64/aarch64/kobj_machdep.c   Fri Dec 11 12:29:27 2020 +0000
+++ b/sys/arch/aarch64/aarch64/kobj_machdep.c   Fri Dec 11 18:03:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobj_machdep.c,v 1.5 2020/09/14 17:14:12 ryo Exp $     */
+/*     $NetBSD: kobj_machdep.c,v 1.6 2020/12/11 18:03:33 skrll Exp $   */
 
 /*
  * Copyright (c) 2018 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5 2020/09/14 17:14:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2020/12/11 18:03:33 skrll Exp $");