From patchwork Fri Feb 19 20:04:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 8363621 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B28E49F2F0 for ; Fri, 19 Feb 2016 20:08:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA5B520454 for ; Fri, 19 Feb 2016 20:08:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1A2CD20450 for ; Fri, 19 Feb 2016 20:08:04 +0000 (UTC) Received: from localhost ([::1]:55026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWrLP-0000R4-Az for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 15:08:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWrIf-0003tx-RJ for qemu-devel@nongnu.org; Fri, 19 Feb 2016 15:05:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWrIe-0007LD-QZ for qemu-devel@nongnu.org; Fri, 19 Feb 2016 15:05:13 -0500 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:34601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWrIe-0007L3-KQ; Fri, 19 Feb 2016 15:05:12 -0500 Received: by mail-pa0-x22b.google.com with SMTP id fy10so55456907pac.1; Fri, 19 Feb 2016 12:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j8EN+itHVDmckinsRuSpNHzacqg4WoRKQjg4yoaKFx4=; b=egPoaaaudHzFJzHibMkaNA/3+OpqeGdQSlE5pnzmE0jiaDYNnaMEbHl/XxpxCDvPMN o98rNv9TCqxc2wtSaJnRGFPCux9grxZunBGHiGFRaa4hofSDdJDGJpXZqliG/vUu3id5 BTsh1tFpTkY0e8G7e7rn4fjrLJ+vwWUAn4BNdiH+YFIapcoKnDrgbCDD3DYzTXZJ2s9y kgimxGy81euud6llQjfDe5ZyWsMPGnGcRG5o/Mci5t6g/T5RCnQEA9QY0+8F2urPzcMI oylOCVsnutgaXpOUpana+A4VxbanmMwO3EtMjsOhishDNb00XzrN4D6bXQ2sOvFJkW/d 9tOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j8EN+itHVDmckinsRuSpNHzacqg4WoRKQjg4yoaKFx4=; b=ebMz82d2ty+spW/onh7r7bi1OL9ljCzzR4xo+x5A3HEzUR2So9+jUvilyS7L5zHFiN FOO5A6wPGPUwU628XokDpyMqvOdnNuctiqMoRLhc9/vPtljPbD830OdSkajsYkCY6lqL lTRBZMYHBzpEotxbb8DJ8vSxTCO51LNBvC68Q0gMCkpEwC9lLchdJoUf3lM08xhgbsor vptkkXwlV9slcN7eqmkxXltjkA8FQaoxPxmjX2aq/2BK4/ynGo0GMxJjSMpPwH2khZ0y sRX66poTO7KAK1Zjk9f8euSDx+NPK95ybTxy0JvL7FmsGoygomG4H+hth9MQ5Zk0URlN 1U4Q== X-Gm-Message-State: AG10YOTuYrl5/Fccaxj+B5VKkxGfCQmhA/LbNxUJ9nG6o5H1S3fcdSIQQfYR6JITR/7NmA== X-Received: by 10.66.62.161 with SMTP id z1mr20855948par.108.1455912311977; Fri, 19 Feb 2016 12:05:11 -0800 (PST) Received: from localhost (ec2-52-8-89-49.us-west-1.compute.amazonaws.com. [52.8.89.49]) by smtp.gmail.com with ESMTPSA id 19sm19594164pfb.64.2016.02.19.12.05.10 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 19 Feb 2016 12:05:11 -0800 (PST) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 19 Feb 2016 21:04:47 +0100 Message-Id: <1455912292-23807-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455912292-23807-1-git-send-email-edgar.iglesias@gmail.com> References: <1455912292-23807-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::22b Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, qemu-arm@nongnu.org, alex.bennee@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v2 3/8] target-arm: Add the IL flag to syn_data_abort 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Add the IL flag to syn_data_abort(). Since we at the moment never set ISV, the IL flag is always set to one. Signed-off-by: Edgar E. Iglesias --- target-arm/internals.h | 4 +++- target-arm/op_helper.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/target-arm/internals.h b/target-arm/internals.h index 2e70272..34e2688 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -384,9 +384,11 @@ static inline uint32_t syn_insn_abort(int same_el, int ea, int s1ptw, int fsc) } static inline uint32_t syn_data_abort(int same_el, int ea, int cm, int s1ptw, - int wnr, int fsc) + int wnr, int fsc, + bool is_16bit) { return (EC_DATAABORT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) + | (is_16bit ? 0 : ARM_EL_IL) | (ea << 9) | (cm << 8) | (s1ptw << 7) | (wnr << 6) | fsc; } diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 538887c..7e845d5 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -115,7 +115,8 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx, syn = syn_insn_abort(same_el, 0, fi.s1ptw, syn); exc = EXCP_PREFETCH_ABORT; } else { - syn = syn_data_abort(same_el, 0, 0, fi.s1ptw, is_write == 1, syn); + syn = syn_data_abort(same_el, 0, 0, fi.s1ptw, is_write == 1, syn, + 1); if (is_write == 1 && arm_feature(env, ARM_FEATURE_V6)) { fsr |= (1 << 11); } @@ -161,7 +162,8 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, int is_write, } raise_exception(env, EXCP_DATA_ABORT, - syn_data_abort(same_el, 0, 0, 0, is_write == 1, 0x21), + syn_data_abort(same_el, 0, 0, 0, is_write == 1, 0x21, + 1), target_el); }