From patchwork Thu Jan 28 08:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 372548 Delivered-To: patch@linaro.org Received: by 2002:a17:906:24d5:0:0:0:0 with SMTP id f21csp657279ejb; Thu, 28 Jan 2021 00:45:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyr2tX8h3HqFMcV5m4mmofQf2z0kt/JHZJ7VrxCnzCpURMhCDifTdZmPM2ZZfouKvFEqbn5 X-Received: by 2002:a25:bc52:: with SMTP id d18mr22369256ybk.331.1611823537019; Thu, 28 Jan 2021 00:45:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611823537; cv=none; d=google.com; s=arc-20160816; b=v5TADHdIb2abLoWA8EgEuTGqgniswoJMADEAWOFoh/xANcgZql5I+dyF8PSUX5VGyH dvy3LxtYHwu1C9IC5hZaYrlZUeFAc6NbVgHOy9WL+6ZrsCsAm0dHBkvZtR6mpO8UlNW4 FvRB6ooEtJzP5w6blivy5QGAZwDYoS6UZuoIECSDUh5qB4q7CecEyK34eu4Q00DxeC4O SNvC/Xj2iLTxnVbaYWOwZVPQNw4wZ+9lhVhq5OAcEKygRYvcJGRxrbctolD2ng+EAp/X ffYR9dpO1I1xFRaWmsLz+4M0wjb5T8BjxpsZUOYRs8BV7dM/wW0FukYNjpTYvLHnVDRn yTdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=rBCcLumWniM/+fC/4eU8EcpSrpup7jHrRf0ZPnvW8R4=; b=dLCgNm55U2FA4oJBrEWmvrxfAjrxcfzV19INPZxT12/Q8WQtEDyPuWCpWORQ1SrqW6 KZUGDY5ZE4CUiStse83BiCAn5db8vJOBEjfIu7FZiiHrU4MnZQ0iPQFyMfncKImpkC6Y TqUOxMRenX26yy9xqGx3jkjZP//neSeMx3VDPI961V0UX3lP6zsR5O5DcRuyaEyrIgeL OVhAwa1zfzB6rsIdOZ3OFbZ2TGAau3tMYrMqDTon8jQBjComSXRLJtva2pk8yygzOtyI Kl6MEaf1PNsdu5VVkNzUNrXgactz/EqOAPGJ738c/a9/Mq4iXxhkSngSUApm+GQ6Oo7P uI8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D9HkyJHD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r6si5008006ybc.352.2021.01.28.00.45.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jan 2021 00:45:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D9HkyJHD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l52vo-0002u5-Bq for patch@linaro.org; Thu, 28 Jan 2021 03:45:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l52aw-00067P-41 for qemu-devel@nongnu.org; Thu, 28 Jan 2021 03:24:02 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:38760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l52au-0005k2-E7 for qemu-devel@nongnu.org; Thu, 28 Jan 2021 03:24:01 -0500 Received: by mail-pj1-x102d.google.com with SMTP id l18so3842868pji.3 for ; Thu, 28 Jan 2021 00:24:00 -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=rBCcLumWniM/+fC/4eU8EcpSrpup7jHrRf0ZPnvW8R4=; b=D9HkyJHDcvgt5VK74A91d6+cya1fsnZWcXymNGtaLkzY0M6Cn74jSvxiN2zdLX+GSM q1YtfD9VUa70kJ1KdTmAqZTuqMKyTHhWJHFq4igSKCL2xDQJTVCCOpBf3EIUQkejE49C ReGb5o0OYeDuM+YJmcfoQ0HYhEVtboNk7fzMCq8ots6SDz64EkSwkIOOk5lv9VcfSOAr Z4FBgvhfbc1fMWdBfrd7rzzyOUUv0wx/y46NlDpqdbhTpTgVb28ffVZYMyoZGYyEujh2 86+3WZCvtx5Cy7GkrSMiyU2SboApjJ0N2OhB0s0qnKH4SgW2e2gX5vFqDkoV4FdjiEYo vIeA== 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=rBCcLumWniM/+fC/4eU8EcpSrpup7jHrRf0ZPnvW8R4=; b=bzOefwGgYjB+nka4B7eUmuoXE1qFE1dX2AHsO86T8kBfWR4nDu0aSM4E8MahdvSuIv IxpRSbcYekQwMkQpVNCUoYeA1r58NWEa+Jo7wcc+kupTBczZIouFZASXn4jxkX2qQrPd mBprxdV4pf2O5g6zyUTkcjxhY8PenyPSsfPxet1gm/B5jATMRLNhP1atDKMm+iyvoMGC 33npcJpCEy7dMpl9GiMZ8vvqLTB2wRFYZTlMT0OpgNlqApIwd8jsR3eFlyBFeqWB/o+o JyJkPMwRDQ2sbn+bUXCULHHSjkADGdEZ3qZ2HlvsvXUQgVc3xjp15o5ZsYk2UurY4CRK WIvA== X-Gm-Message-State: AOAM530cv3Oktx71KJ+qJMnqIHpzBW+zYakQRxBHnBtEBiNQBBOvVOPu CufNuTNsIpovoFa6PJs1MpnTztwiCFtCDGe3 X-Received: by 2002:a17:90a:7e8d:: with SMTP id j13mr10042480pjl.37.1611822239151; Thu, 28 Jan 2021 00:23:59 -0800 (PST) Received: from localhost.localdomain (cpe-66-27-222-29.hawaii.res.rr.com. [66.27.222.29]) by smtp.gmail.com with ESMTPSA id s24sm4658292pfd.118.2021.01.28.00.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 00:23:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 15/23] tcg/tci: Merge INDEX_op_{ld_i32,ld32u_i64} Date: Wed, 27 Jan 2021 22:23:23 -1000 Message-Id: <20210128082331.196801-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210128082331.196801-1-richard.henderson@linaro.org> References: <20210128082331.196801-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: sw@weilnetz.de Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/tci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.25.1 Reviewed-by: Alex Bennée diff --git a/tcg/tci.c b/tcg/tci.c index 95625701bb..233fc0604e 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -599,6 +599,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_write_reg(regs, t0, *(int16_t *)(t1 + t2)); break; case INDEX_op_ld_i32: + case INDEX_op_ld32u_i64: t0 = *tb_ptr++; t1 = tci_read_r(regs, &tb_ptr); t2 = tci_read_s32(&tb_ptr); @@ -854,12 +855,6 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, /* Load/store operations (64 bit). */ - case INDEX_op_ld32u_i64: - t0 = *tb_ptr++; - t1 = tci_read_r(regs, &tb_ptr); - t2 = tci_read_s32(&tb_ptr); - tci_write_reg(regs, t0, *(uint32_t *)(t1 + t2)); - break; case INDEX_op_ld32s_i64: t0 = *tb_ptr++; t1 = tci_read_r(regs, &tb_ptr);