From patchwork Fri Sep 28 00:53:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7595D2C007E for ; Fri, 28 Sep 2012 10:54:13 +1000 (EST) Received: from localhost ([::1]:58516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOqJ-0004x6-LE for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:54:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOqD-0004wx-Dy for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOqC-00057b-Da for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:54:05 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOqC-00057T-75 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:54:04 -0400 Received: by pbbrp2 with SMTP id rp2so4380674pbb.4 for ; Thu, 27 Sep 2012 17:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Q+wb1u9SVddZSQUwsiCzIghdyZHV053p0LchpggZfqo=; b=eG/cuhH3elWpNKWkiBIl+eJUe5YyidaUtm3UVhfEQi/m28UvwnyGDPug0yon6s6ntl wa442KCswfFRCvA5Znf9BatQ7aLhfgFFa6xrlkeX4vTu0coOp0q+Lm0ETcqZwesVC8pd rSd/PoYY5Qs30Sg8TTo3xvvAyXH9oDTfnHOCwphLa66npNew/gYp36nGK4VYIGtvrM8w XBH6eK+vojWX7joUEfhNCqJ/rmzddEwygFIXJj6ANZZQGdT++oQgY6CivYioCMj0LBwa WHshOb0X9CA2GWVSOdMxGB/OWxAWQE1bGNqoWANI9iSw5No5DM87beLCjQsMwgoxqaFP yFwA== Received: by 10.66.73.6 with SMTP id h6mr13457134pav.69.1348793643313; Thu, 27 Sep 2012 17:54:03 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id it10sm4640536pbc.53.2012.09.27.17.54.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:54:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:53:59 -0700 Message-Id: <1348793639-27784-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 118/147] target-s390: Implement BRANCH ON INDEX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- target-s390x/insn-data.def | 10 +++++++++ target-s390x/translate.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index cd773d0..8b89ce6 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -90,6 +90,16 @@ /* BRANCH RELATIVE ON COUNT */ C(0xa706, BRCT, RI_b, Z, 0, 0, 0, 0, bct32, 0) C(0xa707, BRCTG, RI_b, Z, 0, 0, 0, 0, bct64, 0) +/* BRANCH ON INDEX */ + D(0x8600, BXH, RS_a, Z, 0, a2, 0, 0, bx32, 0, 0) + D(0x8700, BXLE, RS_a, Z, 0, a2, 0, 0, bx32, 0, 1) + D(0xeb44, BXHG, RSY_a, Z, 0, a2, 0, 0, bx64, 0, 0) + D(0xeb45, BXLEG, RSY_a, Z, 0, a2, 0, 0, bx64, 0, 1) +/* BRANCH RELATIVE ON INDEX */ + D(0x8400, BRXH, RSI, Z, 0, 0, 0, 0, bx32, 0, 0) + D(0x8500, BRXLE, RSI, Z, 0, 0, 0, 0, bx32, 0, 1) + D(0xec44, BRXHG, RIE_e, Z, 0, 0, 0, 0, bx64, 0, 0) + D(0xec45, BRXHLE, RIE_e, Z, 0, 0, 0, 0, bx64, 0, 1) /* CHECKSUM */ C(0xb241, CKSM, RRE, Z, r1_o, ra2, new, r1_32, cksm, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index f2ac98f..74f14bc 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1355,6 +1355,58 @@ static ExitStatus op_bct64(DisasContext *s, DisasOps *o) return help_branch(s, &c, is_imm, imm, o->in2); } +static ExitStatus op_bx32(DisasContext *s, DisasOps *o) +{ + int r1 = get_field(s->fields, r1); + int r3 = get_field(s->fields, r3); + bool is_imm = have_field(s->fields, i2); + int imm = is_imm ? get_field(s->fields, i2) : 0; + DisasCompare c; + TCGv_i64 t; + + c.cond = (s->insn->data ? TCG_COND_LE : TCG_COND_GT); + c.is_64 = false; + c.g1 = false; + c.g2 = false; + + t = tcg_temp_new_i64(); + tcg_gen_add_i64(t, regs[r1], regs[r3]); + c.u.s32.a = tcg_temp_new_i32(); + c.u.s32.b = tcg_temp_new_i32(); + tcg_gen_trunc_i64_i32(c.u.s32.a, t); + tcg_gen_trunc_i64_i32(c.u.s32.b, regs[r3 | 1]); + store_reg32_i64(r1, t); + tcg_temp_free_i64(t); + + return help_branch(s, &c, is_imm, imm, o->in2); +} + +static ExitStatus op_bx64(DisasContext *s, DisasOps *o) +{ + int r1 = get_field(s->fields, r1); + int r3 = get_field(s->fields, r3); + bool is_imm = have_field(s->fields, i2); + int imm = is_imm ? get_field(s->fields, i2) : 0; + DisasCompare c; + + c.cond = (s->insn->data ? TCG_COND_LE : TCG_COND_GT); + c.is_64 = true; + + if (r1 == (r3 | 1)) { + c.u.s64.b = load_reg(r3 | 1); + c.g2 = false; + } else { + c.u.s64.b = regs[r3 | 1]; + c.g2 = true; + } + + tcg_gen_add_i64(regs[r1], regs[r1], regs[r3]); + c.u.s64.a = regs[r1]; + c.g1 = true; + + return help_branch(s, &c, is_imm, imm, o->in2); +} + static ExitStatus op_ceb(DisasContext *s, DisasOps *o) { gen_helper_ceb(cc_op, cpu_env, o->in1, o->in2);