diff options
| author | Greg Bellows | 2014-10-24 13:19:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-10-24 13:19:14 +0200 |
| commit | dcbff19bd07c198f4f9bdbf2db740a8e282dd5f6 (patch) | |
| tree | a304e8bdf598a72b540eb0b84ab4bca496b7f4d3 /target-arm/internals.h | |
| parent | target-arm: reject switching to monitor mode (diff) | |
| download | qemu-dcbff19bd07c198f4f9bdbf2db740a8e282dd5f6.tar.gz qemu-dcbff19bd07c198f4f9bdbf2db740a8e282dd5f6.tar.xz qemu-dcbff19bd07c198f4f9bdbf2db740a8e282dd5f6.zip | |
target-arm: rename arm_current_pl to arm_current_el
Renamed the arm_current_pl CPU function to more accurately represent that it
returns the ARMv8 EL rather than ARMv7 PL.
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1413910544-20150-5-git-send-email-greg.bellows@linaro.org
[PMM: fixed a minor merge resolution error in a couple of hunks]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/internals.h')
| -rw-r--r-- | target-arm/internals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/internals.h b/target-arm/internals.h index 51c5c16446..2dff4ffb19 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -130,7 +130,7 @@ static inline void aarch64_restore_sp(CPUARMState *env, int el) static inline void update_spsel(CPUARMState *env, uint32_t imm) { - unsigned int cur_el = arm_current_pl(env); + unsigned int cur_el = arm_current_el(env); /* Update PSTATE SPSel bit; this requires us to update the * working stack pointer in xregs[31]. */ |