[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/8] target-arm: Add the IL flag to syn_data_abor
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v2 3/8] target-arm: Add the IL flag to syn_data_abort |
Date: |
Fri, 19 Feb 2016 21:04:47 +0100 |
From: "Edgar E. Iglesias" <address@hidden>
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 <address@hidden>
---
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);
}
--
1.9.1
- [Qemu-devel] [PATCH v2 0/8] arm: Steps towards EL2 support round 6, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 1/8] tcg: Add tcg_set_insn_param, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 2/8] gen-icount: Use tcg_set_insn_param, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 3/8] target-arm: Add the IL flag to syn_data_abort,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v2 5/8] target-arm/translate-a64.c: Use extract32 in disas_ldst_reg_imm9, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 4/8] target-arm: Add more fields to the data abort syndrome generator, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 6/8] target-arm/translate-a64.c: Unify some of the ldst_reg decoding, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 7/8] target-arm: A64: Create Instruction Syndromes for Data Aborts, Edgar E. Iglesias, 2016/02/19
- [Qemu-devel] [PATCH v2 8/8] target-arm: Use isyn.swstep.ex to hold the is_ldex state, Edgar E. Iglesias, 2016/02/19