From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LDedF-0001Qy-17
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 07:39:05 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LDedC-0001Px-RZ
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 07:39:03 -0500
Received: from [199.232.76.173] (port=50930 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LDedC-0001Pp-Bn
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 07:39:02 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53795 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LDedC-000398-3L
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 07:39:02 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LDedB-0000AH-8c
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 12:39:01 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1LDedB-0000AD-28
	for qemu-devel@nongnu.org; Fri, 19 Dec 2008 12:39:01 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1LDedB-0000AD-28@cvs.savannah.gnu.org>
Date: Fri, 19 Dec 2008 12:39:01 +0000
Subject: [Qemu-devel] [6099] Implement ARMv7 MMU access permissions.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6099
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6099
Author:   pbrook
Date:     2008-12-19 12:39:00 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Implement ARMv7 MMU access permissions.

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

Modified Paths:
--------------
    trunk/target-arm/helper.c

Modified: trunk/target-arm/helper.c
===================================================================
--- trunk/target-arm/helper.c	2008-12-18 22:51:31 UTC (rev 6098)
+++ trunk/target-arm/helper.c	2008-12-19 12:39:00 UTC (rev 6099)
@@ -900,12 +900,16 @@
           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 @@
     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.  */