From: Jiri Gaisler <jiri@gaisler.se>
To: gdb-patches@sourceware.org
Cc: Jiri Gaisler <jiri@gaisler.se>
Subject: [PATCH v4 08/13] sim/erc32: Move local extern declarations into sis.h.
Date: Tue, 17 Mar 2015 21:04:00 -0000 [thread overview]
Message-ID: <1426626170-21401-9-git-send-email-jiri@gaisler.se> (raw)
In-Reply-To: <1426626170-21401-1-git-send-email-jiri@gaisler.se>
* erc32.c : Move extern declarations to sis.h
* exec.c, func.c, interf.c, sis.c : As above.
---
sim/erc32/erc32.c | 10 ----------
sim/erc32/exec.c | 7 -------
sim/erc32/func.c | 12 ++++--------
sim/erc32/interf.c | 19 -------------------
sim/erc32/sis.c | 20 --------------------
sim/erc32/sis.h | 18 ++++++++++++++++++
6 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c
index f3cce80..12e20a6 100644
--- a/sim/erc32/erc32.c
+++ b/sim/erc32/erc32.c
@@ -33,12 +33,6 @@
#include "sis.h"
#include "sim-config.h"
-extern int ctrl_c;
-extern int32 sis_verbose;
-extern int32 sparclite, sparclite_board;
-extern int rom8,wrp,uben;
-extern char uart_dev1[], uart_dev2[];
-
static int tty_setup = 1; /* default setup if not a tty */
/* MEC registers */
@@ -295,8 +289,6 @@ static unsigned char *
static void store_bytes (unsigned char *mem, uint32 waddr,
uint32 *data, int sz, int32 *ws);
-extern int ext_irl;
-
static host_callback *callback;
@@ -1883,8 +1875,6 @@ sis_memory_read(addr, data, length)
return (length);
}
-extern struct pstate sregs;
-
void
boot_init (void)
{
diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c
index 71ae677..2ee1118 100644
--- a/sim/erc32/exec.c
+++ b/sim/erc32/exec.c
@@ -24,7 +24,6 @@
#include <math.h>
#include <stdio.h>
-extern int32 sis_verbose, sparclite;
int ext_irl = 0;
/* Load/store interlock delay */
@@ -228,10 +227,6 @@ static int fpexec (uint32 op3, uint32 rd, uint32 rs1, uint32 rs2,
struct pstate *sregs);
static int chk_asi (struct pstate *sregs, uint32 *asi, uint32 op3);
-
-extern struct estate ebase;
-extern int32 nfp,ift;
-
#ifdef ERRINJ
extern uint32 errtt, errftt;
#endif
@@ -2017,8 +2012,6 @@ execute_trap(sregs)
}
-extern struct irqcell irqarr[16];
-
int
check_interrupts(sregs)
struct pstate *sregs;
diff --git a/sim/erc32/func.c b/sim/erc32/func.c
index 210842b..94493b8 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -41,7 +41,10 @@ int dumbio = 0; /* normal, smart, terminal oriented IO by default */
struct disassemble_info dinfo;
struct pstate sregs;
-extern struct estate ebase;
+struct estate ebase;
+struct evcell evbuf[EVENT_MAX];
+struct irqcell irqarr[16];
+
int ctrl_c = 0;
int sis_verbose = 0;
char *sis_version = "2.7.5";
@@ -55,7 +58,6 @@ int sparclite = 0; /* emulating SPARClite instructions? */
int sparclite_board = 0; /* emulating SPARClite board RAM? */
char uart_dev1[128] = "";
char uart_dev2[128] = "";
-extern int ext_irl;
uint32 last_load_addr = 0;
int nouartrx = 0;
host_callback *sim_callback;
@@ -729,12 +731,6 @@ init_signals()
}
-extern struct disassemble_info dinfo;
-
-struct estate ebase;
-struct evcell evbuf[EVENT_MAX];
-struct irqcell irqarr[16];
-
static int
disp_fpu(sregs)
struct pstate *sregs;
diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 394b724..3d827ff 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -37,25 +37,6 @@
#define PSR_CWP 0x7
-extern struct disassemble_info dinfo;
-extern struct estate ebase;
-
-extern int nfp;
-extern int ift;
-extern int rom8;
-extern int wrp;
-extern int uben;
-extern char *sis_version;
-extern struct estate ebase;
-extern struct evcell evbuf[];
-extern struct irqcell irqarr[];
-extern int irqpend, ext_irl;
-extern int sparclite;
-extern int dumbio;
-extern int sparclite_board;
-extern int termsave;
-extern char uart_dev1[], uart_dev2[];
-
int sis_gdb_break = 1;
int
diff --git a/sim/erc32/sis.c b/sim/erc32/sis.c
index 79757ae..d833da3 100644
--- a/sim/erc32/sis.c
+++ b/sim/erc32/sis.c
@@ -42,26 +42,6 @@
/* Command history buffer length - MUST be binary */
#define HIST_LEN 64
-extern struct disassemble_info dinfo;
-extern struct estate ebase;
-
-extern int nfp;
-extern int ift;
-extern int wrp;
-extern int rom8;
-extern int uben;
-extern char *sis_version;
-extern struct estate ebase;
-extern struct evcell evbuf[];
-extern struct irqcell irqarr[];
-extern int irqpend, ext_irl;
-extern int termsave;
-extern int sparclite;
-extern int dumbio;
-extern char uart_dev1[];
-extern char uart_dev2[];
-extern uint32 last_load_addr;
-
#ifdef ERA
extern int era;
#endif
diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h
index 36067ad..9ec128e 100644
--- a/sim/erc32/sis.h
+++ b/sim/erc32/sis.h
@@ -166,8 +166,25 @@ extern const struct memsys erc32sys;
/* func.c */
extern struct pstate sregs;
+extern struct estate ebase;
+extern struct evcell evbuf[];
+extern struct irqcell irqarr[];
+extern int nfp;
+extern int ift;
extern int ctrl_c;
extern int sis_verbose;
+extern char *sis_version;
+extern int sparclite;
+extern int sparclite_board;
+extern uint32 last_load_addr;
+extern int wrp;
+extern int rom8;
+extern int uben;
+extern int irqpend;
+extern int ext_irl;
+extern int termsave;
+extern char uart_dev1[];
+extern char uart_dev2[];
extern void set_regi (struct pstate *sregs, int32 reg,
uint32 rval);
extern void get_regi (struct pstate *sregs, int32 reg, char *buf);
@@ -178,6 +195,7 @@ extern void init_bpt (struct pstate *sregs);
extern void init_signals (void);
struct disassemble_info;
+extern struct disassemble_info dinfo;
extern void dis_mem (uint32 addr, uint32 len,
struct disassemble_info *info);
extern void event (void (*cfunc) (), int32 arg, uint64 delta);
--
1.9.1
prev parent reply other threads:[~2015-03-17 21:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 21:03 [PATCH v4 00/13] Update of the SPARC SIS simulator Jiri Gaisler
2015-03-17 21:03 ` [PATCH v4 02/13] sim/erc32: Removed type mismatch compiler warnings Jiri Gaisler
2015-03-17 22:59 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 11/13] sim/erc32: Updated documentation Jiri Gaisler
2015-03-28 7:17 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 10/13] sim/erc32: Add support for LEON2 processor emulation Jiri Gaisler
2015-03-28 7:21 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 05/13] sim/erc32: Fix a few compiler warnings Jiri Gaisler
2015-03-28 7:06 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 09/13] sim/erc32: Add support for LEON3 processor emulation Jiri Gaisler
2015-03-17 21:03 ` [PATCH v4 04/13] sim/erc32: Use memory_iread() function for instruction fetching Jiri Gaisler
2015-03-28 7:01 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 03/13] sim/erc32: Switched emulated memory to host endian order Jiri Gaisler
2015-03-22 22:46 ` Mike Frysinger
2015-03-23 9:01 ` Jiri Gaisler
2015-03-28 7:41 ` Mike Frysinger
2015-03-28 8:21 ` Jiri Gaisler
2015-03-24 9:39 ` Jiri Gaisler
2015-03-27 10:26 ` Jiri Gaisler
2015-03-17 21:03 ` [PATCH v4 12/13] sim/erc32: Add data watchpoint support Jiri Gaisler
2015-03-28 7:16 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 01/13] sim/erc32: Added -v command line switch for verbose output Jiri Gaisler
2015-03-17 22:56 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 07/13] sim/erc32: Access memory subsystem through struct memsys Jiri Gaisler
2015-03-28 7:15 ` Mike Frysinger
2015-03-17 21:03 ` [PATCH v4 06/13] sim/erc32: Use gdb callback for UART I/O when linked with gdb Jiri Gaisler
2015-03-28 7:13 ` Mike Frysinger
2015-03-17 21:04 ` [PATCH v4 13/13] Add watchpoint support to gdb simulator interface Jiri Gaisler
2015-03-28 7:19 ` Mike Frysinger
2015-03-30 20:51 ` Jiri Gaisler
2015-03-17 21:04 ` Jiri Gaisler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426626170-21401-9-git-send-email-jiri@gaisler.se \
--to=jiri@gaisler.se \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox