9os

commit aeeb098661f45e12a9c2d72e9e70c65bbc19b342
parent 2d8c78cf3a8e2eefefd014861a1d712a73666106
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Sun, 14 Oct 2018 17:25:58 +0100

Don't use unsigned long long for pointers

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

Diffstat:
M
arch/arm64/arch.s
 | 
2
+-
M
include/rcode.h
 | 
6
+++---

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/arch.s b/arch/arm64/arch.s
@@ -7,7 +7,7 @@ DAIF_DBG	=	4
 	.globl	panic,enaabt,disabt,enadbg,disdbg,wfi,wfe
 	.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_rcr_r,wr_rcr_r,rd_rdscr_r,wr_rdscr_r
 	.globl	rd_sctlr_rwr_sctlr_r,rd_rvbar_el3,wr_sp_r
 	.globl	vectbl,swtch
 
diff --git a/include/rcode.h b/include/rcode.h
@@ -24,8 +24,8 @@ struct trapframe {
 	unsigned long long far;
 	unsigned long long esr;
 	unsigned long long spsr;
-	unsigned long long elr;
-	unsigned long long sp;
+	void *elr;
+	void *sp;
 	unsigned long long x30,x29,x28,x27;
 	unsigned long long x26,x25,x24,x23;
 	unsigned long long x22,x21,x20,x19;
@@ -75,7 +75,7 @@ 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 *rd_rvbar_el3(void);
 extern void wr_sp_r(void *);
 
 /* global constant variables */