espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-02 04:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: dv-sockser: add stub funcs when not available

Browse Source 
This lets ports assume that the dv-sockser API is always available if
they want to.  This way we don't have to do an abort at configure time
and it makes the resulting code a bit simpler.
This commit is contained in:
Mike Frysinger
2015-03-22 22:23:04 -04:00
parent 80fc77e6c1
commit 3649cb0656
11 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sim/bfin/ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* dv-bfin_uart.c [!HAVE_DV_SOCKSER] (dv_sockser_status,
dv_sockser_write, dv_sockser_read): Delete.
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* sim-main.h: Delete run-sim.h include.

6
sim/bfin/dv-bfin_uart.c
View File

@ -74,12 +74,6 @@ static const char *mmr_name (struct bfin_uart *uart, bu32 idx)
}
#define mmr_name(off) mmr_name (uart, (off) / 4)
#ifndef HAVE_DV_SOCKSER
# define dv_sockser_status(sd) -1
# define dv_sockser_write(sd, byte) do { ; } while (0)
# define dv_sockser_read(sd) 0xff
#endif
static void
bfin_uart_poll (struct hw *me, void *data)
{

8
sim/common/ChangeLog
View File

@ -1,3 +1,11 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* dv-sockser.c: Include config.h.
* dv-sockser.h: Include sim-inline.h.
[HAVE_DV_SOCKSER]: Move all prototypes here.
[!HAVE_DV_SOCKSER] (dv_sockser_status, dv_sockser_write,
dv_sockser_write_buffer, dv_sockser_read): New stub functions.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* gentmap.c, run.c: Convert old style prototypes.

1
sim/common/dv-sockser.c
View File

@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* FIXME: will obviously need to evolve.
- connectionless sockets might be more appropriate. */
#include "config.h"
#include "sim-main.h"
#ifdef HAVE_STRING_H

37
sim/common/dv-sockser.h
View File

@ -19,11 +19,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef DV_SOCKSER_H
#define DV_SOCKSER_H
#include "sim-inline.h"
/* bits in result of dev_sockser_status */
#define DV_SOCKSER_INPUT_EMPTY 0x1
#define DV_SOCKSER_OUTPUT_EMPTY 0x2
#define DV_SOCKSER_DISCONNECTED 0x4
#ifdef HAVE_DV_SOCKSER
/* FIXME: later add a device ptr arg */
extern int dv_sockser_status (SIM_DESC);
int dv_sockser_write (SIM_DESC, unsigned char);
@ -32,4 +36,37 @@ int dv_sockser_read (SIM_DESC);
SIM_RC dv_sockser_install (SIM_DESC);
#else
/* If dv-sockser isn't available, provide stub functions. */
STATIC_INLINE int
dv_sockser_status (SIM_DESC sd)
{
return (DV_SOCKSER_INPUT_EMPTY |
DV_SOCKSER_OUTPUT_EMPTY |
DV_SOCKSER_DISCONNECTED);
}
STATIC_INLINE int
dv_sockser_write (SIM_DESC sd, unsigned char c)
{
return -1;
}
STATIC_INLINE int
dv_sockser_write_buffer (SIM_DESC sd, const unsigned char *buffer,
unsigned nr_bytes)
{
return -1;
}
STATIC_INLINE int
dv_sockser_read (SIM_DESC sd)
{
return -1;
}
#endif /* HAVE_DV_SOCKSER */
#endif /* DV_SOCKSER_H */

5
sim/mips/ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
* configure.ac: Delete sim_hw checks for dv-sockser.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.

9
sim/mips/configure vendored
View File

@ -14126,15 +14126,6 @@ fi
mips_extra_objs="$SIM_DV_SOCKSER_O"
if test "$sim_hw_p" = yes -a -z "$SIM_DV_SOCKSER_O"; then
case " $sim_hw " in
*" tx3904sio "*)
as_fn_error "Sorry, but tx3904sio hardware support is
unavailable for your target. Please use --disable-sim-hardware, or pass a
list of devices to enable that does not include that." "$LINENO" 5
esac
fi
# Choose simulator engine
case "${target}" in

9
sim/mips/configure.ac
View File

@ -422,15 +422,6 @@ SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
mips_extra_objs="$SIM_DV_SOCKSER_O"
AC_SUBST(mips_extra_objs)
if test "$sim_hw_p" = yes -a -z "$SIM_DV_SOCKSER_O"; then
case " $sim_hw " in
*" tx3904sio "*)
AC_MSG_ERROR([Sorry, but tx3904sio hardware support is
unavailable for your target. Please use --disable-sim-hardware, or pass a
list of devices to enable that does not include that.])
esac
fi
# Choose simulator engine
case "${target}" in

5
sim/mn10300/ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
* configure.ac: Delete SIM_DV_SOCKSER_O check.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.

6
sim/mn10300/configure vendored
View File

@ -13793,12 +13793,6 @@ fi
fi
if test -z "$SIM_DV_SOCKSER_O"; then
as_fn_error "Sorry, but hardware support in this simulator
unconditionally relies on dv-sockser.o which is unavailable for your host.
Please fix this simulator." "$LINENO" 5
fi
ac_sources="$sim_link_files"
ac_dests="$sim_link_links"

6
sim/mn10300/configure.ac
View File

@ -19,10 +19,4 @@ AC_CHECK_HEADERS(utime.h)
SIM_AC_OPTION_HARDWARE(always,"","")
if test -z "$SIM_DV_SOCKSER_O"; then
AC_MSG_ERROR([Sorry, but hardware support in this simulator
unconditionally relies on dv-sockser.o which is unavailable for your host.
Please fix this simulator.])
fi
SIM_AC_OUTPUT