summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-06-25 18:16:06 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-06-25 18:16:09 +0100
commit34affeefbbdbd97471c283677179254a2e006994 (patch)
tree58eb1a46fca34135cde8fc3dc4803cf102867fb6
parentbaf8673ca802cb3ea2cdbe94813441d23bde223b (diff)
downloadfocaccia-qemu-34affeefbbdbd97471c283677179254a2e006994.tar.gz
focaccia-qemu-34affeefbbdbd97471c283677179254a2e006994.zip
target-arm: Allow special cpregs to have flags set
Relax the "is this a valid ARMCPRegInfo type value?" check to permit
"special" cpregs to have flags other than ARM_CP_SPECIAL set. At
the moment none of the other flags are relevant for special regs,
but the migration related flag we're about to introduce can apply
here too.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target-arm/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 54384446b4..737c00c220 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -456,7 +456,7 @@ static inline bool cptype_valid(int cptype)
 {
     return ((cptype & ~ARM_CP_FLAG_MASK) == 0)
         || ((cptype & ARM_CP_SPECIAL) &&
-            (cptype <= ARM_LAST_SPECIAL));
+            ((cptype & ~ARM_CP_FLAG_MASK) <= ARM_LAST_SPECIAL));
 }
 
 /* Access rights: