mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 03:43:37 +08:00
target/loongarch: Fix the CSRRD CPUID instruction on big endian hosts
The test in tests/avocado/machine_loongarch.py is currently failing on big endian hosts like s390x. By comparing the traces between running the QEMU_EFI.fd bios on a s390x and on a x86 host, it's quickly obvious that the CSRRD instruction for the CPUID is behaving differently. And indeed: The code currently does a long read (i.e. 64 bit) from the address that points to the CPUState->cpu_index field (with tcg_gen_ld_tl() in the trans_csrrd() function). But this cpu_index field is only an "int" (i.e. 32 bit). While this dirty pointer magic works on little endian hosts, it of course fails on big endian hosts. Fix it by using a proper helper function instead. Message-Id: <20230720175307.854460-1-thuth@redhat.com> Reviewed-by: Song Gao <gaosong@loongson.cn> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
71a00a5bae
commit
c34ad45992
@ -342,6 +342,7 @@ typedef struct CPUArchState {
|
||||
uint64_t CSR_DBG;
|
||||
uint64_t CSR_DERA;
|
||||
uint64_t CSR_DSAVE;
|
||||
uint64_t CSR_CPUID;
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
LoongArchTLB tlb[LOONGARCH_TLB_MAX];
|
||||
|
@ -35,6 +35,15 @@ target_ulong helper_csrrd_pgd(CPULoongArchState *env)
|
||||
return v;
|
||||
}
|
||||
|
||||
target_ulong helper_csrrd_cpuid(CPULoongArchState *env)
|
||||
{
|
||||
LoongArchCPU *lac = env_archcpu(env);
|
||||
|
||||
env->CSR_CPUID = CPU(lac)->cpu_index;
|
||||
|
||||
return env->CSR_CPUID;
|
||||
}
|
||||
|
||||
target_ulong helper_csrrd_tval(CPULoongArchState *env)
|
||||
{
|
||||
LoongArchCPU *cpu = env_archcpu(env);
|
||||
|
@ -98,6 +98,7 @@ DEF_HELPER_1(rdtime_d, i64, env)
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
/* CSRs helper */
|
||||
DEF_HELPER_1(csrrd_pgd, i64, env)
|
||||
DEF_HELPER_1(csrrd_cpuid, i64, env)
|
||||
DEF_HELPER_1(csrrd_tval, i64, env)
|
||||
DEF_HELPER_2(csrwr_estat, i64, env, tl)
|
||||
DEF_HELPER_2(csrwr_asid, i64, env, tl)
|
||||
|
@ -99,13 +99,7 @@ static const CSRInfo csr_info[] = {
|
||||
CSR_OFF(PWCH),
|
||||
CSR_OFF(STLBPS),
|
||||
CSR_OFF(RVACFG),
|
||||
[LOONGARCH_CSR_CPUID] = {
|
||||
.offset = (int)offsetof(CPUState, cpu_index)
|
||||
- (int)offsetof(LoongArchCPU, env),
|
||||
.flags = CSRFL_READONLY,
|
||||
.readfn = NULL,
|
||||
.writefn = NULL
|
||||
},
|
||||
CSR_OFF_FUNCS(CPUID, CSRFL_READONLY, gen_helper_csrrd_cpuid, NULL),
|
||||
CSR_OFF_FLAGS(PRCFG1, CSRFL_READONLY),
|
||||
CSR_OFF_FLAGS(PRCFG2, CSRFL_READONLY),
|
||||
CSR_OFF_FLAGS(PRCFG3, CSRFL_READONLY),
|
||||
|
Loading…
Reference in New Issue
Block a user