| Message ID | 20190615154352.26824-14-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support disabling TCG on ARM | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > The Security State helpers are now only called within v7m_helper.c. > Remove them from "internals.h". > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> This does seem a little round the houses, but whatever: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/internals.h | 8 -------- > target/arm/v7m_helper.c | 10 +++++----- > 2 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/target/arm/internals.h b/target/arm/internals.h > index 1d15af3f8b..fe9e4665e2 100644 > --- a/target/arm/internals.h > +++ b/target/arm/internals.h > @@ -1043,12 +1043,4 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, > int *prot, bool *is_subpage, > ARMMMUFaultInfo *fi, uint32_t *mregion); > > -void write_v7m_control_spsel_for_secstate(CPUARMState *env, > - bool new_spsel, > - bool secstate); > - > -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel); > - > -void switch_v7m_security_state(CPUARMState *env, bool new_secstate); > - > #endif > diff --git a/target/arm/v7m_helper.c b/target/arm/v7m_helper.c > index b50bb98e06..aa6a08e326 100644 > --- a/target/arm/v7m_helper.c > +++ b/target/arm/v7m_helper.c > @@ -94,9 +94,9 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) > * stack pointers if it is done for the CONTROL register for the current > * security state. > */ > -void write_v7m_control_spsel_for_secstate(CPUARMState *env, > - bool new_spsel, > - bool secstate) > +static void write_v7m_control_spsel_for_secstate(CPUARMState *env, > + bool new_spsel, > + bool secstate) > { > bool old_is_psp = v7m_using_psp(env); > > @@ -121,13 +121,13 @@ void write_v7m_control_spsel_for_secstate(CPUARMState *env, > * Write to v7M CONTROL.SPSEL bit. This may change the current > * stack pointer between Main and Process stack pointers. > */ > -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) > +static void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) > { > write_v7m_control_spsel_for_secstate(env, new_spsel, env->v7m.secure); > } > > /* Switch M profile security state between NS and S */ > -void switch_v7m_security_state(CPUARMState *env, bool new_secstate) > +static void switch_v7m_security_state(CPUARMState *env, bool new_secstate) > { > uint32_t new_ss_msp, new_ss_psp; -- Alex Bennée
diff --git a/target/arm/internals.h b/target/arm/internals.h index 1d15af3f8b..fe9e4665e2 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1043,12 +1043,4 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, int *prot, bool *is_subpage, ARMMMUFaultInfo *fi, uint32_t *mregion); -void write_v7m_control_spsel_for_secstate(CPUARMState *env, - bool new_spsel, - bool secstate); - -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel); - -void switch_v7m_security_state(CPUARMState *env, bool new_secstate); - #endif diff --git a/target/arm/v7m_helper.c b/target/arm/v7m_helper.c index b50bb98e06..aa6a08e326 100644 --- a/target/arm/v7m_helper.c +++ b/target/arm/v7m_helper.c @@ -94,9 +94,9 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) * stack pointers if it is done for the CONTROL register for the current * security state. */ -void write_v7m_control_spsel_for_secstate(CPUARMState *env, - bool new_spsel, - bool secstate) +static void write_v7m_control_spsel_for_secstate(CPUARMState *env, + bool new_spsel, + bool secstate) { bool old_is_psp = v7m_using_psp(env); @@ -121,13 +121,13 @@ void write_v7m_control_spsel_for_secstate(CPUARMState *env, * Write to v7M CONTROL.SPSEL bit. This may change the current * stack pointer between Main and Process stack pointers. */ -void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) +static void write_v7m_control_spsel(CPUARMState *env, bool new_spsel) { write_v7m_control_spsel_for_secstate(env, new_spsel, env->v7m.secure); } /* Switch M profile security state between NS and S */ -void switch_v7m_security_state(CPUARMState *env, bool new_secstate) +static void switch_v7m_security_state(CPUARMState *env, bool new_secstate) { uint32_t new_ss_msp, new_ss_psp;
The Security State helpers are now only called within v7m_helper.c. Remove them from "internals.h". Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/arm/internals.h | 8 -------- target/arm/v7m_helper.c | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-)