target/loongarch: Remove some unnecessary target_ulong uses

[PATCH 4/4] target/loongarch: Do not use target_ulong type for LDDIR level

Posted by Philippe Mathieu-Daudé 1 month ago

The LDDIR level page table is a 5-bit immediate. Using the
uint32_t type for it is sufficient. Avoid the target_ulong type.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/loongarch/cpu-mmu.h                             | 2 +-
 target/loongarch/tcg/helper.h                          | 2 +-
 target/loongarch/cpu_helper.c                          | 2 +-
 target/loongarch/tcg/tlb_helper.c                      | 4 ++--
 target/loongarch/tcg/insn_trans/trans_privileged.c.inc | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target/loongarch/cpu-mmu.h b/target/loongarch/cpu-mmu.h
index 0068d22efcb..dbc69c7c0f2 100644
--- a/target/loongarch/cpu-mmu.h
+++ b/target/loongarch/cpu-mmu.h
@@ -34,7 +34,7 @@ TLBRet get_physical_address(CPULoongArchState *env, MMUContext *context,
                             MMUAccessType access_type, int mmu_idx,
                             int is_debug);
 void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
-                               uint64_t *dir_width, target_ulong level);
+                        uint64_t *dir_width, unsigned int level);
 hwaddr loongarch_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
 
 #endif  /* LOONGARCH_CPU_MMU_H */
diff --git a/target/loongarch/tcg/helper.h b/target/loongarch/tcg/helper.h
index db57dbfc167..7e508c5a7b9 100644
--- a/target/loongarch/tcg/helper.h
+++ b/target/loongarch/tcg/helper.h
@@ -129,7 +129,7 @@ DEF_HELPER_2(invtlb_all_asid, void, env, tl)
 DEF_HELPER_3(invtlb_page_asid, void, env, tl, tl)
 DEF_HELPER_3(invtlb_page_asid_or_g, void, env, tl, tl)
 
-DEF_HELPER_4(lddir, tl, env, tl, tl, i32)
+DEF_HELPER_4(lddir, tl, env, tl, i32, i32)
 DEF_HELPER_4(ldpte, void, env, tl, tl, i32)
 DEF_HELPER_1(ertn, void, env)
 DEF_HELPER_1(idle, void, env)
diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c
index 4a9db3ea4c1..867e7c88670 100644
--- a/target/loongarch/cpu_helper.c
+++ b/target/loongarch/cpu_helper.c
@@ -17,7 +17,7 @@
 #include "tcg/tcg_loongarch.h"
 
 void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
-                        uint64_t *dir_width, target_ulong level)
+                        uint64_t *dir_width, unsigned int level)
 {
     switch (level) {
     case 1:
diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c
index 8cfce48a297..f85b68fa53d 100644
--- a/target/loongarch/tcg/tlb_helper.c
+++ b/target/loongarch/tcg/tlb_helper.c
@@ -595,7 +595,7 @@ bool loongarch_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
 }
 
 target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
-                          target_ulong level, uint32_t mem_idx)
+                          uint32_t level, uint32_t mem_idx)
 {
     CPUState *cs = env_cpu(env);
     target_ulong badvaddr, index, phys;
@@ -603,7 +603,7 @@ target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
 
     if (unlikely((level == 0) || (level > 4))) {
         qemu_log_mask(LOG_GUEST_ERROR,
-                      "Attepted LDDIR with level %"PRId64"\n", level);
+                      "Attepted LDDIR with level %u\n", level);
         return base;
     }
 
diff --git a/target/loongarch/tcg/insn_trans/trans_privileged.c.inc b/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
index a407ab51b74..64e53a44606 100644
--- a/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
+++ b/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
@@ -380,7 +380,7 @@ static bool trans_lddir(DisasContext *ctx, arg_lddir *a)
     if (check_plv(ctx)) {
         return false;
     }
-    gen_helper_lddir(dest, tcg_env, src, tcg_constant_tl(a->imm), mem_idx);
+    gen_helper_lddir(dest, tcg_env, src, tcg_constant_i32(a->imm), mem_idx);
     return true;
 }
 
-- 
2.51.0

Re: [PATCH 4/4] target/loongarch: Do not use target_ulong type for LDDIR level

Posted by gaosong 1 month ago

在 2025/10/10 上午4:19, Philippe Mathieu-Daudé 写道:
> The LDDIR level page table is a 5-bit immediate. Using the
> uint32_t type for it is sufficient. Avoid the target_ulong type.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/loongarch/cpu-mmu.h                             | 2 +-
>   target/loongarch/tcg/helper.h                          | 2 +-
>   target/loongarch/cpu_helper.c                          | 2 +-
>   target/loongarch/tcg/tlb_helper.c                      | 4 ++--
>   target/loongarch/tcg/insn_trans/trans_privileged.c.inc | 2 +-
>   5 files changed, 6 insertions(+), 6 deletions(-)
Signed-off-by: Song Gao <gaosong@loongson.cn>

