On 24 June 2014 02:12, Alistair Francis <alistair.fran...@xilinx.com> wrote: > + /* This implements the PMCCFILTR_EL0:P and U bits; the PMXEVTYPER:P and U > + * bits and the c9_pmcr:E bit. > + * > + * It does not suppor the secure/non-secure componenets of the > + * PMCCFILTR_EL0 register > + */ > + #define CCNT_ENABLED(env) \ > + ((env->cp15.c9_pmcr & PMCRE) && \ > + !(env->cp15.pmccfiltr_el0 & PMCP && arm_current_pl(env) == 1) && \ > + !(env->cp15.pmccfiltr_el0 & PMCU && arm_current_pl(env) == 0) && \ > + !(env->cp15.c9_pmxevtyper & PMCP && arm_current_pl(env) == 1) && \ > + !(env->cp15.c9_pmxevtyper & PMCU && arm_current_pl(env) == 0)) > +#endif
This really should be a function, not a macro. (And it probably ought to live in internals.h.) Can you write the check so that it won't blow up and need fixing when arm_current_pl() returns 2 or 3 in the future? thanks -- PMM
