mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-29 02:20:51 +00:00
* Make-common.in (sim-options.o, sim-load.o): Add rules for.
(sim_main_headers): Add sim-trace.h.
* run.c (exec_bfd, target_byte_order): Delete.
(main): Pass -E <endian> to sim_open. Delete code to load sections,
call sim_load instead. Check return code of sim_create_inferior.
* sim-base.h (CURRENT_STATE): Define.
(sim_state_base): Make typedef. New members options, prog_argv,
prog_bfd, text_{section,start,end}, start_addr, simcache_size,
mem_size, memory [+ corresponding access macros].
(sim_cpu_base): New typedef.
* sim-trace.h: New file.
* sim-basics.h: #include it.
* sim-load.c: New file.
This commit is contained in:
David Edelsohn
@@ -38,22 +38,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
extern struct sim_state *current_state;
|
||||
#endif
|
||||
|
||||
/* Simulator state pseudo base-class.
|
||||
/* The simulator may provide different (and faster) definition. */
|
||||
#ifndef CURRENT_STATE
|
||||
#define CURRENT_STATE current_state
|
||||
#endif
|
||||
|
||||
/* Simulator state pseudo baseclass.
|
||||
Each simulator is required to have a sim-main.h file that includes
|
||||
sim-basics.h and defines struct sim_state to be:
|
||||
|
||||
struct sim_state {
|
||||
struct sim_state_base base;
|
||||
sim_cpu cpu;
|
||||
#define STATE_CPU(sd,n) (&(sd)->cpu)
|
||||
... simulator specific members ...
|
||||
sim_state_base base;
|
||||
};
|
||||
|
||||
for a single processor or
|
||||
|
||||
struct sim_state {
|
||||
sim_cpu cpu[MAX_CPUS]; -- could be also be array of pointers
|
||||
#define STATE_CPU(sd,n) (&(sd)->cpu[n])
|
||||
... simulator specific members ...
|
||||
sim_state_base base;
|
||||
};
|
||||
|
||||
for multiprocessors.
|
||||
Note that `base' appears last. This makes `base.magic' appear last
|
||||
in the entire struct and helps catch miscompilation errors.
|
||||
|
||||
sim_cpu is defined to be:
|
||||
|
||||
typedef struct {
|
||||
... simulator specific members ...
|
||||
sim_cpu_base base;
|
||||
} sim_cpu;
|
||||
*/
|
||||
|
||||
struct sim_state_base {
|
||||
/* Marker for those wanting to do sanity checks. */
|
||||
int magic;
|
||||
#define SIM_MAGIC_NUMBER 0x4242
|
||||
#define STATE_MAGIC(sd) ((sd)->base.magic)
|
||||
|
||||
typedef struct {
|
||||
/* Simulator's argv[0]. */
|
||||
const char *my_name;
|
||||
#define STATE_MY_NAME(sd) ((sd)->base.my_name)
|
||||
@@ -71,7 +93,138 @@ struct sim_state_base {
|
||||
struct sim_config config;
|
||||
#define STATE_CONFIG(sd) ((sd)->base.config)
|
||||
#endif
|
||||
};
|
||||
|
||||
/* Supported options. */
|
||||
struct option_list *options;
|
||||
#define STATE_OPTIONS(sd) ((sd)->base.options)
|
||||
|
||||
/* Non-zero if -v specified. */
|
||||
int verbose_p;
|
||||
#define STATE_VERBOSE_P(sd) ((sd)->base.verbose_p)
|
||||
|
||||
/* In standalone simulator, this is the program's arguments passed
|
||||
on the command line. */
|
||||
char **prog_argv;
|
||||
#define STATE_PROG_ARGV(sd) ((sd)->base.prog_argv)
|
||||
|
||||
/* The program's bfd. */
|
||||
struct _bfd *prog_bfd;
|
||||
#define STATE_PROG_BFD(sd) ((sd)->base.prog_bfd)
|
||||
|
||||
/* The program's text section. */
|
||||
struct sec *text_section;
|
||||
/* Starting and ending text section addresses from the bfd. */
|
||||
SIM_ADDR text_start, text_end;
|
||||
#define STATE_TEXT_SECTION(sd) ((sd)->base.text_section)
|
||||
#define STATE_TEXT_START(sd) ((sd)->base.text_start)
|
||||
#define STATE_TEXT_END(sd) ((sd)->base.text_end)
|
||||
|
||||
/* Start address, set when the program is loaded from the bfd. */
|
||||
SIM_ADDR start_addr;
|
||||
#define STATE_START_ADDR(sd) ((sd)->base.start_addr)
|
||||
|
||||
/* Size of the simulator's cache, if any.
|
||||
This is not the target's cache. It is the cache the simulator uses
|
||||
to process instructions. */
|
||||
unsigned int simcache_size;
|
||||
#define STATE_SIMCACHE_SIZE(sd) ((sd)->base.simcache_size)
|
||||
|
||||
/* FIXME: Move to top level sim_state struct (as some struct)? */
|
||||
#ifdef SIM_HAVE_FLATMEM
|
||||
unsigned int mem_size;
|
||||
#define STATE_MEM_SIZE(sd) ((sd)->base.mem_size)
|
||||
unsigned char *memory;
|
||||
#define STATE_MEMORY(sd) ((sd)->base.memory)
|
||||
#endif
|
||||
|
||||
/* Marker for those wanting to do sanity checks.
|
||||
This should remain the last member of this struct to help catch
|
||||
miscompilation errors. */
|
||||
int magic;
|
||||
#define SIM_MAGIC_NUMBER 0x4242
|
||||
#define STATE_MAGIC(sd) ((sd)->base.magic)
|
||||
} sim_state_base;
|
||||
|
||||
/* Pseudo baseclass for each cpu. */
|
||||
|
||||
typedef struct {
|
||||
/* Backlink to main state struct. */
|
||||
SIM_DESC sd;
|
||||
|
||||
/* Maximum number of traceable entities. */
|
||||
#ifndef MAX_TRACE_VALUES
|
||||
#define MAX_TRACE_VALUES 12
|
||||
#endif
|
||||
|
||||
/* Boolean array of specified tracing flags. */
|
||||
/* ??? It's not clear that using an array vs a bit mask is faster.
|
||||
Consider the case where one wants to test whether any of several bits
|
||||
are set. */
|
||||
char trace_flags[MAX_TRACE_VALUES];
|
||||
#define CPU_TRACE_FLAGS(cpu) ((cpu)->base.trace_flags)
|
||||
/* Standard values. */
|
||||
#define TRACE_INSN_IDX 0
|
||||
#define TRACE_DECODE_IDX 1
|
||||
#define TRACE_EXTRACT_IDX 2
|
||||
#define TRACE_LINENUM_IDX 3
|
||||
#define TRACE_MEMORY_IDX 4
|
||||
#define TRACE_MODEL_IDX 5
|
||||
#define TRACE_ALU_IDX 6
|
||||
#define TRACE_NEXT_IDX 8 /* simulator specific trace bits begin here */
|
||||
|
||||
/* Tracing output goes to this or stdout if NULL.
|
||||
We can't store `stdout' here as stdout goes through a callback. */
|
||||
FILE *trace_file;
|
||||
|
||||
/* Maximum number of debuggable entities.
|
||||
This debugging is not intended for normal use.
|
||||
It is only enabled when the simulator is configured with --with-debug
|
||||
which shouldn't normally be specified. */
|
||||
#ifndef MAX_DEBUG_VALUES
|
||||
#define MAX_DEBUG_VALUES 4
|
||||
#endif
|
||||
|
||||
/* Boolean array of specified debugging flags. */
|
||||
char debug_flags[MAX_DEBUG_VALUES];
|
||||
#define CPU_DEBUG_FLAGS(cpu) ((cpu)->base.debug_flags)
|
||||
/* Standard values. */
|
||||
#define DEBUG_INSN_IDX 0
|
||||
#define DEBUG_NEXT_IDX 2 /* simulator specific debug bits begin here */
|
||||
|
||||
/* Debugging output goes to this or stderr if NULL.
|
||||
We can't store `stderr' here as stderr goes through a callback. */
|
||||
FILE *debug_file;
|
||||
|
||||
#ifdef SIM_HAVE_PROFILE
|
||||
/* Maximum number of profilable entities. */
|
||||
#ifndef MAX_PROFILE_VALUES
|
||||
#define MAX_PROFILE_VALUES 8
|
||||
#endif
|
||||
|
||||
/* Boolean array of specified profiling flags. */
|
||||
char profile_flags[MAX_PROFILE_VALUES];
|
||||
#define CPU_PROFILE_FLAGS(cpu) ((cpu)->base.profile_flags)
|
||||
/* Standard masks. */
|
||||
#define PROFILE_INSN_MASK 0
|
||||
#define PROFILE_MEMORY_MASK 1
|
||||
#define PROFILE_MODEL_MASK 2
|
||||
#define PROFILE_SIMCACHE_MASK 3
|
||||
#define PROFILE_NEXT_MASK 6 /* simulator specific profile bits begin here */
|
||||
|
||||
/* PC profiling attempts to determine function usage by sampling the PC
|
||||
every so many instructions. */
|
||||
#ifdef SIM_HAVE_PROFILE_PC
|
||||
unsigned int profile_pc_freq;
|
||||
#define STATE_PROFILE_PC_FREQ(sd) ((sd)->base.profile_pc_freq)
|
||||
unsigned int profile_pc_size;
|
||||
#define STATE_PROFILE_PC_SIZE(sd) ((sd)->base.profile_pc_size)
|
||||
#endif
|
||||
|
||||
/* Profile output goes to this or stdout if NULL.
|
||||
We can't store `stderr' here as stdout goes through a callback. */
|
||||
FILE *profile_file;
|
||||
#endif /* SIM_HAVE_PROFILE */
|
||||
} sim_cpu_base;
|
||||
|
||||
/* Functions for allocating/freeing a sim_state. */
|
||||
SIM_DESC sim_state_alloc PARAMS ((void));
|
||||
|
||||
Reference in New Issue
Block a user