qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PATCH v5 3/6] tcg/sparc: Convert patch_reloc to return bool
Date: Sun,  6 Feb 2022 21:31:35 +1100	[thread overview]
Message-ID: <20220206103138.36105-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220206103138.36105-1-richard.henderson@linaro.org>

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.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 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 f9afb1bffc..f3043e6833 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;
-- 
2.25.1



  parent reply	other threads:[~2022-02-06 10:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-06 10:31 [PATCH v5 0/6] tcg/sparc: Unaligned access for user-only Richard Henderson
2022-02-06 10:31 ` [PATCH v5 1/6] tcg/sparc: Add scratch argument to tcg_out_movi_int Richard Henderson
2022-02-07 17:59   ` Peter Maydell
2022-02-07 21:48     ` Richard Henderson
2022-02-06 10:31 ` [PATCH v5 2/6] tcg/sparc: Improve code gen for shifted 32-bit constants Richard Henderson
2022-02-06 10:31 ` Richard Henderson [this message]
2022-02-06 10:45   ` [PATCH v5 3/6] tcg/sparc: Convert patch_reloc to return bool Peter Maydell
2022-02-06 10:31 ` [PATCH v5 4/6] tcg/sparc: Use the constant pool for 64-bit constants Richard Henderson
2022-02-06 10:31 ` [PATCH v5 5/6] tcg/sparc: Add tcg_out_jmpl_const for better tail calls Richard Henderson
2022-02-06 10:31 ` [PATCH v5 6/6] tcg/sparc: Support unaligned access for user-only Richard Henderson
2022-02-07 18:30   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220206103138.36105-4-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).