9os

commit c7cf28e0306f96e51e32e465255390199fd1ecca
parent 8c56561c267d01b974920083f9b48eda3cbeeda5
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu, 17 Jan 2019 13:45:09 +0000

Merge branch 'master' of ssh://gerrit.oss.arm.com/trusted-firmware/rcode

Change-Id: I1f0cefaa098bace01d8aa4dc5a8b2e1f30c83278

Diffstat:
M
include/bits/rmode/arch/setjmp.h
 | 
2
+-
M
src/libc/arch/rmode/longjmp.s
 | 
4
----
M
src/romfw/regstr.c
 | 
2
+-
M
target/native/crt.s
 | 
2
+-

4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/include/bits/rmode/arch/setjmp.h b/include/bits/rmode/arch/setjmp.h
@@ -1 +1 @@
-typedef unsigned long long jmp_buf[22];
+typedef unsigned long long jmp_buf[14];
diff --git a/src/libc/arch/rmode/longjmp.s b/src/libc/arch/rmode/longjmp.s
@@ -11,10 +11,6 @@ longjmp:
 	ldp x29, x30, [x0,#80]
 	ldr x2, [x0,#104]
 	mov sp, x2
-	ldp d8 , d9, [x0,#112]
-	ldp d10, d11, [x0,#128]
-	ldp d12, d13, [x0,#144]
-	ldp d14, d15, [x0,#160]
 
 	mov x0, x1
 	cbnz x1, 1f
diff --git a/src/romfw/regstr.c b/src/romfw/regstr.c
@@ -1,6 +1,6 @@
 #include <rcode/rcode.h>
 
-const char *const regtbl[] = {
+static const char *const regtbl[] = {
 	[X0] = "x0",
 	[X1] = "x1",
 	[X2] = "x2",
diff --git a/target/native/crt.s b/target/native/crt.s
@@ -19,7 +19,7 @@ getpc:
 	isb
 
 	ldr	x0,=SRAMADDR
-	mov	x1,#1024		/* Setup a initial stack at the botton */
+	mov	x1,#1024		/* Setup a initial stack at the bottom */
 	add	x0,x0,x1
 	mov	sp,x0
 	mov	x29,#0