From patchwork Thu Feb 4 01:43:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 376165 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp840430jah; Wed, 3 Feb 2021 18:04:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyfLJAYdg3nWjjcgHzdXD0TFZ/bC5rHFXYBrFyF483LtzG/k6egMxKCcBTJx2NhmWiiz+gW X-Received: by 2002:a25:bdc2:: with SMTP id g2mr8923088ybk.193.1612404240354; Wed, 03 Feb 2021 18:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612404240; cv=none; d=google.com; s=arc-20160816; b=qxIoAb0FddoyNTlP5X02Nwtom7odIrZXURXK+AY5B5AFOpeLjBb3MAmgWJtREe+zxh 9ntBvuYyhiKGcPPk/lJAi+1RFqGESAAumUYyvk9A27KAqj2HfdBV3ibegW9Wu7BS6/uO /uKGJEZcElBlyn5tMVkxrUZL5pW5nFwogL7rbLsHYZQX6wlZ48kYbnbMwFmoZXJ0YV0l ZPiz/nhQ372IBudRHwUNTgq8isc6AaajZJslegHIvnrkXOICLmZr9taTukhQpX0nW+Ak o1SNVUhegqtjcu0UFgpWLS/RsVGytlz9VeqmbDLl4bTKMl/8zjPcm5Uu0rkiyU0WcTC4 la4Q== 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=pMV4BySeK8KuIUlVV1lxW3l1A4MrToushLk684ASlQM=; b=MtRUKIEnuQ1GYJN9KeqlZmo6EqaH05QvSTJI3qnhD6dMmaYQHcfC24mJEb36CJK5kd J6DwK/N4FLsQv89dmH/f3Yd/0dgCirpqLdGGZb5xiJPiig83mtyvyUjyJOmYNa1+hgTi 0A3ptsKDHWbbtXbsuVw+KYPALeTvcLWezPJF2Dc7KZfzESwruHVzo9s1aNxfWClqAlBM qNAgkVYJNZQ37yBAmi07KZYbixk7t1/W0qSb6kiiJwaUHgQr8q/wYeWVKT4Gsj30Rj4u ZnBeukPvBXfzqSnXsKO3/N56njWSZjFaD2O2Yulfx4swMEFUxGm8TJpXWE78VpAJ4DQj LAww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qKoRnNM1; 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 g16si3852863ybc.382.2021.02.03.18.04.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Feb 2021 18:04:00 -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=qKoRnNM1; 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]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7Tzz-0002K7-T7 for patch@linaro.org; Wed, 03 Feb 2021 21:03:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7TiW-0004zh-CI for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:45:57 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:35655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l7TiT-0003pO-HC for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:45:56 -0500 Received: by mail-pj1-x1029.google.com with SMTP id e9so830340pjj.0 for ; Wed, 03 Feb 2021 17:45:53 -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=pMV4BySeK8KuIUlVV1lxW3l1A4MrToushLk684ASlQM=; b=qKoRnNM1V0rKUajNMEYrupKr1+Gxq4lBoSBpOzjwIwrWH2fFvl10/2P0IVCTcgnMWD /SvdNztn2tBMUiPhoEmgaHkzf3SYIxt9M6y/KvwiAMV+CEnuPzZ8HlAa6ik7g73eIvlJ 7ynCPjkOdcAp3ILeW9Bk1pzKYycixP1mtKwLQTkVKSDRwioj6KfcS3AhUJyZxfv86xcU fkUfSERsSX6W1E6MPBY8s4eU3Tb0SUkjaK8XimlnnAk8QmAtocSDLv1O/i8ZA+XixAz3 pMJKMpo2H1t9pwGhNhzN2Z0AJ2u6Aa8aYusrH8oDhWdIF6KW5Ir8lXU9TSrWsfkXTIrn nC3w== 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=pMV4BySeK8KuIUlVV1lxW3l1A4MrToushLk684ASlQM=; b=htnXhKIQ58OKDw2tKHnJO7NDkyo7Yb1m/v2G98OJdOAtirUE7+3z8yraffxNBxcfgi FmvA8WBsX+ZYutGVQsQP7r7GlX+6BrGmA6wVyxH42NSAEH9h5PsvEZfWSFhpMjDn1Too UGBWwYXUE0i80V/YeLg66CSPkXFRBe7N9F3NHumfx2uaRj7LRBvyjOsT/PoPNJwKFKXA amMLcT4O7vbq5ZPVDjGS6guBOSE33JsIzL1uVaIZCufL653v+WdtCxh82F+l5/4JiTF/ +sNotcn20Y4Z/mZgKGYKXp/wpC00I00dN8BiOLWzzsju01pYuxJaFCNAnhnhhQjRnUPU 0MSw== X-Gm-Message-State: AOAM53141D22GhV71aYK+CXQK/KxWB/0wJlwkMAUCkGGens/LrkOwqtK MJA54WhctadjQPGGAq/jNLjZko3w1oe2qpc2 X-Received: by 2002:a17:903:181:b029:df:c7e5:8e39 with SMTP id z1-20020a1709030181b02900dfc7e58e39mr5921269plg.25.1612403152244; Wed, 03 Feb 2021 17:45:52 -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 q132sm3835462pfq.171.2021.02.03.17.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 17:45:51 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 21/93] tcg/tci: Merge INDEX_op_{st_i32,st32_i64} Date: Wed, 3 Feb 2021 15:43:57 -1000 Message-Id: <20210204014509.882821-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204014509.882821-1-richard.henderson@linaro.org> References: <20210204014509.882821-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Alex Bennée Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/tci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.25.1 diff --git a/tcg/tci.c b/tcg/tci.c index ee2cd7dfa2..eb70672efb 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -625,6 +625,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, *(uint16_t *)(t1 + t2) = t0; break; case INDEX_op_st_i32: + CASE_64(st32) t0 = tci_read_r32(regs, &tb_ptr); t1 = tci_read_r(regs, &tb_ptr); t2 = tci_read_s32(&tb_ptr); @@ -873,12 +874,6 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, t2 = tci_read_s32(&tb_ptr); tci_write_reg(regs, t0, *(uint64_t *)(t1 + t2)); break; - case INDEX_op_st32_i64: - t0 = tci_read_r32(regs, &tb_ptr); - t1 = tci_read_r(regs, &tb_ptr); - t2 = tci_read_s32(&tb_ptr); - *(uint32_t *)(t1 + t2) = t0; - break; case INDEX_op_st_i64: t0 = tci_read_r64(regs, &tb_ptr); t1 = tci_read_r(regs, &tb_ptr);