* [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst
@ 2023-01-17 23:04 Richard Henderson
2023-01-18 0:25 ` Alistair Francis
2023-01-18 22:41 ` Alistair Francis
0 siblings, 2 replies; 3+ messages in thread
From: Richard Henderson @ 2023-01-17 23:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-riscv, Alistair.Francis
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst
2023-01-17 23:04 [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst Richard Henderson
@ 2023-01-18 0:25 ` Alistair Francis
2023-01-18 22:41 ` Alistair Francis
1 sibling, 0 replies; 3+ messages in thread
From: Alistair Francis @ 2023-01-18 0:25 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, qemu-riscv, Alistair.Francis
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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst
2023-01-17 23:04 [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst Richard Henderson
2023-01-18 0:25 ` Alistair Francis
@ 2023-01-18 22:41 ` Alistair Francis
1 sibling, 0 replies; 3+ messages in thread
From: Alistair Francis @ 2023-01-18 22:41 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, qemu-riscv, Alistair.Francis
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-18 22:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-17 23:04 [PATCH] tcg/riscv: Use tcg_pcrel_diff in tcg_out_ldst Richard Henderson
2023-01-18 0:25 ` Alistair Francis
2023-01-18 22:41 ` Alistair Francis
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).