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

sim: cr16: convert to common sim engine logic

Browse source 
Now that we have access to the sim state everywhere, we can convert to
the common engine logic for overall processing.  This frees us up from
tracking exception state ourselves.
This commit is contained in:
Mike Frysinger 2015-11-15 03:07:06 -08:00
parent 761e171ad8
commit 0ef7f98177
5 changed files with 98 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sim/cr16/ChangeLog
View file

@ -1,3 +1,25 @@
2015-11-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Add sim-reason.o, sim-resume.o, and
sim-stop.o.
* cr16_sim.h (struct _state): Delete exe and exception.
* interp.c (lookup_hash): Call sim_engine_halt instead of setting
State.exception.
(do_run): Delete unused s and func variables.
(stop_simulator, sim_stop, sim_stop_reason): Delete.
(sim_resume): Rename to ...
(step_once): ... this. Delete State.exception code and move
siggnal checking to sim_engine_run.
(sim_engine_run): New function.
* simops.c (EXCEPTION): Define.
(move_to_cr): Call EXCEPTION instead of setting State.exception.
(OP_1_4, OP_18_8, OP_10_10, OP_C0_8, OP_102_14, OP_148_14, OP_D_C,
OP_14_D, OP_15_D, OP_2C00_10, OP_16_D, OP_17_D, OP_31E_10, OP_6_10):
Likewise.
(OP_C_C): Likewise. Call sim_engine_halt instead of setting
State.exception.
(OP_0_20): Call sim_engine_halt instead of setting State.exception.
2015-11-15 Mike Frysinger <vapier@gentoo.org> 2015-11-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete endian.o. * Makefile.in (SIM_OBJS): Delete endian.o.

3
sim/cr16/Makefile.in
View file

@ -20,7 +20,10 @@
SIM_OBJS = \ SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \ $(SIM_NEW_COMMON_OBJS) \
sim-hload.o \ sim-hload.o \
sim-reason.o \
sim-reg.o \ sim-reg.o \
sim-resume.o \
sim-stop.o \
interp.o \ interp.o \
table.o \ table.o \
simops.o simops.o

2
sim/cr16/cr16_sim.h
View file

