SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Expand TBFLAG_ANY.MMUIDX to 4 bits

Browse Source 
We are about to expand the number of mmuidx to 10, and so need 4 bits.
For the benefit of reading the number out of -d exec, align it to the
penultimate nibble.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200206105448.4726-17-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-02-07 14:04:23 +00:00 committed by Peter Maydell
parent 79cabf1f47
commit 506f149815
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/arm/cpu.h
View File

@ -3214,7 +3214,7 @@ typedef ARMCPU ArchCPU;
* We put flags which are shared between 32 and 64 bit mode at the top * We put flags which are shared between 32 and 64 bit mode at the top
* of the word, and flags which apply to only one mode at the bottom. * of the word, and flags which apply to only one mode at the bottom.
* *
* 31 21 18 14 9 0 * 31 20 18 14 9 0
* +--------------+-----+-----+----------+--------------+ * +--------------+-----+-----+----------+--------------+
* | | | TBFLAG_A32 | | * | | | TBFLAG_A32 | |
* | | +-----+----------+ TBFLAG_AM32 | * | | +-----+----------+ TBFLAG_AM32 |
@ -3222,19 +3222,19 @@ typedef ARMCPU ArchCPU;
* | | +-------------------------| * | | +-------------------------|
* | | | TBFLAG_A64 | * | | | TBFLAG_A64 |
* +--------------+-----------+-------------------------+ * +--------------+-----------+-------------------------+
* 31 21 14 0 * 31 20 14 0
* *
* Unless otherwise noted, these bits are cached in env->hflags. * Unless otherwise noted, these bits are cached in env->hflags.
*/ */
FIELD(TBFLAG_ANY, AARCH64_STATE, 31, 1) FIELD(TBFLAG_ANY, AARCH64_STATE, 31, 1)
FIELD(TBFLAG_ANY, MMUIDX, 28, 3) FIELD(TBFLAG_ANY, SS_ACTIVE, 30, 1)
FIELD(TBFLAG_ANY, SS_ACTIVE, 27, 1) FIELD(TBFLAG_ANY, PSTATE_SS, 29, 1) /* Not cached. */
FIELD(TBFLAG_ANY, PSTATE_SS, 26, 1) /* Not cached. */ FIELD(TBFLAG_ANY, BE_DATA, 28, 1)
FIELD(TBFLAG_ANY, MMUIDX, 24, 4)
/* Target EL if we take a floating-point-disabled exception */ /* Target EL if we take a floating-point-disabled exception */
FIELD(TBFLAG_ANY, FPEXC_EL, 24, 2) FIELD(TBFLAG_ANY, FPEXC_EL, 22, 2)
FIELD(TBFLAG_ANY, BE_DATA, 23, 1)
/* For A-profile only, target EL for debug exceptions. */ /* For A-profile only, target EL for debug exceptions. */
FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 21, 2) FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 20, 2)
/* /*
* Bit usage when in AArch32 state, both A- and M-profile. * Bit usage when in AArch32 state, both A- and M-profile.