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: [Qemu-devel] [PULL 20/23] tcg/mips: Fix tcg_out_qemu_ld_slow_path
Date: Mon, 28 Jan 2019 07:59:04 -0800	[thread overview]
Message-ID: <20190128155907.20607-21-richard.henderson@linaro.org> (raw)
In-Reply-To: <20190128155907.20607-1-richard.henderson@linaro.org>

Patch the branch after it has been emitted rather
than before it exists.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tcg/mips/tcg-target.inc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
index be0bc92e8e..c5d7067f89 100644
--- a/tcg/mips/tcg-target.inc.c
+++ b/tcg/mips/tcg-target.inc.c
@@ -1343,8 +1343,9 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l)
         }
     }
 
-    reloc_pc16(s->code_ptr, l->raddr);
     tcg_out_opc_br(s, OPC_BEQ, TCG_REG_ZERO, TCG_REG_ZERO);
+    reloc_pc16(s->code_ptr - 1, l->raddr);
+
     /* delay slot */
     if (TCG_TARGET_REG_BITS == 64 && l->type == TCG_TYPE_I32) {
         /* we always sign-extend 32-bit loads */
-- 
2.17.2

  parent reply	other threads:[~2019-01-28 15:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-28 15:58 [Qemu-devel] [PULL 00/23] tcg queued patches Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 01/23] tcg: Add logical simplifications during gvec expand Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 02/23] tcg: Add gvec expanders for nand, nor, eqv Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 03/23] tcg: Add write_aofs to GVecGen4 Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 04/23] tcg: Add opcodes for vector saturated arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 05/23] tcg: Add opcodes for vector minmax arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 06/23] tcg/i386: Split subroutines out of tcg_expand_vec_op Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 07/23] tcg/i386: Implement vector saturating arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 08/23] tcg/i386: Implement vector minmax arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 09/23] tcg/aarch64: Implement vector saturating arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 10/23] tcg/aarch64: Implement vector minmax arithmetic Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 11/23] cputlb: do not evict empty entries to the vtlb Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 12/23] tcg: introduce dynamic TLB sizing Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 13/23] tcg/i386: enable " Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 14/23] tcg/aarch64: " Richard Henderson
2019-01-28 15:58 ` [Qemu-devel] [PULL 15/23] tcg/ppc: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 16/23] tcg/sparc: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 17/23] tcg/s390: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 18/23] tcg/riscv: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 19/23] tcg/arm: " Richard Henderson
2019-01-28 15:59 ` Richard Henderson [this message]
2019-01-28 15:59 ` [Qemu-devel] [PULL 21/23] tcg/mips: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 22/23] tcg/tci: " Richard Henderson
2019-01-28 15:59 ` [Qemu-devel] [PULL 23/23] cputlb: Remove static tlb sizing Richard Henderson
2019-01-28 18:44 ` [Qemu-devel] [PULL 00/23] tcg queued patches Peter Maydell
2019-01-31 17:53 ` no-reply

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=20190128155907.20607-21-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).