diff mbox series

[v1,08/16] target/riscv: fpu_helper: Match function defs in HELPER macros

Message ID 8786fd77439c26f677eeac2eccedf75ba3b68bb4.1603467169.git.alistair.francis@wdc.com
State New
Headers show
Series RISC-V: Start to remove xlen preprocess | expand

Commit Message

Alistair Francis Oct. 23, 2020, 3:33 p.m. UTC 
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 target/riscv/fpu_helper.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Bin Meng Oct. 26, 2020, 8:56 a.m. UTC | #1 
On Fri, Oct 23, 2020 at 11:44 PM Alistair Francis
<alistair.francis@wdc.com> wrote:
>


Could you please put some details as to why changing uint64_t to
target_ulong (and vice versa) is needed?

> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

> ---

>  target/riscv/fpu_helper.c | 16 ++++++++--------

>  1 file changed, 8 insertions(+), 8 deletions(-)

>

> diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c

> index bb346a8249..507d7fe7fa 100644

> --- a/target/riscv/fpu_helper.c

> +++ b/target/riscv/fpu_helper.c

> @@ -224,13 +224,13 @@ target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1)

>  }

>

>  #if defined(TARGET_RISCV64)

> -uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)

> +target_ulong helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)

>  {

>      float32 frs1 = check_nanbox_s(rs1);

>      return float32_to_int64(frs1, &env->fp_status);

>  }

>

> -uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)

> +target_ulong helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)

>  {

>      float32 frs1 = check_nanbox_s(rs1);

>      return float32_to_uint64(frs1, &env->fp_status);

> @@ -248,12 +248,12 @@ uint64_t helper_fcvt_s_wu(CPURISCVState *env, target_ulong rs1)

>  }

>

>  #if defined(TARGET_RISCV64)

> -uint64_t helper_fcvt_s_l(CPURISCVState *env, uint64_t rs1)

> +uint64_t helper_fcvt_s_l(CPURISCVState *env, target_ulong rs1)

>  {

>      return nanbox_s(int64_to_float32(rs1, &env->fp_status));

>  }

>

> -uint64_t helper_fcvt_s_lu(CPURISCVState *env, uint64_t rs1)

> +uint64_t helper_fcvt_s_lu(CPURISCVState *env, target_ulong rs1)

>  {

>      return nanbox_s(uint64_to_float32(rs1, &env->fp_status));

>  }

> @@ -337,12 +337,12 @@ target_ulong helper_fcvt_wu_d(CPURISCVState *env, uint64_t frs1)

>  }

>

>  #if defined(TARGET_RISCV64)

> -uint64_t helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)

> +target_ulong helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)

>  {

>      return float64_to_int64(frs1, &env->fp_status);

>  }

>

> -uint64_t helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)

> +target_ulong helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)

>  {

>      return float64_to_uint64(frs1, &env->fp_status);

>  }

> @@ -359,12 +359,12 @@ uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1)

>  }

>

>  #if defined(TARGET_RISCV64)

> -uint64_t helper_fcvt_d_l(CPURISCVState *env, uint64_t rs1)

> +uint64_t helper_fcvt_d_l(CPURISCVState *env, target_ulong rs1)

>  {

>      return int64_to_float64(rs1, &env->fp_status);

>  }

>

> -uint64_t helper_fcvt_d_lu(CPURISCVState *env, uint64_t rs1)

> +uint64_t helper_fcvt_d_lu(CPURISCVState *env, target_ulong rs1)

>  {

>      return uint64_to_float64(rs1, &env->fp_status);

>  }

> --


Regards,
Bin
Alistair Francis Oct. 26, 2020, 3:16 p.m. UTC | #2 
On Mon, Oct 26, 2020 at 1:56 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>

> On Fri, Oct 23, 2020 at 11:44 PM Alistair Francis

> <alistair.francis@wdc.com> wrote:

> >

>

> Could you please put some details as to why changing uint64_t to

> target_ulong (and vice versa) is needed?


Done!

Alistair

>

> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

> > ---

> >  target/riscv/fpu_helper.c | 16 ++++++++--------

> >  1 file changed, 8 insertions(+), 8 deletions(-)

> >

> > diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c

> > index bb346a8249..507d7fe7fa 100644

> > --- a/target/riscv/fpu_helper.c

> > +++ b/target/riscv/fpu_helper.c

> > @@ -224,13 +224,13 @@ target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1)

> >  }

> >

> >  #if defined(TARGET_RISCV64)

> > -uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)

> > +target_ulong helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)

> >  {

> >      float32 frs1 = check_nanbox_s(rs1);

> >      return float32_to_int64(frs1, &env->fp_status);

> >  }

> >

> > -uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)

> > +target_ulong helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)

> >  {

> >      float32 frs1 = check_nanbox_s(rs1);

> >      return float32_to_uint64(frs1, &env->fp_status);

> > @@ -248,12 +248,12 @@ uint64_t helper_fcvt_s_wu(CPURISCVState *env, target_ulong rs1)

> >  }

