fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

target/loongarch: Change return value type with loongarch_tlb_search_cb()

Browse source 
With function loongarch_tlb_search_cb(), change return value type from
bool type to pointer LoongArchTLB *, the pointer type can be use directly
in future.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
This commit is contained in:
Bibo Mao 2025-09-04 17:32:05 +08:00
parent 58c5522f17
commit 5e3ccedcf9
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
target/loongarch/tcg/tlb_helper.c
View file

@ -203,8 +203,9 @@ static uint32_t get_random_tlb(uint32_t low, uint32_t high)
* field in tlb entry contains bit[47:13], so need adjust.
* virt_vpn = vaddr[47:13]
*/
static bool loongarch_tlb_search_cb(CPULoongArchState *env, vaddr vaddr,
int *index, int csr_asid, tlb_match func)
static LoongArchTLB *loongarch_tlb_search_cb(CPULoongArchState *env,
vaddr vaddr, int csr_asid,
tlb_match func)
{
LoongArchTLB *tlb;
uint16_t tlb_asid, stlb_idx;
@ -229,8 +230,7 @@ static bool loongarch_tlb_search_cb(CPULoongArchState *env, vaddr vaddr,
if (func(tlb_g, csr_asid, tlb_asid) &&
(vpn == (tlb_vppn >> compare_shift))) {
*index = i * 256 + stlb_idx;
return true;
return tlb;
}
}
}
@ -248,12 +248,11 @@ static bool loongarch_tlb_search_cb(CPULoongArchState *env, vaddr vaddr,
vpn = (vaddr & TARGET_VIRT_MASK) >> (tlb_ps + 1);
if (func(tlb_g, csr_asid, tlb_asid) &&
(vpn == (tlb_vppn >> compare_shift))) {
*index = i;
return true;
return tlb;
}
}
}
return false;
return NULL;
}
static bool loongarch_tlb_search(CPULoongArchState *env, vaddr vaddr,
@ -261,10 +260,17 @@ static bool loongarch_tlb_search(CPULoongArchState *env, vaddr vaddr,
{
int csr_asid;
tlb_match func;
LoongArchTLB *tlb;
func = tlb_match_any;
csr_asid = FIELD_EX64(env->CSR_ASID, CSR_ASID, ASID);
return loongarch_tlb_search_cb(env, vaddr, index, csr_asid, func);
tlb = loongarch_tlb_search_cb(env, vaddr, csr_asid, func);
if (tlb) {
*index = tlb - env->tlb;
return true;
}
return false;
}
void helper_tlbsrch(CPULoongArchState *env)