aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@redhat.com>2001-03-16 03:20:26 +0000
committerFrank Ch. Eigler <fche@redhat.com>2001-03-16 03:20:26 +0000
commit35c209920b75f22de686ab26de0ed352bc25f22b (patch)
treee7e83772ad3de08d451c2e79b623488130d03494 /sim
parent0dc1fa070b5423ce1da115e776bb88c4bc957e32 (diff)
downloadfsf-binutils-gdb-35c209920b75f22de686ab26de0ed352bc25f22b.zip
fsf-binutils-gdb-35c209920b75f22de686ab26de0ed352bc25f22b.tar.gz
fsf-binutils-gdb-35c209920b75f22de686ab26de0ed352bc25f22b.tar.bz2
* tweak
2001-03-15 Frank Ch. Eigler <fche@redhat.com> * sim-core.c (sim_core_map_attach): Correct overlap-related error messages.
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/sim-core.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c83c581..98c5e81 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-15 Frank Ch. Eigler <fche@redhat.com>
+
+ * sim-core.c (sim_core_map_attach): Correct overlap-related
+ error messages.
+
2001-03-07 Michael Meissner <meissner@redhat.com>
* run.c (alloca-conf.h): Delete, no longer provided.
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index f7579c4..8e5ef38 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -226,8 +226,8 @@ sim_core_map_attach (SIM_DESC sd,
device_error (client, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
space,
(long) addr,
+ (long) (addr + nr_bytes - 1),
(long) nr_bytes,
- (long) (addr + (nr_bytes - 1)),
next_mapping->space,
(long) next_mapping->base,
(long) next_mapping->bound,
@@ -237,8 +237,8 @@ sim_core_map_attach (SIM_DESC sd,
sim_hw_abort (sd, client, "memory map %d:0x%lx..0x%lx (%ld bytes) overlaps %d:0x%lx..0x%lx (%ld bytes)",
space,
(long) addr,
- (long) nr_bytes,
(long) (addr + (nr_bytes - 1)),
+ (long) nr_bytes,
next_mapping->space,
(long) next_mapping->base,
(long) next_mapping->bound,
@@ -247,8 +247,8 @@ sim_core_map_attach (SIM_DESC sd,
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,
(long) (addr + (nr_bytes - 1)),
+ (long) nr_bytes,
next_mapping->space,
(long) next_mapping->base,
(long) next_mapping->bound,