Patchwork target-mips: Remove semicolon from macro definition

login
register
mail settings
Submitter Stefan Weil
Date Dec. 22, 2012, 12:38 p.m.
Message ID <1356179899-1268-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/207930/
State Accepted
Headers show

Comments

Stefan Weil - Dec. 22, 2012, 12:38 p.m.
Macro RESTORE_FLUSH_MODE is similar to RESTORE_ROUNDING_MODE
but included a semicolon.

The code which uses that macro also includes a semicolon,
so the result was an empty statement.

Remove the superfluous semicolon from the macro definition.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

Note:

After the patch, the modified line is shorter, but still longer than
required by the coding conventions.

 target-mips/op_helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Peter Maydell - Dec. 22, 2012, 1:23 p.m.
On 22 December 2012 12:38, Stefan Weil <sw@weilnetz.de> wrote:
> Macro RESTORE_FLUSH_MODE is similar to RESTORE_ROUNDING_MODE
> but included a semicolon.
>
> The code which uses that macro also includes a semicolon,
> so the result was an empty statement.
>
> Remove the superfluous semicolon from the macro definition.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

FWIW I think it would be better to just turn these two macros into
static inline functions which took a CPUMIPSState *env argument.
Macros which don't take arguments but silently use variables from
their caller are a bit ugly, and in this case there's no need to do it
that way.

-- PMM
Aurelien Jarno - Jan. 1, 2013, 10:20 a.m.
On Sat, Dec 22, 2012 at 01:38:19PM +0100, Stefan Weil wrote:
> Macro RESTORE_FLUSH_MODE is similar to RESTORE_ROUNDING_MODE
> but included a semicolon.
> 
> The code which uses that macro also includes a semicolon,
> so the result was an empty statement.
> 
> Remove the superfluous semicolon from the macro definition.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> Note:
> 
> After the patch, the modified line is shorter, but still longer than
> required by the coding conventions.
> 
>  target-mips/op_helper.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> index e85edce..e3ab05c 100644
> --- a/target-mips/op_helper.c
> +++ b/target-mips/op_helper.c
> @@ -2175,7 +2175,7 @@ static unsigned int ieee_rm[] = {
>      set_float_rounding_mode(ieee_rm[env->active_fpu.fcr31 & 3], &env->active_fpu.fp_status)
>  
>  #define RESTORE_FLUSH_MODE \
> -    set_flush_to_zero((env->active_fpu.fcr31 & (1 << 24)) != 0, &env->active_fpu.fp_status);
> +    set_flush_to_zero((env->active_fpu.fcr31 & (1 << 24)) != 0, &env->active_fpu.fp_status)
>  
>  target_ulong helper_cfc1(CPUMIPSState *env, uint32_t reg)
>  {

Thanks, applied.

Patch

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index e85edce..e3ab05c 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -2175,7 +2175,7 @@  static unsigned int ieee_rm[] = {
     set_float_rounding_mode(ieee_rm[env->active_fpu.fcr31 & 3], &env->active_fpu.fp_status)
 
 #define RESTORE_FLUSH_MODE \
-    set_flush_to_zero((env->active_fpu.fcr31 & (1 << 24)) != 0, &env->active_fpu.fp_status);
+    set_flush_to_zero((env->active_fpu.fcr31 & (1 << 24)) != 0, &env->active_fpu.fp_status)
 
 target_ulong helper_cfc1(CPUMIPSState *env, uint32_t reg)
 {