X86: coding style fixes to arch/x86/math-errors.c
PATCH 1/1 X86: coding style fixes to arch/x86/math-errors.c
This file has not been modified since October so should be easy to integrate the following patch.
Before:
total: 214 errors, 28 warnings, 739 lines checked
After:
total: 4 errors, 28 warnings, 708 lines checked
Compile tested:
paolo@paolo-desktop:/tmp$ size error.o.* text data bss dec hex filename 3476 0 0 3476 d94 error.o.after 3476 0 0 3476 d94 error.o.before
---
The only remaining errors are like the following:
ERROR: need consistent spacing around '*' (ctx:WxB) #110: FILE: errors.c:110:
+ FPU_get_user(FPU_modrm, 1 + (u_char __user *) address);
^Any hint on how to fix them?
arch/x86/math-emu/errors.c | 405 ++++++++++++++++++++------------------------ 1 files changed, 187 insertions(+), 218 deletions(-)
arch/x86/math-emu/errors.c +187 -218
@@ -43,25 +43,23 @@ void Un_impl(void)RE_ENTRANT_CHECK_OFF ;/* No need to check access_ok(), we have previously fetched these bytes. */ printk ("Unimplemented FPU Opcode at eip=%p : " , (void __user *) address); -if (FPU_CS == __USER_CS ) - { -while (1 ) - { +if (FPU_CS == __USER_CS) { +while (1 ) {FPU_get_user (byte1, (u_char __user *) address); -if ( (byte1 &0xf8 ) ==0xd8 )break ; +if ((byte1 &0xf8 ) ==0xd8 ) +break ;printk ("[%02x]" , byte1); address++; }printk ("%02x " , byte1);FPU_get_user (FPU_modrm,1 + (u_char __user *) address); - +if (FPU_modrm >=0300 )printk ("%02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , FPU_modrm &7 );else printk ("/%d\n" , (FPU_modrm >>3 ) &7 ); } -else - { +else {printk ("cs selector = %04x\n" ,FPU_CS ); }
@@ -76,10 +74,10 @@ void Un_impl(void)/* Called for opcodes which are illegal and which are known to result in a SIGILL with a real 80486. -*/ +*/ void FPU_illegal (void ) { -math_abort (FPU_info,SIGILL ); +math_abort (FPU_info ,SIGILL ); }
@@ -88,61 +86,69 @@ void FPU_printall(void) {int i;static const char *tag_desc[] = {"Valid" ,"Zero" ,"ERROR" ,"Empty" , -"DeNorm" ,"Inf" ,"NaN" }; +"DeNorm" ,"Inf" ,"NaN" };u_char byte1, FPU_modrm;unsigned long address =FPU_ORIG_EIP ;RE_ENTRANT_CHECK_OFF ;/* No need to check access_ok(), we have previously fetched these bytes. */ printk ("At %p:" , (void *) address); -if (FPU_CS == __USER_CS ) - { +if (FPU_CS == __USER_CS) {#define MAX_PRINTED_BYTES 20 -for ( i =0 ; i <MAX_PRINTED_BYTES ; i++ ) - { +for (i =0 ; i <MAX_PRINTED_BYTES ; i++) {FPU_get_user (byte1, (u_char __user *) address); -if ( (byte1 &0xf8 ) ==0xd8 ) - { +if ((byte1 &0xf8 ) ==0xd8 ) {printk (" %02x" , byte1);break ; }printk (" [%02x]" , byte1); address++; } -if ( i ==MAX_PRINTED_BYTES ) +if (i ==MAX_PRINTED_BYTES )printk (" [more..]\n" ); -else - { +else {FPU_get_user (FPU_modrm,1 + (u_char __user *) address); - +if (FPU_modrm >=0300 ) -printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , FPU_modrm &7 ); +printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , + FPU_modrm &7 );else printk (" /%d, mod=%d rm=%d\n" , (FPU_modrm >>3 ) &7 , (FPU_modrm >>6 ) &3 , FPU_modrm &7 ); } }else - {printk ("%04x\n" ,FPU_CS ); - } partial_status =status_word ();#ifdef DEBUGGING -if ( partial_status & SW_Backward )printk ("SW: backward compatibility\n" ); -if ( partial_status &SW_C3 )printk ("SW: condition bit 3\n" ); -if ( partial_status &SW_C2 )printk ("SW: condition bit 2\n" ); -if ( partial_status &SW_C1 )printk ("SW: condition bit 1\n" ); -if ( partial_status &SW_C0 )printk ("SW: condition bit 0\n" ); -if ( partial_status & SW_Summary )printk ("SW: exception summary\n" ); -if ( partial_status & SW_Stack_Fault )printk ("SW: stack fault\n" ); -if ( partial_status & SW_Precision )printk ("SW: loss of precision\n" ); -if ( partial_status & SW_Underflow )printk ("SW: underflow\n" ); -if ( partial_status & SW_Overflow )printk ("SW: overflow\n" ); -if ( partial_status & SW_Zero_Div )printk ("SW: divide by zero\n" ); -if ( partial_status & SW_Denorm_Op )printk ("SW: denormalized operand\n" ); -if ( partial_status & SW_Invalid )printk ("SW: invalid operation\n" ); +if (partial_status & SW_Backward) +printk ("SW: backward compatibility\n" ); +if (partial_status &SW_C3 ) +printk ("SW: condition bit 3\n" ); +if (partial_status &SW_C2 ) +printk ("SW: condition bit 2\n" ); +if (partial_status &SW_C1 ) +printk ("SW: condition bit 1\n" ); +if (partial_status &SW_C0 ) +printk ("SW: condition bit 0\n" ); +if (partial_status & SW_Summary) +printk ("SW: exception summary\n" ); +if (partial_status & SW_Stack_Fault) +printk ("SW: stack fault\n" ); +if (partial_status & SW_Precision) +printk ("SW: loss of precision\n" ); +if (partial_status & SW_Underflow) +printk ("SW: underflow\n" ); +if (partial_status & SW_Overflow) +printk ("SW: overflow\n" ); +if (partial_status & SW_Zero_Div) +printk ("SW: divide by zero\n" ); +if (partial_status & SW_Denorm_Op) +printk ("SW: denormalized operand\n" ); +if (partial_status & SW_Invalid) +printk ("SW: invalid operation\n" );#endif /* DEBUGGING */ printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",
@@ -155,7 +161,7 @@ if ( partial_status & SW_Invalid ) printk("SW: invalid operation\n"); partial_status & SW_Precision?1 :0 , partial_status & SW_Underflow?1 :0 , partial_status & SW_Overflow?1 :0 , partial_status & SW_Zero_Div?1 :0 , partial_status & SW_Denorm_Op?1:0, partial_status & SW_Invalid?1:0); - + printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d ef=%d%d%d%d%d%d\n", control_word & 0x1000 ? 1 : 0, (control_word & 0x800) >> 11, (control_word & 0x400) >> 10,
@@ -165,12 +171,10 @@ printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d ef=%d%d%d%d%d%d\n", control_word & SW_Overflow?1 :0 , control_word & SW_Zero_Div?1 :0 , control_word & SW_Denorm_Op?1:0, control_word & SW_Invalid?1:0); -for ( i =0 ; i <8 ; i++ ) - { +for (i =0 ; i <8 ; i++) {FPU_REG *r = &st (i);u_char tagi =FPU_gettagi (i); -switch (tagi) - { +switch (tagi) {case TAG_Empty:continue ;break ;
@@ -219,78 +223,78 @@ static struct {error was detected. Internal error types: -0x14 in fpu_etc.c -0x1nn in a *.c file: -0x101 in reg_add_sub.c -0x102 in reg_mul.c -0x104 in poly_atan.c -0x105 in reg_mul.c -0x107 in fpu_trig.c -0x108 in reg_compare.c -0x109 in reg_compare.c -0x110 in reg_add_sub.c -0x111 in fpe_entry.c -0x112 in fpu_trig.c -0x113 in errors.c -0x115 in fpu_trig.c -0x116 in fpu_trig.c -0x117 in fpu_trig.c -0x118 in fpu_trig.c -0x119 in fpu_trig.c -0x120 in poly_atan.c -0x121 in reg_compare.c -0x122 in reg_compare.c -0x123 in reg_compare.c -0x125 in fpu_trig.c -0x126 in fpu_entry.c -0x127 in poly_2xm1.c -0x128 in fpu_entry.c -0x129 in fpu_entry.c -0x130 in get_address.c -0x131 in get_address.c -0x132 in get_address.c -0x133 in get_address.c -0x140 in load_store.c -0x141 in load_store.c -0x150 in poly_sin.c -0x151 in poly_sin.c -0x160 in reg_ld_str.c -0x161 in reg_ld_str.c -0x162 in reg_ld_str.c -0x163 in reg_ld_str.c -0x164 in reg_ld_str.c -0x170 in fpu_tags.c -0x171 in fpu_tags.c -0x172 in fpu_tags.c -0x180 in reg_convert.c -0x2nn in an *.S file: -0x201 in reg_u_add.S -0x202 in reg_u_div.S -0x203 in reg_u_div.S -0x204 in reg_u_div.S -0x205 in reg_u_mul.S -0x206 in reg_u_sub.S -0x207 in wm_sqrt.S -0x208 in reg_div.S -0x209 in reg_u_sub.S -0x210 in reg_u_sub.S -0x211 in reg_u_sub.S -0x212 in reg_u_sub.S -0x213 in wm_sqrt.S -0x214 in wm_sqrt.S -0x215 in wm_sqrt.S -0x220 in reg_norm.S -0x221 in reg_norm.S -0x230 in reg_round.S -0x231 in reg_round.S -0x232 in reg_round.S -0x233 in reg_round.S -0x234 in reg_round.S -0x235 in reg_round.S -0x236 in reg_round.S -0x240 in div_Xsig.S -0x241 in div_Xsig.S -0x242 in div_Xsig.S +0x14 in fpu_etc.c +0x1nn in a *.c file: +0x101 in reg_add_sub.c +0x102 in reg_mul.c +0x104 in poly_atan.c +0x105 in reg_mul.c +0x107 in fpu_trig.c +0x108 in reg_compare.c +0x109 in reg_compare.c +0x110 in reg_add_sub.c +0x111 in fpe_entry.c +0x112 in fpu_trig.c +0x113 in errors.c +0x115 in fpu_trig.c +0x116 in fpu_trig.c +0x117 in fpu_trig.c +0x118 in fpu_trig.c +0x119 in fpu_trig.c +0x120 in poly_atan.c +0x121 in reg_compare.c +0x122 in reg_compare.c +0x123 in reg_compare.c +0x125 in fpu_trig.c +0x126 in fpu_entry.c +0x127 in poly_2xm1.c +0x128 in fpu_entry.c +0x129 in fpu_entry.c +0x130 in get_address.c +0x131 in get_address.c +0x132 in get_address.c +0x133 in get_address.c +0x140 in load_store.c +0x141 in load_store.c +0x150 in poly_sin.c +0x151 in poly_sin.c +0x160 in reg_ld_str.c +0x161 in reg_ld_str.c +0x162 in reg_ld_str.c +0x163 in reg_ld_str.c +0x164 in reg_ld_str.c +0x170 in fpu_tags.c +0x171 in fpu_tags.c +0x172 in fpu_tags.c +0x180 in reg_convert.c +0x2nn in an *.S file: +0x201 in reg_u_add.S +0x202 in reg_u_div.S +0x203 in reg_u_div.S +0x204 in reg_u_div.S +0x205 in reg_u_mul.S +0x206 in reg_u_sub.S +0x207 in wm_sqrt.S +0x208 in reg_div.S +0x209 in reg_u_sub.S +0x210 in reg_u_sub.S +0x211 in reg_u_sub.S +0x212 in reg_u_sub.S +0x213 in wm_sqrt.S +0x214 in wm_sqrt.S +0x215 in wm_sqrt.S +0x220 in reg_norm.S +0x221 in reg_norm.S +0x230 in reg_round.S +0x231 in reg_round.S +0x232 in reg_round.S +0x233 in reg_round.S +0x234 in reg_round.S +0x235 in reg_round.S +0x236 in reg_round.S +0x240 in div_Xsig.S +0x241 in div_Xsig.S +0x242 in div_Xsig.S */ asmlinkage void FPU_exception(int n)
@@ -298,25 +302,22 @@ asmlinkage void FPU_exception(int n)int i, int_type; int_type =0 ;/* Needed only to stop compiler warnings */ -if ( n &EX_INTERNAL ) - { +if (n &EX_INTERNAL ) { int_type = n -EX_INTERNAL ; n =EX_INTERNAL ;/* Set lots of exception bits! */ partial_status |= (SW_Exc_Mask | SW_Summary | SW_Backward); } -else - { +else {/* Extract only the bits which we use to set the status word */ n &= (SW_Exc_Mask);/* Set the corresponding exception bit */ partial_status |= n;/* Set summary bits iff exception isn't masked */ -if ( partial_status & ~control_word & CW_Exceptions ) +if (partial_status & ~control_word & CW_Exceptions) partial_status |= (SW_Summary | SW_Backward); -if ( n & (SW_Stack_Fault | EX_Precision) ) - { -if ( !(n &SW_C1 ) ) +if (n & (SW_Stack_Fault | EX_Precision)) { +if (!(n &SW_C1 ))/* This bit distinguishes over- from underflow for a stack fault, and roundup from round-down for precision loss. */ partial_status &= ~SW_C1 ;
@@ -324,29 +325,26 @@ asmlinkage void FPU_exception(int n) }RE_ENTRANT_CHECK_OFF ; -if ( (~control_word & n & CW_Exceptions) || (n ==EX_INTERNAL ) ) - { +if ((~control_word & n & CW_Exceptions) || (n ==EX_INTERNAL )) {#ifdef PRINT_MESSAGES /* My message from the sponsor */ printk (FPU_VERSION " " __DATE__" (C) W. Metzenthen.\n" );#endif /* PRINT_MESSAGES */ - +/* Get a name string for error reporting */ -for (i=0 ; exception_names[i].type; i++) -if ( (exception_names[i].type & n) == exception_names[i].type ) +for (i =0 ; exception_names[i].type; i++) +if ((exception_names[i].type & n) == exception_names[i].type)break ; - -if (exception_names[i].type) - { + +if (exception_names[i].type) {#ifdef PRINT_MESSAGES printk ("FP Exception: %s!\n" , exception_names[i].name);#endif /* PRINT_MESSAGES */ }else printk ("FPU emulator: Unknown Exception: 0x%04x!\n" , n); - -if ( n ==EX_INTERNAL ) - { + +if (n ==EX_INTERNAL ) {printk ("FPU emulator: Internal error type 0x%04x\n" , int_type);FPU_printall (); }
@@ -364,7 +362,7 @@ asmlinkage void FPU_exception(int n)RE_ENTRANT_CHECK_ON ;#ifdef __DEBUG__ -math_abort (FPU_info,SIGFPE ); +math_abort (FPU_info ,SIGFPE );#endif /* __DEBUG__ */ }
@@ -382,12 +380,10 @@ int real_1op_NaN(FPU_REG *a)differ) is chosen to reproduce 80486 behaviour */ signalling = isNaN && !(a->sigh &0x40000000 ); -if ( !signalling ) - { -if ( !isNaN )/* pseudo-NaN, or other unsupported? */ - { -if ( control_word & CW_Invalid ) - { +if (!signalling) { +if (!isNaN) { +/* pseudo-NaN, or other unsupported? */ +if (control_word & CW_Invalid) {/* Masked response */ reg_copy (&CONST_QNaN, a); }
@@ -397,11 +393,10 @@ int real_1op_NaN(FPU_REG *a)return TAG_Special; } -if ( control_word & CW_Invalid ) - { +if (control_word & CW_Invalid) {/* The masked response */ -if ( !(a->sigh &0x80000000 ) )/* pseudo-NaN ? */ - { +if (!(a->sigh &0x80000000 )) { +/* pseudo-NaN ? */ reg_copy (&CONST_QNaN, a); }/* ensure a Quiet NaN */
@@ -426,9 +421,9 @@ int real_2op_NaN(FPU_REG const *b, u_char tagb,FPU_REG const *x;int signalling, unsupported; -if ( taga == TAG_Special ) +if (taga == TAG_Special) taga =FPU_Special (a); -if ( tagb == TAG_Special ) +if (tagb == TAG_Special) tagb =FPU_Special (b);/* TW_NaN is also used for unsupported data types. */
@@ -436,10 +431,8 @@ int real_2op_NaN(FPU_REG const *b, u_char tagb, && !((exponent(a) == EXP_OVER) && (a->sigh & 0x80000000))) || ((tagb == TW_NaN) && !((exponent (b) ==EXP_OVER ) && (b->sigh &0x80000000 ))); -if ( unsupported ) - { -if ( control_word & CW_Invalid ) - { +if (unsupported) { +if (control_word & CW_Invalid) {/* Masked response */ FPU_copy_to_regi (&CONST_QNaN, TAG_Special, deststnr); }
@@ -447,23 +440,19 @@ int real_2op_NaN(FPU_REG const *b, u_char tagb,return (!(control_word & CW_Invalid) ? FPU_Exception :0 ) | TAG_Special; } -if (taga == TW_NaN) - { +if (taga == TW_NaN) { x = a; -if (tagb == TW_NaN) - { +if (tagb == TW_NaN) { signalling = !(a->sigh & b->sigh &0x40000000 ); -if (significand (b) >significand (a) ) +if (significand (b) >significand (a)) x = b; -else if (significand (b) ==significand (a) ) - { +else if (significand (b) ==significand (a)) {/* The default result for the case of two "equal" NaNs (signs may differ) is chosen to reproduce 80486 behaviour */ x = defaultNaN; } } -else - { +else {/* return the quiet version of the NaN in a */ signalling = !(a->sigh &0x40000000 ); }
@@ -477,25 +466,23 @@ int real_2op_NaN(FPU_REG const *b, u_char tagb, x = b; }#ifdef PARANOID - else - { + else { signalling =0 ;EXCEPTION (EX_INTERNAL |0x113 ); x = &CONST_QNaN; }#endif /* PARANOID */ -if ( (!signalling) || (control_word & CW_Invalid) ) - { -if ( ! x ) +if ((!signalling) || (control_word & CW_Invalid)) { +if (!x) x = b; -if ( !(x->sigh &0x80000000 ) )/* pseudo-NaN ? */ +if (!(x->sigh &0x80000000 ))/* pseudo-NaN ? */ x = &CONST_QNaN;FPU_copy_to_regi (x, TAG_Special, deststnr); -if ( !signalling ) +if (!signalling)return TAG_Special;/* ensure a Quiet NaN */
@@ -514,13 +501,12 @@ asmlinkage int arith_invalid(int deststnr) {EXCEPTION (EX_Invalid); - -if ( control_word & CW_Invalid ) - { + +if (control_word & CW_Invalid) {/* The masked response */ FPU_copy_to_regi (&CONST_QNaN, TAG_Special, deststnr); } - +return (!(control_word & CW_Invalid) ? FPU_Exception :0 ) | TAG_Valid; }
@@ -532,14 +518,13 @@ asmlinkage int FPU_divide_by_zero(int deststnr, u_char sign)FPU_REG *dest = &st (deststnr);int tag = TAG_Valid; -if ( control_word & CW_ZeroDiv ) - { +if (control_word & CW_ZeroDiv) {/* The masked response */ FPU_copy_to_regi (&CONST_INF , TAG_Special, deststnr);setsign (dest, sign); tag = TAG_Special; } - +EXCEPTION (EX_ZeroDiv);return (!(control_word & CW_ZeroDiv) ? FPU_Exception :0 ) | tag;
@@ -550,14 +535,12 @@ asmlinkage int FPU_divide_by_zero(int deststnr, u_char sign)/* This may be called often, so keep it lean */ int set_precision_flag (int flags) { -if ( control_word & CW_Precision ) - { +if (control_word & CW_Precision) { partial_status &= ~(SW_C1 & flags); partial_status |= flags;/* The masked response */ return 0 ; } -else - { +else {EXCEPTION (flags);return 1 ; }
@@ -567,7 +550,7 @@ int set_precision_flag(int flags)/* This may be called often, so keep it lean */ asmlinkage void set_precision_flag_up(void) { -if ( control_word & CW_Precision ) +if (control_word & CW_Precision) partial_status |= (SW_Precision |SW_C1 );/* The masked response */ else EXCEPTION (EX_Precision |SW_C1 );
@@ -577,8 +560,8 @@ asmlinkage void set_precision_flag_up(void)/* This may be called often, so keep it lean */ asmlinkage void set_precision_flag_down(void) { -if ( control_word & CW_Precision ) - {/* The masked response */ +if (control_word & CW_Precision) { +/* The masked response */ partial_status &= ~SW_C1 ; partial_status |= SW_Precision; }
@@ -587,15 +570,14 @@ asmlinkage void set_precision_flag_down(void) } -asmlinkage int denormal_operand(void) + asmlinkage int denormal_operand(void) { -if ( control_word & CW_Denormal ) - {/* The masked response */ +if (control_word & CW_Denormal) { +/* The masked response */ partial_status |= SW_Denorm_Op;return TAG_Special; } -else - { +else {EXCEPTION (EX_Denormal);return TAG_Special | FPU_Exception; }
@@ -606,22 +588,19 @@ asmlinkage int arith_overflow(FPU_REG *dest) {int tag = TAG_Valid; -if ( control_word & CW_Overflow ) - { +if (control_word & CW_Overflow) {/* The masked response */ /* ###### The response here depends upon the rounding mode */ reg_copy (&CONST_INF , dest); tag = TAG_Special; } -else - { +else {/* Subtract the magic number from the exponent */ addexponent (dest, (-3 * (1 <<13 ))); }EXCEPTION (EX_Overflow); -if ( control_word & CW_Overflow ) - { +if (control_word & CW_Overflow) {/* The overflow exception is masked. */ /* By definition, precision is lost. The roundup bit (C1) is also set because we have
@@ -639,33 +618,27 @@ asmlinkage int arith_underflow(FPU_REG *dest) {int tag = TAG_Valid; -if ( control_word & CW_Underflow ) - { +if (control_word & CW_Underflow) {/* The masked response */ -if (exponent16 (dest) <=EXP_UNDER -63 ) - { +if (exponent16 (dest) <=EXP_UNDER -63 ) {reg_copy (&CONST_Z , dest); partial_status &= ~SW_C1 ;/* Round down. */ tag = TAG_Zero; }else - {stdexp (dest); - } } -else - { +else {/* Add the magic number to the exponent. */ addexponent (dest, (3 * (1 <<13 )) + EXTENDED_Ebias); }EXCEPTION (EX_Underflow); -if ( control_word & CW_Underflow ) - { +if (control_word & CW_Underflow) {/* The underflow exception is masked. */ EXCEPTION (EX_Precision);return tag; - } + }return tag;
@@ -675,12 +648,11 @@ asmlinkage int arith_underflow(FPU_REG *dest)void FPU_stack_overflow (void ) { -if ( control_word & CW_Invalid ) - { -/* The masked response */ - top--; +if (control_word & CW_Invalid) { +/* The masked response */ + top--;FPU_copy_to_reg0 (&CONST_QNaN, TAG_Special); - } + }EXCEPTION (EX_StackOver);
@@ -692,11 +664,10 @@ void FPU_stack_overflow(void)void FPU_stack_underflow (void ) { -if ( control_word & CW_Invalid ) - { -/* The masked response */ -FPU_copy_to_reg0 (&CONST_QNaN, TAG_Special); - } +if (control_word & CW_Invalid) { +/* The masked response */ +FPU_copy_to_reg0 (&CONST_QNaN, TAG_Special); + }EXCEPTION (EX_StackUnder);
@@ -708,11 +679,10 @@ void FPU_stack_underflow(void)void FPU_stack_underflow_i (int i) { -if ( control_word & CW_Invalid ) - { +if (control_word & CW_Invalid) {/* The masked response */ FPU_copy_to_regi (&CONST_QNaN, TAG_Special, i); - } + }EXCEPTION (EX_StackUnder);
@@ -724,12 +694,11 @@ void FPU_stack_underflow_i(int i)void FPU_stack_underflow_pop (int i) { -if ( control_word & CW_Invalid ) - { +if (control_word & CW_Invalid) {/* The masked response */ FPU_copy_to_regi (&CONST_QNaN, TAG_Special, i);FPU_pop (); - } + }EXCEPTION (EX_StackUnder);
Signature · 1 line
1.5.4.rc3
Paolo Ciarrocchi пишет:
Quoted 68 lines
This file has not been modified since October so should be easy to integrate the following patch.
Before:
total: 214 errors, 28 warnings, 739 lines checkedAfter:
total: 4 errors, 28 warnings, 708 lines checkedCompile tested:
paolo@paolo-desktop:/tmp$ size error.o.* text data bss dec hex filename 3476 0 0 3476 d94 error.o.after 3476 0 0 3476 d94 error.o.beforeSigned-off-by Paolo Ciarrocchi <[email protected]>---
The only remaining errors are like the following:
ERROR: need consistent spacing around '*' (ctx:WxB) #110: FILE: errors.c:110:
+ FPU_get_user(FPU_modrm, 1 + (u_char __user *) address); ^Any hint on how to fix them?
arch/x86/math-emu/errors.c | 405 ++++++++++++++++++++------------------------ 1 files changed, 187 insertions(+), 218 deletions(-)arch/x86/math-emu/errors.c +6
-8@@ -43,25 +43,23 @@ void Un_impl(void)RE_ENTRANT_CHECK_OFF ;/* No need to check access_ok(), we have previously fetched these bytes. */ printk ("Unimplemented FPU Opcode at eip=%p : " , (void __user *) address); -if (FPU_CS == __USER_CS ) - { -while (1 ) - { +if (FPU_CS == __USER_CS) { +while (1 ) {FPU_get_user (byte1, (u_char __user *) address); -if ( (byte1 &0xf8 ) ==0xd8 )break ; +if ((byte1 &0xf8 ) ==0xd8 ) +break ;printk ("[%02x]" , byte1); address++; }printk ("%02x " , byte1);FPU_get_user (FPU_modrm,1 + (u_char __user *) address); - +if (FPU_modrm >=0300 )printk ("%02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , FPU_modrm &7 );else printk ("/%d\n" , (FPU_modrm >>3 ) &7 ); } -else - { +else {printk ("cs selector = %04x\n" ,FPU_CS ); }
arch/x86/math-emu/errors.c void Un_impl(void) · line 80
Quoted 9 lines
arch/x86/math-emu/errors.c +2
-2@@ -76,10 +74,10 @@ void Un_impl(void)/* Called for opcodes which are illegal and which are known to result in a SIGILL with a real 80486. -*/ +*/ void FPU_illegal (void ) { -math_abort (FPU_info,SIGILL ); +math_abort (FPU_info ,SIGILL );
Looks like you're trading bad for worse here.
Quoted 87 lines
arch/x86/math-emu/errors.c +25
-27}@@ -88,61 +86,69 @@ void FPU_printall(void) {int i;static const char *tag_desc[] = {"Valid" ,"Zero" ,"ERROR" ,"Empty" , -"DeNorm" ,"Inf" ,"NaN" }; +"DeNorm" ,"Inf" ,"NaN" };u_char byte1, FPU_modrm;unsigned long address =FPU_ORIG_EIP ;RE_ENTRANT_CHECK_OFF ;/* No need to check access_ok(), we have previously fetched these bytes. */ printk ("At %p:" , (void *) address); -if (FPU_CS == __USER_CS ) - { +if (FPU_CS == __USER_CS) {#define MAX_PRINTED_BYTES 20 -for ( i =0 ; i <MAX_PRINTED_BYTES ; i++ ) - { +for (i =0 ; i <MAX_PRINTED_BYTES ; i++) {FPU_get_user (byte1, (u_char __user *) address); -if ( (byte1 &0xf8 ) ==0xd8 ) - { +if ((byte1 &0xf8 ) ==0xd8 ) {printk (" %02x" , byte1);break ; }printk (" [%02x]" , byte1); address++; } -if ( i ==MAX_PRINTED_BYTES ) +if (i ==MAX_PRINTED_BYTES )printk (" [more..]\n" ); -else - { +else {FPU_get_user (FPU_modrm,1 + (u_char __user *) address); - +if (FPU_modrm >=0300 ) -printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , FPU_modrm &7 ); +printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , + FPU_modrm &7 );else printk (" /%d, mod=%d rm=%d\n" , (FPU_modrm >>3 ) &7 , (FPU_modrm >>6 ) &3 , FPU_modrm &7 ); } }else - {printk ("%04x\n" ,FPU_CS ); - } partial_status =status_word ();#ifdef DEBUGGING -if ( partial_status & SW_Backward )printk ("SW: backward compatibility\n" ); -if ( partial_status &SW_C3 )printk ("SW: condition bit 3\n" ); -if ( partial_status &SW_C2 )printk ("SW: condition bit 2\n" ); -if ( partial_status &SW_C1 )printk ("SW: condition bit 1\n" ); -if ( partial_status &SW_C0 )printk ("SW: condition bit 0\n" ); -if ( partial_status & SW_Summary )printk ("SW: exception summary\n" ); -if ( partial_status & SW_Stack_Fault )printk ("SW: stack fault\n" ); -if ( partial_status & SW_Precision )printk ("SW: loss of precision\n" ); -if ( partial_status & SW_Underflow )printk ("SW: underflow\n" ); -if ( partial_status & SW_Overflow )printk ("SW: overflow\n" ); -if ( partial_status & SW_Zero_Div )printk ("SW: divide by zero\n" ); -if ( partial_status & SW_Denorm_Op )printk ("SW: denormalized operand\n" ); -if ( partial_status & SW_Invalid )printk ("SW: invalid operation\n" ); +if (partial_status & SW_Backward) +printk ("SW: backward compatibility\n" ); +if (partial_status &SW_C3 ) +printk ("SW: condition bit 3\n" ); +if (partial_status &SW_C2 ) +printk ("SW: condition bit 2\n" ); +if (partial_status &SW_C1 ) +printk ("SW: condition bit 1\n" ); +if (partial_status &SW_C0 ) +printk ("SW: condition bit 0\n" ); +if (partial_status & SW_Summary) +printk ("SW: exception summary\n" ); +if (partial_status & SW_Stack_Fault) +printk ("SW: stack fault\n" ); +if (partial_status & SW_Precision) +printk ("SW: loss of precision\n" );
arch/x86/math-emu/errors.c void FPU_printall(void) · line 151
Quoted 10 lines
arch/x86/math-emu/errors.c +10
-0+if (partial_status & SW_Underflow) +printk ("SW: underflow\n" ); +if (partial_status & SW_Overflow) +printk ("SW: overflow\n" ); +if (partial_status & SW_Zero_Div) +printk ("SW: divide by zero\n" ); +if (partial_status & SW_Denorm_Op) +printk ("SW: denormalized operand\n" ); +if (partial_status & SW_Invalid) +printk ("SW: invalid operation\n" );
While you're at it, please think about adding proper KERN_ facility to these printk() calls.
arch/x86/math-emu/errors.c void FPU_printall(void) · line 154
Quoted 3 lines
arch/x86/math-emu/errors.c +0
-0#endif /* DEBUGGING */ printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",
Ditto.
arch/x86/math-emu/errors.c if ( partial_status & SW_Invalid ) printk("SW: invalid operation\n"); · line 165
Quoted 7 lines
arch/x86/math-emu/errors.c +1
-1@@ -155,7 +161,7 @@ if ( partial_status & SW_Invalid ) printk("SW: invalid operation\n"); partial_status & SW_Precision?1 :0 , partial_status & SW_Underflow?1 :0 , partial_status & SW_Overflow?1 :0 , partial_status & SW_Zero_Div?1 :0 , partial_status & SW_Denorm_Op?1:0, partial_status & SW_Invalid?1:0); - + printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d ef=%d%d%d%d%d%d\n",
Ditto.
Quoted 238 lines
arch/x86/math-emu/errors.c +87
-95control_word &0x1000 ?1 :0 , (control_word & 0x800) >> 11, (control_word & 0x400) >> 10,@@ -165,12 +171,10 @@ printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d ef=%d%d%d%d%d%d\n", control_word & SW_Overflow?1 :0 , control_word & SW_Zero_Div?1 :0 , control_word & SW_Denorm_Op?1:0, control_word & SW_Invalid?1:0); -for ( i =0 ; i <8 ; i++ ) - { +for (i =0 ; i <8 ; i++) {FPU_REG *r = &st (i);u_char tagi =FPU_gettagi (i); -switch (tagi) - { +switch (tagi) {case TAG_Empty:continue ;break ;@@ -219,78 +223,78 @@ static struct {error was detected. Internal error types: -0x14 in fpu_etc.c -0x1nn in a *.c file: -0x101 in reg_add_sub.c -0x102 in reg_mul.c -0x104 in poly_atan.c -0x105 in reg_mul.c -0x107 in fpu_trig.c -0x108 in reg_compare.c -0x109 in reg_compare.c -0x110 in reg_add_sub.c -0x111 in fpe_entry.c -0x112 in fpu_trig.c -0x113 in errors.c -0x115 in fpu_trig.c -0x116 in fpu_trig.c -0x117 in fpu_trig.c -0x118 in fpu_trig.c -0x119 in fpu_trig.c -0x120 in poly_atan.c -0x121 in reg_compare.c -0x122 in reg_compare.c -0x123 in reg_compare.c -0x125 in fpu_trig.c -0x126 in fpu_entry.c -0x127 in poly_2xm1.c -0x128 in fpu_entry.c -0x129 in fpu_entry.c -0x130 in get_address.c -0x131 in get_address.c -0x132 in get_address.c -0x133 in get_address.c -0x140 in load_store.c -0x141 in load_store.c -0x150 in poly_sin.c -0x151 in poly_sin.c -0x160 in reg_ld_str.c -0x161 in reg_ld_str.c -0x162 in reg_ld_str.c -0x163 in reg_ld_str.c -0x164 in reg_ld_str.c -0x170 in fpu_tags.c -0x171 in fpu_tags.c -0x172 in fpu_tags.c -0x180 in reg_convert.c -0x2nn in an *.S file: -0x201 in reg_u_add.S -0x202 in reg_u_div.S -0x203 in reg_u_div.S -0x204 in reg_u_div.S -0x205 in reg_u_mul.S -0x206 in reg_u_sub.S -0x207 in wm_sqrt.S -0x208 in reg_div.S -0x209 in reg_u_sub.S -0x210 in reg_u_sub.S -0x211 in reg_u_sub.S -0x212 in reg_u_sub.S -0x213 in wm_sqrt.S -0x214 in wm_sqrt.S -0x215 in wm_sqrt.S -0x220 in reg_norm.S -0x221 in reg_norm.S -0x230 in reg_round.S -0x231 in reg_round.S -0x232 in reg_round.S -0x233 in reg_round.S -0x234 in reg_round.S -0x235 in reg_round.S -0x236 in reg_round.S -0x240 in div_Xsig.S -0x241 in div_Xsig.S -0x242 in div_Xsig.S +0x14 in fpu_etc.c +0x1nn in a *.c file: +0x101 in reg_add_sub.c +0x102 in reg_mul.c +0x104 in poly_atan.c +0x105 in reg_mul.c +0x107 in fpu_trig.c +0x108 in reg_compare.c +0x109 in reg_compare.c +0x110 in reg_add_sub.c +0x111 in fpe_entry.c +0x112 in fpu_trig.c +0x113 in errors.c +0x115 in fpu_trig.c +0x116 in fpu_trig.c +0x117 in fpu_trig.c +0x118 in fpu_trig.c +0x119 in fpu_trig.c +0x120 in poly_atan.c +0x121 in reg_compare.c +0x122 in reg_compare.c +0x123 in reg_compare.c +0x125 in fpu_trig.c +0x126 in fpu_entry.c +0x127 in poly_2xm1.c +0x128 in fpu_entry.c +0x129 in fpu_entry.c +0x130 in get_address.c +0x131 in get_address.c +0x132 in get_address.c +0x133 in get_address.c +0x140 in load_store.c +0x141 in load_store.c +0x150 in poly_sin.c +0x151 in poly_sin.c +0x160 in reg_ld_str.c +0x161 in reg_ld_str.c +0x162 in reg_ld_str.c +0x163 in reg_ld_str.c +0x164 in reg_ld_str.c +0x170 in fpu_tags.c +0x171 in fpu_tags.c +0x172 in fpu_tags.c +0x180 in reg_convert.c +0x2nn in an *.S file: +0x201 in reg_u_add.S +0x202 in reg_u_div.S +0x203 in reg_u_div.S +0x204 in reg_u_div.S +0x205 in reg_u_mul.S +0x206 in reg_u_sub.S +0x207 in wm_sqrt.S +0x208 in reg_div.S +0x209 in reg_u_sub.S +0x210 in reg_u_sub.S +0x211 in reg_u_sub.S +0x212 in reg_u_sub.S +0x213 in wm_sqrt.S +0x214 in wm_sqrt.S +0x215 in wm_sqrt.S +0x220 in reg_norm.S +0x221 in reg_norm.S +0x230 in reg_round.S +0x231 in reg_round.S +0x232 in reg_round.S +0x233 in reg_round.S +0x234 in reg_round.S +0x235 in reg_round.S +0x236 in reg_round.S +0x240 in div_Xsig.S +0x241 in div_Xsig.S +0x242 in div_Xsig.S */ asmlinkage void FPU_exception(int n)@@ -298,25 +302,22 @@ asmlinkage void FPU_exception(int n)int i, int_type; int_type =0 ;/* Needed only to stop compiler warnings */ -if ( n &EX_INTERNAL ) - { +if (n &EX_INTERNAL ) { int_type = n -EX_INTERNAL ; n =EX_INTERNAL ;/* Set lots of exception bits! */ partial_status |= (SW_Exc_Mask | SW_Summary | SW_Backward); } -else - { +else {/* Extract only the bits which we use to set the status word */ n &= (SW_Exc_Mask);/* Set the corresponding exception bit */ partial_status |= n;/* Set summary bits iff exception isn't masked */ -if ( partial_status & ~control_word & CW_Exceptions ) +if (partial_status & ~control_word & CW_Exceptions) partial_status |= (SW_Summary | SW_Backward); -if ( n & (SW_Stack_Fault | EX_Precision) ) - { -if ( !(n &SW_C1 ) ) +if (n & (SW_Stack_Fault | EX_Precision)) { +if (!(n &SW_C1 ))/* This bit distinguishes over- from underflow for a stack fault, and roundup from round-down for precision loss. */ partial_status &= ~SW_C1 ;@@ -324,29 +325,26 @@ asmlinkage void FPU_exception(int n) }RE_ENTRANT_CHECK_OFF ; -if ( (~control_word & n & CW_Exceptions) || (n ==EX_INTERNAL ) ) - { +if ((~control_word & n & CW_Exceptions) || (n ==EX_INTERNAL )) {#ifdef PRINT_MESSAGES /* My message from the sponsor */ printk (FPU_VERSION " " __DATE__" (C) W. Metzenthen.\n" );#endif /* PRINT_MESSAGES */ - +/* Get a name string for error reporting */ -for (i=0 ; exception_names[i].type; i++) -if ( (exception_names[i].type & n) == exception_names[i].type ) +for (i =0 ; exception_names[i].type; i++) +if ((exception_names[i].type & n) == exception_names[i].type)break ; - -if (exception_names[i].type) - { + +if (exception_names[i].type) {#ifdef PRINT_MESSAGES printk ("FP Exception: %s!\n" , exception_names[i].name);#endif /* PRINT_MESSAGES */ }else printk ("FPU emulator: Unknown Exception: 0x%04x!\n" , n); - -if ( n ==EX_INTERNAL ) - { + +if (n ==EX_INTERNAL ) {printk ("FPU emulator: Internal error type 0x%04x\n" , int_type);FPU_printall (); }
arch/x86/math-emu/errors.c asmlinkage void FPU_exception(int n) · line 365
Quoted 5 lines
arch/x86/math-emu/errors.c +1
-1@@ -364,7 +362,7 @@ asmlinkage void FPU_exception(int n)RE_ENTRANT_CHECK_ON ;#ifdef __DEBUG__ -math_abort (FPU_info,SIGFPE ); +math_abort (FPU_info ,SIGFPE );
Why do you need this extra space before the comma?
This file seems to be in need of formatting lines to use tabs instead of spaces.
Thanks,
Dmitri
Quoted 4 lines · Dmitri Vorobiev
arch/x86/math-emu/errors.c void Un_impl(void) · line 80
Quoted 2 lines
arch/x86/math-emu/errors.c +1
-1-math_abort (FPU_info,SIGILL ); +math_abort (FPU_info ,SIGILL );Looks like you're trading bad for worse here.
Should I make it read like math_abort(FPU_info, SIGILL); ?
Quoted 92 lines
Quoted 92 lines
}
arch/x86/math-emu/errors.c +29
-27@@ -88,61 +86,69 @@ void FPU_printall(void) {int i;static const char *tag_desc[] = {"Valid" ,"Zero" ,"ERROR" ,"Empty" , -"DeNorm" ,"Inf" ,"NaN" }; +"DeNorm" ,"Inf" ,"NaN" };u_char byte1, FPU_modrm;unsigned long address =FPU_ORIG_EIP ;RE_ENTRANT_CHECK_OFF ;/* No need to check access_ok(), we have previously fetched these bytes. */ printk ("At %p:" , (void *) address); -if (FPU_CS == __USER_CS ) - { +if (FPU_CS == __USER_CS) {#define MAX_PRINTED_BYTES 20 -for ( i =0 ; i <MAX_PRINTED_BYTES ; i++ ) - { +for (i =0 ; i <MAX_PRINTED_BYTES ; i++) {FPU_get_user (byte1, (u_char __user *) address); -if ( (byte1 &0xf8 ) ==0xd8 ) - { +if ((byte1 &0xf8 ) ==0xd8 ) {printk (" %02x" , byte1);break ; }printk (" [%02x]" , byte1); address++; } -if ( i ==MAX_PRINTED_BYTES ) +if (i ==MAX_PRINTED_BYTES )printk (" [more..]\n" ); -else - { +else {FPU_get_user (FPU_modrm,1 + (u_char __user *) address); - +if (FPU_modrm >=0300 ) -printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , FPU_modrm &7 ); +printk (" %02x (%02x+%d)\n" , FPU_modrm, FPU_modrm &0xf8 , + FPU_modrm &7 );else printk (" /%d, mod=%d rm=%d\n" , (FPU_modrm >>3 ) &7 , (FPU_modrm >>6 ) &3 , FPU_modrm &7 ); } }else - {printk ("%04x\n" ,FPU_CS ); - } partial_status =status_word ();#ifdef DEBUGGING -if ( partial_status & SW_Backward )printk ("SW: backward compatibility\n" ); -if ( partial_status &SW_C3 )printk ("SW: condition bit 3\n" ); -if ( partial_status &SW_C2 )printk ("SW: condition bit 2\n" ); -if ( partial_status &SW_C1 )printk ("SW: condition bit 1\n" ); -if ( partial_status &SW_C0 )printk ("SW: condition bit 0\n" ); -if ( partial_status & SW_Summary )printk ("SW: exception summary\n" ); -if ( partial_status & SW_Stack_Fault )printk ("SW: stack fault\n" ); -if ( partial_status & SW_Precision )printk ("SW: loss of precision\n" ); -if ( partial_status & SW_Underflow )printk ("SW: underflow\n" ); -if ( partial_status & SW_Overflow )printk ("SW: overflow\n" ); -if ( partial_status & SW_Zero_Div )printk ("SW: divide by zero\n" ); -if ( partial_status & SW_Denorm_Op )printk ("SW: denormalized operand\n" ); -if ( partial_status & SW_Invalid )printk ("SW: invalid operation\n" ); +if (partial_status & SW_Backward) +printk ("SW: backward compatibility\n" ); +if (partial_status &SW_C3 ) +printk ("SW: condition bit 3\n" ); +if (partial_status &SW_C2 ) +printk ("SW: condition bit 2\n" ); +if (partial_status &SW_C1 ) +printk ("SW: condition bit 1\n" ); +if (partial_status &SW_C0 ) +printk ("SW: condition bit 0\n" ); +if (partial_status & SW_Summary) +printk ("SW: exception summary\n" ); +if (partial_status & SW_Stack_Fault) +printk ("SW: stack fault\n" ); +if (partial_status & SW_Precision) +printk ("SW: loss of precision\n" ); +if (partial_status & SW_Underflow) +printk ("SW: underflow\n" ); +if (partial_status & SW_Overflow) +printk ("SW: overflow\n" );
Quoted 8 lines
arch/x86/math-emu/errors.c void FPU_printall(void) · line 151
Quoted 6 lines
arch/x86/math-emu/errors.c +6
-0+if (partial_status & SW_Zero_Div) +printk ("SW: divide by zero\n" ); +if (partial_status & SW_Denorm_Op) +printk ("SW: denormalized operand\n" ); +if (partial_status & SW_Invalid) +printk ("SW: invalid operation\n" );While you're at it, please think about adding proper
KERN_facility to theseprintk()calls.
Yes, basically all the warnings are about missing KERN_. Do you want me to add KERN_ERR to all the above printk?
Quoted 16 lines
arch/x86/math-emu/errors.c void FPU_printall(void) · line 154
Quoted 3 lines
arch/x86/math-emu/errors.c +0
-0#endif /* DEBUGGING */ printk(" SW: b=%d st=%ld es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",Ditto.
arch/x86/math-emu/errors.c if ( partial_status & SW_Invalid ) printk("SW: invalid operation\n"); · line 165
Quoted 7 lines
arch/x86/math-emu/errors.c +1
-1@@ -155,7 +161,7 @@ if ( partial_status & SW_Invalid ) printk("SW: invalid operation\n"); partial_status & SW_Precision?1 :0 , partial_status & SW_Underflow?1 :0 , partial_status & SW_Overflow?1 :0 , partial_status & SW_Zero_Div?1 :0 , partial_status & SW_Denorm_Op?1:0, partial_status & SW_Invalid?1:0); - + printk(" CW: ic=%d rc=%ld%ld pc=%ld%ld iem=%d ef=%d%d%d%d%d%d\n",Ditto.
[...]
Quoted 5 lines
arch/x86/math-emu/errors.c asmlinkage void FPU_exception(int n) · line 365
Quoted 3 lines
#ifdef
__DEBUG__arch/x86/math-emu/errors.c +1
-1-math_abort (FPU_info,SIGFPE ); +math_abort (FPU_info ,SIGFPE );Why do you need this extra space before the comma?
My mistake.
Quoted 2 lines
This file seems to be in need of formatting lines to use tabs instead of spaces.
Ciao,
Signature · 2 lines
Paolo http://paolo.ciarrocchi.googlepages.com/
Quoted 7 lines · Paolo Ciarrocchi
Quoted 4 lines · Dmitri Vorobiev
arch/x86/math-emu/errors.c void Un_impl(void) · line 80
Quoted 2 lines
arch/x86/math-emu/errors.c +1
-1-math_abort (FPU_info,SIGILL ); +math_abort (FPU_info ,SIGILL );Looks like you're trading bad for worse here.
Should I make it read like
math_abort(FPU_info, SIGILL); ?
yeah, that's the correct one.
Quoted 4 lines
Quoted 1 line
While you're at it, please think about adding proper
KERN_facility to theseprintk()calls.Yes, basically all the warnings are about missing
KERN_. Do you want me to addKERN_ERRto all the above printk?
Do that in a separate patch though, as it changes strings. (and hence the checking for 'did the object md5 change' misfires)
Ingo