yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-22 02:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Rename check_s2_startlevel to check_s2_mmu_setup

Browse source 
Rename check_s2_startlevel to check_s2_mmu_setup in preparation
for additional checks.

Backports commit a0e966c93a0968d29ef51447d08a6b7be6f4d757 from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-19 01:16:06 -05:00 committed by Lioncash
parent bab59f6b18
commit 71f370d549
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/target-arm/helper.c
View file

@ -6110,17 +6110,18 @@ typedef enum {
} MMUFaultType; } MMUFaultType;
/* /*
* check_s2_startlevel * check_s2_mmu_setup
* @cpu: ARMCPU * @cpu: ARMCPU
* @is_aa64: True if the translation regime is in AArch64 state * @is_aa64: True if the translation regime is in AArch64 state
* @startlevel: Suggested starting level * @startlevel: Suggested starting level
* @inputsize: Bitsize of IPAs * @inputsize: Bitsize of IPAs
* @stride: Page-table stride (See the ARM ARM) * @stride: Page-table stride (See the ARM ARM)
* *
* Returns true if the suggested starting level is OK and false otherwise. * Returns true if the suggested S2 translation parameters are OK and
* false otherwise.
*/ */
static bool check_s2_startlevel(ARMCPU *cpu, bool is_aa64, int level, static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, int level,
int inputsize, int stride) int inputsize, int stride)
{ {
const int grainsize = stride + 3; const int grainsize = stride + 3;
int startsizecheck; int startsizecheck;
@ -6360,8 +6361,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
/* Check that the starting level is valid. */ /* Check that the starting level is valid. */
ok = check_s2_startlevel(cpu, va_size == 64, level, ok = check_s2_mmu_setup(cpu, va_size == 64, level, inputsize, stride);
inputsize, stride);
if (!ok) { if (!ok) {
/* AArch64 reports these as level 0 faults. /* AArch64 reports these as level 0 faults.
* AArch32 reports these as level 1 faults. * AArch32 reports these as level 1 faults.