From patchwork Tue May 27 16:28:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31012 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 545E9203C3 for ; Tue, 27 May 2014 16:45:47 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id y20sf50370214ier.11 for ; Tue, 27 May 2014 09:45:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=C3m0XOw2iKrFwSKlRKyPeyHwpzMxjPRymHAqFdVf/Ic=; b=g66f2JhPZBteRwm71XkyiihcxgT4qXlurzqQiam/MHY1Ygu+pataUdwfzVSxuDHFwr MmYs2LJEPFqnPJ5Sy5kg0gZd3jQntg7m6F2Qf8ohCh14RqIa66U7FqnTkFOExVg/OXJG NteDuvgZ/6BjjdCd3qV3ZAdxCi6dEB6WiGOagFrFlVHbYmHQ0kS/zlJnGUUqFSyO7uGS vMQUdhtwEOngY1fsnhJsaAdiFRm0s8m+WzE/ySgAnArKWfUi1p52Z2L+1s6PtSwFMCsp VWKkV5WFLgv/EaibLazW+EZcuKVicWhaprOyJlcpuVjtbsFaXW4jBURrnaJl9QHG7yIH J8vA== X-Gm-Message-State: ALoCoQkAPlPweYcmSEmTLq+Ukwx9+KjVmQ2tu2fXa/OO+lB6cFhOEETpBajDnFG49nh8a0x2DLh1 X-Received: by 10.182.153.68 with SMTP id ve4mr14052135obb.39.1401209146833; Tue, 27 May 2014 09:45:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.33 with SMTP id q30ls3283098qgd.10.gmail; Tue, 27 May 2014 09:45:46 -0700 (PDT) X-Received: by 10.58.46.83 with SMTP id t19mr2186544vem.60.1401209146712; Tue, 27 May 2014 09:45:46 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id i11si8474314vdf.96.2014.05.27.09.45.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:45:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id jx11so10985062veb.14 for ; Tue, 27 May 2014 09:45:46 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr28623761vcb.0.1401209146645; Tue, 27 May 2014 09:45:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp133907vcb; Tue, 27 May 2014 09:45:46 -0700 (PDT) X-Received: by 10.224.66.4 with SMTP id l4mr44658606qai.70.1401209146139; Tue, 27 May 2014 09:45:46 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z2si18235787qai.56.2014.05.27.09.45.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:45:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:36542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKLC-0004yH-Io for patch@linaro.org; Tue, 27 May 2014 12:35:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF4-00037C-4z for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF3-0002pb-59 for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:46 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF2-0002lf-Ot for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:45 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEt-0005ri-GN; Tue, 27 May 2014 17:28:35 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:29 +0100 Message-Id: <1401208114-22404-22-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> References: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 21/26] target-arm: A64: Trap ERET from EL0 at translation time 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Suggested-by: Peter Maydell Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-19-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- 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;