Module Name: src
Committed By: christos
Date: Tue Jul 17 18:08:37 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: copyinout.S cpuswitch.S fusu.S locore.S
src/sys/arch/aarch64/include: asm.h
Log Message:
centralize fp,lr definitions
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/copyinout.S \
src/sys/arch/aarch64/aarch64/fusu.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/cpuswitch.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/locore.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/include/asm.h
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/copyinout.S
diff -u src/sys/arch/aarch64/aarch64/copyinout.S:1.4 src/sys/arch/aarch64/aarch64/copyinout.S:1.5
--- src/sys/arch/aarch64/aarch64/copyinout.S:1.4 Tue Jul 17 06:01:59 2018
+++ src/sys/arch/aarch64/aarch64/copyinout.S Tue Jul 17 14:08:36 2018
@@ -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 */
Index: src/sys/arch/aarch64/aarch64/fusu.S
diff -u src/sys/arch/aarch64/aarch64/fusu.S:1.4 src/sys/arch/aarch64/aarch64/fusu.S:1.5
--- src/sys/arch/aarch64/aarch64/fusu.S:1.4 Tue Jul 17 06:01:59 2018
+++ src/sys/arch/aarch64/aarch64/fusu.S Tue Jul 17 14:08:36 2018
@@ -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 */
Index: src/sys/arch/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.3 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.4
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.3 Tue Jul 17 06:01:59 2018
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S Tue Jul 17 14:08:36 2018
@@ -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:
Index: src/sys/arch/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.12 src/sys/arch/aarch64/aarch64/locore.S:1.13
--- src/sys/arch/aarch64/aarch64/locore.S:1.12 Tue Jul 17 06:01:59 2018
+++ src/sys/arch/aarch64/aarch64/locore.S Tue Jul 17 14:08:36 2018
@@ -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 <r...@nerv.org>
@@ -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 @@ RCSID("$NetBSD: locore.S,v 1.12 2018/07/
#define VERBOSE(string)
#endif
-#define fp x29
-#define lr x30
-
/* load far effective address (pc relative) */
.macro ADDR, reg, addr
adrp \reg, \addr
Index: src/sys/arch/aarch64/include/asm.h
diff -u src/sys/arch/aarch64/include/asm.h:1.2 src/sys/arch/aarch64/include/asm.h:1.3
--- src/sys/arch/aarch64/include/asm.h:1.2 Sun Apr 1 00:35:03 2018
+++ src/sys/arch/aarch64/include/asm.h Tue Jul 17 14:08:37 2018
@@ -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_ */
