]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tcg/loongarch64: Use tcg_pcrel_diff in tcg_out_ldst
authorRichard Henderson <richard.henderson@linaro.org>
Tue, 29 Nov 2022 17:03:23 +0000 (09:03 -0800)
committerRichard Henderson <richard.henderson@linaro.org>
Tue, 24 Jan 2023 02:00:13 +0000 (16:00 -1000)
Take the w^x split into account when computing the
pc-relative distance to an absolute pointer.

Reviewed-by: WANG Xuerui <git@xen0n.name>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
tcg/loongarch64/tcg-target.c.inc

index 29d75c80eba117b8e799b054c178652054e3af81..d6926bdb839a6c6ffdc85a1a64f8b8178720c6a9 100644 (file)
@@ -702,7 +702,7 @@ static void tcg_out_ldst(TCGContext *s, LoongArchInsn 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);