FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: dv-sockser: push module init prototype down

Browse source 
Pull out the duplicated dv_sockser_install prototype from the tconfig.in
files and put it in the one place it gets used -- sim-module.c.  This is
still arguably incorrect, but it's better than the status quo where the
tconfig.in has to include header files and duplicate the dv-sockser func.
The tconfig header is meant to be simple and contain a target defines.
This commit is contained in:
Mike Frysinger 2015-03-15 02:55:08 -04:00
parent b19839da38
commit 8406bb5944
24 changed files with 68 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/gdb/ChangeLog
View file

@ -1,3 +1,7 @@
2015-05-15 Mike Frysinger <vapier@gentoo.org>
* remote-sim.h (struct host_callback_struct): Define.
2015-01-31 Doug Evans <xdje42@gmail.com> 2015-01-31 Doug Evans <xdje42@gmail.com>
* section-scripts.h: Remove "future extension" comment. * section-scripts.h: Remove "future extension" comment.

3
include/gdb/remote-sim.h
View file

@ -60,9 +60,10 @@ typedef enum {
} SIM_RC; } SIM_RC;
/* The bfd struct, as an opaque type. */ /* Some structs, as opaque types. */
struct bfd; struct bfd;
struct host_callback_struct;
/* Main simulator entry points. */ /* Main simulator entry points. */

