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 9df17bd74a2964c427251a4aab89b71718e17cba..f2a04082b5099982e6e44c34df8bc1a3d609b48f 100644 (file)
--- 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 b8e1d385ccd372e5bf861cf3dbdaa846c0433101..2e49af8f0e10fdd9370c6516d12272d5e7c5fc2d 100644 (file)
--- 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);