On Wed, Jan 18, 2023 at 9:05 AM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> We failed to update this with the w^x split, so misses the fact
> that true pc-relative offsets are usually small.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> tcg/riscv/tcg-target.c.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
> index fc0edd811f..01cb67ef7b 100644
> --- a/tcg/riscv/tcg-target.c.inc
> +++ b/tcg/riscv/tcg-target.c.inc
> @@ -599,7 +599,7 @@ static void tcg_out_ldst(TCGContext *s, RISCVInsn opc, TCGReg data,
> intptr_t imm12 = sextreg(offset, 0, 12);
>
> if (offset != imm12) {
> - intptr_t diff = offset - (uintptr_t)s->code_ptr;
> + intptr_t diff = tcg_pcrel_diff(s, (void *)offset);
>
> if (addr == TCG_REG_ZERO && diff == (int32_t)diff) {
> imm12 = sextreg(diff, 0, 12);
> --
> 2.34.1
>
>