5
sim/bfin/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in: Delete includes.
[HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* bfin-sim.c (decode_dsp32alu_0): Change v to bu32. * bfin-sim.c (decode_dsp32alu_0): Change v to bu32.

12
sim/bfin/tconfig.in
View file

@ -7,18 +7,6 @@
Common sim core by default sets hw_system_cpu to NULL for WITH_HW. */ Common sim core by default sets hw_system_cpu to NULL for WITH_HW. */
#define WITH_DEVICES 1 #define WITH_DEVICES 1
/* FIXME: This is unnecessarily necessary: */
#include "ansidecl.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
#include "sim-module.h"
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
/* ??? Temporary hack until model support unified. */ /* ??? Temporary hack until model support unified. */
#define SIM_HAVE_MODEL #define SIM_HAVE_MODEL

8
sim/common/ChangeLog
View file

@ -1,3 +1,11 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* dv-socker.h (dv_sockser_install): Declare.
* sim-module.c: Include config.h.
[HAVE_DV_SOCKSER]: Include dv-sockser.h.
(modules) [HAVE_DV_SOCKSER]: Add dv_sockser_install.
* sim-module.h: Include gdb/remote-sim.h.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (BUILT_SRC_FROM_COMMON): Delete. * Make-common.in (BUILT_SRC_FROM_COMMON): Delete.

2
sim/common/dv-sockser.h
View file

@ -30,4 +30,6 @@ int dv_sockser_write (SIM_DESC, unsigned char);
int dv_sockser_write_buffer (SIM_DESC, const unsigned char *, unsigned); int dv_sockser_write_buffer (SIM_DESC, const unsigned char *, unsigned);
int dv_sockser_read (SIM_DESC); int dv_sockser_read (SIM_DESC);
SIM_RC dv_sockser_install (SIM_DESC);
#endif /* DV_SOCKSER_H */ #endif /* DV_SOCKSER_H */

10
sim/common/sim-module.c
View file

@ -19,6 +19,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "config.h"
#include "sim-main.h" #include "sim-main.h"
#include "sim-io.h" #include "sim-io.h"
#include "sim-options.h" #include "sim-options.h"
@ -28,6 +29,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-hw.h" #include "sim-hw.h"
#endif #endif
#ifdef HAVE_DV_SOCKSER
/* TODO: Shouldn't have device models here. */
#include "dv-sockser.h"
#endif
#include "libiberty.h" #include "libiberty.h"
/* List of all modules. */ /* List of all modules. */
@ -59,6 +65,10 @@ static MODULE_INSTALL_FN * const modules[] = {
#endif #endif
#if WITH_HW #if WITH_HW
sim_hw_install, sim_hw_install,
#endif
#ifdef HAVE_DV_SOCKSER
/* TODO: Shouldn't have device models here. */
dv_sockser_install,
#endif #endif
/* Configured in [simulator specific] additional modules. */ /* Configured in [simulator specific] additional modules. */
#ifdef MODULE_LIST #ifdef MODULE_LIST

1
sim/common/sim-module.h
View file

@ -30,6 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
TODO: Add facilities for saving/restoring state to/from a file. */ TODO: Add facilities for saving/restoring state to/from a file. */
#include "gdb/remote-sim.h"
/* Various function types. */ /* Various function types. */

5
sim/cris/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in: Delete most includes.
[HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

13
sim/cris/tconfig.in
View file

@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef CRIS_TCONFIG_H #ifndef CRIS_TCONFIG_H
#define CRIS_TCONFIG_H #define CRIS_TCONFIG_H
#include "ansidecl.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
#include "sim-module.h"
/* There's basically a a big ??? FIXME: CHECK THIS on everything in this /* There's basically a a big ??? FIXME: CHECK THIS on everything in this
file. I just copied it from m32r, pruned some stuff and added file. I just copied it from m32r, pruned some stuff and added
HAVE_MODEL because it seemed useful. */ HAVE_MODEL because it seemed useful. */
@ -35,15 +30,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* For MSPR support. FIXME: revisit. */ /* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1 #define WITH_DEVICES 1
#include "sim-module.h"
extern MODULE_INSTALL_FN cris_option_install; extern MODULE_INSTALL_FN cris_option_install;
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
extern MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install, cris_option_install,
#else
#define MODULE_LIST cris_option_install, #define MODULE_LIST cris_option_install,
#endif
#define SIM_HAVE_MODEL #define SIM_HAVE_MODEL

4
sim/frv/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in [HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

6
sim/frv/tconfig.in
View file

@ -13,12 +13,6 @@
/* For MSPR support. FIXME: revisit. */ /* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1 #define WITH_DEVICES 1
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
#if 0 #if 0
/* Enable watchpoints. */ /* Enable watchpoints. */
#define WITH_WATCHPOINTS 1 #define WITH_WATCHPOINTS 1

4
sim/iq2000/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in [HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

6
sim/iq2000/tconfig.in
View file

@ -13,12 +13,6 @@
/* For MSPR support. FIXME: revisit. */ /* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 0 #define WITH_DEVICES 0
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
#if 0 #if 0
/* Enable watchpoints. */ /* Enable watchpoints. */
#define WITH_WATCHPOINTS 1 #define WITH_WATCHPOINTS 1

4
sim/lm32/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Add @SIM_DV_SOCKSER_O@.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

1
sim/lm32/Makefile.in
View file

@ -12,6 +12,7 @@ SIM_OBJS = \
sim-model.o \ sim-model.o \
sim-reg.o \ sim-reg.o \
sim-signal.o \ sim-signal.o \
@SIM_DV_SOCKSER_O@ \
cgen-utils.o cgen-trace.o cgen-scache.o \ cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o sim-reason.o sim-engine.o sim-stop.o \ cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
sim-if.o arch.o \ sim-if.o arch.o \

4
sim/m32r/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in [HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

6
sim/m32r/tconfig.in
View file

@ -16,12 +16,6 @@
/* For MSPR support. FIXME: revisit. */ /* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1 #define WITH_DEVICES 1
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
#if 0 #if 0
/* Enable watchpoints. */ /* Enable watchpoints. */
#define WITH_WATCHPOINTS 1 #define WITH_WATCHPOINTS 1

5
sim/mips/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in: Delete includes.
[HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

13
sim/mips/tconfig.in
View file

@ -3,19 +3,6 @@
/* See sim-hload.c. We properly handle LMA. */ /* See sim-hload.c. We properly handle LMA. */
#ifdef TARGET_TX3904 #ifdef TARGET_TX3904
#define SIM_HANDLES_LMA 1 #define SIM_HANDLES_LMA 1
/* FIXME: This is unnecessarily necessary: */
#include "ansidecl.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
#include "sim-module.h"
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
#else #else
#define SIM_HANDLES_LMA 0 #define SIM_HANDLES_LMA 0
#endif #endif

4
sim/mn10300/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in: Delete file.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

29
sim/mn10300/tconfig.in
View file

@ -1,29 +0,0 @@
/* mn10300 target configuration file. */
/* FIXME: This is unnecessarily necessary: */
#include "ansidecl.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
#include "sim-module.h"
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
/* Define this if the simulator supports profiling.
See the mips simulator for an example.
This enables the `-p foo' and `-s bar' options.
The target is required to provide sim_set_profile{,_size}. */
/* #define SIM_HAVE_PROFILE */
/* Define this if the simulator uses an instruction cache.
See the h8/300 simulator for an example.
This enables the `-c size' option to set the size of the cache.
The target is required to provide sim_set_simcache_size. */
/* #define SIM_HAVE_SIMCACHE */
/* Define this if the target cpu is bi-endian
and the simulator supports it. */
/* #define SIM_HAVE_BIENDIAN */

4
sim/sh64/ChangeLog
View file

@ -1,3 +1,7 @@
2015-03-15 Mike Frysinger <vapier@gentoo.org>
* tconfig.in [HAVE_DV_SOCKSER]: Delete.
2015-03-14 Mike Frysinger <vapier@gentoo.org> 2015-03-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_RUN_OBJS): Delete. * Makefile.in (SIM_RUN_OBJS): Delete.

6
sim/sh64/tconfig.in
View file

@ -13,12 +13,6 @@
/* For MSPR support. FIXME: revisit. */ /* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 0 #define WITH_DEVICES 0
/* FIXME: Revisit. */
#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
#endif
#if 0 #if 0
/* Enable watchpoints. */ /* Enable watchpoints. */
#define WITH_WATCHPOINTS 1 #define WITH_WATCHPOINTS 1