summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/arm/ChangeLog6
-rw-r--r--sim/arm/armsupp.c2
2 files changed, 7 insertions, 1 deletions
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);