diff options
author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-21 17:48:01 +0000 |
---|---|---|
committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-21 17:48:01 +0000 |
commit | 1b1afeb95b1e31ca32b48b07ff862a7b885b3896 (patch) | |
tree | 931f9f37203f4011ff70d2e557ac3eeef1b68ff7 /target-arm/op.c | |
parent | 8d7fe05385e2e0ac1243ac437d3f400b2c5cb919 (diff) |
Don't touch carry flag in ASR <reg> with zero <reg>, submitted by Aurelien Jarno.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2843 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-arm/op.c')
-rw-r--r-- | target-arm/op.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/op.c b/target-arm/op.c index fd44a40f83..d7ac6de062 100644 --- a/target-arm/op.c +++ b/target-arm/op.c @@ -667,7 +667,7 @@ void OPPROTO op_sarl_T1_T0_cc(void) if (shift >= 32) { env->CF = (T1 >> 31) & 1; T1 = (int32_t)T1 >> 31; - } else { + } else if (shift != 0) { env->CF = (T1 >> (shift - 1)) & 1; T1 = (int32_t)T1 >> shift; } |