From patchwork Thu Jan 28 08:23:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 372536 Delivered-To: patch@linaro.org Received: by 2002:a17:906:24d5:0:0:0:0 with SMTP id f21csp648849ejb; Thu, 28 Jan 2021 00:30:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJ/hduFYDr1FVQEHKN1F6D8etLwLRGfCE7QQw5NbD3LdQSdOmh0EYi1pyhkVeTjMolUPGf X-Received: by 2002:a25:1d86:: with SMTP id d128mr4543894ybd.278.1611822607947; Thu, 28 Jan 2021 00:30:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611822607; cv=none; d=google.com; s=arc-20160816; b=QhYXsxHhQJLuRHmkxXtKf1pKUAiWtA4Hsfld6T8Glud0rg5jSxqeD/rv0KaTmUpCt7 1J7E5Ywi6IKrvbInK+fskf286I36MB4hRddJr67vm4ed2LRFLie7hOTrKcwEbHIdypqk ZB4yITn3xZ88jf0DMuIx5NdgS/HoKGXZ7UTlZnfnFeM9kv0qsO2DlXl1aaj6qXENFzaf 73Sw4jhJkV+nJ3TeBLfd0ZGdw9bP2dsTtkgfttjTNSCf2Zndp5+EVguC+GQtA7Jr4Mii BdvIEG0+Ui5084uwR9NVPzWMWBUVoKwbECsEN2/HvkrvL0MC37sRx7BxWFXiMGpzScuT rSLw== 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=PGD2Hxxva1v/CL+/7AMsseVrS1hfbb671q8VvUewR3Q=; b=MBpU5MxvWc8xKWrrS7Y5Heudf1nkCPTUjctAV1+a87+xtxfP9bFk1qfLl7ESOwJBqg B4T45NnpMfCEqktIJMtRz0dBNZ/CMr9BQ9k1uphI+fJau5d1HU5sm5DC/6vvJ1gE8d8X mQaAZ7woylKveNPy7rn0TRw/ueQ7mngIJuH56BmAz9wcYASUxKBGU5BaxYGxbSDywwNR LfElkHyfBBw7ZTEtMsCe6/UZqbpJofX5Nt60eyicuXzbE6HSACRwaNgfnJgKTabDGekJ ap1TdhgcPE2syoyrD65GQUt9tkRJBytPpZyZo0iqGkuLX2AoiWfFemNc7fmGrJ34HxKn 9hCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbJIjotX; 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 b64si5288154ybh.32.2021.01.28.00.30.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jan 2021 00:30:07 -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=kbJIjotX; 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]:47464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l52gp-0004rp-AA for patch@linaro.org; Thu, 28 Jan 2021 03:30:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l52ax-0006C9-P1 for qemu-devel@nongnu.org; Thu, 28 Jan 2021 03:24:03 -0500 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:52027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l52aw-0005l9-4H for qemu-devel@nongnu.org; Thu, 28 Jan 2021 03:24:03 -0500 Received: by mail-pj1-x1035.google.com with SMTP id a20so3433313pjs.1 for ; Thu, 28 Jan 2021 00:24: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=PGD2Hxxva1v/CL+/7AMsseVrS1hfbb671q8VvUewR3Q=; b=kbJIjotXkUV5lodYVh3kUQBnndyGwOHWb45JU50NIWHBcFtHDsogcgetoYbZhR0maZ RUG/qTLIV3Q4A2GTOzLipRDGSMKrWqK1uA0Kkm+5v/86J18mGTv+C0VHRzC//4EfjzV4 Z3VUanK7HcxGILWwuaanp+JOw5FBJEnnVvzFot+geR0j9oaeRYe51s2gcatFv9wSCnT1 A2KF8BCkeEDFAMCjbcANPcDIB2BIxqDWi3qzAZKqlRk8beH1sPPS0bHgWLtmKCHI0VVp kDhJaAjTSMTKVtOR6/g9dKIK6MvKdXS2Fg5go7EZnlqfwlIu0GTJvvlJnDN1M3sgZ6PE ktnw== 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=PGD2Hxxva1v/CL+/7AMsseVrS1hfbb671q8VvUewR3Q=; b=FRffk5BeoXcFPNMCYdvSZMlUBiqaOkleY3mzJr57Jp/777TlverAX54MGxe45OzAOP x4pTqHnmaSLmyym1WpwhFIJwh6LZLrYO8CRi/gQVrbLc77CKwgyrlo1/rdwAqzVH+cfQ i28/4EjuUA4BbukGzsd6bFwySEBVLgYZXSqmTL4vcmvclygM/wt3EiGYNrqif2+dmZX1 xh1nEa2t31coxi3i4xOlrRlETf+coGS65vuwm53BIXdqyKgUu/viTllfoGJD09uFYncx JCjC/TtKrmb7ra1tTbPgABp579VQttUFWOb6OkGE3X/RXjDJcRN9x2umhEXMc8cYgatr tPNg== X-Gm-Message-State: AOAM533UH9HF8q4ANaoVt4JsJarz+FVYTR4UVikiZjCRwk8SyVtuWXnL 0rZxy5XSwQta9/uwdua0+PuqE9HG1dbSowfs X-Received: by 2002:a17:90a:7e2:: with SMTP id m89mr10098631pjm.2.1611822240837; Thu, 28 Jan 2021 00:24:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 00:24:00 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 16/23] tcg/tci: Merge INDEX_op_st8_{i32,i64} Date: Wed, 27 Jan 2021 22:23:24 -1000 Message-Id: <20210128082331.196801-17-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::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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 233fc0604e..0978a5c554 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -606,6 +606,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_write_reg(regs, t0, *(uint32_t *)(t1 + t2)); break; case INDEX_op_st8_i32: + case INDEX_op_st8_i64: t0 = tci_read_r8(regs, &tb_ptr); t1 = tci_read_r(regs, &tb_ptr); t2 = tci_read_s32(&tb_ptr); @@ -867,12 +868,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_st8_i64: - t0 = tci_read_r8(regs, &tb_ptr); - t1 = tci_read_r(regs, &tb_ptr); - t2 = tci_read_s32(&tb_ptr); - *(uint8_t *)(t1 + t2) = t0; - break; case INDEX_op_st16_i64: t0 = tci_read_r16(regs, &tb_ptr); t1 = tci_read_r(regs, &tb_ptr);