From nobody Thu Nov 6 10:38:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540488475468416.6231062383332; Thu, 25 Oct 2018 10:27:55 -0700 (PDT) Received: from localhost ([::1]:56043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFjQE-0003HN-Un for importer@patchew.org; Thu, 25 Oct 2018 13:27:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFjKf-0006h0-DT for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFjKX-0000J8-Vp for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:21:59 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:33567) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gFjKW-00009D-0x for qemu-devel@nongnu.org; Thu, 25 Oct 2018 13:21:57 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8414D221CB; Thu, 25 Oct 2018 13:21:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Oct 2018 13:21:16 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 8EF0BE4897; Thu, 25 Oct 2018 13:21:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=e/BHzRnE2mUdr294JMe4l4Xhe8lifavFXwcoTix71pM=; b=w5qD3 dZIKadLbHMo9eFJvVWvWzD4du2YYrpt2xMao9aYeY6BKLtCXPo7ocpj/Tn3NiPne 2IPBBw1snXo3Euc6Ud04TTfEAoRWLlzv5NfT3I3bdQv8jLyDAuKUV/4SGF87n+am SCLxeXhzbVypaNmks12cQdl9oIGYzRgA/VzVeM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=e/BHzRnE2mUdr294JMe4l4Xhe8lif avFXwcoTix71pM=; b=WQ6ZztSSA7ieUk0NA4yxoWY7JCci5qgY5ZxAJIG4jJNcg VRimEkrZgDKh2WhFUe12f9JOY5jyzYfqxCusfEtXr8QBqrOKiEolxMeUBS8MHHru wrq9452rIs/pKE+zwrJqZdsPqEk/k3bNnWGmNd0fCVr7aW60K0aVM7bDmdnQLRQt FxT818LdcYl4sPBVRTgYNAquc83FjHGOYoFlnSeDIWE6s9cz7NVXEqD8V18fbyLR ajn7b9nODoIzyM0qCluwCUyGiVyz+xuEqaQpafmX/3Uy/LrT39yiCcxSk/3RFSvA W2BAF2/tPuA0dk7W1/Wnw7BgtNmJYY2zqC5yVm40w== X-ME-Sender: X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2018 13:20:43 -0400 Message-Id: <20181025172057.20414-35-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025172057.20414-1-cota@braap.org> References: <20181025172057.20414-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.27 Subject: [Qemu-devel] [RFC 34/48] target/s390x: prepare for 2-pass translation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Pavel Dovgalyuk , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Emilio G. Cota --- target/s390x/translate.c | 49 ++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 6ac1a8d821..0c41e0d83a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -5934,13 +5934,39 @@ static void extract_field(DisasFields *o, const Dis= asField *f, uint64_t insn) o->c[f->indexC] =3D r; } =20 +static inline void +s390_plugin_insn(uint64_t insn, struct qemu_plugin_insn *plugin_insn, int = len) +{ + uint16_t insn2; + uint32_t insn4; + + if (plugin_insn =3D=3D NULL) { + return; + } + + switch (len) { + case 2: + insn2 =3D insn; + qemu_plugin_insn_append(plugin_insn, &insn2, sizeof(insn2)); + break; + case 4: + insn4 =3D insn; + qemu_plugin_insn_append(plugin_insn, &insn4, sizeof(insn4)); + break; + default: + g_assert_not_reached(); + } +} + /* Lookup the insn at the current PC, extracting the operands into O and returning the info struct for the insn. Returns NULL for invalid insn.= */ =20 static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s, - DisasFields *f) + DisasFields *f, + struct qemu_plugin_insn *plugin_insn) { uint64_t insn, pc =3D s->base.pc_next; + uint64_t insn4; int op, op2, ilen; const DisasInsn *info; =20 @@ -5960,13 +5986,19 @@ static const DisasInsn *extract_insn(CPUS390XState = *env, DisasContext *s, ilen =3D get_ilen(op); switch (ilen) { case 2: - insn =3D insn << 48; + s390_plugin_insn(insn, plugin_insn, 2); + insn <<=3D 48; break; case 4: - insn =3D ld_code4(env, pc) << 32; + insn =3D ld_code4(env, pc); + s390_plugin_insn(insn, plugin_insn, 4); + insn <<=3D 32; break; case 6: - insn =3D (insn << 48) | (ld_code4(env, pc + 2) << 16); + s390_plugin_insn(insn, plugin_insn, 2); + insn4 =3D ld_code4(env, pc + 2); + s390_plugin_insn(insn4, plugin_insn, 4); + insn =3D (insn << 48) | (insn4 << 16); break; default: g_assert_not_reached(); @@ -6049,7 +6081,8 @@ static bool is_fp_pair(int reg) return !(reg & 0x2); } =20 -static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) +static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s, + struct qemu_plugin_insn *plugin_insn) { const DisasInsn *insn; DisasJumpType ret =3D DISAS_NEXT; @@ -6057,7 +6090,7 @@ static DisasJumpType translate_one(CPUS390XState *env= , DisasContext *s) DisasOps o; =20 /* Search for the insn in the table. */ - insn =3D extract_insn(env, s, &f); + insn =3D extract_insn(env, s, &f, plugin_insn); =20 /* Not found means unimplemented/illegal opcode. */ if (insn =3D=3D NULL) { @@ -6234,7 +6267,7 @@ static void s390x_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cs, CPUS390XState *env =3D cs->env_ptr; DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - dc->base.is_jmp =3D translate_one(env, dc); + dc->base.is_jmp =3D translate_one(env, dc, plugin_insn); if (dc->base.is_jmp =3D=3D DISAS_NEXT) { uint64_t page_start; =20 @@ -6300,6 +6333,8 @@ static const TranslatorOps s390x_tr_ops =3D { .translate_insn =3D s390x_tr_translate_insn, .tb_stop =3D s390x_tr_tb_stop, .disas_log =3D s390x_tr_disas_log, + .ctx_base_offset =3D offsetof(DisasContext, base), + .ctx_size =3D sizeof(DisasContext), }; =20 void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) --=20 2.17.1