From 3c39c800bf8fb22222372f9ae84423f966f6da98 Mon Sep 17 00:00:00 2001 From: Richard Henderson <rth@twiddle.net> Date: Fri, 16 Jun 2017 17:37:59 -0700 Subject: target/s390x: Finish implementing ETF2-ENH Missed the proper alignment in TRTO/TRTT, and ignoring the M3 field for all TRXX insns without ETF2-ENH. Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Richard Henderson <rth@twiddle.net> --- target/s390x/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'target/s390x/translate.c') diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 72af76df27..a3414c0616 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4356,8 +4356,9 @@ static ExitStatus op_trXX(DisasContext *s, DisasOps *o) TCGv_i32 tst = tcg_temp_new_i32(); int m3 = get_field(s->fields, m3); - /* XXX: the C bit in M3 should be considered as 0 when the - ETF2-enhancement facility is not installed. */ + if (!s390_has_feat(S390_FEAT_ETF2_ENH)) { + m3 = 0; + } if (m3 & 1) { tcg_gen_movi_i32(tst, -1); } else { -- cgit v1.2.3