aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/rx/ChangeLog5
-rw-r--r--sim/rx/rx.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 39ee94d..d7bfa45 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25 Nick Clifton <nickc@redhat.com>
+
+ * rx.c (SHIFT_OP): A shift by zero still sets the condition
+ codes.
+
2013-06-03 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, configure: Regenerate.
diff --git a/sim/rx/rx.c b/sim/rx/rx.c
index e12aa85..dd88676 100644
--- a/sim/rx/rx.c
+++ b/sim/rx/rx.c
@@ -732,8 +732,7 @@ poppc()
c = val & carry_mask; \
val OP 1; \
} \
- if (count) \
- set_oszc (val, 4, c); \
+ set_oszc (val, 4, c); \
PD (val); \
}