* [PATCH 3/4] sim: d10v: delete NEED_UI_LOOP_HOOK handling
2015-03-30 6:22 [PATCH 1/4] sim: d10v: use common configure options Mike Frysinger
2015-03-30 6:22 ` [PATCH 4/4] sim: d10v: convert to nrun Mike Frysinger
2015-03-30 6:22 ` [PATCH 2/4] sim: d10v: clean up misc warnings Mike Frysinger
@ 2015-03-30 6:22 ` Mike Frysinger
2 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-03-30 6:22 UTC (permalink / raw)
To: gdb-patches
This hook is used only when linked into gdb, and d10v doesn't have a gdb
port anymore. Punt it.
Committed.
---
sim/d10v/ChangeLog | 7 +++++++
sim/d10v/Makefile.in | 3 +--
sim/d10v/interp.c | 19 -------------------
3 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 08a099f..ca4b5d2 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,12 @@
2015-03-30 Mike Frysinger <vapier@gentoo.org>
+ * Makefile.in (SIM_EXTRA_CFLAGS): Delete -DNEED_UI_LOOP_HOOK.
+ * interp.c [NEED_UI_LOOP_HOOK] (UI_LOOP_POLL_INTERVAL,
+ ui_loop_hook_counter, deprecated_ui_loop_hook): Delete.
+ (sim_resume) [NEED_UI_LOOP_HOOK]: Delete ui code.
+
+2015-03-30 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in (gencode.o, d10v-opc.o): Add $(WARN_CFLAGS).
(gencode): Add $(BUILD_LDFLAGS).
* endian.c (get_word, get_longword, get_longlong, write_word,
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 5ea5b1d..fb2d72d 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -22,8 +22,7 @@ SIM_RUN_OBJS = run.o
SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT \
- -DSIM_USE_DEPRECATED_RUN_FRONTEND
+SIM_EXTRA_CFLAGS = -DSIM_HAVE_ENVIRONMENT -DSIM_USE_DEPRECATED_RUN_FRONTEND
INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
$(srcroot)/include/gdb/sim-d10v.h
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 57bca39..0b21549 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -56,17 +56,6 @@ extern void sim_set_profile (int n);
extern void sim_set_profile_size (int n);
static INLINE uint8 *map_memory (unsigned phys_addr);
-#ifdef NEED_UI_LOOP_HOOK
-/* How often to run the ui_loop update, when in use */
-#define UI_LOOP_POLL_INTERVAL 0x14000
-
-/* Counter for the ui_loop_hook update */
-static long ui_loop_hook_counter = UI_LOOP_POLL_INTERVAL;
-
-/* Actual hook to call to run through gdb's gui event loop */
-extern int (*deprecated_ui_loop_hook) (int signo);
-#endif /* NEED_UI_LOOP_HOOK */
-
#ifndef INLINE
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define INLINE __inline__
@@ -1042,14 +1031,6 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
/* Writeback all the DATA / PC changes */
SLOT_FLUSH ();
-
-#ifdef NEED_UI_LOOP_HOOK
- if (deprecated_ui_loop_hook != NULL && ui_loop_hook_counter-- < 0)
- {
- ui_loop_hook_counter = UI_LOOP_POLL_INTERVAL;
- deprecated_ui_loop_hook (0);
- }
-#endif /* NEED_UI_LOOP_HOOK */
}
while ( !State.exception && !stop_simulator);
--
2.3.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/4] sim: d10v: clean up misc warnings
2015-03-30 6:22 [PATCH 1/4] sim: d10v: use common configure options Mike Frysinger
2015-03-30 6:22 ` [PATCH 4/4] sim: d10v: convert to nrun Mike Frysinger
@ 2015-03-30 6:22 ` Mike Frysinger
2015-03-30 6:22 ` [PATCH 3/4] sim: d10v: delete NEED_UI_LOOP_HOOK handling Mike Frysinger
2 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-03-30 6:22 UTC (permalink / raw)
To: gdb-patches
Committed.
---
sim/d10v/ChangeLog | 25 ++++
sim/d10v/Makefile.in | 6 +-
sim/d10v/endian.c | 21 +---
sim/d10v/gencode.c | 21 ++--
sim/d10v/interp.c | 108 ++++------------
sim/d10v/simops.c | 344 +++++++++++++++++++++++++--------------------------
6 files changed, 240 insertions(+), 285 deletions(-)
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 1ab3014..08a099f 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,30 @@
2015-03-30 Mike Frysinger <vapier@gentoo.org>
+ * Makefile.in (gencode.o, d10v-opc.o): Add $(WARN_CFLAGS).
+ (gencode): Add $(BUILD_LDFLAGS).
+ * endian.c (get_word, get_longword, get_longlong, write_word,
+ write_longword, write_longlong): Convert old style prototypes.
+ * gencode.c: Include string.h.
+ (main): Convert old style prototype.
+ (write_header): Convert old style prototype and fix printf format.
+ (write_template, write_opcodes): Likewise.
+ (check_opcodes): Mark static void.
+ * interp.c: Include inttypes.h and run-sim.h.
+ (hash, lookup_hash, decode_pc, do_long, do_2_short, do_parallel,
+ add_commas, sim_size, sim_write, sim_read, sim_open, sim_close,
+ sim_set_profile, sim_set_profile_size, sim_stop, +sim_resume,
+ sim_info, sim_set_callbacks, sim_stop_reason, sim_fetch_register,
+ sim_store_register, sim_do_command, sim_load): Convert old style
+ prototypes.
+ (sim_create_inferior): Fix pointer cast to use uintptr_t.
+ * simops.c (strrchr): Delete prototype.
+ (trace_input_func): Mark name static.
+ (trace_input_func, trace_output_void, trace_output_flag): Convert old style
+ prototypes.
+ (OP_*): Convert old style prototypes.
+
+2015-03-30 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in (interp.o, simops.o, endian.o, table.o): Delete rules.
* configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
SIM_AC_OPTION_HOSTENDIAN, SIM_AC_OPTION_ENVIRONMENT, and
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index b6d6a18..5ea5b1d 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -40,13 +40,13 @@ table.c: gencode simops.h
./gencode >$@
gencode.o: gencode.c $(INCLUDE)
- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gencode.c
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/gencode.c
d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c
- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
gencode: gencode.o d10v-opc.o
- $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
+ $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
clean-extra:
rm -f table.c simops.h gencode
diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
index 9ef503e..e9fce7d 100644
--- a/sim/d10v/endian.c
+++ b/sim/d10v/endian.c
@@ -8,8 +8,7 @@
#endif
ENDIAN_INLINE uint16
-get_word (x)
- uint8 *x;
+get_word (uint8 *x)
{
#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
@@ -28,8 +27,7 @@ get_word (x)
}
ENDIAN_INLINE uint32
-get_longword (x)
- uint8 *x;
+get_longword (uint8 *x)
{
#if (defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__) && defined(USE_BSWAP)
@@ -62,8 +60,7 @@ get_longword (x)
}
ENDIAN_INLINE int64
-get_longlong (x)
- uint8 *x;
+get_longlong (uint8 *x)
{
uint32 top = get_longword (x);
uint32 bottom = get_longword (x+4);
@@ -71,9 +68,7 @@ get_longlong (x)
}
ENDIAN_INLINE void
-write_word (addr, data)
- uint8 *addr;
- uint16 data;
+write_word (uint8 *addr, uint16 data)
{
#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
@@ -92,9 +87,7 @@ write_word (addr, data)
}
ENDIAN_INLINE void
-write_longword (addr, data)
- uint8 *addr;
- uint32 data;
+write_longword (uint8 *addr, uint32 data)
{
#if (defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__) && defined(USE_BSWAP)
@@ -128,9 +121,7 @@ write_longword (addr, data)
}
ENDIAN_INLINE void
-write_longlong (addr, data)
- uint8 *addr;
- int64 data;
+write_longlong (uint8 *addr, int64 data)
{
write_longword (addr, (uint32)(data >> 32));
write_longword (addr+4, (uint32)data);
diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c
index c0a748f..1728d8c 100644
--- a/sim/d10v/gencode.c
+++ b/sim/d10v/gencode.c
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <ctype.h>
#include <limits.h>
+#include <string.h>
#include "ansidecl.h"
#include "opcode/d10v.h"
@@ -10,9 +11,7 @@ static void write_opcodes (void);
static void write_template (void);
int
-main (argc, argv)
- int argc;
- char *argv[];
+main (int argc, char *argv[])
{
if ((argc > 1) && (strcmp (argv[1],"-h") == 0))
write_header();
@@ -25,13 +24,13 @@ main (argc, argv)
static void
-write_header ()
+write_header (void)
{
struct d10v_opcode *opcode;
for (opcode = (struct d10v_opcode *)d10v_opcodes; opcode->name; opcode++)
if (opcode->format != OPCODE_FAKE)
- printf("void OP_%X (void);\t\t/* %s */\n",opcode->opcode, opcode->name);
+ printf("void OP_%lX (void);\t\t/* %s */\n", opcode->opcode, opcode->name);
}
@@ -39,7 +38,7 @@ write_header ()
/* to be filled out */
static void
-write_template ()
+write_template (void)
{
struct d10v_opcode *opcode;
int i,j;
@@ -51,7 +50,7 @@ write_template ()
{
if (opcode->format != OPCODE_FAKE)
{
- printf("/* %s */\nvoid\nOP_%X ()\n{\n",opcode->name,opcode->opcode);
+ printf("/* %s */\nvoid\nOP_%lX ()\n{\n", opcode->name, opcode->opcode);
/* count operands */
j = 0;
@@ -87,18 +86,18 @@ write_template ()
long Opcodes[512];
static int curop=0;
+static void
check_opcodes( long op)
{
int i;
for (i=0;i<curop;i++)
if (Opcodes[i] == op)
- fprintf(stderr,"DUPLICATE OPCODES: %x\n",op);
+ fprintf(stderr,"DUPLICATE OPCODES: %lx\n", op);
}
-
static void
-write_opcodes ()
+write_opcodes (void)
{
struct d10v_opcode *opcode;
int i, j;
@@ -112,7 +111,7 @@ write_opcodes ()
{
if (opcode->format != OPCODE_FAKE)
{
- printf (" { %ld,%d,%ld,%d,%d,%d,%d,OP_%X,", opcode->opcode,
+ printf (" { %ld,%d,%ld,%d,%d,%d,%d,OP_%lX,", opcode->opcode,
(opcode->format & LONG_OPCODE) ? 1 : 0, opcode->mask, opcode->format,
opcode->cycles, opcode->unit, opcode->exec_type, opcode->opcode);
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 27ae19f..57bca39 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1,8 +1,10 @@
#include "config.h"
+#include <inttypes.h>
#include <signal.h>
#include "bfd.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
+#include "run-sim.h"
#include "d10v_sim.h"
#include "gdb/sim-d10v.h"
@@ -86,9 +88,7 @@ struct hash_entry
struct hash_entry hash_table[MAX_HASH+1];
INLINE static long
-hash(insn, format)
- long insn;
- int format;
+hash (long insn, int format)
{
if (format & LONG_OPCODE)
return ((insn & 0x3F000000) >> 24);
@@ -97,9 +97,7 @@ hash(insn, format)
}
INLINE static struct hash_entry *
-lookup_hash (ins, size)
- uint32 ins;
- int size;
+lookup_hash (uint32 ins, int size)
{
struct hash_entry *h;
@@ -140,7 +138,7 @@ get_operands (struct simops *s, uint32 ins)
}
bfd_vma
-decode_pc ()
+decode_pc (void)
{
asection *s;
if (!init_text_p && prog_bfd != NULL)
@@ -160,8 +158,7 @@ decode_pc ()
}
static void
-do_long (ins)
- uint32 ins;
+do_long (uint32 ins)
{
struct hash_entry *h;
#ifdef DEBUG
@@ -178,9 +175,7 @@ do_long (ins)
}
static void
-do_2_short (ins1, ins2, leftright)
- uint16 ins1, ins2;
- enum _leftright leftright;
+do_2_short (uint16 ins1, uint16 ins2, enum _leftright leftright)
{
struct hash_entry *h;
enum _ins_type first, second;
@@ -232,8 +227,7 @@ do_2_short (ins1, ins2, leftright)
}
static void
-do_parallel (ins1, ins2)
- uint16 ins1, ins2;
+do_parallel (uint16 ins1, uint16 ins2)
{
struct hash_entry *h1, *h2;
#ifdef DEBUG
@@ -299,10 +293,7 @@ do_parallel (ins1, ins2)
}
static char *
-add_commas(buf, sizeof_buf, value)
- char *buf;
- int sizeof_buf;
- unsigned long value;
+add_commas (char *buf, int sizeof_buf, unsigned long value)
{
int comma = 3;
char *endbuf = buf + sizeof_buf - 1;
@@ -322,9 +313,7 @@ add_commas(buf, sizeof_buf, value)
}
void
-sim_size (power)
- int power;
-
+sim_size (int power)
{
int i;
for (i = 0; i < IMEM_SEGMENTS; i++)
@@ -770,22 +759,14 @@ xfer_mem (SIM_ADDR virt,
int
-sim_write (sd, addr, buffer, size)
- SIM_DESC sd;
- SIM_ADDR addr;
- const unsigned char *buffer;
- int size;
+sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size)
{
/* FIXME: this should be performing a virtual transfer */
return xfer_mem( addr, buffer, size, 1);
}
int
-sim_read (sd, addr, buffer, size)
- SIM_DESC sd;
- SIM_ADDR addr;
- unsigned char *buffer;
- int size;
+sim_read (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
{
/* FIXME: this should be performing a virtual transfer */
return xfer_mem( addr, buffer, size, 0);
@@ -793,11 +774,7 @@ sim_read (sd, addr, buffer, size)
SIM_DESC
-sim_open (kind, callback, abfd, argv)
- SIM_OPEN_KIND kind;
- host_callback *callback;
- struct bfd *abfd;
- char **argv;
+sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, char **argv)
{
struct simops *s;
struct hash_entry *h;
@@ -863,9 +840,7 @@ sim_open (kind, callback, abfd, argv)
void
-sim_close (sd, quitting)
- SIM_DESC sd;
- int quitting;
+sim_close (SIM_DESC sd, int quitting)
{
if (prog_bfd != NULL && prog_bfd_was_opened_p)
{
@@ -876,15 +851,13 @@ sim_close (sd, quitting)
}
void
-sim_set_profile (n)
- int n;
+sim_set_profile (int n)
{
(*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile %d\n",n);
}
void
-sim_set_profile_size (n)
- int n;
+sim_set_profile_size (int n)
{
(*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile_size %d\n",n);
}
@@ -951,8 +924,7 @@ imem_addr (uint32 offset)
static int stop_simulator = 0;
int
-sim_stop (sd)
- SIM_DESC sd;
+sim_stop (SIM_DESC sd)
{
stop_simulator = 1;
return 1;
@@ -961,9 +933,7 @@ sim_stop (sd)
/* Run (or resume) the program. */
void
-sim_resume (sd, step, siggnal)
- SIM_DESC sd;
- int step, siggnal;
+sim_resume (SIM_DESC sd, int step, int siggnal)
{
uint32 inst;
uint8 *iaddr;
@@ -1096,9 +1066,7 @@ sim_set_trace (void)
}
void
-sim_info (sd, verbose)
- SIM_DESC sd;
- int verbose;
+sim_info (SIM_DESC sd, int verbose)
{
char buf1[40];
char buf2[40];
@@ -1201,16 +1169,12 @@ sim_info (sd, verbose)
}
SIM_RC
-sim_create_inferior (sd, abfd, argv, env)
- SIM_DESC sd;
- struct bfd *abfd;
- char **argv;
- char **env;
+sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
{
bfd_vma start_address;
/* reset all state information */
- memset (&State.regs, 0, (int)&State.mem - (int)&State.regs);
+ memset (&State.regs, 0, (uintptr_t)&State.mem - (uintptr_t)&State.regs);
/* There was a hack here to copy the values of argc and argv into r0
and r1. The values were also saved into some high memory that
@@ -1262,8 +1226,7 @@ sim_create_inferior (sd, abfd, argv, env)
void
-sim_set_callbacks (p)
- host_callback *p;
+sim_set_callbacks (host_callback *p)
{
d10v_callback = p;
}
@@ -1277,10 +1240,7 @@ sim_trace (SIM_DESC sd)
}
void
-sim_stop_reason (sd, reason, sigrc)
- SIM_DESC sd;
- enum sim_stop *reason;
- int *sigrc;
+sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
{
/* (*d10v_callback->printf_filtered) (d10v_callback, "sim_stop_reason: PC=0x%x\n",PC<<2); */
@@ -1314,11 +1274,7 @@ sim_stop_reason (sd, reason, sigrc)
}
int
-sim_fetch_register (sd, rn, memory, length)
- SIM_DESC sd;
- int rn;
- unsigned char *memory;
- int length;
+sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
{
int size;
switch ((enum sim_d10v_regs) rn)
@@ -1401,11 +1357,7 @@ sim_fetch_register (sd, rn, memory, length)
}
int
-sim_store_register (sd, rn, memory, length)
- SIM_DESC sd;
- int rn;
- unsigned char *memory;
- int length;
+sim_store_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
{
int size;
switch ((enum sim_d10v_regs) rn)
@@ -1488,19 +1440,13 @@ sim_store_register (sd, rn, memory, length)
void
-sim_do_command (sd, cmd)
- SIM_DESC sd;
- const char *cmd;
+sim_do_command (SIM_DESC sd, const char *cmd)
{
(*d10v_callback->printf_filtered) (d10v_callback, "sim_do_command: %s\n",cmd);
}
SIM_RC
-sim_load (sd, prog, abfd, from_tty)
- SIM_DESC sd;
- const char *prog;
- bfd *abfd;
- int from_tty;
+sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty)
{
extern bfd *sim_load_file (); /* ??? Don't know where this should live. */
diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index ed3e570..e26770c 100644
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -15,8 +15,6 @@
#include "simops.h"
#include "targ-vals.h"
-extern char *strrchr ();
-
enum op_types {
OP_VOID,
OP_REG,
@@ -122,7 +120,7 @@ move_to_cr (int cr, reg_t mask, reg_t val, int psw_hw_p)
}
#ifdef DEBUG
-static void trace_input_func (char *name,
+static void trace_input_func (const char *name,
enum op_types in1,
enum op_types in2,
enum op_types in3);
@@ -154,11 +152,7 @@ static void trace_input_func (char *name,
#endif
static void
-trace_input_func (name, in1, in2, in3)
- char *name;
- enum op_types in1;
- enum op_types in2;
- enum op_types in3;
+trace_input_func (const char *name, enum op_types in1, enum op_types in2, enum op_types in3)
{
char *comma;
enum op_types in[3];
@@ -549,7 +543,7 @@ trace_output_16 (uint16 val)
}
static void
-trace_output_void ()
+trace_output_void (void)
{
if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
{
@@ -559,7 +553,7 @@ trace_output_void ()
}
static void
-trace_output_flag ()
+trace_output_flag (void)
{
if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
{
@@ -581,7 +575,7 @@ trace_output_flag ()
/* abs */
void
-OP_4607 ()
+OP_4607 (void)
{
int16 tmp;
trace_input ("abs", OP_REG, OP_VOID, OP_VOID);
@@ -600,7 +594,7 @@ OP_4607 ()
/* abs */
void
-OP_5607 ()
+OP_5607 (void)
{
int64 tmp;
trace_input ("abs", OP_ACCUM, OP_VOID, OP_VOID);
@@ -634,7 +628,7 @@ OP_5607 ()
/* add */
void
-OP_200 ()
+OP_200 (void)
{
uint16 a = GPR (OP[0]);
uint16 b = GPR (OP[1]);
@@ -647,7 +641,7 @@ OP_200 ()
/* add */
void
-OP_1201 ()
+OP_1201 (void)
{
int64 tmp;
tmp = SEXT40(ACC (OP[0])) + (SEXT16 (GPR (OP[1])) << 16 | GPR (OP[1] + 1));
@@ -670,7 +664,7 @@ OP_1201 ()
/* add */
void
-OP_1203 ()
+OP_1203 (void)
{
int64 tmp;
tmp = SEXT40(ACC (OP[0])) + SEXT40(ACC (OP[1]));
@@ -693,7 +687,7 @@ OP_1203 ()
/* add2w */
void
-OP_1200 ()
+OP_1200 (void)
{
uint32 tmp;
uint32 a = (GPR (OP[0])) << 16 | GPR (OP[0] + 1);
@@ -708,7 +702,7 @@ OP_1200 ()
/* add3 */
void
-OP_1000000 ()
+OP_1000000 (void)
{
uint16 a = GPR (OP[1]);
uint16 b = OP[2];
@@ -721,7 +715,7 @@ OP_1000000 ()
/* addac3 */
void
-OP_17000200 ()
+OP_17000200 (void)
{
int64 tmp;
tmp = SEXT40(ACC (OP[2])) + SEXT40 ((GPR (OP[1]) << 16) | GPR (OP[1] + 1));
@@ -734,7 +728,7 @@ OP_17000200 ()
/* addac3 */
void
-OP_17000202 ()
+OP_17000202 (void)
{
int64 tmp;
tmp = SEXT40(ACC (OP[1])) + SEXT40(ACC (OP[2]));
@@ -747,7 +741,7 @@ OP_17000202 ()
/* addac3s */
void
-OP_17001200 ()
+OP_17001200 (void)
{
int64 tmp;
SET_PSW_F1 (PSW_F0);
@@ -775,7 +769,7 @@ OP_17001200 ()
/* addac3s */
void
-OP_17001202 ()
+OP_17001202 (void)
{
int64 tmp;
SET_PSW_F1 (PSW_F0);
@@ -803,7 +797,7 @@ OP_17001202 ()
/* addi */
void
-OP_201 ()
+OP_201 (void)
{
uint16 a = GPR (OP[0]);
uint16 b;
@@ -820,7 +814,7 @@ OP_201 ()
/* and */
void
-OP_C00 ()
+OP_C00 (void)
{
uint16 tmp = GPR (OP[0]) & GPR (OP[1]);
trace_input ("and", OP_REG, OP_REG, OP_VOID);
@@ -830,7 +824,7 @@ OP_C00 ()
/* and3 */
void
-OP_6000000 ()
+OP_6000000 (void)
{
uint16 tmp = GPR (OP[1]) & OP[2];
trace_input ("and3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
@@ -840,7 +834,7 @@ OP_6000000 ()
/* bclri */
void
-OP_C01 ()
+OP_C01 (void)
{
int16 tmp;
trace_input ("bclri", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -851,7 +845,7 @@ OP_C01 ()
/* bl.s */
void
-OP_4900 ()
+OP_4900 (void)
{
trace_input ("bl.s", OP_CONSTANT8, OP_R0, OP_R1);
SET_GPR (13, PC + 1);
@@ -861,7 +855,7 @@ OP_4900 ()
/* bl.l */
void
-OP_24800000 ()
+OP_24800000 (void)
{
trace_input ("bl.l", OP_CONSTANT16, OP_R0, OP_R1);
SET_GPR (13, (PC + 1));
@@ -871,7 +865,7 @@ OP_24800000 ()
/* bnoti */
void
-OP_A01 ()
+OP_A01 (void)
{
int16 tmp;
trace_input ("bnoti", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -882,7 +876,7 @@ OP_A01 ()
/* bra.s */
void
-OP_4800 ()
+OP_4800 (void)
{
trace_input ("bra.s", OP_CONSTANT8, OP_VOID, OP_VOID);
JMP (PC + SEXT8 (OP[0]));
@@ -891,7 +885,7 @@ OP_4800 ()
/* bra.l */
void
-OP_24000000 ()
+OP_24000000 (void)
{
trace_input ("bra.l", OP_CONSTANT16, OP_VOID, OP_VOID);
JMP (PC + OP[0]);
@@ -900,7 +894,7 @@ OP_24000000 ()
/* brf0f.s */
void
-OP_4A00 ()
+OP_4A00 (void)
{
trace_input ("brf0f.s", OP_CONSTANT8, OP_VOID, OP_VOID);
if (!PSW_F0)
@@ -910,7 +904,7 @@ OP_4A00 ()
/* brf0f.l */
void
-OP_25000000 ()
+OP_25000000 (void)
{
trace_input ("brf0f.l", OP_CONSTANT16, OP_VOID, OP_VOID);
if (!PSW_F0)
@@ -920,7 +914,7 @@ OP_25000000 ()
/* brf0t.s */
void
-OP_4B00 ()
+OP_4B00 (void)
{
trace_input ("brf0t.s", OP_CONSTANT8, OP_VOID, OP_VOID);
if (PSW_F0)
@@ -930,7 +924,7 @@ OP_4B00 ()
/* brf0t.l */
void
-OP_25800000 ()
+OP_25800000 (void)
{
trace_input ("brf0t.l", OP_CONSTANT16, OP_VOID, OP_VOID);
if (PSW_F0)
@@ -940,7 +934,7 @@ OP_25800000 ()
/* bseti */
void
-OP_801 ()
+OP_801 (void)
{
int16 tmp;
trace_input ("bseti", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -951,7 +945,7 @@ OP_801 ()
/* btsti */
void
-OP_E01 ()
+OP_E01 (void)
{
trace_input ("btsti", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -961,7 +955,7 @@ OP_E01 ()
/* clrac */
void
-OP_5601 ()
+OP_5601 (void)
{
trace_input ("clrac", OP_ACCUM_OUTPUT, OP_VOID, OP_VOID);
SET_ACC (OP[0], 0);
@@ -970,7 +964,7 @@ OP_5601 ()
/* cmp */
void
-OP_600 ()
+OP_600 (void)
{
trace_input ("cmp", OP_REG, OP_REG, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -980,7 +974,7 @@ OP_600 ()
/* cmp */
void
-OP_1603 ()
+OP_1603 (void)
{
trace_input ("cmp", OP_ACCUM, OP_ACCUM, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -990,7 +984,7 @@ OP_1603 ()
/* cmpeq */
void
-OP_400 ()
+OP_400 (void)
{
trace_input ("cmpeq", OP_REG, OP_REG, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1000,7 +994,7 @@ OP_400 ()
/* cmpeq */
void
-OP_1403 ()
+OP_1403 (void)
{
trace_input ("cmpeq", OP_ACCUM, OP_ACCUM, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1010,7 +1004,7 @@ OP_1403 ()
/* cmpeqi.s */
void
-OP_401 ()
+OP_401 (void)
{
trace_input ("cmpeqi.s", OP_REG, OP_CONSTANT4, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1020,7 +1014,7 @@ OP_401 ()
/* cmpeqi.l */
void
-OP_2000000 ()
+OP_2000000 (void)
{
trace_input ("cmpeqi.l", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1030,7 +1024,7 @@ OP_2000000 ()
/* cmpi.s */
void
-OP_601 ()
+OP_601 (void)
{
trace_input ("cmpi.s", OP_REG, OP_CONSTANT4, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1040,7 +1034,7 @@ OP_601 ()
/* cmpi.l */
void
-OP_3000000 ()
+OP_3000000 (void)
{
trace_input ("cmpi.l", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1050,7 +1044,7 @@ OP_3000000 ()
/* cmpu */
void
-OP_4600 ()
+OP_4600 (void)
{
trace_input ("cmpu", OP_REG, OP_REG, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1060,7 +1054,7 @@ OP_4600 ()
/* cmpui */
void
-OP_23000000 ()
+OP_23000000 (void)
{
trace_input ("cmpui", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -1070,7 +1064,7 @@ OP_23000000 ()
/* cpfg */
void
-OP_4E09 ()
+OP_4E09 (void)
{
uint8 val;
@@ -1092,7 +1086,7 @@ OP_4E09 ()
/* cpfg */
void
-OP_4E0F ()
+OP_4E0F (void)
{
uint8 val;
@@ -1114,7 +1108,7 @@ OP_4E0F ()
/* dbt */
void
-OP_5F20 ()
+OP_5F20 (void)
{
/* d10v_callback->printf_filtered(d10v_callback, "***** DBT ***** PC=%x\n",PC); */
@@ -1145,7 +1139,7 @@ OP_5F20 ()
/* divs */
void
-OP_14002800 ()
+OP_14002800 (void)
{
uint16 foo, tmp, tmpf;
uint16 hi;
@@ -1164,7 +1158,7 @@ OP_14002800 ()
/* exef0f */
void
-OP_4E04 ()
+OP_4E04 (void)
{
trace_input ("exef0f", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 == 0);
@@ -1173,7 +1167,7 @@ OP_4E04 ()
/* exef0t */
void
-OP_4E24 ()
+OP_4E24 (void)
{
trace_input ("exef0t", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 != 0);
@@ -1182,7 +1176,7 @@ OP_4E24 ()
/* exef1f */
void
-OP_4E40 ()
+OP_4E40 (void)
{
trace_input ("exef1f", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F1 == 0);
@@ -1191,7 +1185,7 @@ OP_4E40 ()
/* exef1t */
void
-OP_4E42 ()
+OP_4E42 (void)
{
trace_input ("exef1t", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F1 != 0);
@@ -1200,7 +1194,7 @@ OP_4E42 ()
/* exefaf */
void
-OP_4E00 ()
+OP_4E00 (void)
{
trace_input ("exefaf", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 == 0) & (PSW_F1 == 0);
@@ -1209,7 +1203,7 @@ OP_4E00 ()
/* exefat */
void
-OP_4E02 ()
+OP_4E02 (void)
{
trace_input ("exefat", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 == 0) & (PSW_F1 != 0);
@@ -1218,7 +1212,7 @@ OP_4E02 ()
/* exetaf */
void
-OP_4E20 ()
+OP_4E20 (void)
{
trace_input ("exetaf", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 != 0) & (PSW_F1 == 0);
@@ -1227,7 +1221,7 @@ OP_4E20 ()
/* exetat */
void
-OP_4E22 ()
+OP_4E22 (void)
{
trace_input ("exetat", OP_VOID, OP_VOID, OP_VOID);
State.exe = (PSW_F0 != 0) & (PSW_F1 != 0);
@@ -1236,7 +1230,7 @@ OP_4E22 ()
/* exp */
void
-OP_15002A00 ()
+OP_15002A00 (void)
{
uint32 tmp, foo;
int i;
@@ -1264,7 +1258,7 @@ OP_15002A00 ()
/* exp */
void
-OP_15002A02 ()
+OP_15002A02 (void)
{
int64 tmp, foo;
int i;
@@ -1291,7 +1285,7 @@ OP_15002A02 ()
/* jl */
void
-OP_4D00 ()
+OP_4D00 (void)
{
trace_input ("jl", OP_REG, OP_R0, OP_R1);
SET_GPR (13, PC + 1);
@@ -1301,7 +1295,7 @@ OP_4D00 ()
/* jmp */
void
-OP_4C00 ()
+OP_4C00 (void)
{
trace_input ("jmp", OP_REG,
(OP[0] == 13) ? OP_R0 : OP_VOID,
@@ -1313,7 +1307,7 @@ OP_4C00 ()
/* ld */
void
-OP_30000000 ()
+OP_30000000 (void)
{
uint16 tmp;
uint16 addr = OP[1] + GPR (OP[2]);
@@ -1332,7 +1326,7 @@ OP_30000000 ()
/* ld */
void
-OP_6401 ()
+OP_6401 (void)
{
uint16 tmp;
uint16 addr = GPR (OP[1]);
@@ -1353,7 +1347,7 @@ OP_6401 ()
/* ld */
void
-OP_6001 ()
+OP_6001 (void)
{
uint16 tmp;
uint16 addr = GPR (OP[1]);
@@ -1374,7 +1368,7 @@ OP_6001 ()
/* ld */
void
-OP_6000 ()
+OP_6000 (void)
{
uint16 tmp;
uint16 addr = GPR (OP[1]);
@@ -1393,7 +1387,7 @@ OP_6000 ()
/* ld */
void
-OP_32010000 ()
+OP_32010000 (void)
{
uint16 tmp;
uint16 addr = OP[1];
@@ -1412,7 +1406,7 @@ OP_32010000 ()
/* ld2w */
void
-OP_31000000 ()
+OP_31000000 (void)
{
int32 tmp;
uint16 addr = OP[1] + GPR (OP[2]);
@@ -1431,7 +1425,7 @@ OP_31000000 ()
/* ld2w */
void
-OP_6601 ()
+OP_6601 (void)
{
uint16 addr = GPR (OP[1]);
int32 tmp;
@@ -1452,7 +1446,7 @@ OP_6601 ()
/* ld2w */
void
-OP_6201 ()
+OP_6201 (void)
{
int32 tmp;
uint16 addr = GPR (OP[1]);
@@ -1473,7 +1467,7 @@ OP_6201 ()
/* ld2w */
void
-OP_6200 ()
+OP_6200 (void)
{
uint16 addr = GPR (OP[1]);
int32 tmp;
@@ -1492,7 +1486,7 @@ OP_6200 ()
/* ld2w */
void
-OP_33010000 ()
+OP_33010000 (void)
{
int32 tmp;
uint16 addr = OP[1];
@@ -1511,7 +1505,7 @@ OP_33010000 ()
/* ldb */
void
-OP_38000000 ()
+OP_38000000 (void)
{
int16 tmp;
trace_input ("ldb", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
@@ -1522,7 +1516,7 @@ OP_38000000 ()
/* ldb */
void
-OP_7000 ()
+OP_7000 (void)
{
int16 tmp;
trace_input ("ldb", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
@@ -1533,7 +1527,7 @@ OP_7000 ()
/* ldi.s */
void
-OP_4001 ()
+OP_4001 (void)
{
int16 tmp;
trace_input ("ldi.s", OP_REG_OUTPUT, OP_CONSTANT4, OP_VOID);
@@ -1544,7 +1538,7 @@ OP_4001 ()
/* ldi.l */
void
-OP_20000000 ()
+OP_20000000 (void)
{
int16 tmp;
trace_input ("ldi.l", OP_REG_OUTPUT, OP_CONSTANT16, OP_VOID);
@@ -1555,7 +1549,7 @@ OP_20000000 ()
/* ldub */
void
-OP_39000000 ()
+OP_39000000 (void)
{
int16 tmp;
trace_input ("ldub", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
@@ -1566,7 +1560,7 @@ OP_39000000 ()
/* ldub */
void
-OP_7200 ()
+OP_7200 (void)
{
int16 tmp;
trace_input ("ldub", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
@@ -1577,7 +1571,7 @@ OP_7200 ()
/* mac */
void
-OP_2A00 ()
+OP_2A00 (void)
{
int64 tmp;
@@ -1608,7 +1602,7 @@ OP_2A00 ()
/* macsu */
void
-OP_1A00 ()
+OP_1A00 (void)
{
int64 tmp;
@@ -1623,7 +1617,7 @@ OP_1A00 ()
/* macu */
void
-OP_3A00 ()
+OP_3A00 (void)
{
uint64 tmp;
uint32 src1;
@@ -1642,7 +1636,7 @@ OP_3A00 ()
/* max */
void
-OP_2600 ()
+OP_2600 (void)
{
int16 tmp;
trace_input ("max", OP_REG, OP_REG, OP_VOID);
@@ -1663,7 +1657,7 @@ OP_2600 ()
/* max */
void
-OP_3600 ()
+OP_3600 (void)
{
int64 tmp;
@@ -1686,7 +1680,7 @@ OP_3600 ()
/* max */
void
-OP_3602 ()
+OP_3602 (void)
{
int64 tmp;
trace_input ("max", OP_ACCUM, OP_ACCUM, OP_VOID);
@@ -1708,7 +1702,7 @@ OP_3602 ()
/* min */
void
-OP_2601 ()
+OP_2601 (void)
{
int16 tmp;
trace_input ("min", OP_REG, OP_REG, OP_VOID);
@@ -1729,7 +1723,7 @@ OP_2601 ()
/* min */
void
-OP_3601 ()
+OP_3601 (void)
{
int64 tmp;
@@ -1752,7 +1746,7 @@ OP_3601 ()
/* min */
void
-OP_3603 ()
+OP_3603 (void)
{
int64 tmp;
trace_input ("min", OP_ACCUM, OP_ACCUM, OP_VOID);
@@ -1773,7 +1767,7 @@ OP_3603 ()
/* msb */
void
-OP_2800 ()
+OP_2800 (void)
{
int64 tmp;
@@ -1806,7 +1800,7 @@ OP_2800 ()
/* msbsu */
void
-OP_1800 ()
+OP_1800 (void)
{
int64 tmp;
@@ -1821,7 +1815,7 @@ OP_1800 ()
/* msbu */
void
-OP_3800 ()
+OP_3800 (void)
{
uint64 tmp;
uint32 src1;
@@ -1840,7 +1834,7 @@ OP_3800 ()
/* mul */
void
-OP_2E00 ()
+OP_2E00 (void)
{
int16 tmp;
trace_input ("mul", OP_REG, OP_REG, OP_VOID);
@@ -1851,7 +1845,7 @@ OP_2E00 ()
/* mulx */
void
-OP_2C00 ()
+OP_2C00 (void)
{
int64 tmp;
@@ -1871,7 +1865,7 @@ OP_2C00 ()
/* mulxsu */
void
-OP_1C00 ()
+OP_1C00 (void)
{
int64 tmp;
@@ -1887,7 +1881,7 @@ OP_1C00 ()
/* mulxu */
void
-OP_3C00 ()
+OP_3C00 (void)
{
uint64 tmp;
uint32 src1;
@@ -1906,7 +1900,7 @@ OP_3C00 ()
/* mv */
void
-OP_4000 ()
+OP_4000 (void)
{
int16 tmp;
trace_input ("mv", OP_REG_OUTPUT, OP_REG, OP_VOID);
@@ -1917,7 +1911,7 @@ OP_4000 ()
/* mv2w */
void
-OP_5000 ()
+OP_5000 (void)
{
int32 tmp;
trace_input ("mv2w", OP_DREG_OUTPUT, OP_DREG, OP_VOID);
@@ -1928,7 +1922,7 @@ OP_5000 ()
/* mv2wfac */
void
-OP_3E00 ()
+OP_3E00 (void)
{
int32 tmp;
trace_input ("mv2wfac", OP_DREG_OUTPUT, OP_ACCUM, OP_VOID);
@@ -1939,7 +1933,7 @@ OP_3E00 ()
/* mv2wtac */
void
-OP_3E01 ()
+OP_3E01 (void)
{
int64 tmp;
trace_input ("mv2wtac", OP_DREG, OP_ACCUM_OUTPUT, OP_VOID);
@@ -1950,7 +1944,7 @@ OP_3E01 ()
/* mvac */
void
-OP_3E03 ()
+OP_3E03 (void)
{
int64 tmp;
trace_input ("mvac", OP_ACCUM_OUTPUT, OP_ACCUM, OP_VOID);
@@ -1961,7 +1955,7 @@ OP_3E03 ()
/* mvb */
void
-OP_5400 ()
+OP_5400 (void)
{
int16 tmp;
trace_input ("mvb", OP_REG_OUTPUT, OP_REG, OP_VOID);
@@ -1972,7 +1966,7 @@ OP_5400 ()
/* mvf0f */
void
-OP_4400 ()
+OP_4400 (void)
{
int16 tmp;
trace_input ("mvf0f", OP_REG_OUTPUT, OP_REG, OP_VOID);
@@ -1988,7 +1982,7 @@ OP_4400 ()
/* mvf0t */
void
-OP_4401 ()
+OP_4401 (void)
{
int16 tmp;
trace_input ("mvf0t", OP_REG_OUTPUT, OP_REG, OP_VOID);
@@ -2004,7 +1998,7 @@ OP_4401 ()
/* mvfacg */
void
-OP_1E04 ()
+OP_1E04 (void)
{
int16 tmp;
trace_input ("mvfacg", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
@@ -2015,7 +2009,7 @@ OP_1E04 ()
/* mvfachi */
void
-OP_1E00 ()
+OP_1E00 (void)
{
int16 tmp;
trace_input ("mvfachi", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
@@ -2026,7 +2020,7 @@ OP_1E00 ()
/* mvfaclo */
void
-OP_1E02 ()
+OP_1E02 (void)
{
int16 tmp;
trace_input ("mvfaclo", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
@@ -2037,7 +2031,7 @@ OP_1E02 ()
/* mvfc */
void
-OP_5200 ()
+OP_5200 (void)
{
int16 tmp;
trace_input ("mvfc", OP_REG_OUTPUT, OP_CR, OP_VOID);
@@ -2048,7 +2042,7 @@ OP_5200 ()
/* mvtacg */
void
-OP_1E41 ()
+OP_1E41 (void)
{
int64 tmp;
trace_input ("mvtacg", OP_REG, OP_ACCUM, OP_VOID);
@@ -2060,7 +2054,7 @@ OP_1E41 ()
/* mvtachi */
void
-OP_1E01 ()
+OP_1E01 (void)
{
uint64 tmp;
trace_input ("mvtachi", OP_REG, OP_ACCUM, OP_VOID);
@@ -2072,7 +2066,7 @@ OP_1E01 ()
/* mvtaclo */
void
-OP_1E21 ()
+OP_1E21 (void)
{
int64 tmp;
trace_input ("mvtaclo", OP_REG, OP_ACCUM, OP_VOID);
@@ -2083,7 +2077,7 @@ OP_1E21 ()
/* mvtc */
void
-OP_5600 ()
+OP_5600 (void)
{
int16 tmp;
trace_input ("mvtc", OP_REG, OP_CR_OUTPUT, OP_VOID);
@@ -2094,7 +2088,7 @@ OP_5600 ()
/* mvub */
void
-OP_5401 ()
+OP_5401 (void)
{
int16 tmp;
trace_input ("mvub", OP_REG_OUTPUT, OP_REG, OP_VOID);
@@ -2105,7 +2099,7 @@ OP_5401 ()
/* neg */
void
-OP_4605 ()
+OP_4605 (void)
{
int16 tmp;
trace_input ("neg", OP_REG, OP_VOID, OP_VOID);
@@ -2116,7 +2110,7 @@ OP_4605 ()
/* neg */
void
-OP_5605 ()
+OP_5605 (void)
{
int64 tmp;
@@ -2140,7 +2134,7 @@ OP_5605 ()
/* nop */
void
-OP_5E00 ()
+OP_5E00 (void)
{
trace_input ("nop", OP_VOID, OP_VOID, OP_VOID);
@@ -2181,7 +2175,7 @@ OP_5E00 ()
/* not */
void
-OP_4603 ()
+OP_4603 (void)
{
int16 tmp;
trace_input ("not", OP_REG, OP_VOID, OP_VOID);
@@ -2192,7 +2186,7 @@ OP_4603 ()
/* or */
void
-OP_800 ()
+OP_800 (void)
{
int16 tmp;
trace_input ("or", OP_REG, OP_REG, OP_VOID);
@@ -2203,7 +2197,7 @@ OP_800 ()
/* or3 */
void
-OP_4000000 ()
+OP_4000000 (void)
{
int16 tmp;
trace_input ("or3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
@@ -2214,7 +2208,7 @@ OP_4000000 ()
/* rac */
void
-OP_5201 ()
+OP_5201 (void)
{
int64 tmp;
int shift = SEXT3 (OP[2]);
@@ -2256,7 +2250,7 @@ OP_5201 ()
/* rachi */
void
-OP_4201 ()
+OP_4201 (void)
{
signed64 tmp;
int shift = SEXT3 (OP[2]);
@@ -2290,7 +2284,7 @@ OP_4201 ()
/* rep */
void
-OP_27000000 ()
+OP_27000000 (void)
{
trace_input ("rep", OP_REG, OP_CONSTANT16, OP_VOID);
SET_RPT_S (PC + 1);
@@ -2312,7 +2306,7 @@ OP_27000000 ()
/* repi */
void
-OP_2F000000 ()
+OP_2F000000 (void)
{
trace_input ("repi", OP_CONSTANT16, OP_CONSTANT16, OP_VOID);
SET_RPT_S (PC + 1);
@@ -2334,7 +2328,7 @@ OP_2F000000 ()
/* rtd */
void
-OP_5F60 ()
+OP_5F60 (void)
{
trace_input ("rtd", OP_VOID, OP_VOID, OP_VOID);
SET_CREG (PSW_CR, DPSW);
@@ -2344,7 +2338,7 @@ OP_5F60 ()
/* rte */
void
-OP_5F40 ()
+OP_5F40 (void)
{
trace_input ("rte", OP_VOID, OP_VOID, OP_VOID);
SET_CREG (PSW_CR, BPSW);
@@ -2353,7 +2347,7 @@ OP_5F40 ()
}
/* sac */
-void OP_5209 ()
+void OP_5209 (void)
{
int64 tmp;
@@ -2386,7 +2380,7 @@ void OP_5209 ()
/* sachi */
void
-OP_4209 ()
+OP_4209 (void)
{
int64 tmp;
@@ -2419,7 +2413,7 @@ OP_4209 ()
/* sadd */
void
-OP_1223 ()
+OP_1223 (void)
{
int64 tmp;
@@ -2442,7 +2436,7 @@ OP_1223 ()
/* setf0f */
void
-OP_4611 ()
+OP_4611 (void)
{
int16 tmp;
trace_input ("setf0f", OP_REG_OUTPUT, OP_VOID, OP_VOID);
@@ -2453,7 +2447,7 @@ OP_4611 ()
/* setf0t */
void
-OP_4613 ()
+OP_4613 (void)
{
int16 tmp;
trace_input ("setf0t", OP_REG_OUTPUT, OP_VOID, OP_VOID);
@@ -2464,7 +2458,7 @@ OP_4613 ()
/* slae */
void
-OP_3220 ()
+OP_3220 (void)
{
int64 tmp;
int16 reg;
@@ -2516,7 +2510,7 @@ OP_3220 ()
/* sleep */
void
-OP_5FC0 ()
+OP_5FC0 (void)
{
trace_input ("sleep", OP_VOID, OP_VOID, OP_VOID);
SET_PSW_IE (1);
@@ -2525,7 +2519,7 @@ OP_5FC0 ()
/* sll */
void
-OP_2200 ()
+OP_2200 (void)
{
int16 tmp;
trace_input ("sll", OP_REG, OP_REG, OP_VOID);
@@ -2536,7 +2530,7 @@ OP_2200 ()
/* sll */
void
-OP_3200 ()
+OP_3200 (void)
{
int64 tmp;
trace_input ("sll", OP_ACCUM, OP_REG, OP_VOID);
@@ -2566,7 +2560,7 @@ OP_3200 ()
/* slli */
void
-OP_2201 ()
+OP_2201 (void)
{
int16 tmp;
trace_input ("slli", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -2577,7 +2571,7 @@ OP_2201 ()
/* slli */
void
-OP_3201 ()
+OP_3201 (void)
{
int64 tmp;
@@ -2604,7 +2598,7 @@ OP_3201 ()
/* slx */
void
-OP_460B ()
+OP_460B (void)
{
int16 tmp;
trace_input ("slx", OP_REG, OP_VOID, OP_VOID);
@@ -2615,7 +2609,7 @@ OP_460B ()
/* sra */
void
-OP_2400 ()
+OP_2400 (void)
{
int16 tmp;
trace_input ("sra", OP_REG, OP_REG, OP_VOID);
@@ -2626,7 +2620,7 @@ OP_2400 ()
/* sra */
void
-OP_3400 ()
+OP_3400 (void)
{
trace_input ("sra", OP_ACCUM, OP_REG, OP_VOID);
if ((GPR (OP[1]) & 31) <= 16)
@@ -2645,7 +2639,7 @@ OP_3400 ()
/* srai */
void
-OP_2401 ()
+OP_2401 (void)
{
int16 tmp;
trace_input ("srai", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -2656,7 +2650,7 @@ OP_2401 ()
/* srai */
void
-OP_3401 ()
+OP_3401 (void)
{
int64 tmp;
if (OP[1] == 0)
@@ -2670,7 +2664,7 @@ OP_3401 ()
/* srl */
void
-OP_2000 ()
+OP_2000 (void)
{
int16 tmp;
trace_input ("srl", OP_REG, OP_REG, OP_VOID);
@@ -2681,7 +2675,7 @@ OP_2000 ()
/* srl */
void
-OP_3000 ()
+OP_3000 (void)
{
trace_input ("srl", OP_ACCUM, OP_REG, OP_VOID);
if ((GPR (OP[1]) & 31) <= 16)
@@ -2701,7 +2695,7 @@ OP_3000 ()
/* srli */
void
-OP_2001 ()
+OP_2001 (void)
{
int16 tmp;
trace_input ("srli", OP_REG, OP_CONSTANT16, OP_VOID);
@@ -2712,7 +2706,7 @@ OP_2001 ()
/* srli */
void
-OP_3001 ()
+OP_3001 (void)
{
int64 tmp;
if (OP[1] == 0)
@@ -2726,7 +2720,7 @@ OP_3001 ()
/* srx */
void
-OP_4609 ()
+OP_4609 (void)
{
uint16 tmp;
trace_input ("srx", OP_REG, OP_VOID, OP_VOID);
@@ -2738,7 +2732,7 @@ OP_4609 ()
/* st */
void
-OP_34000000 ()
+OP_34000000 (void)
{
uint16 addr = OP[1] + GPR (OP[2]);
trace_input ("st", OP_REG, OP_MEMREF2, OP_VOID);
@@ -2755,7 +2749,7 @@ OP_34000000 ()
/* st */
void
-OP_6800 ()
+OP_6800 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st", OP_REG, OP_MEMREF, OP_VOID);
@@ -2773,7 +2767,7 @@ OP_6800 ()
/* st */
/* st Rsrc1,@-SP */
void
-OP_6C1F ()
+OP_6C1F (void)
{
uint16 addr = GPR (OP[1]) - 2;
trace_input ("st", OP_REG, OP_PREDEC, OP_VOID);
@@ -2797,7 +2791,7 @@ OP_6C1F ()
/* st */
void
-OP_6801 ()
+OP_6801 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st", OP_REG, OP_POSTINC, OP_VOID);
@@ -2815,7 +2809,7 @@ OP_6801 ()
/* st */
void
-OP_6C01 ()
+OP_6C01 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st", OP_REG, OP_POSTDEC, OP_VOID);
@@ -2839,7 +2833,7 @@ OP_6C01 ()
/* st */
void
-OP_36010000 ()
+OP_36010000 (void)
{
uint16 addr = OP[1];
trace_input ("st", OP_REG, OP_MEMREF3, OP_VOID);
@@ -2856,7 +2850,7 @@ OP_36010000 ()
/* st2w */
void
-OP_35000000 ()
+OP_35000000 (void)
{
uint16 addr = GPR (OP[2])+ OP[1];
trace_input ("st2w", OP_DREG, OP_MEMREF2, OP_VOID);
@@ -2874,7 +2868,7 @@ OP_35000000 ()
/* st2w */
void
-OP_6A00 ()
+OP_6A00 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st2w", OP_DREG, OP_MEMREF, OP_VOID);
@@ -2892,7 +2886,7 @@ OP_6A00 ()
/* st2w */
void
-OP_6E1F ()
+OP_6E1F (void)
{
uint16 addr = GPR (OP[1]) - 4;
trace_input ("st2w", OP_DREG, OP_PREDEC, OP_VOID);
@@ -2917,7 +2911,7 @@ OP_6E1F ()
/* st2w */
void
-OP_6A01 ()
+OP_6A01 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st2w", OP_DREG, OP_POSTINC, OP_VOID);
@@ -2936,7 +2930,7 @@ OP_6A01 ()
/* st2w */
void
-OP_6E01 ()
+OP_6E01 (void)
{
uint16 addr = GPR (OP[1]);
trace_input ("st2w", OP_DREG, OP_POSTDEC, OP_VOID);
@@ -2961,7 +2955,7 @@ OP_6E01 ()
/* st2w */
void
-OP_37010000 ()
+OP_37010000 (void)
{
uint16 addr = OP[1];
trace_input ("st2w", OP_DREG, OP_MEMREF3, OP_VOID);
@@ -2979,7 +2973,7 @@ OP_37010000 ()
/* stb */
void
-OP_3C000000 ()
+OP_3C000000 (void)
{
trace_input ("stb", OP_REG, OP_MEMREF2, OP_VOID);
SB (GPR (OP[2]) + OP[1], GPR (OP[0]));
@@ -2988,7 +2982,7 @@ OP_3C000000 ()
/* stb */
void
-OP_7800 ()
+OP_7800 (void)
{
trace_input ("stb", OP_REG, OP_MEMREF, OP_VOID);
SB (GPR (OP[1]), GPR (OP[0]));
@@ -2997,7 +2991,7 @@ OP_7800 ()
/* stop */
void
-OP_5FE0 ()
+OP_5FE0 (void)
{
trace_input ("stop", OP_VOID, OP_VOID, OP_VOID);
State.exception = SIG_D10V_STOP;
@@ -3006,7 +3000,7 @@ OP_5FE0 ()
/* sub */
void
-OP_0 ()
+OP_0 (void)
{
uint16 a = GPR (OP[0]);
uint16 b = GPR (OP[1]);
@@ -3021,7 +3015,7 @@ OP_0 ()
/* sub */
void
-OP_1001 ()
+OP_1001 (void)
{
int64 tmp;
@@ -3046,7 +3040,7 @@ OP_1001 ()
/* sub */
void
-OP_1003 ()
+OP_1003 (void)
{
int64 tmp;
@@ -3070,7 +3064,7 @@ OP_1003 ()
/* sub2w */
void
-OP_1000 ()
+OP_1000 (void)
{
uint32 tmp, a, b;
@@ -3087,7 +3081,7 @@ OP_1000 ()
/* subac3 */
void
-OP_17000000 ()
+OP_17000000 (void)
{
int64 tmp;
@@ -3099,7 +3093,7 @@ OP_17000000 ()
/* subac3 */
void
-OP_17000002 ()
+OP_17000002 (void)
{
int64 tmp;
@@ -3111,7 +3105,7 @@ OP_17000002 ()
/* subac3s */
void
-OP_17001000 ()
+OP_17001000 (void)
{
int64 tmp;
@@ -3138,7 +3132,7 @@ OP_17001000 ()
/* subac3s */
void
-OP_17001002 ()
+OP_17001002 (void)
{
int64 tmp;
@@ -3165,7 +3159,7 @@ OP_17001002 ()
/* subi */
void
-OP_1 ()
+OP_1 (void)
{
unsigned tmp;
if (OP[1] == 0)
@@ -3184,7 +3178,7 @@ OP_1 ()
/* trap */
void
-OP_5F00 ()
+OP_5F00 (void)
{
trace_input ("trap", OP_CONSTANT4, OP_VOID, OP_VOID);
trace_output_void ();
@@ -3581,7 +3575,7 @@ OP_5F00 ()
/* tst0i */
void
-OP_7000000 ()
+OP_7000000 (void)
{
trace_input ("tst0i", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);;
@@ -3591,7 +3585,7 @@ OP_7000000 ()
/* tst1i */
void
-OP_F000000 ()
+OP_F000000 (void)
{
trace_input ("tst1i", OP_REG, OP_CONSTANT16, OP_VOID);
SET_PSW_F1 (PSW_F0);
@@ -3601,7 +3595,7 @@ OP_F000000 ()
/* wait */
void
-OP_5F80 ()
+OP_5F80 (void)
{
trace_input ("wait", OP_VOID, OP_VOID, OP_VOID);
SET_PSW_IE (1);
@@ -3610,7 +3604,7 @@ OP_5F80 ()
/* xor */
void
-OP_A00 ()
+OP_A00 (void)
{
int16 tmp;
trace_input ("xor", OP_REG, OP_REG, OP_VOID);
@@ -3621,7 +3615,7 @@ OP_A00 ()
/* xor3 */
void
-OP_5000000 ()
+OP_5000000 (void)
{
int16 tmp;
trace_input ("xor3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
--
2.3.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/4] sim: d10v: use common configure options
@ 2015-03-30 6:22 Mike Frysinger
2015-03-30 6:22 ` [PATCH 4/4] sim: d10v: convert to nrun Mike Frysinger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-03-30 6:22 UTC (permalink / raw)
To: gdb-patches
In preparation for converting to nrun, call the common functions that
are needed. This doesn't produce any new warnings, and the generated
code should be the same.
Committed.
---
sim/d10v/ChangeLog | 9 ++
sim/d10v/Makefile.in | 5 -
sim/d10v/config.in | 15 ++
sim/d10v/configure | 417 +++++++++++++++++++++++++++++++++++++++++++++++++-
sim/d10v/configure.ac | 5 +
sim/d10v/interp.c | 8 +
6 files changed, 452 insertions(+), 7 deletions(-)
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 8bb2666..1ab3014 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-30 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (interp.o, simops.o, endian.o, table.o): Delete rules.
+ * configure.ac: Call SIM_AC_OPTION_ENDIAN, SIM_AC_OPTION_ALIGNMENT,
+ SIM_AC_OPTION_HOSTENDIAN, SIM_AC_OPTION_ENVIRONMENT, and
+ SIM_AC_OPTION_INLINE.
+ * config.in, configure: Regenerate.
+ * interp.c (sim_trace): Define.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 173fe95..b6d6a18 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -50,8 +50,3 @@ gencode: gencode.o d10v-opc.o
clean-extra:
rm -f table.c simops.h gencode
-
-interp.o: interp.c table.c $(INCLUDE)
-simops.o: simops.c simops.h $(INCLUDE)
-endian.o: endian.c $(INCLUDE)
-table.o: table.c
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index 5ded703..6003e58 100644
diff --git a/sim/d10v/configure b/sim/d10v/configure
index c7e82ec..af6e579 100755
diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index 0daa1af..96d0ffd 100644
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@@ -5,6 +5,11 @@ sinclude(../common/acinclude.m4)
SIM_AC_COMMON
+SIM_AC_OPTION_ENDIAN
+SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
+SIM_AC_OPTION_HOSTENDIAN
+SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE
SIM_AC_OPTION_WARNINGS
SIM_AC_OUTPUT
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 86b5e5e..27ae19f 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1268,6 +1268,14 @@ sim_set_callbacks (p)
d10v_callback = p;
}
+int
+sim_trace (SIM_DESC sd)
+{
+ sim_resume (sd, 0, 0);
+
+ return 1;
+}
+
void
sim_stop_reason (sd, reason, sigrc)
SIM_DESC sd;
--
2.3.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 4/4] sim: d10v: convert to nrun
2015-03-30 6:22 [PATCH 1/4] sim: d10v: use common configure options Mike Frysinger
@ 2015-03-30 6:22 ` Mike Frysinger
2015-03-30 6:22 ` [PATCH 2/4] sim: d10v: clean up misc warnings Mike Frysinger
2015-03-30 6:22 ` [PATCH 3/4] sim: d10v: delete NEED_UI_LOOP_HOOK handling Mike Frysinger
2 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-03-30 6:22 UTC (permalink / raw)
To: gdb-patches
A lot of cpu state is stored in global variables, as is memory handling.
The sim_size support needs unwinding at some point. But at least this
is an improvement on the status quo.
Committed.
---
sim/d10v/ChangeLog | 21 +++++
sim/d10v/Makefile.in | 16 ++--
sim/d10v/d10v_sim.h | 10 +-
sim/d10v/interp.c | 183 ++++++++++++++-----------------------
sim/d10v/simops.c | 15 ++-
sim/testsuite/d10v-elf/ChangeLog | 4 +
sim/testsuite/d10v-elf/Makefile.in | 2 +-
7 files changed, 121 insertions(+), 130 deletions(-)
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index ca4b5d2..1808502 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,26 @@
2015-03-30 Mike Frysinger <vapier@gentoo.org>
+ * d10v_sim.h (text, text_start, text_end, prog_bfd): Delete.
+ (SEXT8, SEXT16, SEXT32, MASK32): Undefine.
+ * interp.c: Delete run-sim.h and d10v_sim.h includes. Include
+ sim-main.h and sim-options.h.
+ (myname, sim_kind, init_text_p, prog_bfd_was_opened_p, prog_bfd,
+ text, text_start, text_end, decode_pc, sim_set_profile,
+ sim_set_profile_size, sim_set_trace, sim_set_callbacks,
+ sim_trace, sim_do_command, sim_load): Delete.
+ (INLINE): Delete define.
+ (free_state): New function.
+ (trace_sd): Declare global variable.
+ (sim_open): Rewrite to use new common logic.
+ (sim_close): Delete body.
+ * Makefile.in (SIM_RUN_OBJS, SIM_EXTRA_CFLAGS): Delete.
+ (SIM_OBJS): Change to $(SIM_NEW_COMMON_OBJS).
+ * sim-main.h: New file.
+ * simops.c: Change d10v_sim.h include to sim-main.h.
+ (trace_input_func): Rewrite pc checks to use trace_sd.
+
+2015-03-30 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in (SIM_EXTRA_CFLAGS): Delete -DNEED_UI_LOOP_HOOK.
* interp.c [NEED_UI_LOOP_HOOK] (UI_LOOP_POLL_INTERVAL,
ui_loop_hook_counter, deprecated_ui_loop_hook): Delete.
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index fb2d72d..75b69c3 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -1,7 +1,7 @@
# Makefile template for Configure for the D10v sim library.
# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# Written by Cygnus Support.
-#
+#
# 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
@@ -17,12 +17,16 @@
## COMMON_PRE_CONFIG_FRAG
-# Use the deprecated run frontend until we migrate to nrun.o
-SIM_RUN_OBJS = run.o
-
-SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
+SIM_OBJS = \
+ interp.o \
+ $(SIM_NEW_COMMON_OBJS) \
+ sim-cpu.o \
+ sim-engine.o \
+ sim-hload.o \
+ table.o \
+ simops.o \
+ endian.o
SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DSIM_HAVE_ENVIRONMENT -DSIM_USE_DEPRECATED_RUN_FRONTEND
INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
$(srcroot)/include/gdb/sim-d10v.h
diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h
index c541b41..87f7d5f 100644
--- a/sim/d10v/d10v_sim.h
+++ b/sim/d10v/d10v_sim.h
@@ -278,10 +278,6 @@ struct _state
extern host_callback *d10v_callback;
extern uint16 OP[4];
extern struct simops Simops[];
-extern asection *text;
-extern bfd_vma text_start;
-extern bfd_vma text_end;
-extern bfd *prog_bfd;
enum
{
@@ -397,6 +393,12 @@ enum
#define SIG_D10V_EXIT -2
#define SIG_D10V_BUS -3
+/* TODO: Resolve conflicts with common headers. */
+#undef SEXT8
+#undef SEXT16
+#undef SEXT32
+#undef MASK32
+
#define SEXT3(x) ((((x)&0x7)^(~3))+4)
/* sign-extend a 4-bit number */
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 0b21549..0e14392 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -4,9 +4,10 @@
#include "bfd.h"
#include "gdb/callback.h"
#include "gdb/remote-sim.h"
-#include "run-sim.h"
-#include "d10v_sim.h"
+#include "sim-main.h"
+#include "sim-options.h"
+
#include "gdb/sim-d10v.h"
#include "gdb/signals.h"
@@ -24,8 +25,6 @@
enum _leftright { LEFT_FIRST, RIGHT_FIRST };
-static char *myname;
-static SIM_OPEN_KIND sim_kind;
int d10v_debug;
/* Set this to true to get the previous segment layout. */
@@ -37,14 +36,6 @@ unsigned long ins_type_counters[ (int)INS_MAX ];
uint16 OP[4];
-static int init_text_p = 0;
-/* non-zero if we opened prog_bfd */
-static int prog_bfd_was_opened_p;
-bfd *prog_bfd;
-asection *text;
-bfd_vma text_start;
-bfd_vma text_end;
-
static long hash (long insn, int format);
static struct hash_entry *lookup_hash (uint32 ins, int size);
static void get_operands (struct simops *s, uint32 ins);
@@ -56,14 +47,6 @@ extern void sim_set_profile (int n);
extern void sim_set_profile_size (int n);
static INLINE uint8 *map_memory (unsigned phys_addr);
-#ifndef INLINE
-#if defined(__GNUC__) && defined(__OPTIMIZE__)
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-#endif
-
#define MAX_HASH 63
struct hash_entry
{
@@ -126,26 +109,6 @@ get_operands (struct simops *s, uint32 ins)
State.trace.psw = PSW;
}
-bfd_vma
-decode_pc (void)
-{
- asection *s;
- if (!init_text_p && prog_bfd != NULL)
- {
- init_text_p = 1;
- for (s = prog_bfd->sections; s; s = s->next)
- if (strcmp (bfd_get_section_name (prog_bfd, s), ".text") == 0)
- {
- text = s;
- text_start = bfd_get_section_vma (prog_bfd, s);
- text_end = text_start + bfd_section_size (prog_bfd, s);
- break;
- }
- }
-
- return (PC << 2) + text_start;
-}
-
static void
do_long (uint32 ins)
{
@@ -761,18 +724,77 @@ sim_read (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
return xfer_mem( addr, buffer, size, 0);
}
+static void
+free_state (SIM_DESC sd)
+{
+ if (STATE_MODULES (sd) != NULL)
+ sim_module_uninstall (sd);
+ sim_cpu_free_all (sd);
+ sim_state_free (sd);
+}
+
+SIM_DESC trace_sd = NULL;
SIM_DESC
-sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, char **argv)
+sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv)
{
struct simops *s;
struct hash_entry *h;
static int init_p = 0;
char **p;
+ SIM_DESC sd = sim_state_alloc (kind, cb);
+ SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- sim_kind = kind;
- d10v_callback = callback;
- myname = argv[0];
+ /* The cpu data is kept in a separately allocated chunk of memory. */
+ if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+ {
+ free_state (sd);
+ return 0;
+ }
+
+ if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)
+ {
+ free_state (sd);
+ return 0;
+ }
+
+ /* getopt will print the error message so we just have to exit if this fails.
+ FIXME: Hmmm... in the case of gdb we need getopt to call
+ print_filtered. */
+ if (sim_parse_args (sd, argv) != SIM_RC_OK)
+ {
+ free_state (sd);
+ return 0;
+ }
+
+ /* Check for/establish the a reference program image. */
+ if (sim_analyze_program (sd,
+ (STATE_PROG_ARGV (sd) != NULL
+ ? *STATE_PROG_ARGV (sd)
+ : NULL), abfd) != SIM_RC_OK)
+ {
+ free_state (sd);
+ return 0;
+ }
+
+ /* Configure/verify the target byte order and other runtime
+ configuration options. */
+ if (sim_config (sd) != SIM_RC_OK)
+ {
+ sim_module_uninstall (sd);
+ return 0;
+ }
+
+ if (sim_post_argv_init (sd) != SIM_RC_OK)
+ {
+ /* Uninstall the modules to avoid memory leaks,
+ file descriptor leaks, etc. */
+ sim_module_uninstall (sd);
+ return 0;
+ }
+
+ trace_sd = sd;
+ d10v_callback = cb;
old_segment_mapping = 0;
/* NOTE: This argument parsing is only effective when this function
@@ -788,8 +810,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, char **
else if (strncmp (*p, "-t", 2) == 0)
d10v_debug = atoi (*p + 2);
#endif
- else
- (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: unsupported option(s): %s\n",*p);
}
/* put all the opcodes in the hash table */
@@ -823,32 +843,14 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, char **
sim_size (1);
sim_create_inferior ((SIM_DESC) 1, NULL, NULL, NULL);
- /* Fudge our descriptor. */
- return (SIM_DESC) 1;
+ return sd;
}
void
sim_close (SIM_DESC sd, int quitting)
{
- if (prog_bfd != NULL && prog_bfd_was_opened_p)
- {
- bfd_close (prog_bfd);
- prog_bfd = NULL;
- prog_bfd_was_opened_p = 0;
- }
-}
-
-void
-sim_set_profile (int n)
-{
- (*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile %d\n",n);
-}
-
-void
-sim_set_profile_size (int n)
-{
- (*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile_size %d\n",n);
+ /* Nothing to do. */
}
uint8 *
@@ -1039,14 +1041,6 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
}
void
-sim_set_trace (void)
-{
-#ifdef DEBUG
- d10v_debug = DEBUG;
-#endif
-}
-
-void
sim_info (SIM_DESC sd, int verbose)
{
char buf1[40];
@@ -1205,21 +1199,6 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
return SIM_RC_OK;
}
-
-void
-sim_set_callbacks (host_callback *p)
-{
- d10v_callback = p;
-}
-
-int
-sim_trace (SIM_DESC sd)
-{
- sim_resume (sd, 0, 0);
-
- return 1;
-}
-
void
sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
{
@@ -1418,29 +1397,3 @@ sim_store_register (SIM_DESC sd, int rn, unsigned char *memory, int length)
SLOT_FLUSH ();
return size;
}
-
-
-void
-sim_do_command (SIM_DESC sd, const char *cmd)
-{
- (*d10v_callback->printf_filtered) (d10v_callback, "sim_do_command: %s\n",cmd);
-}
-
-SIM_RC
-sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty)
-{
- extern bfd *sim_load_file (); /* ??? Don't know where this should live. */
-
- if (prog_bfd != NULL && prog_bfd_was_opened_p)
- {
- bfd_close (prog_bfd);
- prog_bfd_was_opened_p = 0;
- }
- prog_bfd = sim_load_file (sd, myname, d10v_callback, prog, abfd,
- sim_kind == SIM_OPEN_DEBUG,
- 1/*LMA*/, sim_write);
- if (prog_bfd == NULL)
- return SIM_RC_FAIL;
- prog_bfd_was_opened_p = abfd == NULL;
- return SIM_RC_OK;
-}
diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index e26770c..2c457bb 100644
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -11,7 +11,7 @@
#include <string.h>
#endif
-#include "d10v_sim.h"
+#include "sim-main.h"
#include "simops.h"
#include "targ-vals.h"
@@ -193,14 +193,21 @@ trace_input_func (const char *name, enum op_types in1, enum op_types in2, enum o
else
{
+ extern SIM_DESC trace_sd;
+
buf[0] = '\0';
- byte_pc = decode_pc ();
- if (text && byte_pc >= text_start && byte_pc < text_end)
+ byte_pc = PC;
+ if (STATE_TEXT_SECTION (trace_sd)
+ && byte_pc >= STATE_TEXT_START (trace_sd)
+ && byte_pc < STATE_TEXT_END (trace_sd))
{
filename = (const char *)0;
functionname = (const char *)0;
linenumber = 0;
- if (bfd_find_nearest_line (prog_bfd, text, (struct bfd_symbol **)0, byte_pc - text_start,
+ if (bfd_find_nearest_line (STATE_PROG_BFD (trace_sd),
+ STATE_TEXT_SECTION (trace_sd),
+ (struct bfd_symbol **)0,
+ byte_pc - STATE_TEXT_START (trace_sd),
&filename, &functionname, &linenumber))
{
p = buf;
diff --git a/sim/testsuite/d10v-elf/ChangeLog b/sim/testsuite/d10v-elf/ChangeLog
index 742bce2..c81a6f2 100644
--- a/sim/testsuite/d10v-elf/ChangeLog
+++ b/sim/testsuite/d10v-elf/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-30 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (RUNFLAGS_FOR_TARGET): Set to --environment operating.
+
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
diff --git a/sim/testsuite/d10v-elf/Makefile.in b/sim/testsuite/d10v-elf/Makefile.in
index 2ef8ebd..c2e7154 100644
--- a/sim/testsuite/d10v-elf/Makefile.in
+++ b/sim/testsuite/d10v-elf/Makefile.in
@@ -107,7 +107,7 @@ RUN_FOR_TARGET = `\
fi`
# Force d10v into operating mode.
-RUNFLAGS_FOR_TARGET=-o
+RUNFLAGS_FOR_TARGET=--environment operating
check: sanity $(TESTS)
--
2.3.4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-30 6:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-30 6:22 [PATCH 1/4] sim: d10v: use common configure options Mike Frysinger
2015-03-30 6:22 ` [PATCH 4/4] sim: d10v: convert to nrun Mike Frysinger
2015-03-30 6:22 ` [PATCH 2/4] sim: d10v: clean up misc warnings Mike Frysinger
2015-03-30 6:22 ` [PATCH 3/4] sim: d10v: delete NEED_UI_LOOP_HOOK handling Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).