@@ -670,14 +670,27 @@ static inline uint32_t pstate_read(CPUARMState *env)
| env->pstate | env->daif;
}
+void update_instruction_count(CPUARMState *env);
+#ifdef CONFIG_BBVEC
+void context_check_mode(CPUARMState *env);
+#endif
+
static inline void pstate_write(CPUARMState *env, uint32_t val)
{
+ bool mode_changed = (env->pstate ^ val) & PSTATE_M;
env->ZF = (~val) & PSTATE_Z;
env->NF = val;
env->CF = (val >> 29) & 1;
env->VF = (val << 3) & 0x80000000;
env->daif = val & PSTATE_DAIF;
env->pstate = val & ~CACHED_PSTATE_BITS;
+
+ if (mode_changed) {
+ update_instruction_count(env);
+#ifdef CONFIG_BBVEC
+ context_check_mode(env);
+#endif
+ }
}
/* Return the current CPSR value. */
@@ -558,8 +558,8 @@ void aarch64_cpu_do_interrupt(CPUState *cs)
env->condexec_bits = 0;
}
- pstate_write(env, PSTATE_DAIF | new_mode);
env->aarch64 = 1;
+ pstate_write(env, PSTATE_DAIF | new_mode);
aarch64_restore_sp(env, new_el);
env->pc = addr;
@@ -387,6 +387,7 @@ static void fcse_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
}
}
+void context_check_pid(CPUARMState *env);
static void contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value)
{
@@ -399,6 +400,9 @@ static void contextidr_write(CPUARMState *env, const ARMCPRegInfo *ri,
arm_tlb_flush(env, 1);
}
raw_write(env, ri, value);
+#ifdef CONFIG_BBVEC
+ context_check_pid(env);
+#endif
}
static void tlbiall_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -4292,29 +4296,34 @@ void HELPER(bbv_profile)(CPUARMState *env)
}
}
-void HELPER(context_check_mode)(CPUARMState *env)
+void context_check_mode(CPUARMState *env)
{
- uint32_t mode;
+ uint32_t priv_mode; /* nonzero if privileged */
+
+ if (!bbtrace_initialized())
+ return;
- /* Get current mode: userspace or privileged */
if (env->aarch64) {
- mode = extract32(env->pstate, 2, 2);
+ priv_mode = extract32(env->pstate, 2, 2);
}
else if ((env->uncached_cpsr & 0x1f) == ARM_CPU_MODE_USR) {
- mode = 0;
+ priv_mode = 0;
}
/* We don't currently implement the Virtualization or TrustZone
* extensions, so PL2 and PL3 don't exist for us.
*/
- else mode = 1;
+ else priv_mode = 1;
- bb_context_check_mode(env->prof_ic, mode);
+ bb_context_check_mode(env->prof_ic, priv_mode);
}
-void HELPER(context_check_pid)(CPUARMState *env)
+void context_check_pid(CPUARMState *env)
{
uint64_t pid;
+ if (!bbtrace_initialized())
+ return;
+
/* Read pid from CONTEXTIDR register. In aarch32, if EL1 is not in AArch64
* mode, we need to shift out the address space identifier in the first 8 bits.
*
@@ -4331,7 +4340,7 @@ void HELPER(context_check_pid)(CPUARMState *env)
bb_context_check_pid(env->prof_ic, pid);
}
-void HELPER(update_instruction_count)(CPUARMState *env)
+void update_instruction_count(CPUARMState *env)
{
if (bbtrace_initialized()) {
/*
@@ -4360,7 +4369,7 @@ void HELPER(update_instruction_count)(CPUARMState *env)
#else //!CONFIG_BBVEC
-void HELPER(update_instruction_count)(CPUARMState *env)
+void update_instruction_count(CPUARMState *env)
{
pmevcntr_increment(env, PMU_COUNTER_TYPE_INSTRUCTIONS, env->prof_ic);
pmevcntr_increment(env, PMU_COUNTER_TYPE_CYCLES, env->prof_ic);
@@ -4369,6 +4378,11 @@ void HELPER(update_instruction_count)(CPUARMState *env)
#endif //CONFIG_BBVEC
+void HELPER(update_instruction_count)(CPUARMState *env)
+{
+ update_instruction_count(env);
+}
+
/* Sign/zero extend */
uint32_t HELPER(sxtb16)(uint32_t x)
{
@@ -4525,6 +4539,11 @@ void switch_mode(CPUARMState *env, int mode)
if (mode == old_mode)
return;
+ update_instruction_count(env);
+#ifdef CONFIG_BBVEC
+ context_check_mode(env);
+#endif
+
if (old_mode == ARM_CPU_MODE_FIQ) {
memcpy (env->fiq_regs, env->regs + 8, 5 * sizeof(uint32_t));
memcpy (env->regs + 8, env->usr_regs, 5 * sizeof(uint32_t));
@@ -39,8 +39,6 @@ PAS_OP(uh)
#ifdef CONFIG_BBVEC
DEF_HELPER_1(bbv_profile, void, env)
-DEF_HELPER_1(context_check_mode, void, env)
-DEF_HELPER_1(context_check_pid, void, env)
#endif // CONFIG_BBVEC
DEF_HELPER_1(update_instruction_count, void, env)
@@ -11076,14 +11076,12 @@ void gen_intermediate_code_internal_a64(ARMCPU *cpu,
if (bbtrace_initialized()) {
gen_helper_bbv_profile(cpu_env);
gen_store_is_jmp(0);
- gen_helper_context_check_pid(cpu_env);
}
#endif // CONFIG_BBVEC
do {
#ifdef CONFIG_BBVEC
if (bbtrace_initialized()) {
- gen_helper_context_check_mode(cpu_env);
gen_pc_incr(env, dc);
}
#endif // CONFIG_BBVEC
@@ -11635,14 +11635,12 @@ static inline void gen_intermediate_code_internal(ARMCPU *cpu,
if (bbtrace_initialized()) {
gen_helper_bbv_profile(cpu_env);
gen_store_is_jmp(0);
- gen_helper_context_check_pid(cpu_env);
}
#endif
do {
#ifdef CONFIG_BBVEC
if (bbtrace_initialized()) {
- gen_helper_context_check_mode(cpu_env);
gen_pc_incr(env, dc);
/* FIXME: this call should not be necessary if all the cases
where the prof_is_jmp flag gets set are correct. */
This should speed up basic block detection since these were previously being checked for on each basic block / instruction. Written by Aaron Lindsay. Signed-off-by: Christopher Covington <cov@codeaurora.org> --- target-arm/cpu.h | 13 +++++++++++++ target-arm/helper-a64.c | 2 +- target-arm/helper.c | 39 +++++++++++++++++++++++++++++---------- target-arm/helper.h | 2 -- target-arm/translate-a64.c | 2 -- target-arm/translate.c | 2 -- 6 files changed, 43 insertions(+), 17 deletions(-)