[src/trunk]: src/sys/arch/aarch64 centralize fp,lr definitions

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

details:   https://anonhg.NetBSD.org/src/rev/267623e6d217
branches:  trunk
changeset: 320748:267623e6d217
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 17 18:08:36 2018 +0000

description:
centralize fp,lr definitions

diffstat:

 sys/arch/aarch64/aarch64/copyinout.S |  7 ++-----
 sys/arch/aarch64/aarch64/cpuswitch.S |  6 ++----
 sys/arch/aarch64/aarch64/fusu.S      |  7 ++-----
 sys/arch/aarch64/aarch64/locore.S    |  7 ++-----
 sys/arch/aarch64/include/asm.h       |  5 ++++-
 5 files changed, 12 insertions(+), 20 deletions(-)

diffs (106 lines):

diff -r 0c1414bb4d50 -r 267623e6d217 sys/arch/aarch64/aarch64/copyinout.S
--- a/sys/arch/aarch64/aarch64/copyinout.S      Tue Jul 17 18:04:57 2018 +0000
+++ b/sys/arch/aarch64/aarch64/copyinout.S      Tue Jul 17 18:08:36 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: copyinout.S,v 1.4 2018/07/17 10:01:59 ryo Exp $ */
+/* $NetBSD: copyinout.S,v 1.5 2018/07/17 18:08:36 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,10 +32,7 @@
 #include <aarch64/asm.h>
 #include "assym.h"
 
-RCSID("$NetBSD: copyinout.S,v 1.4 2018/07/17 10:01:59 ryo Exp $");
-
-#define fp     x29
-#define lr     x30
+RCSID("$NetBSD: copyinout.S,v 1.5 2018/07/17 18:08:36 christos Exp $");
 
        .macro enter_cpu_onfault
        stp     fp, lr, [sp, #-16]!     /* save fp, lr */
diff -r 0c1414bb4d50 -r 267623e6d217 sys/arch/aarch64/aarch64/cpuswitch.S
--- a/sys/arch/aarch64/aarch64/cpuswitch.S      Tue Jul 17 18:04:57 2018 +0000
+++ b/sys/arch/aarch64/aarch64/cpuswitch.S      Tue Jul 17 18:08:36 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.3 2018/07/17 10:01:59 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.4 2018/07/17 18:08:36 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,9 +35,7 @@
 
 #include "opt_ddb.h"
 
-RCSID("$NetBSD: cpuswitch.S,v 1.3 2018/07/17 10:01:59 ryo Exp $")
-
-#define lr     x30
+RCSID("$NetBSD: cpuswitch.S,v 1.4 2018/07/17 18:08:36 christos Exp $")
 
 /*
  * At IPL_SCHED:
diff -r 0c1414bb4d50 -r 267623e6d217 sys/arch/aarch64/aarch64/fusu.S
--- a/sys/arch/aarch64/aarch64/fusu.S   Tue Jul 17 18:04:57 2018 +0000
+++ b/sys/arch/aarch64/aarch64/fusu.S   Tue Jul 17 18:08:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fusu.S,v 1.4 2018/07/17 10:01:59 ryo Exp $     */
+/*     $NetBSD: fusu.S,v 1.5 2018/07/17 18:08:36 christos Exp $        */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,10 +32,7 @@
 #include <aarch64/asm.h>
 #include "assym.h"
 
-RCSID("$NetBSD: fusu.S,v 1.4 2018/07/17 10:01:59 ryo Exp $");
-
-#define fp     x29
-#define lr     x30
+RCSID("$NetBSD: fusu.S,v 1.5 2018/07/17 18:08:36 christos Exp $");
 
        .macro enter_cpu_onfault
        stp     fp, lr, [sp, #-16]!     /* save fp, lr */
diff -r 0c1414bb4d50 -r 267623e6d217 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Tue Jul 17 18:04:57 2018 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Tue Jul 17 18:08:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.12 2018/07/17 10:01:59 ryo Exp $  */
+/*     $NetBSD: locore.S,v 1.13 2018/07/17 18:08:36 christos Exp $     */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -35,7 +35,7 @@
 #include <aarch64/hypervisor.h>
 #include "assym.h"
 
-RCSID("$NetBSD: locore.S,v 1.12 2018/07/17 10:01:59 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.13 2018/07/17 18:08:36 christos Exp $")
 
 /* #define DEBUG_LOCORE */
 /* #define DEBUG_MMU */
@@ -60,9 +60,6 @@
 #define VERBOSE(string)
 #endif
 
-#define fp     x29
-#define lr     x30
-
 /* load far effective address (pc relative) */
 .macro ADDR, reg, addr
        adrp    \reg, \addr
diff -r 0c1414bb4d50 -r 267623e6d217 sys/arch/aarch64/include/asm.h
--- a/sys/arch/aarch64/include/asm.h    Tue Jul 17 18:04:57 2018 +0000
+++ b/sys/arch/aarch64/include/asm.h    Tue Jul 17 18:08:36 2018 +0000
@@ -1,8 +1,11 @@
-/* $NetBSD: asm.h,v 1.2 2018/04/01 04:35:03 ryo Exp $ */
+/* $NetBSD: asm.h,v 1.3 2018/07/17 18:08:37 christos Exp $ */
 
 #ifndef _AARCH64_ASM_H_
 #define _AARCH64_ASM_H_
 
 #include <arm/asm.h>
 
+#define        fp      x29
+#define        lr      x30
+
 #endif /* !_AARCH64_ASM_H_ */