[3/1] target/arm: Fix GETPC usage in do_paired_cmpxchg64_l/be

Message ID 20171114134153.11167-1-richard.henderson@linaro.org
State New
Headers show
Series
  • tcg: Record code_gen_buffer address for user-only memory helpers
Related show

Commit Message

Richard Henderson Nov. 14, 2017, 1:41 p.m.
Use of GETPC must be restricted to those functions that are
directly called from TCG generated code.

Fixes: 2399d4e7cec22ecf1c51062d2ebfd45220dbaace
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/helper-a64.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

Alex Bennée Nov. 14, 2017, 4:11 p.m. | #1
Richard Henderson <richard.henderson@linaro.org> writes:

> Use of GETPC must be restricted to those functions that are
> directly called from TCG generated code.
>
> Fixes: 2399d4e7cec22ecf1c51062d2ebfd45220dbaace
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  target/arm/helper-a64.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
> index 96a3ecf707..b84ebcae6e 100644
> --- a/target/arm/helper-a64.c
> +++ b/target/arm/helper-a64.c
> @@ -432,9 +432,8 @@ uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes)
>  /* Returns 0 on success; 1 otherwise.  */
>  static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
>                                         uint64_t new_lo, uint64_t new_hi,
> -                                       bool parallel)
> +                                       bool parallel, uintptr_t ra)
>  {
> -    uintptr_t ra = GETPC();
>      Int128 oldv, cmpv, newv;
>      bool success;
>
> @@ -491,20 +490,19 @@ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
>  uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr,
>                                                uint64_t new_lo, uint64_t new_hi)
>  {
> -    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false);
> +    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false, GETPC());
>  }
>
>  uint64_t HELPER(paired_cmpxchg64_le_parallel)(CPUARMState *env, uint64_t addr,
>                                                uint64_t new_lo, uint64_t new_hi)
>  {
> -    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true);
> +    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true, GETPC());
>  }
>
>  static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
>                                         uint64_t new_lo, uint64_t new_hi,
> -                                       bool parallel)
> +                                       bool parallel, uintptr_t ra)
>  {
> -    uintptr_t ra = GETPC();
>      Int128 oldv, cmpv, newv;
>      bool success;
>
> @@ -561,11 +559,11 @@ static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
>  uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr,
>                                       uint64_t new_lo, uint64_t new_hi)
>  {
> -    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false);
> +    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false, GETPC());
>  }
>
>  uint64_t HELPER(paired_cmpxchg64_be_parallel)(CPUARMState *env, uint64_t addr,
>                                       uint64_t new_lo, uint64_t new_hi)
>  {
> -    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true);
> +    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true, GETPC());
>  }


--
Alex Bennée

Patch

diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
index 96a3ecf707..b84ebcae6e 100644
--- a/target/arm/helper-a64.c
+++ b/target/arm/helper-a64.c
@@ -432,9 +432,8 @@  uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes)
 /* Returns 0 on success; 1 otherwise.  */
 static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
                                        uint64_t new_lo, uint64_t new_hi,
-                                       bool parallel)
+                                       bool parallel, uintptr_t ra)
 {
-    uintptr_t ra = GETPC();
     Int128 oldv, cmpv, newv;
     bool success;
 
@@ -491,20 +490,19 @@  static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr,
 uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr,
                                               uint64_t new_lo, uint64_t new_hi)
 {
-    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false);
+    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false, GETPC());
 }
 
 uint64_t HELPER(paired_cmpxchg64_le_parallel)(CPUARMState *env, uint64_t addr,
                                               uint64_t new_lo, uint64_t new_hi)
 {
-    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true);
+    return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true, GETPC());
 }
 
 static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
                                        uint64_t new_lo, uint64_t new_hi,
-                                       bool parallel)
+                                       bool parallel, uintptr_t ra)
 {
-    uintptr_t ra = GETPC();
     Int128 oldv, cmpv, newv;
     bool success;
 
@@ -561,11 +559,11 @@  static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr,
 uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr,
                                      uint64_t new_lo, uint64_t new_hi)
 {
-    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false);
+    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false, GETPC());
 }
 
 uint64_t HELPER(paired_cmpxchg64_be_parallel)(CPUARMState *env, uint64_t addr,
                                      uint64_t new_lo, uint64_t new_hi)
 {
-    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true);
+    return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true, GETPC());
 }