Commit 7fbb535f authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Move NS TBFLAG from bit 19 to bit 6 



Move the NS TBFLAG down from bit 19 to bit 6, which has not
been used since commit c1e37810 in 2015, when we
started passing the entire MMU index in the TB flags rather
than just a 'privilege level' bit.

This rearrangement is not strictly necessary, but means that
we can put M-profile-only bits next to each other rather
than scattered across the flag word.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20190416125744.27770-17-peter.maydell@linaro.org
parent 6808c4d2

target/arm/cpu.h

+6 −5
Original line number Diff line number Diff line
@@ -3138,6 +3138,12 @@ FIELD(TBFLAG_ANY, BE_DATA, 23, 1) 
FIELD(TBFLAG_A32, THUMB, 0, 1)

FIELD(TBFLAG_A32, VECLEN, 1, 3)

FIELD(TBFLAG_A32, VECSTRIDE, 4, 2)

/*

 * Indicates whether cp register reads and writes by guest code should access

 * the secure or nonsecure bank of banked registers; note that this is not

 * the same thing as the current security state of the processor!

 */

FIELD(TBFLAG_A32, NS, 6, 1)

FIELD(TBFLAG_A32, VFPEN, 7, 1)

FIELD(TBFLAG_A32, CONDEXEC, 8, 8)

FIELD(TBFLAG_A32, SCTLR_B, 16, 1)
@@ -3145,11 +3151,6 @@ FIELD(TBFLAG_A32, SCTLR_B, 16, 1) 
 * checks on the other bits at runtime

 */

FIELD(TBFLAG_A32, XSCALE_CPAR, 17, 2)

/* Indicates whether cp register reads and writes by guest code should access

 * the secure or nonsecure bank of banked registers; note that this is not

 * the same thing as the current security state of the processor!

 */

FIELD(TBFLAG_A32, NS, 19, 1)

/* For M profile only, Handler (ie not Thread) mode */

FIELD(TBFLAG_A32, HANDLER, 21, 1)

/* For M profile only, whether we should generate stack-limit checks */