* tweak

2001-03-15  Frank Ch. Eigler  <fche@redhat.com>

	* sim-core.c (sim_core_map_attach): Correct overlap-related
	error messages.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c83c581657505dd55005fd53481680552f206b3f..98c5e8159875a8149d24cea62cff09f8066e4654 100644 (file)
--- 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 f7579c40a980f5d031ee90b0d936d21626e766ba..8e5ef38ab958702bf1ce3565cbd147084aaedaa3 100644 (file)
--- 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,