9os

commit 0c414743375616f704e14ad142191ff3eaad349c
parent 960322473ad6aeccbf7b2ae820d182f32131f279
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Sun, 14 Oct 2018 16:53:24 +0100

[arm64] Rename read_/write_ to rd_/wr_

Change-Id: I05ee311e9cd1e82f0a7b9388722b89f60ae37d0b
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
M
arch/arm64/arch.s
 | 
32
++++++++++++++++----------------
M
arch/arm64/rom.c
 | 
2
+-
M
include/rcode.h
 | 
24
++++++++++++------------

3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm64/arch.s b/arch/arm64/arch.s
@@ -5,10 +5,10 @@ DAIF_DBG	=	4
 
 	.text
 	.globl	panic,enaabt,disabt,enadbg,disdbg,wfi,wfe
-	.globl	read_actlr_r,write_actlr_r
-	.globl	read_id_aa64rmfr0_r,write_id_aa64rmfr0_r
-	.globl	read_rcr_r,write_rcr_r,read_rdscr_r,write_rdscr_r
-	.globl	read_sctlr_rwrite_sctlr_r,read_rvbar_el3,write_sp_r
+	.globl	rd_actlr_r,wr_actlr_r
+	.globl	rd_id_aa64rmfr0_r,wr_id_aa64rmfr0_r
+	.globl	rd_rcr_r,wr_rcr_r,read_rdscr_r,wr_rdscr_r
+	.globl	rd_sctlr_rwr_sctlr_r,rd_rvbar_el3,wr_sp_r
 	.globl	vectbl,swtch
 
 enaabt:
@@ -33,51 +33,51 @@ wfi:	wfi
 wfe:	wfe
 	ret
 
-read_actlr_r:
+rd_actlr_r:
 	mrs	x0,S3_6_C1_C0_3
 	ret
 
-write_actlr_r:
+wr_actlr_r:
 	msr	S3_6_C1_C0_3,x0
 	ret
 
-read_id_aa64rmfr0_r:
+rd_id_aa64rmfr0_r:
 	mrs	x0,S3_6_C0_C7_6
 	ret
 
-write_id_aa64rmfr0_r:
+wr_id_aa64rmfr0_r:
 	msr	S3_6_C0_C7_6,x0
 	ret
 
-read_rcr_r:
+rd_rcr_r:
 	mrs	x0,S3_6_C1_C1_6
 	ret
 
-write_rcr_r:
+wr_rcr_r:
 	msr	S3_6_C1_C1_6,x0
 	ret
 
-read_rdscr_r:
+rd_rdscr_r:
 	mrs	x0,S3_6_C6_C15_6
 	ret
 
-write_rdscr_r:
+wr_rdscr_r:
 	msr	S3_6_C6_C15_6,x0
 	ret
 
-read_sctlr_r:
+rd_sctlr_r:
 	mrs	x0,S3_6_C1_C0_6
 	ret
 
-write_sctlr_r:
+wr_sctlr_r:
 	msr	S3_6_C1_C0_6,x0
 	ret
 
-read_rvbar_el3:
+rd_rvbar_el3:
 	mrs	x0,rvbar_el3
 	ret
 
-write_sp_r:
+wr_sp_r:
 	mrs	x1,spsel
 	msr	spsel,#1
 	mov	sp,x0
diff --git a/arch/arm64/rom.c b/arch/arm64/rom.c
@@ -54,7 +54,7 @@ main(void *sram)
 	fp += NR_NESTED - 1;
 	memset(fp, 0, sizeof(*fp));
 
-	fp->elr = read_rvbar_el3();
+	fp->elr = rd_rvbar_el3();
 	fp->spsr = 0xf << 6 | 0xd;
 
 	swtch(fp);
diff --git a/include/rcode.h b/include/rcode.h
@@ -65,18 +65,18 @@ extern void enadbg(void);
 extern void disdbg(void);
 extern void wfi(void);
 extern void wfe(void);
-extern unsigned long long read_actlr_r(void);
-extern void write_actlr_r(unsigned long long v);
-extern unsigned long long read_id_aa64rmfr0_r(void);
-extern void write_id_aa64rmfr0_r(unsigned long long v);
-extern unsigned long long read_rcr_r(void);
-extern void write_rcr_r(unsigned long long v);
-extern unsigned long long read_rdscr_r(void);
-extern void write_rdscr_r(unsigned long long v);
-extern unsigned long long read_sctlr_r(void);
-extern void write_sctlr_r(unsigned long long v);
-extern unsigned long long read_rvbar_el3(void);
-extern void write_sp_r(unsigned long long v);
+extern unsigned long long rd_actlr_r(void);
+extern void wr_actlr_r(unsigned long long v);
+extern unsigned long long rd_id_aa64rmfr0_r(void);
+extern void wr_id_aa64rmfr0_r(unsigned long long v);
+extern unsigned long long rd_rcr_r(void);
+extern void wr_rcr_r(unsigned long long v);
+extern unsigned long long rd_rdscr_r(void);
+extern void wr_rdscr_r(unsigned long long v);
+extern unsigned long long rd_sctlr_r(void);
+extern void wr_sctlr_r(unsigned long long v);
+extern unsigned long long rd_rvbar_el3(void);
+extern void wr_sp_r(unsigned long long v);
 
 /* global constant variables */
 extern const struct rowidx  rowidx[];