[v2] target/loongarch: LoongArch32 fixes 1

[PATCH v2 3/9] target/loongarch: Fix PGD CSR for LoongArch32

Posted by Jiaxun Yang 1 month, 1 week ago

As per manual, the source of PGD CSR is relevant to highest bit of
BADV. In LoongArch32, all CSRs are 32 bits only, thus we should check
bit 31 of BADV to determine PGDH/PGDL for LoongArch32.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 target/loongarch/tcg/csr_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/loongarch/tcg/csr_helper.c b/target/loongarch/tcg/csr_helper.c
index 15f94caefabc7722263fa46e948e21de37b4203c..821aa6af46ea2129d771fdc937eca72317cefc1e 100644
--- a/target/loongarch/tcg/csr_helper.c
+++ b/target/loongarch/tcg/csr_helper.c
@@ -26,7 +26,7 @@ target_ulong helper_csrrd_pgd(CPULoongArchState *env)
         v = env->CSR_BADV;
     }
 
-    if ((v >> 63) & 0x1) {
+    if (extract64(v, is_la64(env) ? 63 : 31, 1)) {
         v = env->CSR_PGDH;
     } else {
         v = env->CSR_PGDL;

-- 
2.43.0

Re: [PATCH v2 3/9] target/loongarch: Fix PGD CSR for LoongArch32

Posted by Philippe Mathieu-Daudé 1 month ago

On 25/2/25 01:40, Jiaxun Yang wrote:
> As per manual, the source of PGD CSR is relevant to highest bit of
> BADV. In LoongArch32, all CSRs are 32 bits only, thus we should check
> bit 31 of BADV to determine PGDH/PGDL for LoongArch32.
> 
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
>   target/loongarch/tcg/csr_helper.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>