* cris.cpu (cris-set-mem): Correct integral write semantics.

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 3eef92697126da8c45ff0d8eb1a773c26d1e63b7..ddbce32295ce9ea2d0962f11788552874451e1a4 100644 (file)
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-21  Mikael Starvik  <starvik@axis.com>
+
+       * cris.cpu (cris-set-mem): Correct integral write semantics.
+
 2004-11-29  Hans-Peter Nilsson  <hp@axis.com>
 
        * cris.cpu: New file.

diff --git a/cpu/cris.cpu b/cpu/cris.cpu
index 6bfa539f90c4b17442efd25e1151657453260e48..955ad3218956f0e8e864d6ce6ac406edc5fff786 100644 (file)
--- a/cpu/cris.cpu
+++ b/cpu/cris.cpu
@@ -2224,7 +2224,10 @@
            (sequence
              ()
              (set (mem size addr) value)
-             (set cbit 0))
+             ; Write failures are signalled (by whatever entity "sends
+             ; the signal") by setting P at time of the write above, if X
+             ; is set.  Here, we just need to copy P into C.
+             (set cbit pbit))
            (set cbit 1))
        (set (mem size addr) value))