summaryrefslogtreecommitdiffstats
path: root/target-arm/op_helper.c
diff options
context:
space:
mode:
authorSergey Sorokin2016-09-06 20:52:17 +0200
committerPeter Maydell2016-09-06 20:52:17 +0200
commite0fe723c24562c8f909bb40f131bfdbe75650677 (patch)
tree9547736c202f8d4f4f456051d37ce488b1617e5c /target-arm/op_helper.c
parentast2400: add a memory controller device model (diff)
downloadqemu-e0fe723c24562c8f909bb40f131bfdbe75650677.tar.gz
qemu-e0fe723c24562c8f909bb40f131bfdbe75650677.tar.xz
qemu-e0fe723c24562c8f909bb40f131bfdbe75650677.zip
target-arm: Fix lpae bit in FSR on an alignment fault
If an alignment fault occurred and target EL is using AArch32, then DFSR/IFSR bit LPAE[9] must be set correctly. Signed-off-by: Sergey Sorokin <afarallax@yandex.ru> Message-id: 1471283293-169850-1-git-send-email-afarallax@yandex.ru Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/op_helper.c')
-rw-r--r--target-arm/op_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 3e8588ee6a..be27b21d52 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -194,7 +194,7 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
* the LPAE long descriptor format, or the short descriptor format
*/
if (arm_s1_regime_using_lpae_format(env, cpu_mmu_index(env, false))) {
- env->exception.fsr = 0x21;
+ env->exception.fsr = (1 << 9) | 0x21;
} else {
env->exception.fsr = 0x1;
}