diff mbox series

[v2,04/20] target/mips: Clean up mips-defs.h

Message ID 1569415572-19635-5-git-send-email-aleksandar.markovic@rt-rk.com (mailing list archive)
State New, archived
Headers show
Series target/mips: Misc cleanups for September/October 2019 | expand

Commit Message

Aleksandar Markovic Sept. 25, 2019, 12:45 p.m. UTC 
From: Aleksandar Markovic <amarkovic@wavecomp.com>

Mostly fix errors and warnings reported by 'checkpatch.pl -f'.

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
 target/mips/mips-defs.h | 53 ++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

Comments

Philippe Mathieu-Daudé Sept. 25, 2019, 3:10 p.m. UTC | #1 
Hi Aleksandar,

On 9/25/19 2:45 PM, Aleksandar Markovic wrote:
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
> 
> Mostly fix errors and warnings reported by 'checkpatch.pl -f'.
> 
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
>  target/mips/mips-defs.h | 53 ++++++++++++++++++++++++++-----------------------
>  1 file changed, 28 insertions(+), 25 deletions(-)
> 
> diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h
> index bbf056a..938c0de 100644
> --- a/target/mips/mips-defs.h
> +++ b/target/mips/mips-defs.h
> @@ -2,7 +2,7 @@
>  #define QEMU_MIPS_DEFS_H
>  
>  /* If we want to use host float regs... */
> -//#define USE_HOST_FLOAT_REGS
> +/* #define USE_HOST_FLOAT_REGS */

I'd use the same block comment for the description and the commented
USE_HOST_FLOAT_REGS, like you did with MIPS_STRICT_STANDARD below.

Anyway, with or without this change:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  
>  /* Real pages are variable size... */
>  #define MIPS_TLB_MAX 128
> @@ -57,43 +57,46 @@
>  #define ASE_MXU           0x0200000000000000ULL
>  
>  /* MIPS CPU defines. */
> -#define		CPU_MIPS1	(ISA_MIPS1)
> -#define		CPU_MIPS2	(CPU_MIPS1 | ISA_MIPS2)
> -#define		CPU_MIPS3	(CPU_MIPS2 | ISA_MIPS3)
> -#define		CPU_MIPS4	(CPU_MIPS3 | ISA_MIPS4)
> -#define		CPU_VR54XX	(CPU_MIPS4 | INSN_VR54XX)
> -#define         CPU_R5900       (CPU_MIPS3 | INSN_R5900)
> -#define		CPU_LOONGSON2E  (CPU_MIPS3 | INSN_LOONGSON2E)
> -#define		CPU_LOONGSON2F  (CPU_MIPS3 | INSN_LOONGSON2F)
> +#define CPU_MIPS1       (ISA_MIPS1)
> +#define CPU_MIPS2       (CPU_MIPS1 | ISA_MIPS2)
> +#define CPU_MIPS3       (CPU_MIPS2 | ISA_MIPS3)
> +#define CPU_MIPS4       (CPU_MIPS3 | ISA_MIPS4)
> +#define CPU_VR54XX      (CPU_MIPS4 | INSN_VR54XX)
> +#define CPU_R5900       (CPU_MIPS3 | INSN_R5900)
> +#define CPU_LOONGSON2E  (CPU_MIPS3 | INSN_LOONGSON2E)
> +#define CPU_LOONGSON2F  (CPU_MIPS3 | INSN_LOONGSON2F)
>  
> -#define		CPU_MIPS5	(CPU_MIPS4 | ISA_MIPS5)
> +#define CPU_MIPS5       (CPU_MIPS4 | ISA_MIPS5)
>  
>  /* MIPS Technologies "Release 1" */
> -#define		CPU_MIPS32	(CPU_MIPS2 | ISA_MIPS32)
> -#define		CPU_MIPS64	(CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
> +#define CPU_MIPS32      (CPU_MIPS2 | ISA_MIPS32)
> +#define CPU_MIPS64      (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
>  
>  /* MIPS Technologies "Release 2" */
> -#define		CPU_MIPS32R2	(CPU_MIPS32 | ISA_MIPS32R2)
> -#define		CPU_MIPS64R2	(CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2)
> +#define CPU_MIPS32R2    (CPU_MIPS32 | ISA_MIPS32R2)
> +#define CPU_MIPS64R2    (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2)
>  
>  /* MIPS Technologies "Release 3" */
> -#define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3)
> -#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3)
> +#define CPU_MIPS32R3    (CPU_MIPS32R2 | ISA_MIPS32R3)
> +#define CPU_MIPS64R3    (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3)
>  
>  /* MIPS Technologies "Release 5" */
> -#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5)
> -#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5)
> +#define CPU_MIPS32R5    (CPU_MIPS32R3 | ISA_MIPS32R5)
> +#define CPU_MIPS64R5    (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5)
>  
>  /* MIPS Technologies "Release 6" */
> -#define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6)
> -#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6)
> +#define CPU_MIPS32R6    (CPU_MIPS32R5 | ISA_MIPS32R6)
> +#define CPU_MIPS64R6    (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6)
>  
>  /* Wave Computing: "nanoMIPS" */
> -#define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32)
> +#define CPU_NANOMIPS32  (CPU_MIPS32R6 | ISA_NANOMIPS32)
>  
> -/* Strictly follow the architecture standard:
> -   - Disallow "special" instruction handling for PMON/SPIM.
> -   Note that we still maintain Count/Compare to match the host clock. */
> -//#define MIPS_STRICT_STANDARD 1
> +/*
> + * Strictly follow the architecture standard:
> + * - Disallow "special" instruction handling for PMON/SPIM.
> + * Note that we still maintain Count/Compare to match the host clock.
> + *
> + * #define MIPS_STRICT_STANDARD 1
> + */
>  
>  #endif /* QEMU_MIPS_DEFS_H */
>
diff mbox series

