9os

commit 6f25d2d314c1cc04b98cc528fa89308a651ae07f
parent b4ce71c5f4878730ae0f46e75bd7f31daa6f0bc1
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Wed, 20 Feb 2019 13:27:23 +0000

Move around some definitions

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

Diffstat:
M
include/bits/rcode/sys/errno.h
 | 
3
---
M
include/rcode/rcode.h
 | 
6
++++++
M
include/rcode/romfw.h
 | 
20
+-------------------
M
src/romfw/dlang.c
 | 
3
+++
M
src/romfw/rmc.c
 | 
10
+++++++++-
M
target/hosted/rom.c
 | 
15
---------------
M
target/native/rom.c
 | 
20
--------------------

7 files changed, 19 insertions(+), 58 deletions(-)
diff --git a/include/bits/rcode/sys/errno.h b/include/bits/rcode/sys/errno.h
@@ -1,6 +1,3 @@
-extern int *geterrno(void);
-
-#define errno *geterrno()
 extern char *const _sys_errlist[];
 extern const int _sys_nerr;
 
diff --git a/include/rcode/rcode.h b/include/rcode/rcode.h
@@ -1,5 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <setjmp.h>
+
 #include <arch/types.h>
 
 #include "../features.h"
@@ -116,3 +118,7 @@ extern uint16_t outm16(uint16_t, void *addr);
 extern uint32_t outm32(uint32_t, void *addr);
 extern void lock(mutex_t *m);
 extern void unlock(mutex_t *m);
+
+/* dlang.c */
+extern unsigned in_debug;
+extern jmp_buf dbgrecover;
diff --git a/include/rcode/romfw.h b/include/rcode/romfw.h
@@ -1,26 +1,8 @@
 #include <stddef.h>
-#include <setjmp.h>
 
 struct rmctab;
 struct trapframe;
-struct rmucmd;
-struct devdata;
 
-extern unsigned char in_panic;
-extern unsigned char in_debug;
-extern unsigned char in_dumpstack;
-extern unsigned char in_backtrace;
-extern void *environ;
-extern size_t bsssize;
-
-extern const char *errstr;
-extern jmp_buf dbgrecover;
+extern struct rmctab romtab;
 extern struct rmctab *rmctab;
 extern struct trapframe *framep;
-extern struct rmucmd *rmucmd;
-
-extern unsigned char enable; /* System realm enablement */
-extern unsigned char hascrypto; /* System-wide memory encryption */
-
-extern int errno_;
-extern struct rmctab romtab;
diff --git a/src/romfw/dlang.c b/src/romfw/dlang.c
@@ -16,6 +16,9 @@
 #define PREFIX	"> "
 #define NR_ARGC_MAX 4
 
+unsigned in_debug;
+jmp_buf dbgrecover;
+
 struct args {
 	char *argv[NR_ARGC_MAX];
 	int argc;
diff --git a/src/romfw/rmc.c b/src/romfw/rmc.c
@@ -8,6 +8,14 @@
 
 #include "ec.h"
 
+struct rmctab *rmctab;
+
+static unsigned in_panic;
+static unsigned in_dumpstack;
+static unsigned in_backtrace;
+static struct rmucmd *rmucmd;
+static char *errstr;
+
 static void
 dumpregs(struct trapframe *fp)
 {
@@ -124,7 +132,7 @@ trap(struct trapframe *fp)
 void
 badcmd(int error)
 {
-	Rmucmd *cmd = cmd;
+	Rmucmd *cmd = rmucmd;
 
 	dbg("bad RMC: %d, %d = %d\n", cmd->class, cmd->func, error);
 	framep->r[X0] = error;
diff --git a/target/hosted/rom.c b/target/hosted/rom.c
@@ -7,25 +7,10 @@
 
 #include "hosted.h"
 
-
 static struct trapframe *frame(void);
 
-unsigned char in_panic;
-unsigned char in_debug;
-unsigned char in_dumpstack;
-unsigned char in_backtrace;
 void *environ;
-
-const char *errstr;
-jmp_buf dbgrecover;
-struct rmctab *rmctab;
 struct trapframe trapframe, *framep;
-struct rmucmd *rmucmd;
-
-unsigned char enable;   /* System realm enablement */
-unsigned char hascrypto;/* System-wide memory encryption */
-
-int errno_;
 struct trapframe *(*getframe)(void) = frame;
 
 static struct trapframe *
diff --git a/target/native/rom.c b/target/native/rom.c
@@ -17,22 +17,8 @@
 
 typedef struct mach Mach;
 
-unsigned char in_panic;
-unsigned char in_debug;
-unsigned char in_dumpstack;
-unsigned char in_backtrace;
 void *environ;
-
-const char *errstr;
-jmp_buf dbgrecover;
-struct rmctab *rmctab;
 struct trapframe trapframe, *framep;
-struct rmucmd *rmucmd;
-
-unsigned char enable;   /* System realm enablement */
-unsigned char hascrypto;/* System-wide memory encryption */
-
-int errno_;
 
 struct mach {
 	struct trapframe frame;
@@ -48,12 +34,6 @@ struct mach {
 	size_t stacksiz;
 };
 
-int *
-geterrno(void)
-{
-	return &errno_;
-}
-
 struct _Env *
 getenviron(void)
 {