mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-arm: Remove old code and replace with new functions

Browse Source 
Remove the old PMCCNTR code and replace it with calls to the new
pmccntr_sync() and arm_ccnt_enabled() functions.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 693a6e437d915c2195fd3dc7303f384ca538b7bf.1409025949.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alistair Francis 2014-08-29 15:00:30 +01:00 committed by Peter Maydell
parent ec7b4ce4c7
commit 942a155b20
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target-arm/helper.c
View File

@ -580,20 +580,7 @@ void pmccntr_sync(CPUARMState *env)
static void pmcr_write(CPUARMState *env, const ARMCPRegInfo *ri, static void pmcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
uint64_t value) uint64_t value)
{ {
uint64_t temp_ticks; pmccntr_sync(env);
temp_ticks = muldiv64(qemu_clock_get_us(QEMU_CLOCK_VIRTUAL),
get_ticks_per_sec(), 1000000);
if (env->cp15.c9_pmcr & PMCRE) {
/* If the counter is enabled */
if (env->cp15.c9_pmcr & PMCRD) {
/* Increment once every 64 processor clock cycles */
env->cp15.c15_ccnt = (temp_ticks/64) - env->cp15.c15_ccnt;
} else {
env->cp15.c15_ccnt = temp_ticks - env->cp15.c15_ccnt;
}
}
if (value & PMCRC) { if (value & PMCRC) {
/* The counter has been reset */ /* The counter has been reset */
@ -604,20 +591,14 @@ static void pmcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
env->cp15.c9_pmcr &= ~0x39; env->cp15.c9_pmcr &= ~0x39;
env->cp15.c9_pmcr |= (value & 0x39); env->cp15.c9_pmcr |= (value & 0x39);
if (env->cp15.c9_pmcr & PMCRE) { pmccntr_sync(env);
if (env->cp15.c9_pmcr & PMCRD) {
/* Increment once every 64 processor clock cycles */
temp_ticks /= 64;
}
env->cp15.c15_ccnt = temp_ticks - env->cp15.c15_ccnt;
}
} }
static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri) static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
uint64_t total_ticks; uint64_t total_ticks;
if (!(env->cp15.c9_pmcr & PMCRE)) { if (!arm_ccnt_enabled(env)) {
/* Counter is disabled, do not change value */ /* Counter is disabled, do not change value */
return env->cp15.c15_ccnt; return env->cp15.c15_ccnt;
} }
@ -637,7 +618,7 @@ static void pmccntr_write(CPUARMState *env, const ARMCPRegInfo *ri,
{ {
uint64_t total_ticks; uint64_t total_ticks;
if (!(env->cp15.c9_pmcr & PMCRE)) { if (!arm_ccnt_enabled(env)) {
/* Counter is disabled, set the absolute value */ /* Counter is disabled, set the absolute value */
env->cp15.c15_ccnt = value; env->cp15.c15_ccnt = value;
return; return;