OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Export the single step function from the AArch64 simulator. 

* interp.c (sim_create_inferior): Allow for being called with a
	NULL abfd parameter.  If a bfd is provided, initialise the sim
	with that start address.
	* simulator.c (HALT_NYI): Just print out the numeric value of the
	instruction when not tracing.
	(aarch64_step): Change from static to global.
	* simulator.h: Add a prototype for aarch64_step().
This commit is contained in:
Nick Clifton 2016-08-11 15:04:40 +01:00
parent 39b2247157
commit 6a2775793d
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sim/aarch64/ChangeLog
View File

@ -1,3 +1,11 @@
2016-08-11 Nick Clifton <nickc@redhat.com>
* interp.c (sim_create_inferior): Allow for being called with a
NULL abfd parameter. If a bfd is provided, initialise the sim
with that start address.
* simulator.c (HALT_NYI): Just print out the numeric value of the
instruction when not tracing.
2016-07-27 Alan Modra <amodra@gmail.com>
* memory.c: Don't include libbfd.h.

8
sim/aarch64/interp.c
View File

@ -135,7 +135,7 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
char * const *argv, char * const *env)
{
sim_cpu *cpu = STATE_CPU (sd, 0);
long storage;
long storage = 0;
bfd_vma addr = 0;
if (abfd != NULL)
@ -154,7 +154,8 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
STATE_PROG_ARGV (sd) = dupargv (argv);
}
storage = bfd_get_symtab_upper_bound (abfd);
if (abfd != NULL)
storage = bfd_get_symtab_upper_bound (abfd);
if (storage > 0)
{
symtab = (asymbol **) xmalloc (storage);
@ -163,7 +164,7 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
qsort (symtab, symcount, sizeof (asymbol *), compare_symbols);
}
aarch64_init (cpu, bfd_get_start_address (abfd));
aarch64_init (cpu, addr);
return SIM_RC_OK;
}
@ -332,7 +333,6 @@ sim_open (SIM_OPEN_KIND kind,
struct bfd * abfd,
char * const * argv)
{
int i;
sim_cpu *cpu;
SIM_DESC sd = sim_state_alloc (kind, callback);

8
sim/aarch64/simulator.c
View File

@ -64,10 +64,8 @@
" exe addr %" PRIx64, \
__LINE__, aarch64_get_PC (cpu)); \
if (! TRACE_ANY_P (cpu)) \
{ \
sim_io_eprintf (CPU_STATE (cpu), "SIM Error: Unimplemented instruction: "); \
trace_disasm (CPU_STATE (cpu), cpu, aarch64_get_PC (cpu)); \
} \
sim_io_eprintf (CPU_STATE (cpu), "SIM Error: Unimplemented instruction: %#08x\n", \
aarch64_get_instr (cpu)); \
sim_engine_halt (CPU_STATE (cpu), cpu, NULL, aarch64_get_PC (cpu),\
sim_stopped, SIM_SIGABRT); \
} \
@ -14074,7 +14072,7 @@ aarch64_decode_and_execute (sim_cpu *cpu, uint64_t pc)
}
}
static bfd_boolean
bfd_boolean
aarch64_step (sim_cpu *cpu)
{
uint64_t pc = aarch64_get_PC (cpu);

4
sim/aarch64/simulator.h
View File

@ -47,6 +47,10 @@ extern void aarch64_init (sim_cpu *, uint64_t);
extern void aarch64_run (SIM_DESC);
/* Call this to execute one instruction at the current PC. */
extern bfd_boolean aarch64_step (sim_cpu *);
extern const char * aarch64_get_func (uint64_t);
extern uint64_t aarch64_get_sym_value (const char *);
extern void aarch64_init_LIT_table (void);