/* Main simulator entry points specific to the CRIS.
- Copyright (C) 2004-2012 Free Software Foundation, Inc.
+ Copyright (C) 2004-2019 Free Software Foundation, Inc.
Contributed by Axis Communications.
This file is part of the GNU simulators.
enum cris_unknown_syscall_action_type cris_unknown_syscall_action
= CRIS_USYSC_MSG_STOP;
-/* Records simulator descriptor so utilities like cris_dump_regs can be
- called from gdb. */
-SIM_DESC current_state;
-
/* CRIS-specific options. */
typedef enum {
OPTION_CRIS_STATS = OPTION_START,
{ {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
};
\f
-/* Add the CRIS-specific option list to the simulator. */
-
-SIM_RC
-cris_option_install (SIM_DESC sd)
-{
- SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- if (sim_add_option_table (sd, NULL, cris_options) != SIM_RC_OK)
- return SIM_RC_FAIL;
- return SIM_RC_OK;
-}
-
/* Handle CRIS-specific options. */
static SIM_RC
return sim_profile_set_option (sd, "-model", PROFILE_MODEL_IDX, "on");
}
-/* FIXME: Remove these, globalize those in sim-load.c, move elsewhere. */
-
-static void
-xprintf (host_callback *callback, const char *fmt, ...)
-{
- va_list ap;
-
- va_start (ap, fmt);
-
- (*callback->vprintf_filtered) (callback, fmt, ap);
-
- va_end (ap);
-}
-
-static void
-eprintf (host_callback *callback, const char *fmt, ...)
-{
- va_list ap;
-
- va_start (ap, fmt);
-
- (*callback->evprintf_filtered) (callback, fmt, ap);
-
- va_end (ap);
-}
-
/* An ELF-specific simplified ../common/sim-load.c:sim_load_file,
using the program headers, not sections, in order to make sure that
the program headers themeselves are also loaded. The caller is
int n_hdrs;
int i;
bfd_boolean verbose = STATE_OPEN_KIND (sd) == SIM_OPEN_DEBUG;
- host_callback *callback = STATE_CALLBACK (sd);
phdr = elf_tdata (abfd)->phdr;
n_hdrs = elf_elfheader (abfd)->e_phnum;
buf = xmalloc (phdr[i].p_filesz);
if (verbose)
- xprintf (callback, "Loading segment at 0x%lx, size 0x%lx\n",
- lma, phdr[i].p_filesz);
+ sim_io_printf (sd, "Loading segment at 0x%lx, size 0x%lx\n",
+ lma, phdr[i].p_filesz);
if (bfd_seek (abfd, phdr[i].p_offset, SEEK_SET) != 0
|| (bfd_bread (buf, phdr[i].p_filesz, abfd) != phdr[i].p_filesz))
{
- eprintf (callback,
- "%s: could not read segment at 0x%lx, size 0x%lx\n",
- STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
+ sim_io_eprintf (sd,
+ "%s: could not read segment at 0x%lx, size 0x%lx\n",
+ STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
free (buf);
return FALSE;
}
if (do_write (sd, lma, buf, phdr[i].p_filesz) != phdr[i].p_filesz)
{
- eprintf (callback,
- "%s: could not load segment at 0x%lx, size 0x%lx\n",
- STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
+ sim_io_eprintf (sd,
+ "%s: could not load segment at 0x%lx, size 0x%lx\n",
+ STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
free (buf);
return FALSE;
}
return TRUE;
}
-/* Helper for sim_load (needed just for ELF files): like sim_write,
- but offset load at cris_program_offset offset. */
-
-static int
-cris_program_offset_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf,
- int length)
-{
- return sim_write (sd, mem + cris_program_offset, buf, length);
-}
-
-/* Replacement for ../common/sim-hload.c:sim_load, so we can treat ELF
- files differently. */
-
-SIM_RC
-sim_load (SIM_DESC sd, char *prog_name, struct bfd *prog_bfd,
- int from_tty ATTRIBUTE_UNUSED)
-{
- bfd *result_bfd;
-
- if (bfd_get_flavour (prog_bfd) != bfd_target_elf_flavour)
- {
- SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
- if (sim_analyze_program (sd, prog_name, prog_bfd) != SIM_RC_OK)
- return SIM_RC_FAIL;
- SIM_ASSERT (STATE_PROG_BFD (sd) != NULL);
-
- result_bfd = sim_load_file (sd, STATE_MY_NAME (sd),
- STATE_CALLBACK (sd),
- prog_name,
- STATE_PROG_BFD (sd),
- STATE_OPEN_KIND (sd) == SIM_OPEN_DEBUG,
- STATE_LOAD_AT_LMA_P (sd),
- sim_write);
- if (result_bfd == NULL)
- {
- bfd_close (STATE_PROG_BFD (sd));
- STATE_PROG_BFD (sd) = NULL;
- return SIM_RC_FAIL;
- }
- return SIM_RC_OK;
- }
-
- return cris_load_elf_file (sd, prog_bfd, cris_program_offset_write)
- ? SIM_RC_OK : SIM_RC_FAIL;
-}
-
/* Cover function of sim_state_free to free the cpu buffers as well. */
static void
SIM_DESC sd = p->sd;
int offset = p->offset;
- if ((bfd_get_section_flags (abfd, s) & SEC_ALLOC))
+ if ((bfd_section_flags (s) & SEC_ALLOC))
{
- bfd_vma vma = bfd_get_section_vma (abfd, s);
+ bfd_vma vma = bfd_section_vma (s);
- bfd_set_section_vma (abfd, s, vma + offset);
+ bfd_set_section_vma (s, vma + offset);
}
/* This seems clumsy and inaccurate, but let's stick to doing it the
same way as sim_analyze_program for consistency. */
- if (strcmp (bfd_get_section_name (abfd, s), ".text") == 0)
- STATE_TEXT_START (sd) = bfd_get_section_vma (abfd, s);
+ if (strcmp (bfd_section_name (s), ".text") == 0)
+ STATE_TEXT_START (sd) = bfd_section_vma (s);
}
/* Adjust the start-address, LMA and VMA of a SD. Must be called
{
struct progbounds *pbp = (struct progbounds *) vp;
- if ((bfd_get_section_flags (abfd, s) & SEC_ALLOC))
+ if ((bfd_section_flags (s) & SEC_ALLOC))
{
- bfd_size_type sec_size = bfd_get_section_size (s);
- bfd_size_type sec_start = bfd_get_section_vma (abfd, s);
+ bfd_size_type sec_size = bfd_section_size (s);
+ bfd_size_type sec_start = bfd_section_vma (s);
bfd_size_type sec_end = sec_start + sec_size;
if (sec_end > pbp->endmem)
if (sec_start < pbp->startmem)
pbp->startmem = sec_start;
- if ((bfd_get_section_flags (abfd, s) & SEC_LOAD))
+ if ((bfd_section_flags (s) & SEC_LOAD))
{
if (sec_end > pbp->end_loadmem)
pbp->end_loadmem = sec_end;
SIM_DESC
sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
- char **argv)
+ char * const *argv)
{
char c;
int i;
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)
+ /* Add the CRIS-specific option list to the simulator. */
+ if (sim_add_option_table (sd, NULL, cris_options) != SIM_RC_OK)
{
free_state (sd);
return 0;
}
- /* If we have a binary program, endianness-setting would not be taken
- from elsewhere unfortunately, so set it here. At the time of this
- writing, it isn't used until sim_config, but that might change so
- set it here before memory is defined or touched. */
- current_target_byte_order = LITTLE_ENDIAN;
+ /* The parser will print an error message for us, so we silently return. */
+ if (sim_parse_args (sd, argv) != SIM_RC_OK)
+ {
+ free_state (sd);
+ return 0;
+ }
/* check for/establish the reference program image */
if (sim_analyze_program (sd,
specified. */
if (abfd != NULL && !cris_bare_iron)
{
- char *name = bfd_get_filename (abfd);
+ const char *name = bfd_get_filename (abfd);
char **my_environ = GET_ENVIRON ();
/* We use these maps to give the same behavior as the old xsim
simulator. */
int i;
char **prog_argv = STATE_PROG_ARGV (sd);
int my_argc = 0;
- /* All CPU:s have the same memory map, apparently. */
- SIM_CPU *cpu = STATE_CPU (sd, 0);
USI csp;
bfd_byte buf[4];
/* Note that the linux kernel does not correctly compute the storage
needs for the static-exe AUX vector. */
- csp -= sizeof (auxv_entries) / sizeof (auxv_entries[0]) * 4 * 2;
+ csp -= ARRAY_SIZE (auxv_entries) * 4 * 2;
csp -= (envc + 1) * 4;
csp -= (my_argc + 1) * 4;
USI data_ = data; \
USI addr_ = addr; \
bfd_putl32 (data_, buf); \
- if (sim_core_write_buffer (sd, cpu, 0, buf, addr_, 4) != 4) \
+ if (sim_core_write_buffer (sd, NULL, NULL_CIA, buf, addr_, 4) != 4)\
goto abandon_chip; \
} \
while (0)
{
size_t strln = strlen (prog_argv[i]) + 1;
- if (sim_core_write_buffer (sd, cpu, 0, prog_argv[i], epp, strln)
+ if (sim_core_write_buffer (sd, NULL, NULL_CIA, prog_argv[i], epp,
+ strln)
!= strln)
goto abandon_chip;
{
unsigned int strln = strlen (my_environ[i]) + 1;
- if (sim_core_write_buffer (sd, cpu, 0, my_environ[i], epp, strln)
+ if (sim_core_write_buffer (sd, NULL, NULL_CIA, my_environ[i], epp,
+ strln)
!= strln)
goto abandon_chip;
goto abandon_chip;
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
- for (i = 0; i < sizeof (auxv_entries) / sizeof (auxv_entries[0]); i++)
+ for (i = 0; i < ARRAY_SIZE (auxv_entries); i++)
{
write_dword (csp, auxv_entries[i].id);
write_dword (csp + 4,
/* Allocate simulator I/O managed memory if none specified by user. */
if (cris_have_900000xxif)
- {
- if (sim_core_read_buffer (sd, NULL, read_map, &c, 0x90000000, 1) == 0)
- sim_core_attach (sd, NULL, 0, access_write, 0, 0x90000000, 0x100,
- 0, &cris_devices, NULL);
- else
- {
- (*callback->
- printf_filtered) (callback,
- "Seeing --cris-900000xx with memory defined there\n");
- goto abandon_chip;
- }
- }
+ sim_hw_parse (sd, "/core/%s/reg %#x %i", "cris_900000xx", 0x90000000, 0x100);
/* Establish any remaining configuration options. */
if (sim_config (sd) != SIM_RC_OK)
Must be done after cris_cgen_cpu_open. */
cgen_init (sd);
- /* Store in a global so things like cris_dump_regs can be invoked
- from the gdb command line. */
- current_state = sd;
-
cris_set_callbacks (callback);
return sd;
}
-
-void
-sim_close (SIM_DESC sd, int quitting ATTRIBUTE_UNUSED)
-{
- cris_cgen_cpu_close (CPU_CPU_DESC (STATE_CPU (sd, 0)));
- sim_module_uninstall (sd);
-}
\f
SIM_RC
sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
- char **argv ATTRIBUTE_UNUSED,
- char **envp ATTRIBUTE_UNUSED)
+ char * const *argv ATTRIBUTE_UNUSED,
+ char * const *envp ATTRIBUTE_UNUSED)
{
SIM_CPU *current_cpu = STATE_CPU (sd, 0);
SIM_ADDR addr;
addr = 0;
sim_pc_set (current_cpu, addr);
- /* Other simulators have #if 0:d code that says
- STATE_ARGV (sd) = sim_copy_argv (argv);
- STATE_ENVP (sd) = sim_copy_argv (envp);
- Enabling that gives you not-found link-errors for sim_copy_argv.
- FIXME: Do archaeology to find out more. */
+ /* Standalone mode (i.e. `run`) will take care of the argv for us in
+ sim_open() -> sim_parse_args(). But in debug mode (i.e. 'target sim'
+ with `gdb`), we need to handle it because the user can change the
+ argv on the fly via gdb's 'run'. */
+ if (STATE_PROG_ARGV (sd) != argv)
+ {
+ freeargv (STATE_PROG_ARGV (sd));
+ STATE_PROG_ARGV (sd) = dupargv (argv);
+ }
return SIM_RC_OK;
}
projects / deliverable / binutils-gdb.git / blobdiff