Patchwork [v2,1/9] target-ppc: remove old CONFIG_SOFTFLOAT #ifdef

login
register
mail settings
Submitter Aurelien Jarno
Date May 23, 2011, 9:42 p.m.
Message ID <1306186971-9528-2-git-send-email-aurelien@aurel32.net>
Download mbox | patch
Permalink /patch/97082/
State New
Headers show

Comments

Aurelien Jarno - May 23, 2011, 9:42 p.m.
target-ppc has been switched to softfloat only long ago, but a
few #ifdef CONFIG_SOFTFLOAT have been forgotten. Remove them.

Cc: Alexander Graf <agraf@suse.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 target-ppc/helper.h    |    2 --
 target-ppc/op_helper.c |   11 -----------
 target-ppc/translate.c |    2 --
 3 files changed, 0 insertions(+), 15 deletions(-)
Andreas Färber - May 29, 2011, 10:58 a.m.
Am 23.05.2011 um 23:42 schrieb Aurelien Jarno:

> target-ppc has been switched to softfloat only long ago, but a
> few #ifdef CONFIG_SOFTFLOAT have been forgotten. Remove them.
>
> Cc: Alexander Graf <agraf@suse.de>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Only removes now-useless #ifdefs and dead code. The dead code in  
helper_float_check_status() differs from the softfloat code path in  
that the softfloat path also evaluations the softfloat status and  
calls some exception helpers. So we're not losing anything.

Acked-by: Andreas Färber <andreas.faerber@web.de>

> ---
> target-ppc/helper.h    |    2 --
> target-ppc/op_helper.c |   11 -----------
> target-ppc/translate.c |    2 --
> 3 files changed, 0 insertions(+), 15 deletions(-)
>
> diff --git a/target-ppc/helper.h b/target-ppc/helper.h
> index 51c99c8..470e42f 100644
> --- a/target-ppc/helper.h
> +++ b/target-ppc/helper.h
> @@ -51,9 +51,7 @@ DEF_HELPER_FLAGS_1(cntlzw32, TCG_CALL_CONST |  
> TCG_CALL_PURE, i32, i32)
> DEF_HELPER_FLAGS_2(brinc, TCG_CALL_CONST | TCG_CALL_PURE, tl, tl, tl)
>
> DEF_HELPER_0(float_check_status, void)
> -#ifdef CONFIG_SOFTFLOAT
> DEF_HELPER_0(reset_fpstatus, void)
> -#endif
> DEF_HELPER_2(compute_fprf, i32, i64, i32)
> DEF_HELPER_2(store_fpscr, void, i64, i32)
> DEF_HELPER_1(fpscr_clrbit, void, i32)
> diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
> index c6cb448..fe66f14 100644
> --- a/target-ppc/op_helper.c
> +++ b/target-ppc/op_helper.c
> @@ -971,7 +971,6 @@ void helper_store_fpscr (uint64_t arg, uint32_t  
> mask)
>
> void helper_float_check_status (void)
> {
> -#ifdef CONFIG_SOFTFLOAT
>     if (env->exception_index == POWERPC_EXCP_PROGRAM &&
>         (env->error_code & POWERPC_EXCP_FP)) {
>         /* Differred floating-point exception after target FPR  
> update */
> @@ -989,22 +988,12 @@ void helper_float_check_status (void)
>             float_inexact_excp();
>         }
>     }
> -#else
> -    if (env->exception_index == POWERPC_EXCP_PROGRAM &&
> -        (env->error_code & POWERPC_EXCP_FP)) {
> -        /* Differred floating-point exception after target FPR  
> update */
> -        if (msr_fe0 != 0 || msr_fe1 != 0)
> -            helper_raise_exception_err(env->exception_index, env- 
> >error_code);
> -    }
> -#endif
> }
>
> -#ifdef CONFIG_SOFTFLOAT
> void helper_reset_fpstatus (void)
> {
>     set_float_exception_flags(0, &env->fp_status);
> }
> -#endif
>
> /* fadd - fadd. */
> uint64_t helper_fadd (uint64_t arg1, uint64_t arg2)
> diff --git a/target-ppc/translate.c b/target-ppc/translate.c
> index 9b3f90c..59aef85 100644
> --- a/target-ppc/translate.c
> +++ b/target-ppc/translate.c
> @@ -215,9 +215,7 @@ struct opc_handler_t {
>
> static inline void gen_reset_fpstatus(void)
> {
> -#ifdef CONFIG_SOFTFLOAT
>     gen_helper_reset_fpstatus();
> -#endif
> }
>
> static inline void gen_compute_fprf(TCGv_i64 arg, int set_fprf, int  
> set_rc)
> -- 
> 1.7.5.1

Patch

diff --git a/target-ppc/helper.h b/target-ppc/helper.h
index 51c99c8..470e42f 100644
--- a/target-ppc/helper.h
+++ b/target-ppc/helper.h
@@ -51,9 +51,7 @@  DEF_HELPER_FLAGS_1(cntlzw32, TCG_CALL_CONST | TCG_CALL_PURE, i32, i32)
 DEF_HELPER_FLAGS_2(brinc, TCG_CALL_CONST | TCG_CALL_PURE, tl, tl, tl)
 
 DEF_HELPER_0(float_check_status, void)
-#ifdef CONFIG_SOFTFLOAT
 DEF_HELPER_0(reset_fpstatus, void)
-#endif
 DEF_HELPER_2(compute_fprf, i32, i64, i32)
 DEF_HELPER_2(store_fpscr, void, i64, i32)
 DEF_HELPER_1(fpscr_clrbit, void, i32)
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index c6cb448..fe66f14 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -971,7 +971,6 @@  void helper_store_fpscr (uint64_t arg, uint32_t mask)
 
 void helper_float_check_status (void)
 {
-#ifdef CONFIG_SOFTFLOAT
     if (env->exception_index == POWERPC_EXCP_PROGRAM &&
         (env->error_code & POWERPC_EXCP_FP)) {
         /* Differred floating-point exception after target FPR update */
@@ -989,22 +988,12 @@  void helper_float_check_status (void)
             float_inexact_excp();
         }
     }
-#else
-    if (env->exception_index == POWERPC_EXCP_PROGRAM &&
-        (env->error_code & POWERPC_EXCP_FP)) {
-        /* Differred floating-point exception after target FPR update */
-        if (msr_fe0 != 0 || msr_fe1 != 0)
-            helper_raise_exception_err(env->exception_index, env->error_code);
-    }
-#endif
 }
 
-#ifdef CONFIG_SOFTFLOAT
 void helper_reset_fpstatus (void)
 {
     set_float_exception_flags(0, &env->fp_status);
 }
-#endif
 
 /* fadd - fadd. */
 uint64_t helper_fadd (uint64_t arg1, uint64_t arg2)
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 9b3f90c..59aef85 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -215,9 +215,7 @@  struct opc_handler_t {
 
 static inline void gen_reset_fpstatus(void)
 {
-#ifdef CONFIG_SOFTFLOAT
     gen_helper_reset_fpstatus();
-#endif
 }
 
 static inline void gen_compute_fprf(TCGv_i64 arg, int set_fprf, int set_rc)