From: Jiri Gaisler <jiri@gaisler.se>
To: gdb-patches@sourceware.org
Cc: Jiri Gaisler <jiri@gaisler.se>
Subject: [PATCH 17/23] sim/erc32: Move local extern declarations into sis.h
Date: Tue, 17 Feb 2015 07:45:00 -0000 [thread overview]
Message-ID: <1424159099-5148-18-git-send-email-jiri@gaisler.se> (raw)
In-Reply-To: <1424159099-5148-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 | 20 ++++++++++++++++++++
6 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c
index 8d2a6e8..1c55579 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;
@@ -1880,8 +1872,6 @@ sis_memory_read(addr, data, length)
return (length);
}
-extern struct pstate sregs;
-
void
boot_init ()
{
diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c
index 65e10bf..6d80306 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 a92a3e6..26cf5ef 100644
--- a/sim/erc32/func.c
+++ b/sim/erc32/func.c
@@ -39,7 +39,10 @@ int current_target_byte_order = BIG_ENDIAN;
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";
@@ -53,7 +56,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;
@@ -716,12 +718,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 612aded..2fab99f 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -36,25 +36,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 a5a81d8..efd8a63 100644
--- a/sim/erc32/sis.c
+++ b/sim/erc32/sis.c
@@ -41,26 +41,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 8f0a9c1..a7bb39a 100644
--- a/sim/erc32/sis.h
+++ b/sim/erc32/sis.h
@@ -167,8 +167,27 @@ extern 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 int dumbio;
+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);
@@ -179,6 +198,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);
--
2.1.0
next prev parent reply other threads:[~2015-02-17 7:45 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-17 7:45 [PATCH 00/22] Update of the SPARC SIS simulator Jiri Gaisler
2015-02-17 7:45 ` [PATCH 02/23] sim/erc32: corrected wrong CPU implementation and version ID in %psr Jiri Gaisler
2015-02-17 11:03 ` Mike Frysinger
2015-02-17 7:45 ` [PATCH 10/23] sim/erc32: Switched emulated memory to host endian order Jiri Gaisler
2015-02-17 7:45 ` [PATCH 01/23] sim/erc32: Disassembly in stand-alone mode did not work due to API change Jiri Gaisler
2015-02-17 11:03 ` Mike Frysinger
2015-02-17 7:45 ` [PATCH 07/23] sim/erc32: file loading via command line did not work Jiri Gaisler
2015-02-17 9:09 ` Mike Frysinger
2015-02-17 7:45 ` [PATCH 05/23] sim/erc32: remove unused defines in Makefile and switch off statistics Jiri Gaisler
2015-02-17 11:04 ` Mike Frysinger
2015-02-17 7:45 ` [PATCH 04/23] sim/erc32: Add FPU support on x86_64 hosts Jiri Gaisler
2015-02-17 9:05 ` Mike Frysinger
2015-02-19 20:45 ` Jiri Gaisler
2015-02-22 4:40 ` Mike Frysinger
2015-02-22 21:43 ` Jiri Gaisler
2015-02-17 7:45 ` [PATCH 16/23] sim/erc32: use readline.h for readline types and functions Jiri Gaisler
2015-02-17 9:21 ` Mike Frysinger
2015-02-17 7:45 ` Jiri Gaisler [this message]
2015-02-17 7:45 ` [PATCH 15/23] sim/erc32: access memory subsystem through struct memsys to allow multiple configurations Jiri Gaisler
2015-02-17 7:46 ` [PATCH 19/23] sim/erc32: Added support for the Leon2 processor Jiri Gaisler
2015-02-17 7:46 ` [PATCH 21/23] sim/erc32: add data watchpoint support for all cpu targets Jiri Gaisler
2015-02-17 7:46 ` [PATCH 11/23] sim/erc32: use AC_C_BIGENDIAN to probe for host endian Jiri Gaisler
2015-02-17 9:19 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 03/23] sim/erc32: Perform pseudo-init of system if binary starts from non-zero address Jiri Gaisler
2015-02-17 8:59 ` Mike Frysinger
2015-02-18 14:40 ` Jiri Gaisler
2015-02-18 16:53 ` Mike Frysinger
2015-02-19 16:11 ` Jiri Gaisler
2015-02-19 17:48 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 20/23] sim/erc32: Updated documentation Jiri Gaisler
2015-02-17 11:03 ` Mike Frysinger
2015-02-17 15:52 ` Eli Zaretskii
2015-02-17 7:46 ` [PATCH 13/23] sim/erc32: Fix a few compiler warnings Jiri Gaisler
2015-02-17 11:08 ` Mike Frysinger
2015-02-18 16:21 ` Jiri Gaisler
2015-02-18 16:51 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 12/23] sim/erc32: Use separate memory_iread() function for instruction fetching Jiri Gaisler
2015-02-17 7:46 ` [PATCH 09/23] sim/erc32: removed type mismatch compiler warnings Jiri Gaisler
2015-02-17 9:10 ` Mike Frysinger
2015-02-18 14:41 ` Jiri Gaisler
2015-02-18 16:57 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 14/23] sim/erc32: Use gdb callback for UART I/O when linked with gdb Jiri Gaisler
2015-02-17 7:46 ` [PATCH 08/23] sim/erc32: added -v and -vv command line switches for verbose output Jiri Gaisler
2015-02-17 9:13 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 06/23] sim/erc32: Fix incorrect simulator performance report Jiri Gaisler
2015-02-17 9:07 ` Mike Frysinger
2015-02-17 7:46 ` [PATCH 22/23] Added watchpoint support to gdb simulator interface Jiri Gaisler
2015-02-17 7:46 ` [PATCH 18/23] sim/erc32: Add support for LEON3 processor emulation Jiri Gaisler
2015-02-17 15:58 ` Eli Zaretskii
2015-02-17 8:54 ` [PATCH 00/22] Update of the SPARC SIS simulator Mike Frysinger
2015-02-17 14:41 ` Jiri Gaisler
2015-02-18 0:16 ` Mike Frysinger
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=1424159099-5148-18-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