| Message ID | 149e5516d0db712916912fce8ab9c8285023e7c8.1688997768.git.federico.serafini@bugseng.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [XEN] x86/emul: fix violations of MISRA C:2012 Rule 8.3 on parameter names | expand |
On Mon, 10 Jul 2023, Federico Serafini wrote: > The headline of MISRA C:2012 Rule 8.3 states that: > "All declarations of an object or function shall use the same names and > type qualifiers". > > Change parameter names to meet the following requirements: > 1) keep consistency between declarations and the corresponding > definitions thus fixing violations of the Rule 8.3; > 2) use the globally-adopted shorthands (e.g., 's' to denote a 'state'); > 3) keep adjacent declarations consistent with respect to the parameter > names that are used. > > Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/x86/x86_emulate/x86_emulate.c | 54 +++++++++++++------------- > xen/arch/x86/x86_emulate/x86_emulate.h | 26 ++++++------- > 2 files changed, 40 insertions(+), 40 deletions(-) > > diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c > index be2e3c6b11..2de1be7996 100644 > --- a/xen/arch/x86/x86_emulate/x86_emulate.c > +++ b/xen/arch/x86/x86_emulate/x86_emulate.c > @@ -8446,12 +8446,12 @@ int x86_emul_rmw( > void *ptr, > unsigned int bytes, > uint32_t *eflags, > - struct x86_emulate_state *state, > + struct x86_emulate_state *s, > struct x86_emulate_ctxt *ctxt) > { > unsigned long *dst = ptr; > > - ASSERT(bytes == state->op_bytes); > + ASSERT(bytes == s->op_bytes); > > /* > * We cannot use Jcc below, as this code executes with the guest status flags > @@ -8469,23 +8469,23 @@ int x86_emul_rmw( > ".L" #op "%=:\n\t" \ > #op > > - switch ( state->rmw ) > + switch ( s->rmw ) > { > #define UNOP(op) \ > case rmw_##op: \ > _emulate_1op(COND_LOCK(op), dst, bytes, *eflags, \ > - "c" ((long)state->lock_prefix) ); \ > + "c" ((long)s->lock_prefix) ); \ > break > #define BINOP(op, sfx) \ > case rmw_##op: \ > _emulate_2op_SrcV##sfx(COND_LOCK(op), \ > - state->ea.val, dst, bytes, *eflags, \ > - "c" ((long)state->lock_prefix) ); \ > + s->ea.val, dst, bytes, *eflags, \ > + "c" ((long)s->lock_prefix) ); \ > break > #define SHIFT(op) \ > case rmw_##op: \ > - ASSERT(!state->lock_prefix); \ > - _emulate_2op_SrcB(#op, state->ea.val, dst, bytes, *eflags); \ > + ASSERT(!s->lock_prefix); \ > + _emulate_2op_SrcB(#op, s->ea.val, dst, bytes, *eflags); \ > break > > BINOP(adc, ); > @@ -8514,46 +8514,46 @@ int x86_emul_rmw( > #undef SHIFT > > case rmw_not: > - switch ( state->op_bytes ) > + switch ( s->op_bytes ) > { > case 1: > asm ( COND_LOCK(notb) " %0" > - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); > + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); > break; > case 2: > asm ( COND_LOCK(notw) " %0" > - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); > + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); > break; > case 4: > asm ( COND_LOCK(notl) " %0" > - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); > + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); > break; > #ifdef __x86_64__ > case 8: > asm ( COND_LOCK(notq) " %0" > - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); > + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); > break; > #endif > } > break; > > case rmw_shld: > - ASSERT(!state->lock_prefix); > + ASSERT(!s->lock_prefix); > _emulate_2op_SrcV_nobyte("shld", > - state->ea.val, dst, bytes, *eflags, > - "c" (state->ea.orig_val) ); > + s->ea.val, dst, bytes, *eflags, > + "c" (s->ea.orig_val) ); > break; > > case rmw_shrd: > - ASSERT(!state->lock_prefix); > + ASSERT(!s->lock_prefix); > _emulate_2op_SrcV_nobyte("shrd", > - state->ea.val, dst, bytes, *eflags, > - "c" (state->ea.orig_val) ); > + s->ea.val, dst, bytes, *eflags, > + "c" (s->ea.orig_val) ); > break; > > case rmw_xadd: > *eflags &= ~EFLAGS_MASK; > - switch ( state->op_bytes ) > + switch ( s->op_bytes ) > { > unsigned long dummy; > > @@ -8562,11 +8562,11 @@ int x86_emul_rmw( > asm ( "" \ > COND_LOCK(xadd) " %"#mod"[reg], %[mem]; " \ > _POST_EFLAGS("[efl]", "[msk]", "[tmp]") \ > - : [reg] "+" #cst (state->ea.val), \ > + : [reg] "+" #cst (s->ea.val), \ > [mem] "+m" (*dst), \ > [efl] "+g" (*eflags), \ > [tmp] "=&r" (dummy) \ > - : "c" ((long)state->lock_prefix), \ > + : "c" ((long)s->lock_prefix), \ > [msk] "i" (EFLAGS_MASK) ); \ > break > XADD(1, q, b); > @@ -8580,21 +8580,21 @@ int x86_emul_rmw( > break; > > case rmw_xchg: > - switch ( state->op_bytes ) > + switch ( s->op_bytes ) > { > case 1: > - asm ( "xchg %b0, %b1" : "+q" (state->ea.val), "+m" (*dst) ); > + asm ( "xchg %b0, %b1" : "+q" (s->ea.val), "+m" (*dst) ); > break; > case 2: > - asm ( "xchg %w0, %w1" : "+r" (state->ea.val), "+m" (*dst) ); > + asm ( "xchg %w0, %w1" : "+r" (s->ea.val), "+m" (*dst) ); > break; > case 4: > #ifdef __x86_64__ > - asm ( "xchg %k0, %k1" : "+r" (state->ea.val), "+m" (*dst) ); > + asm ( "xchg %k0, %k1" : "+r" (s->ea.val), "+m" (*dst) ); > break; > case 8: > #endif > - asm ( "xchg %0, %1" : "+r" (state->ea.val), "+m" (*dst) ); > + asm ( "xchg %0, %1" : "+r" (s->ea.val), "+m" (*dst) ); > break; > } > break; > diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h > index 40d5054fb7..698750267a 100644 > --- a/xen/arch/x86/x86_emulate/x86_emulate.h > +++ b/xen/arch/x86/x86_emulate/x86_emulate.h > @@ -746,36 +746,36 @@ x86_decode_insn( > struct x86_emulate_ctxt *ctxt)); > > unsigned int > -x86_insn_opsize(const struct x86_emulate_state *state); > +x86_insn_opsize(const struct x86_emulate_state *s); > int > -x86_insn_modrm(const struct x86_emulate_state *state, > +x86_insn_modrm(const struct x86_emulate_state *s, > unsigned int *rm, unsigned int *reg); > unsigned long > -x86_insn_operand_ea(const struct x86_emulate_state *state, > +x86_insn_operand_ea(const struct x86_emulate_state *s, > enum x86_segment *seg); > unsigned long > -x86_insn_immediate(const struct x86_emulate_state *state, > +x86_insn_immediate(const struct x86_emulate_state *s, > unsigned int nr); > unsigned int > -x86_insn_length(const struct x86_emulate_state *state, > +x86_insn_length(const struct x86_emulate_state *s, > const struct x86_emulate_ctxt *ctxt); > bool cf_check > -x86_insn_is_mem_access(const struct x86_emulate_state *state, > +x86_insn_is_mem_access(const struct x86_emulate_state *s, > const struct x86_emulate_ctxt *ctxt); > bool cf_check > -x86_insn_is_mem_write(const struct x86_emulate_state *state, > +x86_insn_is_mem_write(const struct x86_emulate_state *s, > const struct x86_emulate_ctxt *ctxt); > bool cf_check > -x86_insn_is_portio(const struct x86_emulate_state *state, > +x86_insn_is_portio(const struct x86_emulate_state *s, > const struct x86_emulate_ctxt *ctxt); > bool cf_check > -x86_insn_is_cr_access(const struct x86_emulate_state *state, > +x86_insn_is_cr_access(const struct x86_emulate_state *s, > const struct x86_emulate_ctxt *ctxt); > > #if !defined(__XEN__) || defined(NDEBUG) > -static inline void x86_emulate_free_state(struct x86_emulate_state *state) {} > +static inline void x86_emulate_free_state(struct x86_emulate_state *s) {} > #else > -void x86_emulate_free_state(struct x86_emulate_state *state); > +void x86_emulate_free_state(struct x86_emulate_state *s); > #endif > > #ifdef __XEN__ > @@ -800,7 +800,7 @@ x86_emul_rmw( > void *ptr, > unsigned int bytes, > uint32_t *eflags, > - struct x86_emulate_state *state, > + struct x86_emulate_state *s, > struct x86_emulate_ctxt *ctxt); > int > x86_emul_blk( > @@ -808,7 +808,7 @@ x86_emul_blk( > void *data, > unsigned int bytes, > uint32_t *eflags, > - struct x86_emulate_state *state, > + struct x86_emulate_state *s, > struct x86_emulate_ctxt *ctxt); > > static inline void x86_emul_hw_exception( > -- > 2.34.1 >
On 10.07.2023 23:08, Stefano Stabellini wrote: > On Mon, 10 Jul 2023, Federico Serafini wrote: >> The headline of MISRA C:2012 Rule 8.3 states that: >> "All declarations of an object or function shall use the same names and >> type qualifiers". >> >> Change parameter names to meet the following requirements: >> 1) keep consistency between declarations and the corresponding >> definitions thus fixing violations of the Rule 8.3; >> 2) use the globally-adopted shorthands (e.g., 's' to denote a 'state'); >> 3) keep adjacent declarations consistent with respect to the parameter >> names that are used. >> >> Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> Acked-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index be2e3c6b11..2de1be7996 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -8446,12 +8446,12 @@ int x86_emul_rmw( void *ptr, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt) { unsigned long *dst = ptr; - ASSERT(bytes == state->op_bytes); + ASSERT(bytes == s->op_bytes); /* * We cannot use Jcc below, as this code executes with the guest status flags @@ -8469,23 +8469,23 @@ int x86_emul_rmw( ".L" #op "%=:\n\t" \ #op - switch ( state->rmw ) + switch ( s->rmw ) { #define UNOP(op) \ case rmw_##op: \ _emulate_1op(COND_LOCK(op), dst, bytes, *eflags, \ - "c" ((long)state->lock_prefix) ); \ + "c" ((long)s->lock_prefix) ); \ break #define BINOP(op, sfx) \ case rmw_##op: \ _emulate_2op_SrcV##sfx(COND_LOCK(op), \ - state->ea.val, dst, bytes, *eflags, \ - "c" ((long)state->lock_prefix) ); \ + s->ea.val, dst, bytes, *eflags, \ + "c" ((long)s->lock_prefix) ); \ break #define SHIFT(op) \ case rmw_##op: \ - ASSERT(!state->lock_prefix); \ - _emulate_2op_SrcB(#op, state->ea.val, dst, bytes, *eflags); \ + ASSERT(!s->lock_prefix); \ + _emulate_2op_SrcB(#op, s->ea.val, dst, bytes, *eflags); \ break BINOP(adc, ); @@ -8514,46 +8514,46 @@ int x86_emul_rmw( #undef SHIFT case rmw_not: - switch ( state->op_bytes ) + switch ( s->op_bytes ) { case 1: asm ( COND_LOCK(notb) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; case 2: asm ( COND_LOCK(notw) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; case 4: asm ( COND_LOCK(notl) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; #ifdef __x86_64__ case 8: asm ( COND_LOCK(notq) " %0" - : "+m" (*dst) : "c" ((long)state->lock_prefix) ); + : "+m" (*dst) : "c" ((long)s->lock_prefix) ); break; #endif } break; case rmw_shld: - ASSERT(!state->lock_prefix); + ASSERT(!s->lock_prefix); _emulate_2op_SrcV_nobyte("shld", - state->ea.val, dst, bytes, *eflags, - "c" (state->ea.orig_val) ); + s->ea.val, dst, bytes, *eflags, + "c" (s->ea.orig_val) ); break; case rmw_shrd: - ASSERT(!state->lock_prefix); + ASSERT(!s->lock_prefix); _emulate_2op_SrcV_nobyte("shrd", - state->ea.val, dst, bytes, *eflags, - "c" (state->ea.orig_val) ); + s->ea.val, dst, bytes, *eflags, + "c" (s->ea.orig_val) ); break; case rmw_xadd: *eflags &= ~EFLAGS_MASK; - switch ( state->op_bytes ) + switch ( s->op_bytes ) { unsigned long dummy; @@ -8562,11 +8562,11 @@ int x86_emul_rmw( asm ( "" \ COND_LOCK(xadd) " %"#mod"[reg], %[mem]; " \ _POST_EFLAGS("[efl]", "[msk]", "[tmp]") \ - : [reg] "+" #cst (state->ea.val), \ + : [reg] "+" #cst (s->ea.val), \ [mem] "+m" (*dst), \ [efl] "+g" (*eflags), \ [tmp] "=&r" (dummy) \ - : "c" ((long)state->lock_prefix), \ + : "c" ((long)s->lock_prefix), \ [msk] "i" (EFLAGS_MASK) ); \ break XADD(1, q, b); @@ -8580,21 +8580,21 @@ int x86_emul_rmw( break; case rmw_xchg: - switch ( state->op_bytes ) + switch ( s->op_bytes ) { case 1: - asm ( "xchg %b0, %b1" : "+q" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %b0, %b1" : "+q" (s->ea.val), "+m" (*dst) ); break; case 2: - asm ( "xchg %w0, %w1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %w0, %w1" : "+r" (s->ea.val), "+m" (*dst) ); break; case 4: #ifdef __x86_64__ - asm ( "xchg %k0, %k1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %k0, %k1" : "+r" (s->ea.val), "+m" (*dst) ); break; case 8: #endif - asm ( "xchg %0, %1" : "+r" (state->ea.val), "+m" (*dst) ); + asm ( "xchg %0, %1" : "+r" (s->ea.val), "+m" (*dst) ); break; } break; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 40d5054fb7..698750267a 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -746,36 +746,36 @@ x86_decode_insn( struct x86_emulate_ctxt *ctxt)); unsigned int -x86_insn_opsize(const struct x86_emulate_state *state); +x86_insn_opsize(const struct x86_emulate_state *s); int -x86_insn_modrm(const struct x86_emulate_state *state, +x86_insn_modrm(const struct x86_emulate_state *s, unsigned int *rm, unsigned int *reg); unsigned long -x86_insn_operand_ea(const struct x86_emulate_state *state, +x86_insn_operand_ea(const struct x86_emulate_state *s, enum x86_segment *seg); unsigned long -x86_insn_immediate(const struct x86_emulate_state *state, +x86_insn_immediate(const struct x86_emulate_state *s, unsigned int nr); unsigned int -x86_insn_length(const struct x86_emulate_state *state, +x86_insn_length(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_mem_access(const struct x86_emulate_state *state, +x86_insn_is_mem_access(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_mem_write(const struct x86_emulate_state *state, +x86_insn_is_mem_write(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_portio(const struct x86_emulate_state *state, +x86_insn_is_portio(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); bool cf_check -x86_insn_is_cr_access(const struct x86_emulate_state *state, +x86_insn_is_cr_access(const struct x86_emulate_state *s, const struct x86_emulate_ctxt *ctxt); #if !defined(__XEN__) || defined(NDEBUG) -static inline void x86_emulate_free_state(struct x86_emulate_state *state) {} +static inline void x86_emulate_free_state(struct x86_emulate_state *s) {} #else -void x86_emulate_free_state(struct x86_emulate_state *state); +void x86_emulate_free_state(struct x86_emulate_state *s); #endif #ifdef __XEN__ @@ -800,7 +800,7 @@ x86_emul_rmw( void *ptr, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt); int x86_emul_blk( @@ -808,7 +808,7 @@ x86_emul_blk( void *data, unsigned int bytes, uint32_t *eflags, - struct x86_emulate_state *state, + struct x86_emulate_state *s, struct x86_emulate_ctxt *ctxt); static inline void x86_emul_hw_exception(
The headline of MISRA C:2012 Rule 8.3 states that: "All declarations of an object or function shall use the same names and type qualifiers". Change parameter names to meet the following requirements: 1) keep consistency between declarations and the corresponding definitions thus fixing violations of the Rule 8.3; 2) use the globally-adopted shorthands (e.g., 's' to denote a 'state'); 3) keep adjacent declarations consistent with respect to the parameter names that are used. Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> --- xen/arch/x86/x86_emulate/x86_emulate.c | 54 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.h | 26 ++++++------- 2 files changed, 40 insertions(+), 40 deletions(-)