Patch

diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h
index bbf056a..938c0de 100644
--- a/target/mips/mips-defs.h
+++ b/target/mips/mips-defs.h
@@ -2,7 +2,7 @@ 
 #define QEMU_MIPS_DEFS_H
 
 /* If we want to use host float regs... */
-//#define USE_HOST_FLOAT_REGS
+/* #define USE_HOST_FLOAT_REGS */
 
 /* Real pages are variable size... */
 #define MIPS_TLB_MAX 128
@@ -57,43 +57,46 @@ 
 #define ASE_MXU           0x0200000000000000ULL
 
 /* MIPS CPU defines. */
-#define		CPU_MIPS1	(ISA_MIPS1)
-#define		CPU_MIPS2	(CPU_MIPS1 | ISA_MIPS2)
-#define		CPU_MIPS3	(CPU_MIPS2 | ISA_MIPS3)
-#define		CPU_MIPS4	(CPU_MIPS3 | ISA_MIPS4)
-#define		CPU_VR54XX	(CPU_MIPS4 | INSN_VR54XX)
-#define         CPU_R5900       (CPU_MIPS3 | INSN_R5900)
-#define		CPU_LOONGSON2E  (CPU_MIPS3 | INSN_LOONGSON2E)
-#define		CPU_LOONGSON2F  (CPU_MIPS3 | INSN_LOONGSON2F)
+#define CPU_MIPS1       (ISA_MIPS1)
+#define CPU_MIPS2       (CPU_MIPS1 | ISA_MIPS2)
+#define CPU_MIPS3       (CPU_MIPS2 | ISA_MIPS3)
+#define CPU_MIPS4       (CPU_MIPS3 | ISA_MIPS4)
+#define CPU_VR54XX      (CPU_MIPS4 | INSN_VR54XX)
+#define CPU_R5900       (CPU_MIPS3 | INSN_R5900)
+#define CPU_LOONGSON2E  (CPU_MIPS3 | INSN_LOONGSON2E)
+#define CPU_LOONGSON2F  (CPU_MIPS3 | INSN_LOONGSON2F)
 
-#define		CPU_MIPS5	(CPU_MIPS4 | ISA_MIPS5)
+#define CPU_MIPS5       (CPU_MIPS4 | ISA_MIPS5)
 
 /* MIPS Technologies "Release 1" */
-#define		CPU_MIPS32	(CPU_MIPS2 | ISA_MIPS32)
-#define		CPU_MIPS64	(CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
+#define CPU_MIPS32      (CPU_MIPS2 | ISA_MIPS32)
+#define CPU_MIPS64      (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
 
 /* MIPS Technologies "Release 2" */
-#define		CPU_MIPS32R2	(CPU_MIPS32 | ISA_MIPS32R2)
-#define		CPU_MIPS64R2	(CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2)
+#define CPU_MIPS32R2    (CPU_MIPS32 | ISA_MIPS32R2)
+#define CPU_MIPS64R2    (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2)
 
 /* MIPS Technologies "Release 3" */
-#define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3)
-#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3)
+#define CPU_MIPS32R3    (CPU_MIPS32R2 | ISA_MIPS32R3)
+#define CPU_MIPS64R3    (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3)
 
 /* MIPS Technologies "Release 5" */
-#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5)
-#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5)
+#define CPU_MIPS32R5    (CPU_MIPS32R3 | ISA_MIPS32R5)
+#define CPU_MIPS64R5    (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5)
 
 /* MIPS Technologies "Release 6" */
-#define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6)
-#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6)
+#define CPU_MIPS32R6    (CPU_MIPS32R5 | ISA_MIPS32R6)
+#define CPU_MIPS64R6    (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6)
 
 /* Wave Computing: "nanoMIPS" */
-#define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32)
+#define CPU_NANOMIPS32  (CPU_MIPS32R6 | ISA_NANOMIPS32)
 
-/* Strictly follow the architecture standard:
-   - Disallow "special" instruction handling for PMON/SPIM.
-   Note that we still maintain Count/Compare to match the host clock. */
-//#define MIPS_STRICT_STANDARD 1
+/*
+ * Strictly follow the architecture standard:
+ * - Disallow "special" instruction handling for PMON/SPIM.
+ * Note that we still maintain Count/Compare to match the host clock.
+ *
+ * #define MIPS_STRICT_STANDARD 1
+ */
 
 #endif /* QEMU_MIPS_DEFS_H */