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

target/i386: Remove ra parameter from ptw_translate 

This argument is no longer used.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20241013184733.1423747-4-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-10-13 11:47:33 -07:00
parent 115ade42d5
commit e46fbc7d50
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/i386/tcg/sysemu/excp_helper.c
View File

@ -60,7 +60,7 @@ typedef struct PTETranslate {
hwaddr gaddr; hwaddr gaddr;
} PTETranslate; } PTETranslate;
static bool ptw_translate(PTETranslate *inout, hwaddr addr, uint64_t ra) static bool ptw_translate(PTETranslate *inout, hwaddr addr)
{ {
int flags; int flags;
@ -166,7 +166,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 5 * Page table level 5
*/ */
pte_addr = (in->cr3 & ~0xfff) + (((addr >> 48) & 0x1ff) << 3); pte_addr = (in->cr3 & ~0xfff) + (((addr >> 48) & 0x1ff) << 3);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
restart_5: restart_5:
@ -190,7 +190,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 4 * Page table level 4
*/ */
pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3); pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
restart_4: restart_4:
@ -210,7 +210,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 3 * Page table level 3
*/ */
pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 30) & 0x1ff) << 3); pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 30) & 0x1ff) << 3);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
restart_3_lma: restart_3_lma:
@ -237,7 +237,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 3 * Page table level 3
*/ */
pte_addr = (in->cr3 & 0xffffffe0ULL) + ((addr >> 27) & 0x18); pte_addr = (in->cr3 & 0xffffffe0ULL) + ((addr >> 27) & 0x18);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
rsvd_mask |= PG_HI_USER_MASK; rsvd_mask |= PG_HI_USER_MASK;
@ -259,7 +259,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 2 * Page table level 2
*/ */
pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3); pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
restart_2_pae: restart_2_pae:
@ -285,7 +285,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 1 * Page table level 1
*/ */
pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3); pte_addr = (pte & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
pte = ptw_ldq(&pte_trans, ra); pte = ptw_ldq(&pte_trans, ra);
@ -303,7 +303,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 2 * Page table level 2
*/ */
pte_addr = (in->cr3 & 0xfffff000ULL) + ((addr >> 20) & 0xffc); pte_addr = (in->cr3 & 0xfffff000ULL) + ((addr >> 20) & 0xffc);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
restart_2_nopae: restart_2_nopae:
@ -332,7 +332,7 @@ static bool mmu_translate(CPUX86State *env, const TranslateParams *in,
* Page table level 1 * Page table level 1
*/ */
pte_addr = (pte & ~0xfffu) + ((addr >> 10) & 0xffc); pte_addr = (pte & ~0xfffu) + ((addr >> 10) & 0xffc);
if (!ptw_translate(&pte_trans, pte_addr, ra)) { if (!ptw_translate(&pte_trans, pte_addr)) {
return false; return false;
} }
pte = ptw_ldl(&pte_trans, ra); pte = ptw_ldl(&pte_trans, ra);