From: Nick Clifton <nickc@redhat.com>
Date: Mon, 3 Sep 2012 10:13:11 +0000 (+0000)
Subject: 	PR sim/14540
X-Git-Tag: sid-snapshot-20121001~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f253d86d7f3da50f46117b753ae763dc393a13c9;p=thirdparty%2Fbinutils-gdb.git

	PR sim/14540
	* armsupp.c (ARMul_MRC): Return 0 if access to the MRC instruction
	is denied.
---

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 9df17bd74a2..f2a04082b50 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-03  Nick Clifton  <nickc@redhat.com>
+
+	PR sim/14540
+	* armsupp.c (ARMul_MRC): Return 0 if access to the MRC instruction
+	is denied.
+
 2012-08-01  Kevin Buettner  <kevinb@redhat.com>
 
 	* wrapper.c (libiberty.h): Include.
diff --git a/sim/arm/armsupp.c b/sim/arm/armsupp.c
index b8e1d385ccd..2e49af8f0e1 100644
--- a/sim/arm/armsupp.c
+++ b/sim/arm/armsupp.c
@@ -636,7 +636,7 @@ ARMul_MRC (ARMul_State * state, ARMword instr)
   if (! CP_ACCESS_ALLOWED (state, CPNum))
     {
       ARMul_UndefInstr (state, instr);
-      return;
+      return result;
     }
 
   cpab = (state->MRC[CPNum]) (state, ARMul_FIRST, instr, &result);