Re: [PATCH v3 6/9] target/loongarch: Define function loongarch_get_addr_from_tlb() non-static

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 22/4/25 09:39, bibo mao wrote:
> 
> 
> On 2025/4/22 下午3:18, Philippe Mathieu-Daudé wrote:
>> On 22/4/25 04:57, Bibo Mao wrote:
>>> Define function loongarch_get_addr_from_tlb() non-static, and add its
>>> definition in header file tcg/tcg_loongarch.h
>>>
>>> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
>>> ---
>>>   target/loongarch/cpu_helper.c        | 10 ++--------
>>>   target/loongarch/tcg/tcg_loongarch.h | 16 ++++++++++++++++
>>>   2 files changed, 18 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/ 
>>> cpu_helper.c
>>> index 5db64a45cc..7636b2c265 100644
>>> --- a/target/loongarch/cpu_helper.c
>>> +++ b/target/loongarch/cpu_helper.c
>>> @@ -11,6 +11,7 @@
>>>   #include "cpu.h"
>>>   #include "internals.h"
>>>   #include "cpu-csr.h"
>>> +#include "tcg/tcg_loongarch.h"
>>>   #ifdef CONFIG_TCG
>>>   static int loongarch_map_tlb_entry(CPULoongArchState *env, hwaddr 
>>> *physical,
>>> @@ -142,7 +143,7 @@ bool loongarch_tlb_search(CPULoongArchState *env, 
>>> target_ulong vaddr,
>>>       return false;
>>>   }
>>> -static int loongarch_get_addr_from_tlb(CPULoongArchState *env, 
>>> hwaddr *physical,
>>> +int loongarch_get_addr_from_tlb(CPULoongArchState *env, hwaddr 
>>> *physical,
>>>                                          int *prot, target_ulong 
>>> address,
>>>                                          MMUAccessType access_type, 
>>> int mmu_idx)
>>>   {
>>> @@ -156,13 +157,6 @@ static int 
>>> loongarch_get_addr_from_tlb(CPULoongArchState *env, hwaddr *physical,
>>>       return TLBRET_NOMATCH;
>>>   }
>>> -#else
>>> -static int loongarch_get_addr_from_tlb(CPULoongArchState *env, 
>>> hwaddr *physical,
>>> -                                       int *prot, target_ulong address,
>>> -                                       MMUAccessType access_type, 
>>> int mmu_idx)
>>> -{
>>> -    return TLBRET_NOMATCH;
>>> -}
>>>   #endif
>>>   void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
>>> diff --git a/target/loongarch/tcg/tcg_loongarch.h b/target/loongarch/ 
>>> tcg/tcg_loongarch.h
>>> index da2539e995..69a93bfc3e 100644
>>> --- a/target/loongarch/tcg/tcg_loongarch.h
>>> +++ b/target/loongarch/tcg/tcg_loongarch.h
>>> @@ -6,7 +6,23 @@
>>>    */
>>>   #ifndef TARGET_LOONGARCH_TCG_LOONGARCH_H
>>>   #define TARGET_LOONGARCH_TCG_LOONGARCH_H
>>> +#include "cpu.h"
>>>   void loongarch_csr_translate_init(void);
>>> +#ifdef CONFIG_TCG
>>> +int loongarch_get_addr_from_tlb(CPULoongArchState *env, hwaddr 
>>> *physical,
>>> +                                int *prot, target_ulong address,
>>> +                                MMUAccessType access_type, int 
>>> mmu_idx);
>>> +#else
>>> +static inline int loongarch_get_addr_from_tlb(CPULoongArchState *env,
>>> +                                              hwaddr *physical,
>>> +                                              int *prot, 
>>> target_ulong address,
>>> +                                              MMUAccessType 
>>> access_type,
>>> +                                              int mmu_idx)
>>> +{
>>> +    return TLBRET_NOMATCH;
>>
>> CONFIG_TCG should always be defined when including tcg/tcg_loongarch.h.
> 
> If so, there will be no stub function declaration with 
> loongarch_get_addr_from_tlb(). *#ifdef CONFIG_TCG* needs be added in c 
> files such as:
> 
> static int loongarch_map_address(CPULoongArchState *env, hwaddr *physical,
>                                   int *prot, target_ulong address,
>                                   MMUAccessType access_type, int mmu_idx,
>                                   int is_debug)
> {
>      int ret;
> 
> *#ifdef CONFIG_TCG*
>      if (!kvm_enabled()) {

Maybe what we want here is:

       if (tcg_enabled()) {

?

>          ret = loongarch_get_addr_from_tlb(env, physical, prot, address,
>                                            access_type, mmu_idx);
>          if (ret != TLBRET_NOMATCH) {
>              return ret;
>          }
>      }
> *#endif*
> 
> My original thought is to add stub function and remove *#ifdef 
> CONFIG_TCG* in c file.
> 
> Regards
> Bibo Mao
> 
>>
>>> +}
>>> +#endif
>>> +
>>>   #endif  /* TARGET_LOONGARCH_TCG_LOONGARCH_H */
>>
>