From: Richard Henderson Date: Sat, 1 Jul 2017 20:20:24 +0000 (-0700) Subject: target/s390x: Fix risbg handling X-Git-Tag: v2.10.0-rc0~43^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbdaaff43adc49f1debd935b1fd58e2b47ba7676;p=thirdparty%2Fqemu.git target/s390x: Fix risbg handling The rotation is to the left, but extract shifts to the right. The computation of the extract parameters needs adjusting. For the entry condition, simplify 64 - rot + len <= 64 -rot + len <= 0 len <= rot Reviewed-by: Aurelien Jarno Reported-by: David Hildenbrand Suggested-by: Aurelien Jarno Signed-off-by: Richard Henderson --- diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b46f4c80132..1dffcee8843 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3479,8 +3479,8 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o) } /* In some cases we can implement this with extract. */ - if (imask == 0 && pos == 0 && len > 0 && rot + len <= 64) { - tcg_gen_extract_i64(o->out, o->in2, rot, len); + if (imask == 0 && pos == 0 && len > 0 && len <= rot) { + tcg_gen_extract_i64(o->out, o->in2, 64 - rot, len); return NO_EXIT; }