Re: [Qemu-devel] [PATCH RFC 4/8] target-arm: Avoid inline for get_phys_addr

[Edgar E. Iglesias]

On Wed, Sep 23, 2015 at 09:58:10AM -0700, Peter Maydell wrote:
> On 19 September 2015 at 07:15, Edgar E. Iglesias
> <address@hidden> wrote:
> > From: "Edgar E. Iglesias" <address@hidden>
> >
> > Avoid inline for get_phys_addr() to prepare for future recursive use.
> 
> Does the compiler actually complain?

Sorry for the late replies Peter...
Yes the compiler complains if we keep the inline. I'll fix the indentation.

Thanks,
Edgar

> 
> In any case this function is a lot more complex than it used to be so
> we might as well just rely on the compiler's discretion about whether
> to bother inlining it or not.
> 
> > Signed-off-by: Edgar E. Iglesias <address@hidden>
> > ---
> >  target-arm/helper.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/target-arm/helper.c b/target-arm/helper.c
> > index 6f0ed51..7e7f29d 100644
> > --- a/target-arm/helper.c
> > +++ b/target-arm/helper.c
> > @@ -13,7 +13,7 @@
> >  #include "exec/semihost.h"
> >
> >  #ifndef CONFIG_USER_ONLY
> > -static inline bool get_phys_addr(CPUARMState *env, target_ulong address,
> > +static bool get_phys_addr(CPUARMState *env, target_ulong address,
> >                                   int access_type, ARMMMUIdx mmu_idx,
> >                                   hwaddr *phys_ptr, MemTxAttrs *attrs, int 
> > *prot,
> >                                   target_ulong *page_size, uint32_t *fsr);
> 
> Might as well reindent these lines.
> 
> > @@ -6967,10 +6967,10 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, 
> > uint32_t address,
> >   * @page_size: set to the size of the page containing phys_ptr
> >   * @fsr: set to the DFSR/IFSR value on failure
> >   */
> > -static inline bool get_phys_addr(CPUARMState *env, target_ulong address,
> > -                                 int access_type, ARMMMUIdx mmu_idx,
> > -                                 hwaddr *phys_ptr, MemTxAttrs *attrs, int 
> > *prot,
> > -                                 target_ulong *page_size, uint32_t *fsr)
> > +static bool get_phys_addr(CPUARMState *env, target_ulong address,
> > +                          int access_type, ARMMMUIdx mmu_idx,
> > +                          hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot,
> > +                          target_ulong *page_size, uint32_t *fsr)
> >  {
> >      if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) {
> >          /* TODO: when we support EL2 we should here call ourselves 
> > recursively
> > --
> > 1.9.1
> >
> 
> Otherwise:
> Reviewed-by: Peter Maydell <address@hidden>
> 
> thanks
> -- PMM