mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-08 22:30:36 +00:00
target/arm: make pmccntr_op_start/finish static
These functions are not used outside helper.c Backports commit f2b2f53f6429b5abd7cd86bd65747f5f13e195eb from qemu
This commit is contained in:
parent
6482182ba5
commit
8719b3edb3
|
@ -4344,8 +4344,6 @@
|
||||||
#define mls_op mls_op_aarch64
|
#define mls_op mls_op_aarch64
|
||||||
#define new_tmp_a64 new_tmp_a64_aarch64
|
#define new_tmp_a64 new_tmp_a64_aarch64
|
||||||
#define new_tmp_a64_zero new_tmp_a64_zero_aarch64
|
#define new_tmp_a64_zero new_tmp_a64_zero_aarch64
|
||||||
#define pmccntr_op_start pmccntr_op_start_aarch64
|
|
||||||
#define pmccntr_op_finish pmccntr_op_finish_aarch64
|
|
||||||
#define pmu_op_start pmu_op_start_aarch64
|
#define pmu_op_start pmu_op_start_aarch64
|
||||||
#define pmu_op_finish pmu_op_finish_aarch64
|
#define pmu_op_finish pmu_op_finish_aarch64
|
||||||
#define pmu_pre_el_change pmu_pre_el_change_aarch64
|
#define pmu_pre_el_change pmu_pre_el_change_aarch64
|
||||||
|
|
|
@ -4344,8 +4344,6 @@
|
||||||
#define mls_op mls_op_aarch64eb
|
#define mls_op mls_op_aarch64eb
|
||||||
#define new_tmp_a64 new_tmp_a64_aarch64eb
|
#define new_tmp_a64 new_tmp_a64_aarch64eb
|
||||||
#define new_tmp_a64_zero new_tmp_a64_zero_aarch64eb
|
#define new_tmp_a64_zero new_tmp_a64_zero_aarch64eb
|
||||||
#define pmccntr_op_start pmccntr_op_start_aarch64eb
|
|
||||||
#define pmccntr_op_finish pmccntr_op_finish_aarch64eb
|
|
||||||
#define pmu_op_start pmu_op_start_aarch64eb
|
#define pmu_op_start pmu_op_start_aarch64eb
|
||||||
#define pmu_op_finish pmu_op_finish_aarch64eb
|
#define pmu_op_finish pmu_op_finish_aarch64eb
|
||||||
#define pmu_pre_el_change pmu_pre_el_change_aarch64eb
|
#define pmu_pre_el_change pmu_pre_el_change_aarch64eb
|
||||||
|
|
|
@ -3352,8 +3352,6 @@
|
||||||
#define pmu_init pmu_init_arm
|
#define pmu_init pmu_init_arm
|
||||||
#define mla_op mla_op_arm
|
#define mla_op mla_op_arm
|
||||||
#define mls_op mls_op_arm
|
#define mls_op mls_op_arm
|
||||||
#define pmccntr_op_start pmccntr_op_start_arm
|
|
||||||
#define pmccntr_op_finish pmccntr_op_finish_arm
|
|
||||||
#define pmu_op_start pmu_op_start_arm
|
#define pmu_op_start pmu_op_start_arm
|
||||||
#define pmu_op_finish pmu_op_finish_arm
|
#define pmu_op_finish pmu_op_finish_arm
|
||||||
#define pmu_pre_el_change pmu_pre_el_change_arm
|
#define pmu_pre_el_change pmu_pre_el_change_arm
|
||||||
|
|
|
@ -3352,8 +3352,6 @@
|
||||||
#define pmu_init pmu_init_armeb
|
#define pmu_init pmu_init_armeb
|
||||||
#define mla_op mla_op_armeb
|
#define mla_op mla_op_armeb
|
||||||
#define mls_op mls_op_armeb
|
#define mls_op mls_op_armeb
|
||||||
#define pmccntr_op_start pmccntr_op_start_armeb
|
|
||||||
#define pmccntr_op_finish pmccntr_op_finish_armeb
|
|
||||||
#define pmu_op_start pmu_op_start_armeb
|
#define pmu_op_start pmu_op_start_armeb
|
||||||
#define pmu_op_finish pmu_op_finish_armeb
|
#define pmu_op_finish pmu_op_finish_armeb
|
||||||
#define pmu_pre_el_change pmu_pre_el_change_armeb
|
#define pmu_pre_el_change pmu_pre_el_change_armeb
|
||||||
|
|
|
@ -3361,8 +3361,6 @@ arm_symbols = (
|
||||||
'pmu_init',
|
'pmu_init',
|
||||||
'mla_op',
|
'mla_op',
|
||||||
'mls_op',
|
'mls_op',
|
||||||
'pmccntr_op_start',
|
|
||||||
'pmccntr_op_finish',
|
|
||||||
'pmu_op_start',
|
'pmu_op_start',
|
||||||
'pmu_op_finish',
|
'pmu_op_finish',
|
||||||
'pmu_pre_el_change',
|
'pmu_pre_el_change',
|
||||||
|
@ -4400,8 +4398,6 @@ aarch64_symbols = (
|
||||||
'mls_op',
|
'mls_op',
|
||||||
'new_tmp_a64',
|
'new_tmp_a64',
|
||||||
'new_tmp_a64_zero',
|
'new_tmp_a64_zero',
|
||||||
'pmccntr_op_start',
|
|
||||||
'pmccntr_op_finish',
|
|
||||||
'pmu_op_start',
|
'pmu_op_start',
|
||||||
'pmu_op_finish',
|
'pmu_op_finish',
|
||||||
'pmu_pre_el_change',
|
'pmu_pre_el_change',
|
||||||
|
|
|
@ -940,17 +940,6 @@ static inline bool is_a64(CPUARMState *env)
|
||||||
int cpu_arm_signal_handler(int host_signum, void *pinfo,
|
int cpu_arm_signal_handler(int host_signum, void *pinfo,
|
||||||
void *puc);
|
void *puc);
|
||||||
|
|
||||||
/**
|
|
||||||
* pmccntr_op_start/finish
|
|
||||||
* @env: CPUARMState
|
|
||||||
*
|
|
||||||
* Convert the counter in the PMCCNTR between its delta form (the typical mode
|
|
||||||
* when it's enabled) and the guest-visible value. These two calls must always
|
|
||||||
* surround any action which might affect the counter.
|
|
||||||
*/
|
|
||||||
void pmccntr_op_start(CPUARMState *env);
|
|
||||||
void pmccntr_op_finish(CPUARMState *env);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pmu_op_start/finish
|
* pmu_op_start/finish
|
||||||
* @env: CPUARMState
|
* @env: CPUARMState
|
||||||
|
|
|
@ -1196,7 +1196,7 @@ static void pmu_update_irq(CPUARMState *env)
|
||||||
* etc. can be done logically. This is essentially a no-op if the counter is
|
* etc. can be done logically. This is essentially a no-op if the counter is
|
||||||
* not enabled at the time of the call.
|
* not enabled at the time of the call.
|
||||||
*/
|
*/
|
||||||
void pmccntr_op_start(CPUARMState *env)
|
static void pmccntr_op_start(CPUARMState *env)
|
||||||
{
|
{
|
||||||
uint64_t cycles = cycles_get_count(env);
|
uint64_t cycles = cycles_get_count(env);
|
||||||
|
|
||||||
|
@ -1226,7 +1226,7 @@ void pmccntr_op_start(CPUARMState *env)
|
||||||
* guest-visible count. A call to pmccntr_op_finish should follow every call to
|
* guest-visible count. A call to pmccntr_op_finish should follow every call to
|
||||||
* pmccntr_op_start.
|
* pmccntr_op_start.
|
||||||
*/
|
*/
|
||||||
void pmccntr_op_finish(CPUARMState *env)
|
static void pmccntr_op_finish(CPUARMState *env)
|
||||||
{
|
{
|
||||||
if (pmu_counter_enabled(env, 31)) {
|
if (pmu_counter_enabled(env, 31)) {
|
||||||
uint64_t prev_cycles = env->cp15.c15_ccnt_delta;
|
uint64_t prev_cycles = env->cp15.c15_ccnt_delta;
|
||||||
|
|
Loading…
Reference in a new issue