From nobody Thu Nov 13 12:02:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579821879; cv=none; d=zohomail.com; s=zohoarc; b=cERUJinI3wZKaflXfkRZKc2MrfsZdz8PRGSdTLT9XiPHFW6zBWacsg5Z6uzP853ieTwES0vLV9L32l0umAUvaPxV4iIWjp/3oaQ9kB9qzmDoWLji76dCDTSDyt5nvj21X59oYr7wS8Nlgs6Nc9QBFlgb7OCBP+mbu93/dh97Lhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579821879; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b03RbSukzpoEye2uxHCZinu0Fc887c6qTcIlfZvoadY=; b=BwrFAXqJmuu5HWX82ovYUD4lPEnmFNT43bqJaVx2T+O7Fp45jDD1Ik4ANBHdACQjvEAWCfOyh2w+zULumg87fw4dfxiThGlWg3JIgvcD+/v3yqjG2V6NJ4yrUwCNaWl9trb91Cs2yxj21Yb7sUCLnfKx3mrdQEs8QMHnvlZryQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157982187926645.610155259448334; Thu, 23 Jan 2020 15:24:39 -0800 (PST) Received: from localhost ([::1]:35328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iulq2-0002ba-6r for importer@patchew.org; Thu, 23 Jan 2020 18:24:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52387) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuloW-00009l-7v for qemu-devel@nongnu.org; Thu, 23 Jan 2020 18:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuloV-0007iI-79 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 18:23:04 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:43067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuloV-0007hu-1R for qemu-devel@nongnu.org; Thu, 23 Jan 2020 18:23:03 -0500 Received: by mail-pg1-x543.google.com with SMTP id u131so4183pgc.10 for ; Thu, 23 Jan 2020 15:23:02 -0800 (PST) Received: from localhost.localdomain (rrcs-173-198-77-92.west.biz.rr.com. [173.198.77.92]) by smtp.gmail.com with ESMTPSA id z5sm4136008pfq.3.2020.01.23.15.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 15:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b03RbSukzpoEye2uxHCZinu0Fc887c6qTcIlfZvoadY=; b=bbdo5YJcZl4eb0SO0yz1Ld5DAVwK4FKTVA/t5oTI2a1CArXaeBMXLdwET3E2ExS/R2 x7kdTnyJCWoEyGoxEomKpMo5FIuhINX823HzRXH458+3o7U0mxnyyfkyT/JGJuO3CKFK A/cBd0QnNLjtUURhKcoVa8BcGXHNhzJlrk1N7zcocP+HtkdNYkXHqRBKo4Kcz0QwSQMD 6YFTgkmy0KS6NdrEjSWOEZrxYMCfLSMaDzWbsWLsFv5Tx2SeYvO226ktr7IlhgMccdr8 i0RkUu/6ZNfQPEj1i86qZxg+k/jA2RzpXGkjPPx6SbPDHLWVEXJvewl5u9sDSX8jDPyq T9Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b03RbSukzpoEye2uxHCZinu0Fc887c6qTcIlfZvoadY=; b=EMwECKLLYebWIjllVzw7UmSsDQWs5a7hqUMFqgm7+d+cL/CKPkHvi8bV2qA8EqcNpu i5o409xN3EYMO3tFqMvFSP8SaYBgoNfU7KPayY42ZRUDfvZ+aeSJLWLed7d0Ig5/RmOy TlbaWcEz9YgQR5tbLSRN4AgzaUuHFYuMl5mEOpogtomw4T2d2Ue+NwiHgbYKML0S9LVF vkTExBk+DNyOFsIGL2MG3loIsV86+WSJtnwToUCzgBO/FgiEhV+tETqlnY80y1Nxlxtj yh1bippXNPhP/rOVjcqm2MWh332G3+yovuvURRrZ2iBqDwL7in4Lakglnf1jMGpxHyWi n0/w== X-Gm-Message-State: APjAAAUtPJADgf5Rh+YLcm4Z7FJCfXsLaNfOltvpWIHCpKeJw/bdilES eGW2BkeAYNPKZ9OMN/zGUxKiknNuy+U= X-Google-Smtp-Source: APXvYqwvMIsph4RsNc1J/WABk+9JM5VgCh63cL6kIqYNJ3xD6w5TeYqJCOvbHoF/qEftDQdalJMViw== X-Received: by 2002:a63:d249:: with SMTP id t9mr848680pgi.263.1579821781678; Thu, 23 Jan 2020 15:23:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/5] target/s390x: Remove DisasFields argument from extract_insn Date: Thu, 23 Jan 2020 13:22:48 -1000 Message-Id: <20200123232248.1800-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200123232248.1800-1-richard.henderson@linaro.org> References: <20200123232248.1800-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, cohuck@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The separate pointer is now redundant. Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth --- target/s390x/translate.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 3674fee10c..0bd2073718 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6183,8 +6183,7 @@ static void extract_field(DisasFields *o, const Disas= Field *f, uint64_t insn) /* 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) +static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) { uint64_t insn, pc =3D s->base.pc_next; int op, op2, ilen; @@ -6264,13 +6263,14 @@ static const DisasInsn *extract_insn(CPUS390XState = *env, DisasContext *s, break; } =20 - memset(f, 0, sizeof(*f)); - f->raw_insn =3D insn; - f->op =3D op; - f->op2 =3D op2; + memset(&s->fields, 0, sizeof(s->fields)); + s->fields.raw_insn =3D insn; + s->fields.op =3D op; + s->fields.op2 =3D op2; =20 /* Lookup the instruction. */ info =3D lookup_opc(op << 8 | op2); + s->insn =3D info; =20 /* If we found it, extract the operands. */ if (info !=3D NULL) { @@ -6278,7 +6278,7 @@ static const DisasInsn *extract_insn(CPUS390XState *e= nv, DisasContext *s, int i; =20 for (i =3D 0; i < NUM_C_FIELD; ++i) { - extract_field(f, &format_info[fmt].op[i], insn); + extract_field(&s->fields, &format_info[fmt].op[i], insn); } } return info; @@ -6302,10 +6302,7 @@ static DisasJumpType translate_one(CPUS390XState *en= v, DisasContext *s) DisasOps o =3D {}; =20 /* Search for the insn in the table. */ - insn =3D extract_insn(env, s, &s->fields); - - /* Set up the strutures we use to communicate with the helpers. */ - s->insn =3D insn; + insn =3D extract_insn(env, s); =20 /* Emit insn_start now that we know the ILEN. */ tcg_gen_insn_start(s->base.pc_next, s->cc_op, s->ilen); --=20 2.20.1