From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WndkU-00061x-9N for qemu-devel@nongnu.org; Thu, 22 May 2014 20:54:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WndkP-0000E1-Gd for qemu-devel@nongnu.org; Thu, 22 May 2014 20:54:14 -0400 Received: from mail-yk0-x234.google.com ([2607:f8b0:4002:c07::234]:63611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WndkP-0000Dv-BP for qemu-devel@nongnu.org; Thu, 22 May 2014 20:54:09 -0400 Received: by mail-yk0-f180.google.com with SMTP id q9so3459140ykb.39 for ; Thu, 22 May 2014 17:54:08 -0700 (PDT) From: "Edgar E. Iglesias" Date: Fri, 23 May 2014 10:42:13 +1000 Message-Id: <1400805738-11889-17-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1400805738-11889-1-git-send-email-edgar.iglesias@gmail.com> References: <1400805738-11889-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v4 16/21] target-arm: A64: Trap ERET from EL0 at translation time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net From: "Edgar E. Iglesias" Suggested-by: Peter Maydell Signed-off-by: Edgar E. Iglesias --- target-arm/translate-a64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index bfd139a..ec6a39d 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -1507,6 +1507,10 @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); break; case 4: /* ERET */ + if (s->current_pl == 0) { + unallocated_encoding(s); + return; + } gen_helper_exception_return(cpu_env); s->is_jmp = DISAS_JUMP; return; -- 1.8.3.2