@ -236,8 +236,6 @@ struct _state
uint16 psw; uint16 psw;
} trace; } trace;
uint8 exe;
int exception;
int pc_changed; int pc_changed;
/* NOTE: everything below this line is not reset by /* NOTE: everything below this line is not reset by

157
sim/cr16/interp.c
View file

@ -91,11 +91,7 @@ lookup_hash (SIM_DESC sd, SIM_CPU *cpu, uint64 ins, int size)
while ((ins & mask) != (BIN(h->opcode, h->mask))) while ((ins & mask) != (BIN(h->opcode, h->mask)))
{ {
if (h->next == NULL) if (h->next == NULL)
{ sim_engine_halt (sd, cpu, NULL, PC, sim_stopped, SIM_SIGILL);
State.exception = SIGILL;
State.pc_changed = 1; /* Don't increment the PC. */
return NULL;
}
h = h->next; h = h->next;
mask = (((1 << (32 - h->mask)) -1) << h->mask); mask = (((1 << (32 - h->mask)) -1) << h->mask);
@ -331,9 +327,8 @@ static int
do_run (SIM_DESC sd, SIM_CPU *cpu, uint64 mcode) do_run (SIM_DESC sd, SIM_CPU *cpu, uint64 mcode)
{ {
host_callback *cr16_callback = STATE_CALLBACK (sd); host_callback *cr16_callback = STATE_CALLBACK (sd);
struct simops *s= Simops;
struct hash_entry *h; struct hash_entry *h;
char func[12]="\0";
#ifdef DEBUG #ifdef DEBUG
if ((cr16_debug & DEBUG_INSTRUCTION) != 0) if ((cr16_debug & DEBUG_INSTRUCTION) != 0)
(*cr16_callback->printf_filtered) (cr16_callback, "do_long 0x%x\n", mcode); (*cr16_callback->printf_filtered) (cr16_callback, "do_long 0x%x\n", mcode);
@ -579,60 +574,11 @@ sim_open (SIM_OPEN_KIND kind, struct host_callback_struct *cb, struct bfd *abfd,
return sd; return sd;
} }
static int stop_simulator = 0; static void
step_once (SIM_DESC sd, SIM_CPU *cpu)
int
sim_stop (SIM_DESC sd)
{ {
stop_simulator = 1;
return 1;
}
/* Run (or resume) the program. */
void
sim_resume (SIM_DESC sd, int step, int siggnal)
{
SIM_CPU *cpu = STATE_CPU (sd, 0);
uint32 curr_ins_size = 0; uint32 curr_ins_size = 0;
uint64 mcode; uint64 mcode = RLW (PC);
#ifdef DEBUG
// (*cr16_callback->printf_filtered) (cr16_callback, "sim_resume (%d,%d) PC=0x%x\n",step,siggnal,PC);
#endif
State.exception = 0;
if (step)
sim_stop (sd);
switch (siggnal)
{
case 0:
break;
#ifdef SIGBUS
case SIGBUS:
#endif
case SIGSEGV:
SET_PC (PC);
SET_PSR (PSR);
JMP (AE_VECTOR_START);
SLOT_FLUSH ();
break;
case SIGILL:
SET_PC (PC);
SET_PSR (PSR);
SET_HW_PSR ((PSR & (PSR_C_BIT)));
JMP (RIE_VECTOR_START);
SLOT_FLUSH ();
break;
default:
/* just ignore it */
break;
}
do
{
mcode = RLW (PC);
State.pc_changed = 0; State.pc_changed = 0;
@ -642,16 +588,10 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
(*cr16_callback->printf_filtered) (cr16_callback, "INS: PC=0x%X, mcode=0x%X\n", PC, mcode); (*cr16_callback->printf_filtered) (cr16_callback, "INS: PC=0x%X, mcode=0x%X\n", PC, mcode);
#endif #endif
if (!State.pc_changed)
{
if (curr_ins_size == 0) if (curr_ins_size == 0)
{ sim_engine_halt (sd, cpu, NULL, PC, sim_exited, GPR (2));
State.exception = SIG_CR16_EXIT; /* exit trap */ else if (!State.pc_changed)
break;
}
else
SET_PC (PC + (curr_ins_size * 2)); /* For word instructions. */ SET_PC (PC + (curr_ins_size * 2)); /* For word instructions. */
}
#if 0 #if 0
/* Check for a breakpoint trap on this instruction. This /* Check for a breakpoint trap on this instruction. This
@ -667,10 +607,48 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
/* Writeback all the DATA / PC changes */ /* Writeback all the DATA / PC changes */
SLOT_FLUSH (); SLOT_FLUSH ();
} }
while ( !State.exception && !stop_simulator);
if (step && !State.exception) void
State.exception = SIGTRAP; sim_engine_run (SIM_DESC sd,
int next_cpu_nr, /* ignore */
int nr_cpus, /* ignore */
int siggnal)
{
sim_cpu *cpu;
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
cpu = STATE_CPU (sd, 0);
switch (siggnal)
{
case 0:
break;
case GDB_SIGNAL_BUS:
case GDB_SIGNAL_SEGV:
SET_PC (PC);
SET_PSR (PSR);
JMP (AE_VECTOR_START);
SLOT_FLUSH ();
break;
case GDB_SIGNAL_ILL:
SET_PC (PC);
SET_PSR (PSR);
SET_HW_PSR ((PSR & (PSR_C_BIT)));
JMP (RIE_VECTOR_START);
SLOT_FLUSH ();
break;
default:
/* just ignore it */
break;
}
while (1)
{
step_once (sd, cpu);
if (sim_events_tick (sd))
sim_events_process (sd);
}
} }
SIM_RC SIM_RC
@ -707,45 +685,6 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env)
return SIM_RC_OK; return SIM_RC_OK;
} }
void
sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc)
{
/* (*cr16_callback->printf_filtered) (cr16_callback, "sim_stop_reason: PC=0x%x\n",PC<<2); */
switch (State.exception)
{
case SIG_CR16_STOP: /* stop instruction */
*reason = sim_stopped;
*sigrc = 0;
break;
case SIG_CR16_EXIT: /* exit trap */
*reason = sim_exited;
*sigrc = GPR (2);
break;
case SIG_CR16_BUS:
*reason = sim_stopped;
*sigrc = GDB_SIGNAL_BUS;
break;
//
// case SIG_CR16_IAD:
// *reason = sim_stopped;
// *sigrc = GDB_SIGNAL_IAD;
// break;
default: /* some signal */
*reason = sim_stopped;
if (stop_simulator && !State.exception)
*sigrc = GDB_SIGNAL_INT;
else
*sigrc = State.exception;
break;
}
stop_simulator = 0;
}
static uint32 static uint32
cr16_extract_unsigned_integer (unsigned char *addr, int len) cr16_extract_unsigned_integer (unsigned char *addr, int len)
{ {

71
sim/cr16/simops.c
View file

@ -48,6 +48,8 @@
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#define EXCEPTION(sig) sim_engine_halt (sd, cpu, NULL, PC, sim_stopped, sig)
enum op_types { enum op_types {
OP_VOID, OP_VOID,
OP_CONSTANT3, OP_CONSTANT3,
@ -184,7 +186,7 @@ move_to_cr (SIM_DESC sd, SIM_CPU *cpu, int cr, creg_t mask, creg_t val, int psw_
(*cr16_callback->printf_filtered) (*cr16_callback->printf_filtered)
(cr16_callback, (cr16_callback,
"ERROR at PC 0x%x: ST can only be set when FX is set.\n", PC); "ERROR at PC 0x%x: ST can only be set when FX is set.\n", PC);
State.exception = SIGILL; EXCEPTION (SIM_SIGILL);
#endif #endif
/* keep an up-to-date psw around for tracing. */ /* keep an up-to-date psw around for tracing. */
State.trace.psw = (State.trace.psw & mask) | val; State.trace.psw = (State.trace.psw & mask) | val;
@ -999,10 +1001,8 @@ OP_1_4 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x000000) || (tmp > 0xFFFFFF)) if ((tmp < 0x000000) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1028,10 +1028,8 @@ OP_18_8 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x000000) || (tmp > 0xFFFFFF)) if ((tmp < 0x000000) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1057,10 +1055,8 @@ OP_10_10 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x000000) || (tmp > 0xFFFFFF)) if ((tmp < 0x000000) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1087,10 +1083,8 @@ OP_C0_8 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x000000) || (tmp > 0xFFFFFF)) if ((tmp < 0x000000) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1116,10 +1110,8 @@ OP_102_14 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x000000) || (tmp > 0xFFFFFF)) if ((tmp < 0x000000) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1141,10 +1133,8 @@ OP_148_14 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x0) || (tmp > 0xFFFFFF)) if ((tmp < 0x0) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -1167,10 +1157,8 @@ OP_D_C (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x0) || (tmp > 0xFFFFFF)) if ((tmp < 0x0) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -2722,10 +2710,8 @@ OP_14_D (SIM_DESC sd, SIM_CPU *cpu)
trace_input ("loadm", OP_CONSTANT4, OP_VOID, OP_VOID); trace_input ("loadm", OP_CONSTANT4, OP_VOID, OP_VOID);
if ((addr & 1)) if ((addr & 1))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
while (count) while (count)
@ -2752,10 +2738,8 @@ OP_15_D (SIM_DESC sd, SIM_CPU *cpu)
trace_input ("loadm", OP_CONSTANT4, OP_VOID, OP_VOID); trace_input ("loadm", OP_CONSTANT4, OP_VOID, OP_VOID);
if ((addr & 1)) if ((addr & 1))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
while (count) while (count)
@ -4359,7 +4343,6 @@ OP_2C00_10 (SIM_DESC sd, SIM_CPU *cpu)
trace_input ("nop", OP_VOID, OP_VOID, OP_VOID); trace_input ("nop", OP_VOID, OP_VOID, OP_VOID);
#if 0 #if 0
State.exception = SIGTRAP;
ins_type_counters[ (int)State.ins_type ]--; /* don't count nops as normal instructions */ ins_type_counters[ (int)State.ins_type ]--; /* don't count nops as normal instructions */
switch (State.ins_type) switch (State.ins_type)
{ {
@ -4368,7 +4351,7 @@ OP_2C00_10 (SIM_DESC sd, SIM_CPU *cpu)
break; break;
} }
EXCEPTION (SIM_SIGTRAP);
#endif #endif
trace_output_void (sd); trace_output_void (sd);
} }
@ -4789,10 +4772,8 @@ OP_16_D (SIM_DESC sd, SIM_CPU *cpu)
trace_input ("storm", OP_CONSTANT4, OP_VOID, OP_VOID); trace_input ("storm", OP_CONSTANT4, OP_VOID, OP_VOID);
if ((addr & 1)) if ((addr & 1))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
while (count) while (count)
@ -4819,10 +4800,8 @@ OP_17_D (SIM_DESC sd, SIM_CPU *cpu)
trace_input ("stormp", OP_CONSTANT4, OP_VOID, OP_VOID); trace_input ("stormp", OP_CONSTANT4, OP_VOID, OP_VOID);
if ((addr & 1)) if ((addr & 1))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
while (count) while (count)
@ -5168,7 +5147,7 @@ OP_C_C (SIM_DESC sd, SIM_CPU *cpu)
if (PARM1 == getpid ()) if (PARM1 == getpid ())
{ {
trace_output_void (sd); trace_output_void (sd);
State.exception = PARM2; EXCEPTION (PARM2);
} }
else else
{ {
@ -5281,7 +5260,7 @@ OP_C_C (SIM_DESC sd, SIM_CPU *cpu)
trace_output_void (sd); trace_output_void (sd);
(*cr16_callback->printf_filtered) (cr16_callback, "Unknown signal %d\n", PARM2); (*cr16_callback->printf_filtered) (cr16_callback, "Unknown signal %d\n", PARM2);
(*cr16_callback->flush_stdout) (cr16_callback); (*cr16_callback->flush_stdout) (cr16_callback);
State.exception = SIGILL; EXCEPTION (SIM_SIGILL);
} }
else else
{ {
@ -5347,7 +5326,7 @@ OP_C_C (SIM_DESC sd, SIM_CPU *cpu)
case TARGET_SYS_kill: case TARGET_SYS_kill:
trace_input ("<kill>", OP_REG, OP_REG, OP_VOID); trace_input ("<kill>", OP_REG, OP_REG, OP_VOID);
trace_output_void (sd); trace_output_void (sd);
State.exception = PARM2; EXCEPTION (PARM2);
break; break;
#endif #endif
@ -5406,8 +5385,8 @@ OP_C_C (SIM_DESC sd, SIM_CPU *cpu)
case TARGET_SYS_exit: case TARGET_SYS_exit:
trace_input ("<exit>", OP_VOID, OP_VOID, OP_VOID); trace_input ("<exit>", OP_VOID, OP_VOID, OP_VOID);
State.exception = SIG_CR16_EXIT;
trace_output_void (sd); trace_output_void (sd);
sim_engine_halt (sd, cpu, NULL, PC, sim_exited, GPR (2));
break; break;
case TARGET_SYS_unlink: case TARGET_SYS_unlink:
@ -5486,14 +5465,14 @@ OP_C_C (SIM_DESC sd, SIM_CPU *cpu)
switch (a) switch (a)
{ {
case TRAP_BREAKPOINT: case TRAP_BREAKPOINT:
State.exception = SIGTRAP;
tmp = (PC); tmp = (PC);
JMP(tmp); JMP(tmp);
trace_output_void (sd); trace_output_void (sd);
EXCEPTION (SIM_SIGTRAP);
break; break;
case SIGTRAP: /* supervisor call ? */ case SIGTRAP: /* supervisor call ? */
State.exception = SIG_CR16_EXIT;
trace_output_void (sd); trace_output_void (sd);
sim_engine_halt (sd, cpu, NULL, PC, sim_exited, GPR (2));
break; break;
default: default:
cr16_callback->error (cr16_callback, "Unknown syscall %d", FUNC); cr16_callback->error (cr16_callback, "Unknown syscall %d", FUNC);
@ -5789,10 +5768,8 @@ OP_31E_10 (SIM_DESC sd, SIM_CPU *cpu)
if ((tmp < 0x0) || (tmp > 0xFFFFFF)) if ((tmp < 0x0) || (tmp > 0xFFFFFF))
{ {
State.exception = SIG_CR16_BUS;
State.pc_changed = 1; /* Don't increment the PC. */
trace_output_void (sd); trace_output_void (sd);
return; EXCEPTION (SIM_SIGBUS);
} }
else else
JMP (tmp); JMP (tmp);
@ -5887,8 +5864,8 @@ void
OP_6_10 (SIM_DESC sd, SIM_CPU *cpu) OP_6_10 (SIM_DESC sd, SIM_CPU *cpu)
{ {
trace_input ("wait", OP_VOID, OP_VOID, OP_VOID); trace_input ("wait", OP_VOID, OP_VOID, OP_VOID);
State.exception = SIGTRAP;
trace_output_void (sd); trace_output_void (sd);
EXCEPTION (SIM_SIGTRAP);
} }
/* ewait. */ /* ewait. */
@ -6013,5 +5990,5 @@ void
OP_0_20 (SIM_DESC sd, SIM_CPU *cpu) OP_0_20 (SIM_DESC sd, SIM_CPU *cpu)
{ {
trace_input ("null", OP_VOID, OP_VOID, OP_VOID); trace_input ("null", OP_VOID, OP_VOID, OP_VOID);
State.exception = SIG_CR16_STOP; sim_engine_halt (sd, cpu, NULL, PC, sim_exited, 0);
} }