> >

> >  #if defined(TARGET_RISCV64)

> > -uint64_t helper_fcvt_s_l(CPURISCVState *env, uint64_t rs1)

> > +uint64_t helper_fcvt_s_l(CPURISCVState *env, target_ulong rs1)

> >  {

> >      return nanbox_s(int64_to_float32(rs1, &env->fp_status));

> >  }

> >

> > -uint64_t helper_fcvt_s_lu(CPURISCVState *env, uint64_t rs1)

> > +uint64_t helper_fcvt_s_lu(CPURISCVState *env, target_ulong rs1)

> >  {

> >      return nanbox_s(uint64_to_float32(rs1, &env->fp_status));

> >  }

> > @@ -337,12 +337,12 @@ target_ulong helper_fcvt_wu_d(CPURISCVState *env, uint64_t frs1)

> >  }

> >

> >  #if defined(TARGET_RISCV64)

> > -uint64_t helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)

> > +target_ulong helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)

> >  {

> >      return float64_to_int64(frs1, &env->fp_status);

> >  }

> >

> > -uint64_t helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)

> > +target_ulong helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)

> >  {

> >      return float64_to_uint64(frs1, &env->fp_status);

> >  }

> > @@ -359,12 +359,12 @@ uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1)

> >  }

> >

> >  #if defined(TARGET_RISCV64)

> > -uint64_t helper_fcvt_d_l(CPURISCVState *env, uint64_t rs1)

> > +uint64_t helper_fcvt_d_l(CPURISCVState *env, target_ulong rs1)

> >  {

> >      return int64_to_float64(rs1, &env->fp_status);

> >  }

> >

> > -uint64_t helper_fcvt_d_lu(CPURISCVState *env, uint64_t rs1)

> > +uint64_t helper_fcvt_d_lu(CPURISCVState *env, target_ulong rs1)

> >  {

> >      return uint64_to_float64(rs1, &env->fp_status);

> >  }

> > --

>

> Regards,

> Bin
diff mbox series

Patch

diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c
index bb346a8249..507d7fe7fa 100644
--- a/target/riscv/fpu_helper.c
+++ b/target/riscv/fpu_helper.c
@@ -224,13 +224,13 @@  target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1)
 }
 
 #if defined(TARGET_RISCV64)
-uint64_t helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)
+target_ulong helper_fcvt_l_s(CPURISCVState *env, uint64_t rs1)
 {
     float32 frs1 = check_nanbox_s(rs1);
     return float32_to_int64(frs1, &env->fp_status);
 }
 
-uint64_t helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)
+target_ulong helper_fcvt_lu_s(CPURISCVState *env, uint64_t rs1)
 {
     float32 frs1 = check_nanbox_s(rs1);
     return float32_to_uint64(frs1, &env->fp_status);
@@ -248,12 +248,12 @@  uint64_t helper_fcvt_s_wu(CPURISCVState *env, target_ulong rs1)
 }
 
 #if defined(TARGET_RISCV64)
-uint64_t helper_fcvt_s_l(CPURISCVState *env, uint64_t rs1)
+uint64_t helper_fcvt_s_l(CPURISCVState *env, target_ulong rs1)
 {
     return nanbox_s(int64_to_float32(rs1, &env->fp_status));
 }
 
-uint64_t helper_fcvt_s_lu(CPURISCVState *env, uint64_t rs1)
+uint64_t helper_fcvt_s_lu(CPURISCVState *env, target_ulong rs1)
 {
     return nanbox_s(uint64_to_float32(rs1, &env->fp_status));
 }
@@ -337,12 +337,12 @@  target_ulong helper_fcvt_wu_d(CPURISCVState *env, uint64_t frs1)
 }
 
 #if defined(TARGET_RISCV64)
-uint64_t helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)
+target_ulong helper_fcvt_l_d(CPURISCVState *env, uint64_t frs1)
 {
     return float64_to_int64(frs1, &env->fp_status);
 }
 
-uint64_t helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)
+target_ulong helper_fcvt_lu_d(CPURISCVState *env, uint64_t frs1)
 {
     return float64_to_uint64(frs1, &env->fp_status);
 }
@@ -359,12 +359,12 @@  uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1)
 }
 
 #if defined(TARGET_RISCV64)
-uint64_t helper_fcvt_d_l(CPURISCVState *env, uint64_t rs1)
+uint64_t helper_fcvt_d_l(CPURISCVState *env, target_ulong rs1)
 {
     return int64_to_float64(rs1, &env->fp_status);
 }
 
-uint64_t helper_fcvt_d_lu(CPURISCVState *env, uint64_t rs1)
+uint64_t helper_fcvt_d_lu(CPURISCVState *env, target_ulong rs1)
 {
     return uint64_to_float64(rs1, &env->fp_status);
 }