From patchwork Fri Feb 11 01:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 541773 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp2720796imo; Thu, 10 Feb 2022 18:08:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2jwcfHOCnbSo8334QBqb0sF/KCNKUTU+6D/VfhkWvc5RZF0y7niMchobKbENkHKUVAyGr X-Received: by 2002:a25:ba86:: with SMTP id s6mr9452936ybg.44.1644545329069; Thu, 10 Feb 2022 18:08:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644545329; cv=none; d=google.com; s=arc-20160816; b=b7U1GbLQxbeuij4WpRxBvHpYB92P5LCo+Lemcq3/twoMqypl3rVQ05u0Sro9VOBnHk APkbPKDEoH/u6ba0cHNK+pAlz09K+xc8BeZH9Y+9Kgg4c4a6zQKgfuecRJOfzckaggFX n7y+HbLvtGWeYNHob1b3Hkqc5uIXQSM4WNUvp8xGBALgK9U33NIwKqafSNeCjNKv/1IH Q1KK3z+ILqnOaNu4ISa40n3Gh975l+yEPRthUWg7lgSNUbodmikj9suDQsY+joxfsCEA 0iW+lBFb33m27Ei8hEM+r44KXVKb+SER4jJ4Ji2ljGb7o6TVmutBGFG1Lr18KQM0yKyU 8Zsg== 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=3FHMimKJDAjCiqHF0GBMwwzERJvWjLvoPgPfQf5aE2U=; b=j+spWmWFPzklf2ZeLFrKMVdDB5IE9KobwW/90jEFa7i0ryVbAItx/YxYODkgwPs4aZ QS8NYM8nQ5h+lBGlD2ZB3uASuAivBUqwH9Gm/wXtFZ4FL9B76oyfEbbDxYuYubbA18Dt YWKYPP13ehkL5KYfjgVxSaFXUZta1VTbskQRdR4H4LnLIYPt42ub6+YRVGOMGVH04CoJ gYMeyISQO0P9+i2xEcoiOnoq6VvTtwOK69+xOIr4lT+wBE8MYVHCZni5LYB/EDXrWHa4 Z69kPWmEx16S+Z/EL1Dcv9Hk22b1hwMw5rf8xekF+i2hTko0LT42fbRBoEIit0ztotH2 7I/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RiK+VUYB; 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 t4si3991864ybc.597.2022.02.10.18.08.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Feb 2022 18:08:49 -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=RiK+VUYB; 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]:58582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nILMe-0001eG-If for patch@linaro.org; Thu, 10 Feb 2022 21:08:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIKo8-0005bk-3c for qemu-devel@nongnu.org; Thu, 10 Feb 2022 20:33:08 -0500 Received: from [2607:f8b0:4864:20::432] (port=40612 helo=mail-pf1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIKo0-0007UX-7m for qemu-devel@nongnu.org; Thu, 10 Feb 2022 20:33:07 -0500 Received: by mail-pf1-x432.google.com with SMTP id a39so12647135pfx.7 for ; Thu, 10 Feb 2022 17:32:51 -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=3FHMimKJDAjCiqHF0GBMwwzERJvWjLvoPgPfQf5aE2U=; b=RiK+VUYBfa5MQUdW/sVybmNEcSNE+5IcPnASLfpYooEY+CKhLOoMUvDZ/d7UBcY8Ck NTD5Bw3VDizz48EgQ7HYeopV8SHYVOz5KJHZTIAWJLm/rWHnvCuOFZpA5AbDe1OzeI6b UQJSxwkmdTuzrZnkojL7TbMPw+p5a0AzAGnTCcT+83U/Jh36YeO1pfsEfUgYEwFA5fIF 2f4BvXAutGXbUGkdICTQLnr1h4c7Qh4P22dO5Paurq4nh3Ts/Fzujhd85TytsSY9wb62 09iNvYytI91BzdE+51mZ/WKW401KHv6ZDvKS3JUfWsHQG5tP2ul5qP0mmErLJebrkEpE KspQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3FHMimKJDAjCiqHF0GBMwwzERJvWjLvoPgPfQf5aE2U=; b=8HyamBUf3cIk3XCCTxszY6X3hOYHPKvH/1nF1TED2Tdkwj5/OoRjAN/exsNswMvGQk vrjwEVgcKDSnsC8QZIgDup6FgKLfuAyQ51OZDOMEfwQEiC2R2C5VKW+ESyDT7Z3twy1W NFM5Vj/UCC7U7ru1zsv7kg7H1cW7eDS3ACwqa/clpo8oE+7ye/GvraCyQdTEp9K88TIi CLjdHBttzMF2+tl2bv/hbSfYVs4/3UgFTKa6pucjuGDsA/ipQ9Z5R/XO/ywcTSafTa46 WQXRlJBwhISuLaLVsT5UdMYnypF7NXZxZcNXnTGfMBczzYEBAu8igI0BGuUB1nvpVfI7 0hQA== X-Gm-Message-State: AOAM532v+QblUD2d6Dy1Bicklb5YU+6bgFgU8I30HrbLt/gQIvBEYs1z LzVVS5QRIKEhLA/ixgimZt1ji0G8j92kBGxO X-Received: by 2002:a05:6a00:198f:: with SMTP id d15mr10261245pfl.78.1644543170839; Thu, 10 Feb 2022 17:32:50 -0800 (PST) Received: from localhost.localdomain ([124.189.222.164]) by smtp.gmail.com with ESMTPSA id h5sm25738788pfi.111.2022.02.10.17.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 17:32:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 30/34] tcg/sparc: Convert patch_reloc to return bool Date: Fri, 11 Feb 2022 12:30:55 +1100 Message-Id: <20220211013059.17994-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220211013059.17994-1-richard.henderson@linaro.org> References: <20220211013059.17994-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::432 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , 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" Since 7ecd02a06f8, if patch_reloc fails we restart translation with a smaller TB. SPARC had its function signature changed, but not the logic. Replace assert with return false. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.c.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tcg/sparc/tcg-target.c.inc b/tcg/sparc/tcg-target.c.inc index ed2f4ecc40..213aba4be6 100644 --- a/tcg/sparc/tcg-target.c.inc +++ b/tcg/sparc/tcg-target.c.inc @@ -323,12 +323,16 @@ static bool patch_reloc(tcg_insn_unit *src_rw, int type, switch (type) { case R_SPARC_WDISP16: - assert(check_fit_ptr(pcrel >> 2, 16)); + if (!check_fit_ptr(pcrel >> 2, 16)) { + return false; + } insn &= ~INSN_OFF16(-1); insn |= INSN_OFF16(pcrel); break; case R_SPARC_WDISP19: - assert(check_fit_ptr(pcrel >> 2, 19)); + if (!check_fit_ptr(pcrel >> 2, 19)) { + return false; + } insn &= ~INSN_OFF19(-1); insn |= INSN_OFF19(pcrel); break;