From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfkc3-0006A2-Hd for qemu-devel@nongnu.org; Thu, 01 May 2014 02:37:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfkbx-0000Ai-As for qemu-devel@nongnu.org; Thu, 01 May 2014 02:36:55 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:56436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfkbx-0000AZ-7A for qemu-devel@nongnu.org; Thu, 01 May 2014 02:36:49 -0400 Received: by mail-qg0-f52.google.com with SMTP id j5so3021249qga.11 for ; Wed, 30 Apr 2014 23:36:48 -0700 (PDT) From: "Edgar E. Iglesias" Date: Thu, 1 May 2014 16:34:55 +1000 Message-Id: <1398926097-28097-3-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1398926097-28097-1-git-send-email-edgar.iglesias@gmail.com> References: <1398926097-28097-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v1 2/4] target-arm: A64: Handle blr lr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org From: "Edgar E. Iglesias" For linked branches, updates to the link register happen conceptually after the read of the branch target register. Signed-off-by: Edgar E. Iglesias --- target-arm/translate-a64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index d86b8ff..0862e54 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -1507,8 +1507,10 @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) switch (opc) { case 0: /* BR */ case 2: /* RET */ + tcg_gen_mov_i64(cpu_pc, cpu_reg(s, rn)); break; case 1: /* BLR */ + tcg_gen_mov_i64(cpu_pc, cpu_reg(s, rn)); tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); break; case 4: /* ERET */ @@ -1527,7 +1529,6 @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) return; } - tcg_gen_mov_i64(cpu_pc, cpu_reg(s, rn)); s->is_jmp = DISAS_JUMP; } -- 1.8.3.2