[PATCH v2 09/14] target/arm: Widen cpsr_{read, write}_for_spsr_elx to uint64_t

[Richard Henderson]

We will shortly need to handle bit 36: PSTATE.UINJ.

Reviewed-by: Philippe Mathieu-Daudé <phi...@oss.qualcomm.com>
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
 target/arm/internals.h | 4 ++--
 target/arm/helper.c    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/arm/internals.h b/target/arm/internals.h
index 1efda543270..843e12487ec 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -2016,8 +2016,8 @@ void vfp_clear_float_status_exc_flags(CPUARMState *env);
  */
 void vfp_set_fpcr_to_host(CPUARMState *env, uint32_t val, uint32_t mask);
 bool arm_pan_enabled(CPUARMState *env);
-uint32_t cpsr_read_for_spsr_elx(CPUARMState *env);
-void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val);
+uint64_t cpsr_read_for_spsr_elx(CPUARMState *env);
+void cpsr_write_from_spsr_elx(CPUARMState *env, uint64_t val);
 
 /* Compare uint64_t for qsort and bsearch. */
 int compare_u64(const void *a, const void *b);
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 0111cbeac03..2034f1d1f17 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -9376,9 +9376,9 @@ static int aarch64_regnum(CPUARMState *env, int 
aarch32_reg)
     }
 }
 
-uint32_t cpsr_read_for_spsr_elx(CPUARMState *env)
+uint64_t cpsr_read_for_spsr_elx(CPUARMState *env)
 {
-    uint32_t ret = cpsr_read(env);
+    uint64_t ret = cpsr_read(env);
 
     /* Move DIT to the correct location for SPSR_ELx */
     if (ret & CPSR_DIT) {
@@ -9391,7 +9391,7 @@ uint32_t cpsr_read_for_spsr_elx(CPUARMState *env)
     return ret;
 }
 
-void cpsr_write_from_spsr_elx(CPUARMState *env, uint32_t val)
+void cpsr_write_from_spsr_elx(CPUARMState *env, uint64_t val)
 {
     uint32_t mask;
 
-- 
2.53.0