Are you still missing spaces in "switch (foo)" in a couple places?
On Fri, Sep 26, 2008 at 3:29 PM, Nathan Binkert <[EMAIL PROTECTED]> wrote: > changeset cb98f0fcc6c6 in /z/repo/m5 > details: http://repo.m5sim.org/m5?cmd=changeset;node=cb98f0fcc6c6 > description: > style: These files didn't even come close to following the M5 style > guide. > > diffstat: > > 2 files changed, 27 insertions(+), 145 deletions(-) > src/arch/mips/dsp.cc | 32 ++++------- > src/arch/mips/dsp.hh | 140 > +++++--------------------------------------------- > > diffs (truncated from 1956 to 300 lines): > > diff -r 03c186e416aa -r cb98f0fcc6c6 src/arch/mips/dsp.cc > --- a/src/arch/mips/dsp.cc Fri Sep 26 07:44:07 2008 -0700 > +++ b/src/arch/mips/dsp.cc Fri Sep 26 08:18:53 2008 -0700 > @@ -40,92 +40,84 @@ > using namespace std; > > int32_t > -MipsISA::bitrev( int32_t value ) > +MipsISA::bitrev(int32_t value) > { > int32_t result = 0; > - int i, shift; > + int shift; > > - for( i=0; i<16; i++ ) > - { > - shift = 2*i - 15; > + for (int i = 0; i < 16; i++) { > + shift = 2 * i - 15; > > - if( shift < 0 ) > - result |= (value & 1L<<i) << -shift; > + if (shift < 0) > + result |= (value & 1 << i) << -shift; > else > - result |= (value & 1L<<i) >> shift; > + result |= (value & 1 << i) >> shift; > } > > return result; > } > > uint64_t > -MipsISA::dspSaturate( uint64_t value, int32_t fmt, int32_t sign, uint32_t > *overflow ) > +MipsISA::dspSaturate(uint64_t value, int32_t fmt, int32_t sign, > + uint32_t *overflow) > { > - int64_t svalue; > + int64_t svalue = (int64_t)value; > > - svalue = (int64_t)value; > - > - switch( sign ) > - { > + switch(sign) { > case SIGNED: > - if( svalue > (int64_t)FIXED_SMAX[fmt] ) > - { > + if (svalue > (int64_t)FIXED_SMAX[fmt]) { > *overflow = 1; > svalue = (int64_t)FIXED_SMAX[fmt]; > - } > - else if( svalue < (int64_t)FIXED_SMIN[fmt] ) > - { > + } else if (svalue < (int64_t)FIXED_SMIN[fmt]) { > *overflow = 1; > svalue = (int64_t)FIXED_SMIN[fmt]; > } > break; > case UNSIGNED: > - if( svalue > (int64_t)FIXED_UMAX[fmt] ) > - { > + if (svalue > (int64_t)FIXED_UMAX[fmt]) { > *overflow = 1; > svalue = FIXED_UMAX[fmt]; > - } > - else if( svalue < (int64_t)FIXED_UMIN[fmt] ) > - { > + } else if (svalue < (int64_t)FIXED_UMIN[fmt]) { > *overflow = 1; > svalue = FIXED_UMIN[fmt]; > } > break; > } > > - return( (uint64_t)svalue ); > + return (uint64_t)svalue; > } > > uint64_t > -MipsISA::checkOverflow( uint64_t value, int32_t fmt, int32_t sign, > uint32_t *overflow ) > +MipsISA::checkOverflow(uint64_t value, int32_t fmt, int32_t sign, > + uint32_t *overflow) > { > - int64_t svalue; > + int64_t svalue = (int64_t)value; > > - svalue = (int64_t)value; > - > - switch( sign ) > + switch(sign) > { > case SIGNED: > - if( svalue > (int64_t)FIXED_SMAX[fmt] || svalue < > (int64_t)FIXED_SMIN[fmt] ) > + if (svalue > (int64_t)FIXED_SMAX[fmt] || > + svalue < (int64_t)FIXED_SMIN[fmt]) > *overflow = 1; > break; > case UNSIGNED: > - if( svalue > (int64_t)FIXED_UMAX[fmt] || svalue < > (int64_t)FIXED_UMIN[fmt] ) > + if (svalue > (int64_t)FIXED_UMAX[fmt] || > + svalue < (int64_t)FIXED_UMIN[fmt]) > *overflow = 1; > break; > } > > - return( (uint64_t)svalue ); > + return (uint64_t)svalue; > } > > uint64_t > -MipsISA::signExtend( uint64_t value, int32_t fmt ) > +MipsISA::signExtend(uint64_t value, int32_t fmt) > { > int32_t signpos = SIMD_NBITS[fmt]; > - uint64_t sign = uint64_t(1)<<(signpos-1); > + uint64_t sign = uint64_t(1) << (signpos - 1); > uint64_t ones = ~(0ULL); > > - if( value & sign ) > + if (value & sign) > value |= (ones << signpos); // extend with ones > else > value &= (ones >> (64 - signpos)); // extend with zeros > @@ -134,231 +126,230 @@ > } > > uint64_t > -MipsISA::addHalfLsb( uint64_t value, int32_t lsbpos ) > +MipsISA::addHalfLsb(uint64_t value, int32_t lsbpos) > { > - return( value += ULL(1) << (lsbpos-1) ); > + return value += ULL(1) << (lsbpos - 1); > } > > int32_t > -MipsISA::dspAbs( int32_t a, int32_t fmt, uint32_t *dspctl ) > +MipsISA::dspAbs(int32_t a, int32_t fmt, uint32_t *dspctl) > { > - int i = 0; > int nvals = SIMD_NVALS[fmt]; > int32_t result; > int64_t svalue; > uint32_t ouflag = 0; > uint64_t a_values[SIMD_MAX_VALS]; > > - simdUnpack( a, a_values, fmt, SIGNED ); > + simdUnpack(a, a_values, fmt, SIGNED); > > - for( i=0; i<nvals; i++ ) > - { > + for (int i = 0; i < nvals; i++) { > svalue = (int64_t)a_values[i]; > > - if( a_values[i] == FIXED_SMIN[fmt] ) > - { > + if (a_values[i] == FIXED_SMIN[fmt]) { > a_values[i] = FIXED_SMAX[fmt]; > ouflag = 1; > - } > - else if( svalue < 0 ) > - { > - a_values[i] = uint64_t( 0 - svalue ); > + } else if (svalue < 0) { > + a_values[i] = uint64_t(0 - svalue); > } > } > > - simdPack( a_values, &result, fmt ); > + simdPack(a_values, &result, fmt); > > - if( ouflag ) > - writeDSPControl( dspctl, (ouflag<<4)<<DSP_CTL_POS[DSP_OUFLAG], > 1<<DSP_OUFLAG); > + if (ouflag) > + writeDSPControl(dspctl, (ouflag << 4) << DSP_CTL_POS[DSP_OUFLAG], > + 1 << DSP_OUFLAG); > > - return( result ); > + return result; > } > > int32_t > -MipsISA::dspAdd( int32_t a, int32_t b, int32_t fmt, int32_t saturate, > int32_t sign, uint32_t *dspctl ) > +MipsISA::dspAdd(int32_t a, int32_t b, int32_t fmt, int32_t saturate, > + int32_t sign, uint32_t *dspctl) > { > - int i = 0; > int nvals = SIMD_NVALS[fmt]; > int32_t result; > uint32_t ouflag = 0; > uint64_t a_values[SIMD_MAX_VALS]; > uint64_t b_values[SIMD_MAX_VALS]; > > - simdUnpack( a, a_values, fmt, sign ); > - simdUnpack( b, b_values, fmt, sign ); > + simdUnpack(a, a_values, fmt, sign); > + simdUnpack(b, b_values, fmt, sign); > > - for( i=0; i<nvals; i++ ) > + for (int i = 0; i < nvals; i++) > { > - if( saturate ) > - a_values[i] = dspSaturate( a_values[i] + b_values[i], fmt, > sign, &ouflag ); > + if (saturate) > + a_values[i] = dspSaturate(a_values[i] + b_values[i], fmt, > sign, > + &ouflag); > else > - a_values[i] = checkOverflow( a_values[i] + b_values[i], fmt, > sign, &ouflag ); > + a_values[i] = checkOverflow(a_values[i] + b_values[i], fmt, > sign, > + &ouflag); > } > > - simdPack( a_values, &result, fmt ); > + simdPack(a_values, &result, fmt); > > - if( ouflag ) > - writeDSPControl( dspctl, (ouflag<<4)<<DSP_CTL_POS[DSP_OUFLAG], > 1<<DSP_OUFLAG); > + if (ouflag) > + writeDSPControl(dspctl, (ouflag << 4) << DSP_CTL_POS[DSP_OUFLAG], > + 1 << DSP_OUFLAG); > > - return( result ); > + return result; > } > > int32_t > -MipsISA::dspAddh( int32_t a, int32_t b, int32_t fmt, int32_t round, > int32_t sign ) > +MipsISA::dspAddh(int32_t a, int32_t b, int32_t fmt, int32_t round, > + int32_t sign) > { > - int i = 0; > int nvals = SIMD_NVALS[fmt]; > int32_t result; > uint64_t a_values[SIMD_MAX_VALS]; > uint64_t b_values[SIMD_MAX_VALS]; > > - simdUnpack( a, a_values, fmt, sign ); > - simdUnpack( b, b_values, fmt, sign ); > + simdUnpack(a, a_values, fmt, sign); > + simdUnpack(b, b_values, fmt, sign); > > - for( i=0; i<nvals; i++ ) > - { > - if( round ) > - a_values[i] = addHalfLsb( a_values[i] + b_values[i], 1 ) >> 1; > + for (int i = 0; i < nvals; i++) { > + if (round) > + a_values[i] = addHalfLsb(a_values[i] + b_values[i], 1) >> 1; > else > - a_values[i] = ( a_values[i] + b_values[i] ) >> 1; > + a_values[i] = (a_values[i] + b_values[i]) >> 1; > } > > - simdPack( a_values, &result, fmt ); > + simdPack(a_values, &result, fmt); > > - return( result ); > + return result; > } > > int32_t > -MipsISA::dspSub( int32_t a, int32_t b, int32_t fmt, int32_t saturate, > int32_t sign, uint32_t *dspctl ) > +MipsISA::dspSub(int32_t a, int32_t b, int32_t fmt, int32_t saturate, > + int32_t sign, uint32_t *dspctl) > { > - int i = 0; > int nvals = SIMD_NVALS[fmt]; > int32_t result; > uint32_t ouflag = 0; > uint64_t a_values[SIMD_MAX_VALS]; > uint64_t b_values[SIMD_MAX_VALS]; > > - simdUnpack( a, a_values, fmt, sign ); > - simdUnpack( b, b_values, fmt, sign ); > + simdUnpack(a, a_values, fmt, sign); > + simdUnpack(b, b_values, fmt, sign); > > - for( i=0; i<nvals; i++ ) > - { > - if( saturate ) > - a_values[i] = dspSaturate( a_values[i] - b_values[i], fmt, > sign, &ouflag ); > + for (int i = 0; i < nvals; i++) { > + if (saturate) > + a_values[i] = dspSaturate(a_values[i] - b_values[i], fmt, > sign, > + &ouflag); > else > - a_values[i] = checkOverflow( a_values[i] - b_values[i], fmt, > sign, &ouflag ); > + a_values[i] = checkOverflow(a_values[i] - b_values[i], fmt, > sign, > + &ouflag); > } > > - simdPack( a_values, &result, fmt ); > + simdPack(a_values, &result, fmt); > > - if( ouflag ) > - writeDSPControl( dspctl, (ouflag<<4)<<DSP_CTL_POS[DSP_OUFLAG], > 1<<DSP_OUFLAG); > + if (ouflag) > + writeDSPControl(dspctl, (ouflag << 4) << DSP_CTL_POS[DSP_OUFLAG], > + 1 << DSP_OUFLAG); > > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev >
_______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
