>It would be easier to comment your code if you wouldn't
>sent it as application/octet-stream attachments.
Ok I'll do better this time.
>Anyway...
>
>The code is in no way DVB specific. IMHO it should
>end up in linux/include/linux/log32.h and linux/lib/log32.c.
Yes, that's correct. But it's not up to me to decide this ...
>> #include <stdint.h>
>
>Don't use stdint.h in the kernel. Use linux/types.h.
Sorry, forgot to change. Includes for WARN_ON added.
>> const unsigned char msbtable[256] = {
>...
>> 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7};
>
>put closing brace like so:
>
> 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
>};
Obsolete.
>> const unsigned short logtable[256] = {
>...
>> 0xfa2f, 0xfaeb, 0xfba6, 0xfc60, 0xfd1b, 0xfdd5, 0xfe8e, 0xff47};
>
>same
Ok.
>> unsigned int intlog2(unsigned int value) {
>
>but for functions the opening brace must be in the next line:
>
>unsigned int intlog2(unsigned int value)
>{
Ok.
>Hm, your code depends on the fact that value and result
>are 32bit entities. IMHO it's better to use u32 to
>make this explicit (although I believe ints are 32bit
>on all Linux platforms).
I've adjusted the function declarations this way. Internally I still use
ints (I only assume that those ints have at least 32 bits).
btw Should I change "unsigned short logtable" to "u16 logtable"?
>> /* returns: log2(value) * 2^16
>> wrong result if value = 0 [ 0 instead of -inf ] */
>
>log2(0) is undefined (NaN), not -inf. Add a WANR_ON().
In my opinion -inf is undefined. Both things at both places changed.
>> /* first detect the msb (count begins at 0)
>> for that we check in which quarter the msb is
>> e.g. for 0x00231f56 the four quarters are |00|, |23|, |1f| and
|56|
>> then we determine the msb of this quarter with a table lookup
>> msbtable[23] = 5
>> then we set the quarter in the context - i.e. adding (quarter - 1)
>* 8
>> 5 + (3 - 1) * 8 = 21
>> in binary form: 0x00231f56 = |00000000|00100011|00011111|01010110|
>> ^ msb of the quarter at position
>5
>> ^ msb of the value
>at position 21 */
>
>Please use block comment markers like so:
> /* bla bla bla
> * bla
> */
Modified everywhere.
>> if (value >= (1 << 16)) /* value >= 2^16 */
>> if (value >= (1 << 24)) /* value >= 2^24 */
>> msb = 24 + msbtable[value >> 24];
>> else /* 2^16 <= value < 2^24 */
>> msb = 16 + msbtable[value >> 16];
>> else /* value < 2^16 */
>> if (value >= (1 << 8)) /* 2^8 <= value < 2^16 */
>> msb = 8 + msbtable[value >> 8];
>> else /* value < 2^8 */
>> msb = msbtable[value];
>
>Isn't that what ffs() does?
fls(). Changed.
>> * @param value The value [ 0 gives a wrong result ]
>
> * @param value The value (must be != 0)
Adjusted according the the warning message.
>Johannes
Thank you for your review!
Christoph
------ dvb-math.h ------
/*
* dvb-math provides some complex fixed-point math
* operations shared between the dvb related stuff
*
* Copyright (C) 2006 Christoph Pfister (christophpfister@xxxxxxxxx)
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef DVB_MATH_H
#define DVB_MATH_H
#include <linux/types.h>
/**
* computes log2 of a value; the result is shifted left by 16 bits
*
* to use rational values you can use the following method:
* intlog2(value) = intlog2(value * 2^x) - x * 2^16
*
* example: intlog2(8) will give 3 << 16 = 3 * 2^16 = 196608
* example: intlog2(9) will give 3 << 16 + ... = 207744 (rounded)
* example: intlog2(1.5) = intlog2(3) - 2^16 = 38336 (rounded)
*
* @param value The value (must be != 0)
* @return log2(value) * 2^16
*/
extern unsigned int intlog2(u32 value);
/**
* computes log10 of a value; the result is shifted left by 28 bits
*
* to use rational values you can use the following method:
* intlog10(value) = intlog10(value * 10^x) - x * 2^28
*
* example: intlog10(1000) will give 3 << 28 = 3 * 2^28
* due to the implementation intlog10(1000) might be not exactly 3 * 2^28
*
* look at intlog2 for similar examples
*
* @param value The value (must be != 0)
* @return log10(value) * 2^28
*/
extern unsigned int intlog10(u32 value);
#endif
------ dvb-math.h ------
------ dvb-math.c ------
/*
* dvb-math provides some complex fixed-point math
* operations shared between the dvb related stuff
*
* Copyright (C) 2006 Christoph Pfister (christophpfister@xxxxxxxxx)
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/bitops.h>
#include <linux/kernel.h>
#include <asm/bug.h>
#include "dvb-math.h"
const unsigned short logtable[256] = {
0x0000, 0x0171, 0x02e0, 0x044e, 0x05ba, 0x0725, 0x088f, 0x09f7,
0x0b5e, 0x0cc3, 0x0e27, 0x0f8a, 0x10eb, 0x124c, 0x13aa, 0x1508,
0x1664, 0x17bf, 0x1919, 0x1a71, 0x1bc8, 0x1d1e, 0x1e73, 0x1fc7,
0x2119, 0x226a, 0x23ba, 0x2508, 0x2656, 0x27a2, 0x28ed, 0x2a37,
0x2b80, 0x2cc8, 0x2e0f, 0x2f54, 0x3098, 0x31dc, 0x331e, 0x345f,
0x359f, 0x36de, 0x381c, 0x3958, 0x3a94, 0x3bcf, 0x3d08, 0x3e41,
0x3f78, 0x40af, 0x41e4, 0x4319, 0x444c, 0x457f, 0x46b0, 0x47e1,
0x4910, 0x4a3f, 0x4b6c, 0x4c99, 0x4dc5, 0x4eef, 0x5019, 0x5142,
0x526a, 0x5391, 0x54b7, 0x55dc, 0x5701, 0x5824, 0x5946, 0x5a68,
0x5b89, 0x5ca8, 0x5dc7, 0x5ee6, 0x6003, 0x611f, 0x623b, 0x6355,
0x646f, 0x6588, 0x66a0, 0x67b8, 0x68ce, 0x69e4, 0x6af9, 0x6c0d,
0x6d20, 0x6e32, 0x6f44, 0x7055, 0x7165, 0x7274, 0x7383, 0x7490,
0x759d, 0x76aa, 0x77b5, 0x78c0, 0x79ca, 0x7ad3, 0x7bdc, 0x7ce3,
0x7dea, 0x7ef1, 0x7ff6, 0x80fb, 0x81ff, 0x8302, 0x8405, 0x8507,
0x8608, 0x8709, 0x8809, 0x8908, 0x8a06, 0x8b04, 0x8c01, 0x8cfe,
0x8dfa, 0x8ef5, 0x8fef, 0x90e9, 0x91e2, 0x92db, 0x93d3, 0x94ca,
0x95c0, 0x96b6, 0x97ab, 0x98a0, 0x9994, 0x9a87, 0x9b7a, 0x9c6c,
0x9d5e, 0x9e4f, 0x9f3f, 0xa02f, 0xa11e, 0xa20c, 0xa2fa, 0xa3e7,
0xa4d4, 0xa5c0, 0xa6ab, 0xa796, 0xa881, 0xa96a, 0xaa54, 0xab3c,
0xac24, 0xad0c, 0xadf3, 0xaed9, 0xafbf, 0xb0a4, 0xb189, 0xb26d,
0xb350, 0xb433, 0xb516, 0xb5f8, 0xb6d9, 0xb7ba, 0xb89a, 0xb97a,
0xba59, 0xbb38, 0xbc16, 0xbcf4, 0xbdd1, 0xbeae, 0xbf8a, 0xc065,
0xc140, 0xc21b, 0xc2f5, 0xc3cf, 0xc4a8, 0xc580, 0xc659, 0xc730,
0xc807, 0xc8de, 0xc9b4, 0xca8a, 0xcb5f, 0xcc34, 0xcd08, 0xcddc,
0xceaf, 0xcf82, 0xd054, 0xd126, 0xd1f7, 0xd2c8, 0xd399, 0xd469,
0xd538, 0xd608, 0xd6d6, 0xd7a4, 0xd872, 0xd940, 0xda0c, 0xdad9,
0xdba5, 0xdc70, 0xdd3b, 0xde06, 0xded0, 0xdf9a, 0xe064, 0xe12d,
0xe1f5, 0xe2bd, 0xe385, 0xe44c, 0xe513, 0xe5d9, 0xe69f, 0xe765,
0xe82a, 0xe8ef, 0xe9b3, 0xea77, 0xeb3b, 0xebfe, 0xecc1, 0xed83,
0xee45, 0xef07, 0xefc8, 0xf088, 0xf149, 0xf209, 0xf2c8, 0xf388,
0xf446, 0xf505, 0xf5c3, 0xf681, 0xf73e, 0xf7fb, 0xf8b7, 0xf973,
0xfa2f, 0xfaeb, 0xfba6, 0xfc60, 0xfd1b, 0xfdd5, 0xfe8e, 0xff47
};
unsigned int intlog2(u32 value)
{
/* returns: log2(value) * 2^16
* wrong result if value = 0 (log2(0) is undefined)
*/
unsigned int msb;
unsigned int logentry;
unsigned int significand;
unsigned int interpolation;
if (unlikely(value == 0)) {
WARN_ON(1);
return 0;
}
/* first detect the msb (count begins at 0) */
msb = fls(value) - 1;
/* now we use a logtable after the following method:
* log2(2^x * y) * 2^16 = x * 2^16 + log2(y) * 2^16
* where x = msb and therefore 1 <= y < 2
* first y is determined by shifting the value left
* so that msb is bit 31
* 0x00231f56 -> 0x8C7D5800
* the result is y * 2^31 -> "significand"
* here the highest 9 bits are used for a table lookup
* the highest bit is discarded because it's always set
* the highest nine bits in our example are 100011000
* so we'd use the entry 0x18
*/
significand = value << (31 - msb);
logentry = (significand >> 23) & 0xff;
/* last step we do is interpolation because of the limitions of the log
table
* the error is that part of the significand which isn't used for lookup
* then we compute the ratio between the error and the next table entry
* and interpolate it between the log table entry used and the next one
* the biggest error possible is 0x7fffff (in our example it's 0x7D5800)
* needed value for next table entry is 0x800000
* so interpolation is (error / 0x800000) * (logtable_next - logtable_current)
* in the implementation the division is moved to the end for better
accuracy
* there is also an overflow correction if logtable_next is 256
*/
interpolation = ((significand & 0x7fffff) * ((logtable[(logentry + 1) &
0xff] -
logtable[logentry]) & 0xffff)) >> 23;
/* now we return the result */
return (msb << 16) + logtable[logentry] + interpolation;
}
unsigned int intlog10(u32 value)
{
/* returns: log10(value) * 2^28
* wrong result if value = 0 (log10(0) is undefined)
*/
u64 log;
if (unlikely(value == 0)) {
WARN_ON(1);
return 0;
}
log = intlog2(value);
/* we use the following method:
* log10(x) = log2(x) * log10(2)
* where log10(2) is approximated as 1262611 / 2^22
*/
return (log * 1262611) >> 10;
}
------ dvb-math.c ------
_______________________________________________
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
