From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLCs-0004HF-BK for qemu-devel@nongnu.org; Thu, 18 Feb 2016 04:49:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWLCp-00059z-62 for qemu-devel@nongnu.org; Thu, 18 Feb 2016 04:49:06 -0500 Date: Thu, 18 Feb 2016 10:48:54 +0100 From: "Edgar E. Iglesias" Message-ID: <20160218094854.GC4403@toto> References: <1455287642-28166-1-git-send-email-edgar.iglesias@gmail.com> <1455287642-28166-4-git-send-email-edgar.iglesias@gmail.com> <56C372C6.4080909@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <56C372C6.4080909@gmail.com> Subject: Re: [Qemu-devel] [PATCH v1 3/9] target-arm: Add the thumb/IL flag to syn_data_abort List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sergey Fedorov Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, alex.bennee@linaro.org, rth@twiddle.net On Tue, Feb 16, 2016 at 10:04:38PM +0300, Sergey Fedorov wrote: > On 12.02.2016 17:33, Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" > > > > 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 70bec4a..b1c483b 100644 > > --- a/target-arm/internals.h > > +++ b/target-arm/internals.h > > @@ -360,9 +360,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_thumb) > > { > > return (EC_DATAABORT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) > > + | (is_thumb ? 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 bd48549..4e629e1 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, > > + env->thumb); > > 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, > > + env->thumb), > > target_el); > > } > > > > ESR_ELx.IL is about instruction length. Thumb instructions can be > 32-bit-long. In such case, IL should be set to 1 even if env->thumb is > set. Additionally, a data abort exception for which the value of the ISV > bit is 0, should also set IL to 1, no matter what was the instruction > length. See ARM ARMv8 A.i, section D7.2.27 ESR_ELx, Exception Syndrome > Register (ELx). Yes, I'll fix this for the next version. Thanks, Edgar