diff mbox series

[v1,4/7] s390x/tcg: Factor out vec_full_reg_offset()

Message ID 20190225115552.7534-5-david@redhat.com (mailing list archive)
State New, archived
Headers show
Series s390x/tcg: Cleanups and refactorings for Vector | expand

Commit Message

David Hildenbrand Feb. 25, 2019, 11:55 a.m. UTC 
We'll use that a lot along with gvec helpers, to calculate the start
address of a vector.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 target/s390x/translate.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Thomas Huth Feb. 25, 2019, 12:32 p.m. UTC | #1 
On 25/02/2019 12.55, David Hildenbrand wrote:
> We'll use that a lot along with gvec helpers, to calculate the start
> address of a vector.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  target/s390x/translate.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 916508b567..f8c285a685 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -145,12 +145,17 @@ void s390x_translate_init(void)
>      }
>  }
>  
> +static inline int vec_full_reg_offset(uint8_t reg)
> +{
> +    g_assert(reg < 32);
> +    return offsetof(CPUS390XState, vregs[reg][0].d);
> +}
> +
>  static inline int vec_reg_offset(uint8_t reg, uint8_t enr, TCGMemOp es)
>  {
>      const uint8_t bytes = 1 << es;
>      int offs = enr * bytes;
>  
> -    g_assert(reg < 32);
>      /*
>       * vregs[n][0] is the lowest 8 byte and vregs[n][1] the highest 8 byte
>       * of the 16 byte vector, on both, little and big endian systems.
> @@ -177,7 +182,7 @@ static inline int vec_reg_offset(uint8_t reg, uint8_t enr, TCGMemOp es)
>  #ifndef HOST_WORDS_BIGENDIAN
>      offs ^= (8 - bytes);
>  #endif
> -    return offs + offsetof(CPUS390XState, vregs[reg][0].d);
> +    return offs + vec_full_reg_offset(reg);
>  }
>  
>  static inline int freg64_offset(uint8_t reg)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 916508b567..f8c285a685 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -145,12 +145,17 @@  void s390x_translate_init(void)
     }
 }
 
+static inline int vec_full_reg_offset(uint8_t reg)
+{
+    g_assert(reg < 32);
+    return offsetof(CPUS390XState, vregs[reg][0].d);
+}
+
 static inline int vec_reg_offset(uint8_t reg, uint8_t enr, TCGMemOp es)
 {
     const uint8_t bytes = 1 << es;
     int offs = enr * bytes;
 
-    g_assert(reg < 32);
     /*
      * vregs[n][0] is the lowest 8 byte and vregs[n][1] the highest 8 byte
      * of the 16 byte vector, on both, little and big endian systems.
@@ -177,7 +182,7 @@  static inline int vec_reg_offset(uint8_t reg, uint8_t enr, TCGMemOp es)
 #ifndef HOST_WORDS_BIGENDIAN
     offs ^= (8 - bytes);
 #endif
-    return offs + offsetof(CPUS390XState, vregs[reg][0].d);
+    return offs + vec_full_reg_offset(reg);
 }
 
 static inline int freg64_offset(uint8_t reg)