From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 19 Dec 2008 12:39:00 +0000 (+0000)
Subject: Implement ARMv7 MMU access permissions.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d4934d18f36dbd974e28c700a55e9393395a18c4;p=qmiga%2Fqemu.git

Implement ARMv7 MMU access permissions.

Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6099 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index a9b31e5d6b..a59c938a81 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -900,12 +900,16 @@ static inline int check_ap(CPUState *env, int ap, int domain, int access_type,
           return PAGE_READ | PAGE_WRITE;
   case 3:
       return PAGE_READ | PAGE_WRITE;
-  case 4: case 7: /* Reserved.  */
+  case 4: /* Reserved.  */
       return 0;
   case 5:
       return is_user ? 0 : prot_ro;
   case 6:
       return prot_ro;
+  case 7:
+      if (!arm_feature (env, ARM_FEATURE_V7))
+          return 0;
+      return prot_ro;
   default:
       abort();
   }
@@ -1085,6 +1089,12 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type,
     if (xn && access_type == 2)
         goto do_fault;
 
+    /* The simplified model uses AP[0] as an access control bit.  */
+    if ((env->cp15.c1_sys & (1 << 29)) && (ap & 1) == 0) {
+        /* Access flag fault.  */
+        code = (code == 15) ? 6 : 3;
+        goto do_fault;
+    }
     *prot = check_ap(env, ap, domain, access_type, is_user);
     if (!*prot) {
         /* Access permission fault.  */