aboutsummaryrefslogtreecommitdiff
path: root/sim/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'sim/testsuite')
-rw-r--r--sim/testsuite/sim/cris/ChangeLog4
-rw-r--r--sim/testsuite/sim/cris/asm/io1.ms2
2 files changed, 5 insertions, 1 deletions
diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog
index 22fb88a..fa34863 100644
--- a/sim/testsuite/sim/cris/ChangeLog
+++ b/sim/testsuite/sim/cris/ChangeLog
@@ -1,5 +1,9 @@
2015-12-25 Mike Frysinger <vapier@gentoo.org>
+ * asm/io1.ms: Update expected output.
+
+2015-12-25 Mike Frysinger <vapier@gentoo.org>
+
* hw/rv-n-cris/rvc.exp (rvdummy): Set up sane default.
2012-03-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/testsuite/sim/cris/asm/io1.ms b/sim/testsuite/sim/cris/asm/io1.ms
index a8335a8..3d252ae 100644
--- a/sim/testsuite/sim/cris/asm/io1.ms
+++ b/sim/testsuite/sim/cris/asm/io1.ms
@@ -1,7 +1,7 @@
# mach: crisv32
# sim: --cris-900000xx --memory-region 0x90000000,0x10
# xerror:
-# output: Seeing --cris-900000xx with memory defined there\n
+# output: /core/cris_900000xx: memory map 0:0x90000000..0x900000ff (256 bytes) overlaps 0:0x90000000..0x9000000f (16 bytes)\nQuit Simulator\n
; Check that I/O region overlap is detected.