From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqpVO-00050W-IR for qemu-devel@nongnu.org; Wed, 11 Dec 2013 14:31:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqpVD-0004C3-Nv for qemu-devel@nongnu.org; Wed, 11 Dec 2013 14:31:34 -0500 Received: from mail-qc0-x235.google.com ([2607:f8b0:400d:c01::235]:53682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqpVD-0004Bz-KV for qemu-devel@nongnu.org; Wed, 11 Dec 2013 14:31:23 -0500 Received: by mail-qc0-f181.google.com with SMTP id e9so5301274qcy.40 for ; Wed, 11 Dec 2013 11:31:23 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Wed, 11 Dec 2013 11:30:44 -0800 Message-Id: <1386790247-14267-3-git-send-email-rth@twiddle.net> In-Reply-To: <1386790247-14267-1-git-send-email-rth@twiddle.net> References: <1386790247-14267-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 2/5] target-s390: Simplify op_clc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de New opcodes can unify 4 different code paths. Signed-off-by: Richard Henderson --- target-s390x/translate.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 8fc8259..8f8567e 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1750,34 +1750,22 @@ static ExitStatus op_cksm(DisasContext *s, DisasOps *o) static ExitStatus op_clc(DisasContext *s, DisasOps *o) { int l = get_field(s->fields, l1); - TCGv_i32 vl; - switch (l + 1) { - case 1: - tcg_gen_qemu_ld_i64(cc_src, o->addr1, get_mem_index(s), MO_UB); - tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), MO_UB); - break; - case 2: - tcg_gen_qemu_ld_i64(cc_src, o->addr1, get_mem_index(s), MO_BEUW); - tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), MO_BEUW); - break; - case 4: - tcg_gen_qemu_ld_i64(cc_src, o->addr1, get_mem_index(s), MO_BEUL); - tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), MO_BEUL); - break; - case 8: - tcg_gen_qemu_ld_i64(cc_src, o->addr1, get_mem_index(s), MO_BEQ); - tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), MO_BEQ); - break; - default: + if (l + 1 <= 8) { + TCGMemOp mop = MO_BE + ctz32(l + 1); + + tcg_gen_qemu_ld_i64(cc_src, o->addr1, get_mem_index(s), mop); + tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), mop); + gen_op_update2_cc_i64(s, CC_OP_LTUGTU_64, cc_src, cc_dst); + } else { + TCGv_i32 vl; + potential_page_fault(s); vl = tcg_const_i32(l); gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2); tcg_temp_free_i32(vl); set_cc_static(s); - return NO_EXIT; } - gen_op_update2_cc_i64(s, CC_OP_LTUGTU_64, cc_src, cc_dst); return NO_EXIT; } -- 1.8.3.1