From patchwork Thu May 1 06:34:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 344442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ABFE4140111 for ; Thu, 1 May 2014 16:37:23 +1000 (EST) Received: from localhost ([::1]:60655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfkcT-0006ps-Ks for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 02:37:21 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=VZphR9mpTvGx0b5dwK0QoYLBCQgFQAfEyKgVhNO2xMQ=; b=fYHg1PFiI1AQaIccEw5eq8iKPIk2rZN8vrTS0P1dz37H9B6UrU3D4zu+EnCAOyh4Dd jLlTtCzS9Xek2u9p5xYQf3kJA4qZJ2hDfMrUHxXgWSZMuOzMrExSCzkOb45xd2yZs8pr MwdQdpHtF1diZUyeUROZ4BcdT4tohfjtVNUDQlW/tuLRUEX5raIvApnvHlr9OW2aAUlT BHpwpi8Rr5wNaXuwhUiI7EQ0g/Un/lJZCAC8C3F+r+0lFEQeE2YkhOA7fPMXL7PAh7cI iNwNeN+8esL2UOO2c8VFmIcishpLfOsDDW39dovaae2+VGs4JNviEGc9aRUS4xBlqnaR jbrg== X-Received: by 10.229.58.68 with SMTP id f4mr11402060qch.18.1398926207752; Wed, 30 Apr 2014 23:36:47 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id c17sm33964959qge.21.2014.04.30.23.36.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 30 Apr 2014 23:36:46 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 1 May 2014 16:34:55 +1000 Message-Id: <1398926097-28097-3-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398926097-28097-1-git-send-email-edgar.iglesias@gmail.com> References: <1398926097-28097-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::234 Subject: [Qemu-devel] [PATCH v1 2/4] target-arm: A64: Handle blr lr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 Reviewed-by: Alex Bennée --- 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; }