summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-03-14 12:26:10 +0000
committerPeter Maydell <peter.maydell@linaro.org>2012-03-15 17:00:51 +0000
commit4de47793d49e70ee048e15889d4bf139e7b36ce7 (patch)
tree7be71bb71a82264f92279fb4a9008a92f5f7cace
parentae7d54d489540b49b7c13a7df7ddc220588a2ced (diff)
downloadfocaccia-qemu-4de47793d49e70ee048e15889d4bf139e7b36ce7.tar.gz
focaccia-qemu-4de47793d49e70ee048e15889d4bf139e7b36ce7.zip
target-arm: Fix typo in ARM946 cp15 c5 handling
Fix a typo in handling of the ARM946 cp15 c5 c0 0 1 handling
(instruction access permission bits) that meant it would
return the data access permission bits by mistake.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target-arm/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 8a08db8d57..4116feebf5 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2025,7 +2025,7 @@ uint32_t HELPER(get_cp15)(CPUARMState *env, uint32_t insn)
             return env->cp15.c5_data;
         case 1:
             if (arm_feature(env, ARM_FEATURE_MPU))
-                return simple_mpu_ap_bits(env->cp15.c5_data);
+                return simple_mpu_ap_bits(env->cp15.c5_insn);
             return env->cp15.c5_insn;
         case 2:
             if (!arm_feature(env, ARM_FEATURE_MPU))