From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 25 Jun 2013 17:16:06 +0000 (+0100)
Subject: target-arm: Allow special cpregs to have flags set
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1660^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34affeefbbdbd97471c283677179254a2e006994;p=sdk%2Femulator%2Fqemu.git

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>
---

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 5438444..737c00c 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: