From patchwork Tue Mar 7 17:58:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 659789 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2524801wrb; Tue, 7 Mar 2023 10:03:38 -0800 (PST) X-Google-Smtp-Source: AK7set+OUViQ5VNdtTTjCNkbBJvatZ35VsZw+a5Qa9rQ8bWamFG/Q/GCtrgInB44/1v2Y/AAOYQ0 X-Received: by 2002:ac8:7d52:0:b0:3a8:1677:bc39 with SMTP id h18-20020ac87d52000000b003a81677bc39mr2266353qtb.52.1678212217968; Tue, 07 Mar 2023 10:03:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678212217; cv=none; d=google.com; s=arc-20160816; b=Mn7ibL5iCKwm+EI74szGVaN4zpwwTbKCZIugCXgyIG7lDrWxoPqncDGboTE6PesGVH yFHRixnc7M1NeZezqRVphOhqJfeGG7HueBfPHA5xj1ytSkMdCKliVBrHeM7l5FuNz9iS azzEvhK5GILCqo4JGeD6ct6M1q1kxpnY6RDGyTZNFGECi4J9fXSZ0xOwhBs2e8wFH6z+ 069aP9tP5qGmlbW0t922Ir5CBFeHym+mD7qn/tMOgr7yQWZl4U9j2ZK60dJgLydUEYrg gVpsH+kx3uLPEfp2L0w9jA8n0sfUWzMtGN/trQe4UUUmFheOBuIOIqPZRPkI66Y8pkIe ONQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=5FP4phlNuAKGlZMwdRjX+9/17//cy6MzJB0F0PRHIeY=; b=Kx7JmlmcsfEmhPb+Iv2u8oMATtYZpM4laR5DVcAxdW2EZstS4ph7xfv7KzL2cyq3vi CqFzKcZMuxPoRGC+TNLu6g6V5sPl2W8HHLpyHQ4FCW+NU2tZzyny+qfhg4v2cK8nwRtR NWvMfgdFV5pQFqi/2NLQi2CaGlyrkbS8lnWHpQvd9vwVIeylPb0ypL7cdawRSEQgHPur iK737bqhli5K6Lxd8sQoFl63Y/7G+5zcRxR4LIe7efKEr31VxFXusrCZ2a4TtATFwOH/ jGaHE0TANAC6ZsuTuZVfNTe/ZwfBZ8Vu0iX3MM3JiVuvVza9Y9srze5Se8NVUnOHoU6b ZwnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QeX2GBFx; 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 c130-20020ae9ed88000000b006fed78dd8f1si9475510qkg.83.2023.03.07.10.03.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Mar 2023 10:03: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=QeX2GBFx; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZbdu-0001eH-Nc; Tue, 07 Mar 2023 13:02:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZbdr-0001Ac-7d for qemu-devel@nongnu.org; Tue, 07 Mar 2023 13:02:27 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZbdp-00014K-1l for qemu-devel@nongnu.org; Tue, 07 Mar 2023 13:02:26 -0500 Received: by mail-pj1-x102d.google.com with SMTP id m8-20020a17090a4d8800b002377bced051so17416136pjh.0 for ; Tue, 07 Mar 2023 10:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678212143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5FP4phlNuAKGlZMwdRjX+9/17//cy6MzJB0F0PRHIeY=; b=QeX2GBFxBEUKY/XEI5BZ1E7JTPdiFYjVkEgHRmnMHWiV1FBQSW8/QDz17v5wJvioYD VCwvrQ9lYbsTDRtEVV9U25hjzvLKCZkiz3MoK9SRSbPcbvqaO39fnKNQLNoaF8rTXsX5 TwKwfNh43QdDO3MuM+BWCf7SPRQ08BOp6swFSDPYJZqWDgIS1Zuyp+vttds47ncY7OG4 QJIdxV3RJIhaPHy1WWLUohIg7tZJeBzdeNizjzhHP2v7skb92dhF5CDCA4D+xrYL5l2W eTF7VipV4sYifLlg7Sgg8yViKaHrHzh7NIZh8s9VMcCqn4OGxOYk+msIQJUon3VGNujb lJzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678212143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5FP4phlNuAKGlZMwdRjX+9/17//cy6MzJB0F0PRHIeY=; b=4Zri7ZoKP4QcNfhzdNShT9lwLRR+LZ2zm1MGV/1HBFHVgBfS7sYZgZlE59aMcWJ+jl OJsvCumRYfQZa2g436VsjH2uVjUOlzy/98nZQHJRNqTV8LbX91PGHUhwASwA6bnaNbAc TDkn7fN2GScq6ynaQP5eVVm+VskukIBNksQaHGt+ltvB4ogPBJqNg0/2c6E2TyYDXL2o PTGEcigBHohH1fSYdR4X6O5GyEsuj3D2rpgN1fCxP8cgh/WUP4gCBs872UHo5OREOOId +mJ4r3Bmie5RA63gXhT6AejPv/4Y2LKWagbi2oNchnXodA/zXr4wMuYaaGGc5Bz/YcDR VSCA== X-Gm-Message-State: AO0yUKVK1LkYSXbyNMwIo4m6U05df30rHjyLMeQyx+XfUYDLPhuxsOEN oAt80KpkG9Xue+BDIOiB4DIiTXdFo9yq+PeUxF8= X-Received: by 2002:a05:6a20:8416:b0:b8:499d:7c9b with SMTP id c22-20020a056a20841600b000b8499d7c9bmr19287363pzd.51.1678212143468; Tue, 07 Mar 2023 10:02:23 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:b1e0:bfd9:8b1a:efeb]) by smtp.gmail.com with ESMTPSA id z4-20020a63e544000000b00502fd70b0bdsm8080441pgj.52.2023.03.07.10.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 10:02:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 42/67] target/hppa: Avoid tcg_const_i64 in trans_fid_f Date: Tue, 7 Mar 2023 09:58:23 -0800 Message-Id: <20230307175848.2508955-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307175848.2508955-1-richard.henderson@linaro.org> References: <20230307175848.2508955-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Use a C test instead of a pre-processor test for the id. Use tcg_constant_i64 instead of tcg_const_i64. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/hppa/translate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index cb4fd1fd62..3ea50d0cec 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3547,12 +3547,16 @@ static void gen_fcpy_f(TCGv_i32 dst, TCGv_env unused, TCGv_i32 src) static bool trans_fid_f(DisasContext *ctx, arg_fid_f *a) { + uint64_t ret; + + if (TARGET_REGISTER_BITS == 64) { + ret = 0x13080000000000ULL; /* PA8700 (PCX-W2) */ + } else { + ret = 0x0f080000000000ULL; /* PA7300LC (PCX-L2) */ + } + nullify_over(ctx); -#if TARGET_REGISTER_BITS == 64 - save_frd(0, tcg_const_i64(0x13080000000000ULL)); /* PA8700 (PCX-W2) */ -#else - save_frd(0, tcg_const_i64(0x0f080000000000ULL)); /* PA7300LC (PCX-L2) */ -#endif + save_frd(0, tcg_constant_i64(ret)); return nullify_end(ctx); }