Thanks.
Song Gao
> diff --git a/target/loongarch/cpu-mmu.h b/target/loongarch/cpu-mmu.h
> index 0068d22efcb..dbc69c7c0f2 100644
> --- a/target/loongarch/cpu-mmu.h
> +++ b/target/loongarch/cpu-mmu.h
> @@ -34,7 +34,7 @@ TLBRet get_physical_address(CPULoongArchState *env, MMUContext *context,
>                               MMUAccessType access_type, int mmu_idx,
>                               int is_debug);
>   void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
> -                               uint64_t *dir_width, target_ulong level);
> +                        uint64_t *dir_width, unsigned int level);
>   hwaddr loongarch_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
>   
>   #endif  /* LOONGARCH_CPU_MMU_H */
> diff --git a/target/loongarch/tcg/helper.h b/target/loongarch/tcg/helper.h
> index db57dbfc167..7e508c5a7b9 100644
> --- a/target/loongarch/tcg/helper.h
> +++ b/target/loongarch/tcg/helper.h
> @@ -129,7 +129,7 @@ DEF_HELPER_2(invtlb_all_asid, void, env, tl)
>   DEF_HELPER_3(invtlb_page_asid, void, env, tl, tl)
>   DEF_HELPER_3(invtlb_page_asid_or_g, void, env, tl, tl)
>   
> -DEF_HELPER_4(lddir, tl, env, tl, tl, i32)
> +DEF_HELPER_4(lddir, tl, env, tl, i32, i32)
>   DEF_HELPER_4(ldpte, void, env, tl, tl, i32)
>   DEF_HELPER_1(ertn, void, env)
>   DEF_HELPER_1(idle, void, env)
> diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c
> index 4a9db3ea4c1..867e7c88670 100644
> --- a/target/loongarch/cpu_helper.c
> +++ b/target/loongarch/cpu_helper.c
> @@ -17,7 +17,7 @@
>   #include "tcg/tcg_loongarch.h"
>   
>   void get_dir_base_width(CPULoongArchState *env, uint64_t *dir_base,
> -                        uint64_t *dir_width, target_ulong level)
> +                        uint64_t *dir_width, unsigned int level)
>   {
>       switch (level) {
>       case 1:
> diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c
> index 8cfce48a297..f85b68fa53d 100644
> --- a/target/loongarch/tcg/tlb_helper.c
> +++ b/target/loongarch/tcg/tlb_helper.c
> @@ -595,7 +595,7 @@ bool loongarch_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
>   }
>   
>   target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
> -                          target_ulong level, uint32_t mem_idx)
> +                          uint32_t level, uint32_t mem_idx)
>   {
>       CPUState *cs = env_cpu(env);
>       target_ulong badvaddr, index, phys;
> @@ -603,7 +603,7 @@ target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
>   
>       if (unlikely((level == 0) || (level > 4))) {
>           qemu_log_mask(LOG_GUEST_ERROR,
> -                      "Attepted LDDIR with level %"PRId64"\n", level);
> +                      "Attepted LDDIR with level %u\n", level);
>           return base;
>       }
>   
> diff --git a/target/loongarch/tcg/insn_trans/trans_privileged.c.inc b/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
> index a407ab51b74..64e53a44606 100644
> --- a/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
> +++ b/target/loongarch/tcg/insn_trans/trans_privileged.c.inc
> @@ -380,7 +380,7 @@ static bool trans_lddir(DisasContext *ctx, arg_lddir *a)
>       if (check_plv(ctx)) {
>           return false;
>       }
> -    gen_helper_lddir(dest, tcg_env, src, tcg_constant_tl(a->imm), mem_idx);
> +    gen_helper_lddir(dest, tcg_env, src, tcg_constant_i32(a->imm), mem_idx);
>       return true;
>   }
>

Re: [PATCH 4/4] target/loongarch: Do not use target_ulong type for LDDIR level

Posted by Richard Henderson 1 month ago

On 10/9/25 13:19, Philippe Mathieu-Daudé wrote:
> The LDDIR level page table is a 5-bit immediate. Using the
> uint32_t type for it is sufficient. Avoid the target_ulong type.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/loongarch/cpu-mmu.h                             | 2 +-
>   target/loongarch/tcg/helper.h                          | 2 +-
>   target/loongarch/cpu_helper.c                          | 2 +-
>   target/loongarch/tcg/tlb_helper.c                      | 4 ++--
>   target/loongarch/tcg/insn_trans/trans_privileged.c.inc | 2 +-
>   5 files changed, 6 insertions(+), 6 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

[PATCH 1/4] hw/loongarch/boot: Remove unnecessary cast to target_ulong
[PATCH 2/4] target/loongarch: Remove target_ulong use in gen_goto_tb()
[PATCH 3/4] target/loongarch: Remove target_ulong use in gdb_write_register handler
[PATCH 4/4] target/loongarch: Do not use target_ulong type for LDDIR level