[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 5/8] tcg/sparc: Convert patch_reloc to return bool
From: |
Richard Henderson |
Subject: |
[PATCH v6 5/8] tcg/sparc: Convert patch_reloc to return bool |
Date: |
Tue, 8 Feb 2022 18:17:07 +1100 |
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: Peter Maydell <peter.maydell@linaro.org>
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 088c680f37..ae809c9941 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
- [PATCH v6 0/8] tcg/sparc: Unaligned access for user-only, Richard Henderson, 2022/02/08
- [PATCH v6 2/8] tcg/sparc: Split out tcg_out_movi_imm32, Richard Henderson, 2022/02/08
- [PATCH v6 3/8] tcg/sparc: Add scratch argument to tcg_out_movi_int, Richard Henderson, 2022/02/08
- [PATCH v6 4/8] tcg/sparc: Improve code gen for shifted 32-bit constants, Richard Henderson, 2022/02/08
- [PATCH v6 5/8] tcg/sparc: Convert patch_reloc to return bool,
Richard Henderson <=
- [PATCH v6 7/8] tcg/sparc: Add tcg_out_jmpl_const for better tail calls, Richard Henderson, 2022/02/08
- [PATCH v6 6/8] tcg/sparc: Use the constant pool for 64-bit constants, Richard Henderson, 2022/02/08
- [PATCH v6 8/8] tcg/sparc: Support unaligned access for user-only, Richard Henderson, 2022/02/08