sim: clean up some more device detritus

Clean up some more remains of WITH_DEVICES that escaped notice.

We also clean up GETTWI/SETTWI defines in a few ports where they
were copied & pasted and are unused as they happen to be near the
device code.
This commit is contained in:
Mike Frysinger 2016-01-03 03:44:02 -05:00
parent 34fed69938
commit 61971b86bb
13 changed files with 26 additions and 53 deletions

View File

@ -1,3 +1,8 @@
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* hw-device.h (device): Delete commented typedef.
* sim-basics.h (device): Delete typedef.
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sim-options.c (sim_parse_args): Replace for loop with a call

View File

@ -23,9 +23,6 @@
#ifndef HW_DEVICE_H
#define HW_DEVICE_H
/* declared in sim-basics.h, this object is used everywhere */
/* typedef struct _device device; */
/* Introduction:

View File

@ -60,7 +60,6 @@ extern int asprintf (char **result, const char *format, ...);
/* Global types that code manipulates */
typedef struct _device device;
struct hw;
struct _sim_fpu;

View File

@ -1,3 +1,7 @@
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (cris_devices): Delete.
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.

View File

@ -226,6 +226,4 @@ cris_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), \
/* Default memory size. */
#define CRIS_DEFAULT_MEM_SIZE 0x800000 /* 8M */
extern device cris_devices;
#endif /* SIM_MAIN_H */

View File

@ -1,3 +1,9 @@
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* iq2000-sim.h: Delete file.
* Makefile.in (SIM_EXTRA_DEPS): Delete iq2000-sim.h.
* sim-main.h: Delete iq2000-sim.h include.
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.

View File

@ -29,7 +29,7 @@ SIM_OBJS = \
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \
$(CGEN_INCLUDE_DEPS) \
arch.h cpuall.h iq2000-sim.h $(srcdir)/../../opcodes/iq2000-desc.h
arch.h cpuall.h $(srcdir)/../../opcodes/iq2000-desc.h
SIM_EXTRA_CFLAGS =

View File

@ -1,34 +0,0 @@
/* collection of junk waiting time to sort out
Copyright (C) 1998-2016 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the GNU Simulators.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef IQ2000_SIM_H
#define IQ2000_SIM_H
#define GETTWI GETTSI
#define SETTWI SETTSI
/* Hardware/device support.
/* sim_core_attach device argument. */
extern device iq2000_devices;
/* FIXME: Temporary, until device support ready. */
struct _device { int foo; };
#endif /* IQ2000_SIM_H */

View File

@ -25,7 +25,6 @@
#include "sim-base.h"
#include "cgen-sim.h"
#include "iq2000-sim.h"
/* The _sim_cpu struct. */

View File

@ -1,3 +1,7 @@
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sim-main.h (sim_state): Delete devices member.
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.

View File

@ -567,7 +567,6 @@ extern void m68hc11cpu_set_port (struct hw *me, sim_cpu *cpu,
struct sim_state {
sim_cpu *cpu[MAX_NR_PROCESSORS];
device *devices;
sim_state_base base;
};

View File

@ -1,3 +1,9 @@
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sh64-sim.h (GETTWI, SETTWI): Delete unused defines.
(sh5_devices): Delete.
(struct _device): Delete.
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sh64.c (count_argc): Delete.

View File

@ -20,20 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef SH64_SIM_H
#define SH64_SIM_H
#define GETTWI GETTSI
#define SETTWI SETTSI
enum {
ISM_COMPACT, ISM_MEDIA
};
/* Hardware/device support. */
extern device sh5_devices;
/* FIXME: Temporary, until device support ready. */
struct _device { int foo; };
extern IDESC * sh64_idesc_media;
extern IDESC * sh64_idesc_compact;