From patchwork Wed Mar 17 15:34:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403179 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp591059jai; Wed, 17 Mar 2021 08:41:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKMfjk/0SPqTALtewKaJOvvzr9Wjr0Slz4P0kdD7HLnmM7q2WnWx10ZGn35LOnJLNLzQ0x X-Received: by 2002:a05:6638:359:: with SMTP id x25mr3389482jap.136.1615995665596; Wed, 17 Mar 2021 08:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615995665; cv=none; d=google.com; s=arc-20160816; b=ppjfzzKQkTSXiNaY1rXRSQtQo3Wu9HgKJHJXdwczLjKZ/vNqMxIEnQHm0qzu3PJivm AJzgkIZv7GnG1QV3ekD6Zl7e4MEvLZNOIw3G1RXvmXL+ZwTFa5Y83PixtIA1YqZeFSQj 27Q9CuSYOmLjD2dWLJx29UeTUYzVgO91TozYgolTUBWSinUO9h9QxV/KwTvxDQqh/Muf eOPtdw60Vg6Z5PNGmPefCgtZXS7ZvwT/DORtmKdcunfMn6tmehgK8ko2eBt55dtorlae kiTVlE70TjBP0r/GN2BJJ6iZ2rg/o2D5nJS9UU0T+WxiFcE4DKAYyRzBMjyQ3aZZsHPX 7eJA== 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=wwVcJ9D39eVFn20MzypYeFiKvgpIijg0tLyG5gGYOpQ=; b=I4sYgn1HqE1Wr+uprUlmdOB5eMF86EVHNDQHDd9DpWkOo58IGfqdakL6U+TMEoHdDX /hGUAnVWq9SukcGYrzaGRJzsukq2uG9+UVYPMKfa17V4gqq+XC+w4USPuv00YVNvlveN KhH93jTBlCiP32yNvaf66IufWGZTrgaGd13t47HKFQjwVBNEvJ6trQKZObXn4Z9C1r+y WT3ZWRdTITPdRFdq/9/nArR1gEVdY4eBojiTBm1YPQ75Igk4u89/eQClg2tfW8+MjTg8 zzqN5XlI9kyy4mORvzH73ft00yP+n61FiEr09BDLZspCsMqXtgEULda418vtnn9gcZxa xKpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kyZiElfC; 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 y18si1362858ilj.26.2021.03.17.08.41.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 08:41:05 -0700 (PDT) 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=kyZiElfC; 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]:40506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYIC-0000dG-T3 for patch@linaro.org; Wed, 17 Mar 2021 11:41:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCL-00051z-Nu for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:01 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]:37565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCB-00075h-W2 for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:01 -0400 Received: by mail-ot1-x32c.google.com with SMTP id t23-20020a0568301e37b02901b65ab30024so2174155otr.4 for ; Wed, 17 Mar 2021 08:34:50 -0700 (PDT) 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=wwVcJ9D39eVFn20MzypYeFiKvgpIijg0tLyG5gGYOpQ=; b=kyZiElfCoT2m5JPBleqpk/tHPMF4PdU/gB/bushY+PmQIyEvmw+2vyXB4i0lzw+LTK Dwis7sgUl0FS2MZcDnvRwtAEl7uhpdGKolZw3Z5S0fBeYg5vGTRd+3fSpYfLXI789U0M fk5RMALT/i7VZLIo1IWqCrqHuD7TQ9nZ4QhfelxSL1RT+AYD+HwWacoym96E3jD8A974 KJpGuWil8KvPntbdTncSt1IbSTi4pJ3PQtuasbFvG9hZwI3W5ZuLH7VeDScnNxUcYnzE AmF2lMqPhIFvzzLaYJgAnyr2Z2ey040kmyJdraNCazB3pNvpRtQ/WwcGf4+MugETdz9T CSBg== 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=wwVcJ9D39eVFn20MzypYeFiKvgpIijg0tLyG5gGYOpQ=; b=gjl9JjuWhlJ0a28RrCf2yMxOZC7V3C7Ed6IAHkPY/haIoaj8Ak0M3dg5xQXulop1zk hafW6yvv+4VUlLM2EQ+lKwUIMstHUA8tEFfg3DamNCftDLtxMg3b7hIjSGBk0FGnqCWo lD+kdiIB6mGu8Q6Y6EpWZe2dFFPl3jqVZVqLd7lshYqgYF1T6Q+yFMyUg1Ik/KFlR0PI U0wsEydYgxNgKc+eT6/vSVE+CzFgtrUuRoqCtWvpLzTVjr/S8eCxmkRS4cMabMPlN7dI Wi6cBt8/cmPRgnU7EaiiFY2cE12g2wGiq6I0QuqSayVRUgDHRUBQbbJ1PIHOR3Yk9XK0 Gjaw== X-Gm-Message-State: AOAM532BnC43BwMiI/aK6L9ftTBdCOeumAxOdY8vJ9BrsTaa40DqNdEw 0Slz2kcsQ8CTxXbf0ltmOpg//6VxSYuAtpex X-Received: by 2002:a9d:7a45:: with SMTP id z5mr4005738otm.31.1615995290023; Wed, 17 Mar 2021 08:34:50 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id i11sm8271154otp.76.2021.03.17.08.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:34:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 04/38] tcg/tci: Split out tci_args_rr Date: Wed, 17 Mar 2021 09:34:10 -0600 Message-Id: <20210317153444.310566-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317153444.310566-1-richard.henderson@linaro.org> References: <20210317153444.310566-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x32c.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tci.c | 67 +++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 36 deletions(-) -- 2.25.1 diff --git a/tcg/tci.c b/tcg/tci.c index 5acf5c38c3..e5aba3a9fa 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -184,6 +184,13 @@ static tcg_target_ulong tci_read_label(const uint8_t **tb_ptr) * s = signed ldst offset */ +static void tci_args_rr(const uint8_t **tb_ptr, + TCGReg *r0, TCGReg *r1) +{ + *r0 = tci_read_r(tb_ptr); + *r1 = tci_read_r(tb_ptr); +} + static void tci_args_rrs(const uint8_t **tb_ptr, TCGReg *r0, TCGReg *r1, int32_t *i2) { @@ -422,9 +429,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, break; #endif CASE_32_64(mov) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = regs[r1]; break; case INDEX_op_tci_movi_i32: t0 = *tb_ptr++; @@ -635,58 +641,50 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, #endif /* TCG_TARGET_REG_BITS == 32 */ #if TCG_TARGET_HAS_ext8s_i32 || TCG_TARGET_HAS_ext8s_i64 CASE_32_64(ext8s) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (int8_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (int8_t)regs[r1]; break; #endif #if TCG_TARGET_HAS_ext16s_i32 || TCG_TARGET_HAS_ext16s_i64 CASE_32_64(ext16s) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (int16_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (int16_t)regs[r1]; break; #endif #if TCG_TARGET_HAS_ext8u_i32 || TCG_TARGET_HAS_ext8u_i64 CASE_32_64(ext8u) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (uint8_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (uint8_t)regs[r1]; break; #endif #if TCG_TARGET_HAS_ext16u_i32 || TCG_TARGET_HAS_ext16u_i64 CASE_32_64(ext16u) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (uint16_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (uint16_t)regs[r1]; break; #endif #if TCG_TARGET_HAS_bswap16_i32 || TCG_TARGET_HAS_bswap16_i64 CASE_32_64(bswap16) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, bswap16(t1)); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = bswap16(regs[r1]); break; #endif #if TCG_TARGET_HAS_bswap32_i32 || TCG_TARGET_HAS_bswap32_i64 CASE_32_64(bswap32) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, bswap32(t1)); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = bswap32(regs[r1]); break; #endif #if TCG_TARGET_HAS_not_i32 || TCG_TARGET_HAS_not_i64 CASE_32_64(not) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, ~t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = ~regs[r1]; break; #endif #if TCG_TARGET_HAS_neg_i32 || TCG_TARGET_HAS_neg_i64 CASE_32_64(neg) - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, -t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = -regs[r1]; break; #endif #if TCG_TARGET_REG_BITS == 64 @@ -799,21 +797,18 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, break; case INDEX_op_ext32s_i64: case INDEX_op_ext_i32_i64: - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (int32_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (int32_t)regs[r1]; break; case INDEX_op_ext32u_i64: case INDEX_op_extu_i32_i64: - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, (uint32_t)t1); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = (uint32_t)regs[r1]; break; #if TCG_TARGET_HAS_bswap64_i64 case INDEX_op_bswap64_i64: - t0 = *tb_ptr++; - t1 = tci_read_rval(regs, &tb_ptr); - tci_write_reg(regs, t0, bswap64(t1)); + tci_args_rr(&tb_ptr, &r0, &r1); + regs[r0] = bswap64(regs[r1]); break; #endif #endif /* TCG_TARGET_REG_BITS == 64 */