ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Move be test for regime into S1TranslateResult 

Hoist this test out of arm_ld[lq]_ptw into S1_ptw_translate.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221011031911.2408754-10-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-10 20:18:56 -07:00 committed by Peter Maydell
parent 4a35855682
commit 4e7a2c9860
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/arm/ptw.c
View File

@ -19,6 +19,7 @@ typedef struct S1Translate {
bool in_secure; bool in_secure;
bool in_debug; bool in_debug;
bool out_secure; bool out_secure;
bool out_be;
hwaddr out_phys; hwaddr out_phys;
} S1Translate; } S1Translate;
@ -277,6 +278,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw,
ptw->out_secure = is_secure; ptw->out_secure = is_secure;
ptw->out_phys = addr; ptw->out_phys = addr;
ptw->out_be = regime_translation_big_endian(env, ptw->in_mmu_idx);
return true; return true;
} }
@ -296,7 +298,7 @@ static uint32_t arm_ldl_ptw(CPUARMState *env, S1Translate *ptw, hwaddr addr,
addr = ptw->out_phys; addr = ptw->out_phys;
attrs.secure = ptw->out_secure; attrs.secure = ptw->out_secure;
as = arm_addressspace(cs, attrs); as = arm_addressspace(cs, attrs);
if (regime_translation_big_endian(env, ptw->in_mmu_idx)) { if (ptw->out_be) {
data = address_space_ldl_be(as, addr, attrs, &result); data = address_space_ldl_be(as, addr, attrs, &result);
} else { } else {
data = address_space_ldl_le(as, addr, attrs, &result); data = address_space_ldl_le(as, addr, attrs, &result);
@ -324,7 +326,7 @@ static uint64_t arm_ldq_ptw(CPUARMState *env, S1Translate *ptw, hwaddr addr,
addr = ptw->out_phys; addr = ptw->out_phys;
attrs.secure = ptw->out_secure; attrs.secure = ptw->out_secure;
as = arm_addressspace(cs, attrs); as = arm_addressspace(cs, attrs);
if (regime_translation_big_endian(env, ptw->in_mmu_idx)) { if (ptw->out_be) {
data = address_space_ldq_be(as, addr, attrs, &result); data = address_space_ldq_be(as, addr, attrs, &result);
} else { } else {
data = address_space_ldq_le(as, addr, attrs, &result); data = address_space_ldq_le(as, addr, attrs, &result);