From patchwork Wed Feb 17 20:19:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 383862 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3117548jao; Wed, 17 Feb 2021 12:36:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJztlKqIg17+cZRv2m4aD/oootURRRSycrHxzA2beySJbVhmcyJufh+y3pGU2KxOOOImdB0C X-Received: by 2002:a25:e008:: with SMTP id x8mr1804219ybg.90.1613594164342; Wed, 17 Feb 2021 12:36:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613594164; cv=none; d=google.com; s=arc-20160816; b=bTEfQbsLz0JrxGNKG8BGImP20ThR9kqYx17MjFnRl6ND2ycpA9T3816wRxUkxSOCaT fyQMUVrCL5NyUb3qeoPsThx9QUfztRLH9n/mdh3r8pk+7ZjBlpMz71DNJrVB3Ke2Gdva e63ZVgocXGjdXRidf+W306CLgvv8gbMkvC/16nvpkT9rc6czpyX5gS6ZFapZUr7lwX6E 6p/N8OjcBHN5lDaAeDdJf/j/LCinSqpY7FAkUYIbbjt6TGWLwK3VC4/zLtbmkSFp0faK 6pQrHEF1AXr8YXt73zvpmyaqJMCLvOjW21LqHLYoJ+e1vQohYt+o1zjarHt+oBiNgJk/ viNg== 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=sLU2XmKG3JbG1D9u9PmlE0yiGugHvDS0F3Tdhc3De6g=; b=vtAIL1tQvC1svJ8w53xcyaKTs+ObTuuBAA7LNIl6C+E+oqz3giQQQPQ40SO+uT9a90 CQKH2jyPDGEg+2FpYdwvwE6G1VcBZjttj+/Y+n2znnnlViLNkoXhkrYUDy+wCZnc6rQk 0WxJ35h1EgHSo+DDGgVillO/3JGux1APU86V0zYBYN5CQJ6YmEPKUnVXRuuE6dMlzB0T 8wDv587FzUT5pCHPM312rlXNHV8LI8N/OkGYDxQ7DuYgjnKd2vlJkOHm/rFzwyZWH56S kaTpugQTYGIZGEmr+ktjLAcBv0IdFpBgFRrjPovjGrtna1ToArTt+troxzbuFjoXvkeM ndMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OyUw7VdG; 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=fail (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 o9si3105029ybb.21.2021.02.17.12.36.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 12:36:04 -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=fail header.i=@linaro.org header.s=google header.b=OyUw7VdG; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCTYJ-0003K1-Q4 for patch@linaro.org; Wed, 17 Feb 2021 15:36:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCTKq-0006yV-AQ for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:22:09 -0500 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:51738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCTKm-00077k-C5 for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:22:08 -0500 Received: by mail-pj1-x102c.google.com with SMTP id fa16so2146915pjb.1 for ; Wed, 17 Feb 2021 12:22:03 -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=sLU2XmKG3JbG1D9u9PmlE0yiGugHvDS0F3Tdhc3De6g=; b=OyUw7VdGURcIpM802vxHhZhiiSF1JUXUsMHvt9qCMycIxLxMwkzYoxlvB3W6uKH4c9 /05QqDMj+FySSI3I/DrM8NoW1tph4tsGpPDom8rqkFLxwGv4IXYEII6yJRmq6XM/bVaM QdvEmduMDvIuD+eOH7miXoBZoKTZ8ppUH1clFG39x7Qbwmp/XQnXLqAVsa/LCyIQPzBq DO8BIemMunACzm5TuuR8VmuXjV1Z5YRsVsrFY52zkJRvOiDUBK0L2JO5GR8N85dqQExW Ya5+nxjw+Tvh921bIvyCfm/QW/KcnmOXcXHGXl5sZMHgWAKcEwrN/FLqQqgSawDPKR/j OtMA== 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=sLU2XmKG3JbG1D9u9PmlE0yiGugHvDS0F3Tdhc3De6g=; b=q2OEpW7djvOgi/JsscCu1cusjFGyKp8pYpn1FQXquMB1o3MjNn6LlerCiOUaUNwNz7 Wj4gJq86ihjsUXsZG/iY/6OhaLD3EXeqR+zT2cu69V6ktPQuEa0I88eTNmG5nZBaxlO9 6cVKU/J50lM5EKLZ3uLJkiB5+z35u/FOqaaV1w9PomTzZAFpwAf0Fb5T5A3mV00u+4OW jxege39CDyORQ37Dh/3VfyjJk7ZddRLmrYQvn9jYa3muJ4hetSCiVLfVNI+ai9f2a4+T E9xupM2irBuNOe9YRi/sNLZF2egC+pNNc6+4W76oNgrWB3XsZu359ggxxNLLfZk7J8mB +zfQ== X-Gm-Message-State: AOAM531VXbBdKI3ljRUYk5BXkwk+Wa20UmMiMcN4qpFX831pccWVajBp vHPE9rb0oG/Kq8NkR/YsNLJ5Cbs2xUcE/Q== X-Received: by 2002:a17:902:e5cc:b029:df:bc77:3aba with SMTP id u12-20020a170902e5ccb02900dfbc773abamr976081plf.72.1613593322556; Wed, 17 Feb 2021 12:22:02 -0800 (PST) Received: from localhost.localdomain (047-051-160-125.biz.spectrum.com. [47.51.160.125]) by smtp.gmail.com with ESMTPSA id 3sm3001576pjk.26.2021.02.17.12.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 12:22:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 08/71] tcg/tci: Remove tci_read_r16s Date: Wed, 17 Feb 2021 12:19:33 -0800 Message-Id: <20210217202036.1724901-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217202036.1724901-1-richard.henderson@linaro.org> References: <20210217202036.1724901-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use explicit casts for ext16s opcodes. Signed-off-by: Richard Henderson --- tcg/tci.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tcg/tci.c b/tcg/tci.c index 2440da1746..8b91e6efc3 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -57,13 +57,6 @@ static tcg_target_ulong tci_read_reg(const tcg_target_ulong *regs, TCGReg index) return regs[index]; } -#if TCG_TARGET_HAS_ext16s_i32 || TCG_TARGET_HAS_ext16s_i64 -static int16_t tci_read_reg16s(const tcg_target_ulong *regs, TCGReg index) -{ - return (int16_t)tci_read_reg(regs, index); -} -#endif - #if TCG_TARGET_REG_BITS == 64 static int32_t tci_read_reg32s(const tcg_target_ulong *regs, TCGReg index) { @@ -152,17 +145,6 @@ tci_read_r(const tcg_target_ulong *regs, const uint8_t **tb_ptr) return value; } -#if TCG_TARGET_HAS_ext16s_i32 || TCG_TARGET_HAS_ext16s_i64 -/* Read indexed register (16 bit signed) from bytecode. */ -static int16_t tci_read_r16s(const tcg_target_ulong *regs, - const uint8_t **tb_ptr) -{ - int16_t value = tci_read_reg16s(regs, **tb_ptr); - *tb_ptr += 1; - return value; -} -#endif - /* Read indexed register (32 bit) from bytecode. */ static uint32_t tci_read_r32(const tcg_target_ulong *regs, const uint8_t **tb_ptr) @@ -671,8 +653,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, #if TCG_TARGET_HAS_ext16s_i32 case INDEX_op_ext16s_i32: t0 = *tb_ptr++; - t1 = tci_read_r16s(regs, &tb_ptr); - tci_write_reg(regs, t0, t1); + t1 = tci_read_r(regs, &tb_ptr); + tci_write_reg(regs, t0, (int16_t)t1); break; #endif #if TCG_TARGET_HAS_ext8u_i32 @@ -886,8 +868,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, #if TCG_TARGET_HAS_ext16s_i64 case INDEX_op_ext16s_i64: t0 = *tb_ptr++; - t1 = tci_read_r16s(regs, &tb_ptr); - tci_write_reg(regs, t0, t1); + t1 = tci_read_r(regs, &tb_ptr); + tci_write_reg(regs, t0, (int16_t)t1); break; #endif #if TCG_TARGET_HAS_ext16u_i64