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

Stanify error reporting memory overlaps.

Browse Source
This commit is contained in:
Andrew Cagney 1997-09-03 04:06:27 +00:00
parent eaac098bd3
commit 80c651f02d
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/common/ChangeLog
View File

@ -1,3 +1,8 @@
Wed Sep 3 10:08:21 1997 Andrew Cagney <cagney@b1.cygnus.com>
* sim-core.c (sim_core_map_attach): Clarify memory overlap error
message.
Tue Sep 2 14:57:06 1997 Doug Evans <dje@canuck.cygnus.com> Tue Sep 2 14:57:06 1997 Doug Evans <dje@canuck.cygnus.com>
* Makefile.in (TAGS): Add support for "/* TAGS: foo */" marker. * Makefile.in (TAGS): Add support for "/* TAGS: foo */" marker.

31
sim/common/sim-core.c
View File

@ -220,21 +220,36 @@ sim_core_map_attach(SIM_DESC sd,
/* check insertion point correct */ /* check insertion point correct */
SIM_ASSERT (next_mapping == NULL || next_mapping->level >= (int) attach); SIM_ASSERT (next_mapping == NULL || next_mapping->level >= (int) attach);
if (next_mapping != NULL && next_mapping->level == (int) attach if (next_mapping != NULL && next_mapping->level == (int) attach
&& next_mapping->base < (addr + (nr_bytes - 1))) { && next_mapping->base < (addr + (nr_bytes - 1)))
{
#if (WITH_DEVICES) #if (WITH_DEVICES)
device_error(client, "map overlap when attaching %d:0x%lx (%ld)", device_error (client, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
space, (long)addr, (long)nr_bytes); space,
(long) addr,
(long) nr_bytes,
(long) (addr + (nr_bytes - 1)),
next_mapping->space,
(long) next_mapping->base,
(long) next_mapping->bound,
(long) next_mapping->nr_bytes);
#else #else
sim_io_error (sd, "map overlap when attaching %d:0x%lx (%ld)", sim_io_error (sd, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
space, (long)addr, (long)nr_bytes); space,
(long) addr,
(long) nr_bytes,
(long) (addr + (nr_bytes - 1)),
next_mapping->space,
(long) next_mapping->base,
(long) next_mapping->bound,
(long) next_mapping->nr_bytes);
#endif #endif
} }
/* create/insert the new mapping */ /* create/insert the new mapping */
*last_mapping = new_sim_core_mapping(sd, *last_mapping = new_sim_core_mapping(sd,
attach, attach,
space, addr, nr_bytes, space, addr, nr_bytes,
client, buffer, free_buffer); client, buffer, free_buffer);
(*last_mapping)->next = next_mapping; (*last_mapping)->next = next_mapping;
} }

2
sim/common/sim-utils.h
View File

@ -48,8 +48,6 @@ unsigned long sim_elapsed_time_since (SIM_ELAPSED_TIME start);
SIM_RC sim_analyze_program (SIM_DESC sd, char *prog_name, SIM_RC sim_analyze_program (SIM_DESC sd, char *prog_name,
struct _bfd *prog_bfd); struct _bfd *prog_bfd);
char **sim_copy_argv (char **argv);
/* Load program PROG into the simulator. /* Load program PROG into the simulator.
If PROG_BFD is non-NULL, the file has already been opened. If PROG_BFD is non-NULL, the file has already been opened.
If VERBOSE_P is non-zero statistics are printed of each loaded section If VERBOSE_P is non-zero statistics are printed of each loaded section