target/mips: errors and warnings cleanups
v2 cover target/mips: errors and warnings cleanups
This v2 series combines previous two patches into one and removes some left trailing spaces
Jules Irenge (2):
target/mips: realign comments to fix checkpatch warnings target/mips: add or remove space to fix checkpatch errors
target/mips/cpu.h | 60 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 25 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/2 target/mips: realign comments to fix checkpatch warnings
Realign comments to fix warnings issued by checkpatch.pl tool "WARNING: Block comments use a leading /* on a separate line" within "target/mips/cpu.h" file.
--- target/mips/cpu.h | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
target/mips/cpu.h +22 -12
@@ -37,7 +37,8 @@ union fpr_t {/* FPU/MSA register mapping is not tested on big-endian hosts. */ wr_t wr;/* vector data */ }; -/* define FP_ENDIAN_IDX to access the same location +/* +* define FP_ENDIAN_IDX to access the same location * in the fpr_t union regardless of the host endianness */ #if defined(HOST_WORDS_BIGENDIAN )
@@ -963,9 +964,11 @@ struct CPUMIPSState {/* TMASK defines different execution modes */ #define MIPS_HFLAG_TMASK 0x1F5807FF#define MIPS_HFLAG_MODE 0x00007/* execution modes */ -/* The KSU flags must be the lowest bits in hflags. The flag order -must be the same as defined for CP0 Status. This allows to use -the bits as the value of mmu_idx. */ +/* +* The KSU flags must be the lowest bits in hflags. The flag order +* must be the same as defined for CP0 Status. This allows to use +* the bits as the value of mmu_idx. +*/ #define MIPS_HFLAG_KSU 0x00003/* kernel/supervisor/user mode mask */ #define MIPS_HFLAG_UM 0x00002/* user mode flag */ #define MIPS_HFLAG_SM 0x00001/* supervisor mode flag */
@@ -975,18 +978,22 @@ struct CPUMIPSState {#define MIPS_HFLAG_CP0 0x00010/* CP0 enabled */ #define MIPS_HFLAG_FPU 0x00020/* FPU enabled */ #define MIPS_HFLAG_F64 0x00040/* 64-bit FPU enabled */ -/* True if the MIPS IV COP1X instructions can be used. This also -controls the non-COP1X instructions RECIP.S, RECIP.D, RSQRT.S -and RSQRT.D. */ +/* +* True if the MIPS IV COP1X instructions can be used. This also +* controls the non-COP1X instructions RECIP.S, RECIP.D, RSQRT.S +* and RSQRT.D. +*/ #define MIPS_HFLAG_COP1X 0x00080/* COP1X instructions enabled */ #define MIPS_HFLAG_RE 0x00100/* Reversed endianness */ #define MIPS_HFLAG_AWRAP 0x00200/* 32-bit compatibility address wrapping */ #define MIPS_HFLAG_M16 0x00400/* MIPS16 mode flag */ #define MIPS_HFLAG_M16_SHIFT 10 -/* If translation is interrupted between the branch instruction and +/* +* If translation is interrupted between the branch instruction and * the delay slot, record what type of branch it is so that we can * resume translation properly. It might be possible to reduce -* this from three bits to two. */ +* this from three bits to two. +*/ #define MIPS_HFLAG_BMASK_BASE 0x803800#define MIPS_HFLAG_B 0x00800/* Unconditional branch */ #define MIPS_HFLAG_BC 0x01000/* Conditional branch */
@@ -1073,8 +1080,10 @@ void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf);extern void cpu_wrdsp (uint32_t rs,uint32_t mask_num,CPUMIPSState *env);extern uint32_t cpu_rddsp (uint32_t mask_num,CPUMIPSState *env); -/* MMU modes definitions. We carefully match the indices with our -hflags layout. */ +/* +* MMU modes definitions. We carefully match the indices with our +* hflags layout. +*/ #define MMU_MODE0_SUFFIX _kernel#define MMU_MODE1_SUFFIX _super#define MMU_MODE2_SUFFIX _user
@@ -1097,7 +1106,8 @@ static inline int cpu_mmu_index (CPUMIPSState *env, bool ifetch)#include "exec/cpu-all.h" -/* Memory access type : +/* +* Memory access type : * may be needed for precise access rights control and precise exceptions. */ enum {
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 1/2] target/mips: realign comments to fix checkpatch warnings
Quoted 6 lines
From: Jules Irenge <[email protected]>
Sent: Thursday, April 4, 2019 7:39 PM
To: Aleksandar Markovic
Cc: Aleksandar Rikalo; [email protected]
Subject: [PATCH v2 1/2] target/mips: realign comments to fix checkpatch warnings
Quoted 6 lines
Realign comments to fix warnings issued by checkpatch.pl tool "WARNING: Block comments use a leading /* on a separate line" within "
target/mips/cpu.h" file.Signed-off-by Jules Irenge <[email protected]>---
PATCH v2 2/2 target/mips: add or remove space to fix checkpatch errors
In reply to Jules IrengeAdd or remove space to fix errors issued by checkpatch.pl tool "ERROR: spaces required around ..."
"ERROR: space required after that"
"ERROR: space required before the open parenthesis" "ERROR: space prohibited between function name and open parenthesis" within "target/mips/cpu.h" file.
--- target/mips/cpu.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
target/mips/cpu.h +14 -14
@@ -22,10 +22,10 @@ typedef struct CPUMIPSTLBContext CPUMIPSTLBContext;typedef union wr_t wr_t ;union wr_t { -int8_t b[MSA_WRLEN /8 ]; -int16_t h[MSA_WRLEN /16 ]; -int32_t w[MSA_WRLEN /32 ]; -int64_t d[MSA_WRLEN /64 ]; +int8_t b[MSA_WRLEN /8 ]; +int16_t h[MSA_WRLEN /16 ]; +int32_t w[MSA_WRLEN /32 ]; +int64_t d[MSA_WRLEN /64 ]; };typedef union fpr_t fpr_t ;
@@ -72,16 +72,16 @@ struct CPUMIPSFPUContext {#define FCR31_FS 24#define FCR31_ABS2008 19#define FCR31_NAN2008 18 -#define SET_FP_COND (num,env) do { ((env).fcr31) |= ((num) ? (1 << ((num) + 24)) : (1 << 23)); } while(0) -#define CLEAR_FP_COND (num,env) do { ((env).fcr31) &= ~((num) ? (1 << ((num) + 24)) : (1 << 23)); } while(0) +#define SET_FP_COND (num, env) do { ((env).fcr31) |= ((num) ? (1 << ((num) + 24)) : (1 << 23)); } while (0) +#define CLEAR_FP_COND (num, env) do { ((env).fcr31) &= ~((num) ? (1 << ((num) + 24)) : (1 << 23)); } while (0)#define GET_FP_COND (env) ((((env).fcr31 >> 24) & 0xfe) | (((env).fcr31 >> 23) & 0x1))#define GET_FP_CAUSE (reg) (((reg) >> 12) & 0x3f)#define GET_FP_ENABLE (reg) (((reg) >> 7) & 0x1f)#define GET_FP_FLAGS (reg) (((reg) >> 2) & 0x1f) -#define SET_FP_CAUSE (reg,v) do { (reg) = ((reg) & ~(0x3f << 12)) | ((v & 0x3f) << 12); } while(0) -#define SET_FP_ENABLE (reg,v) do { (reg) = ((reg) & ~(0x1f << 7)) | ((v & 0x1f) << 7); } while(0) -#define SET_FP_FLAGS (reg,v) do { (reg) = ((reg) & ~(0x1f << 2)) | ((v & 0x1f) << 2); } while(0) -#define UPDATE_FP_FLAGS (reg,v) do { (reg) |= ((v & 0x1f) << 2); } while(0) +#define SET_FP_CAUSE (reg, v) do { (reg) = ((reg) & ~(0x3f << 12)) | ((v & 0x3f) << 12); } while (0) +#define SET_FP_ENABLE (reg, v) do { (reg) = ((reg) & ~(0x1f << 7)) | ((v & 0x1f) << 7); } while (0) +#define SET_FP_FLAGS (reg, v) do { (reg) = ((reg) & ~(0x1f << 2)) | ((v & 0x1f) << 2); } while (0) +#define UPDATE_FP_FLAGS (reg, v) do { (reg) |= ((v & 0x1f) << 2); } while (0)#define FP_INEXACT 1#define FP_UNDERFLOW 2#define FP_OVERFLOW 4
@@ -1072,7 +1072,7 @@ static inline MIPSCPU *mips_env_get_cpu(CPUMIPSState *env)#define ENV_OFFSET offsetof(MIPSCPU, env) -void mips_cpu_list (FILE *f,fprintf_function cpu_fprintf); +void mips_cpu_list (FILE *f,fprintf_function cpu_fprintf);#define cpu_signal_handler cpu_mips_signal_handler#define cpu_list mips_cpu_list
@@ -1099,7 +1099,7 @@ static inline int hflags_mmu_index(uint32_t hflags) } } -static inline int cpu_mmu_index (CPUMIPSState *env,bool ifetch) +static inline int cpu_mmu_index (CPUMIPSState *env,bool ifetch) {return hflags_mmu_index (env->hflags); }
@@ -1107,7 +1107,7 @@ static inline int cpu_mmu_index (CPUMIPSState *env, bool ifetch)#include "exec/cpu-all.h" /* -* Memory access type : +* Memory access type: * may be needed for precise access rights control and precise exceptions. */ enum {
@@ -1192,7 +1192,7 @@ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level);void itc_reconfigure (struct MIPSITUState *tag);/* helper.c */ -target_ulong exception_resume_pc (CPUMIPSState *env); +target_ulong exception_resume_pc (CPUMIPSState *env);static inline void restore_snan_bit_mode (CPUMIPSState *env) {
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 2/2] target/mips: add or remove space to fix checkpatch errors
Quoted 10 lines
From: Jules Irenge <[email protected]>
Subject: [PATCH v2 2/2] target/mips: add or remove space to fix checkpatch errorsAdd or remove space to fix errors issued by checkpatch.pl tool "ERROR: spaces required around ..."
"ERROR: space required after that"
"ERROR: space required before the open parenthesis" "ERROR: space prohibited between function name and open parenthesis" within "target/mips/cpu.h" file.
Quoted 2 lines
Signed-off-by Jules Irenge <[email protected]>---
This patch should also contain the fix for long lines, otherwise the checkpatch.pl complains about this very patch.
In any case, thank you for sending this and other patches!
Aleksandar
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Subject: [Qemu-devel] [PATCH v2 0/2] target/mips: errors and warnings cleanups
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
98abd4d target/mips: add or remove space to fix checkpatch errors 11f40fe target/mips: realign comments to fix checkpatch warnings
=== OUTPUT BEGIN ===
1/2 Checking commit 11f40fe1fa16 (target/mips: realign comments to fix checkpatch warnings) 2/2 Checking commit 98abd4d88462 (target/mips: add or remove space to fix checkpatch errors)
ERROR: line over 90 characters
#42: FILE: target/mips/cpu.h:75:
+#define SET_FP_COND(num, env) do { ((env).fcr31) |= ((num) ? (1 << ((num) + 24)) : (1 << 23)); } while (0)
ERROR: line over 90 characters
#43: FILE: target/mips/cpu.h:76:
+#define CLEAR_FP_COND(num, env) do { ((env).fcr31) &= ~((num) ? (1 << ((num) + 24)) : (1 << 23)); } while (0)
ERROR: line over 90 characters
#52: FILE: target/mips/cpu.h:81:
+#define SET_FP_CAUSE(reg, v) do { (reg) = ((reg) & ~(0x3f << 12)) | ((v & 0x3f) << 12); } while (0)
ERROR: line over 90 characters
#53: FILE: target/mips/cpu.h:82:
+#define SET_FP_ENABLE(reg, v) do { (reg) = ((reg) & ~(0x1f << 7)) | ((v & 0x1f) << 7); } while (0)
ERROR: line over 90 characters
#54: FILE: target/mips/cpu.h:83:
+#define SET_FP_FLAGS(reg, v) do { (reg) = ((reg) & ~(0x1f << 2)) | ((v & 0x1f) << 2); } while (0)
total: 5 errors, 0 warnings, 68 lines checked
Patch 2/2 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]