Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23e1a358 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools lib: Move asm-generic/bitops/find.h code to tools/include and tools/lib 

To match the Linux kernel source code structure from where this code came from.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-fkbma1h04ki0zzdmp0dpgfyy@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 93c49b3e

tools/include/asm-generic/bitops/find.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_



#ifndef find_next_bit

/**

 * find_next_bit - find the next set bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 *

 * Returns the bit number for the next set bit

 * If no bits are set, returns @size.

 */

extern unsigned long find_next_bit(const unsigned long *addr, unsigned long

		size, unsigned long offset);

#endif



#ifndef find_first_bit



/**

 * find_first_bit - find the first set bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum number of bits to search

 *

 * Returns the bit number of the first set bit.

 * If no bits are set, returns @size.

 */

extern unsigned long find_first_bit(const unsigned long *addr,

				    unsigned long size);



#endif /* find_first_bit */



#endif /*_TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_ */

tools/lib/util/find_next_bit.c

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/* find_next_bit.c: fallback find next bit implementation

 *

 * Copied from lib/find_next_bit.c to tools/lib/next_bit.c

 *

 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#include <linux/bitops.h>

#include <asm/types.h>

#include <asm/byteorder.h>



#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)



#ifndef find_next_bit

/*

 * Find the next set bit in a memory region.

 */

unsigned long find_next_bit(const unsigned long *addr, unsigned long size,

			    unsigned long offset)

{

	const unsigned long *p = addr + BITOP_WORD(offset);

	unsigned long result = offset & ~(BITS_PER_LONG-1);

	unsigned long tmp;



	if (offset >= size)

		return size;

	size -= result;

	offset %= BITS_PER_LONG;

	if (offset) {

		tmp = *(p++);

		tmp &= (~0UL << offset);

		if (size < BITS_PER_LONG)

			goto found_first;

		if (tmp)

			goto found_middle;

		size -= BITS_PER_LONG;

		result += BITS_PER_LONG;

	}

	while (size & ~(BITS_PER_LONG-1)) {

		if ((tmp = *(p++)))

			goto found_middle;

		result += BITS_PER_LONG;

		size -= BITS_PER_LONG;

	}

	if (!size)

		return result;

	tmp = *p;



found_first:

	tmp &= (~0UL >> (BITS_PER_LONG - size));

	if (tmp == 0UL)		/* Are any bits set? */

		return result + size;	/* Nope. */

found_middle:

	return result + __ffs(tmp);

}

#endif



#ifndef find_first_bit

/*

 * Find the first set bit in a memory region.

 */

unsigned long find_first_bit(const unsigned long *addr, unsigned long size)

{

	const unsigned long *p = addr;

	unsigned long result = 0;

	unsigned long tmp;



	while (size & ~(BITS_PER_LONG-1)) {

		if ((tmp = *(p++)))

			goto found;

		result += BITS_PER_LONG;

		size -= BITS_PER_LONG;

	}

	if (!size)

		return result;



	tmp = (*p) & (~0UL >> (BITS_PER_LONG - size));

	if (tmp == 0UL)		/* Are any bits set? */

		return result + size;	/* Nope. */

found:

	return result + __ffs(tmp);

}

#endif

tools/perf/MANIFEST

+3 −0
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ tools/lib/traceevent 
tools/lib/api

tools/lib/symbol/kallsyms.c

tools/lib/symbol/kallsyms.h

tools/lib/util/find_next_bit.c

tools/include/asm/bug.h

tools/include/asm-generic/bitops/atomic.h

tools/include/asm-generic/bitops/find.h

tools/include/asm-generic/bitops/__ffs.h

tools/include/linux/compiler.h

tools/include/linux/export.h
@@ -18,6 +20,7 @@ include/linux/rbtree.h 
include/linux/list.h

include/linux/hash.h

include/linux/stringify.h

lib/find_next_bit.c

lib/rbtree.c

include/linux/swab.h

arch/*/include/asm/unistd*.h

tools/perf/Makefile.perf

+5 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ LIB_H += ../../include/linux/stringify.h 
LIB_H += util/include/linux/bitmap.h

LIB_H += util/include/linux/bitops.h

LIB_H += ../include/asm-generic/bitops/atomic.h

LIB_H += ../include/asm-generic/bitops/find.h

LIB_H += ../include/asm-generic/bitops/__ffs.h

LIB_H += ../include/linux/compiler.h

LIB_H += ../include/linux/log2.h
@@ -338,6 +339,7 @@ LIB_OBJS += $(OUTPUT)util/event.o 
LIB_OBJS += $(OUTPUT)util/evlist.o

LIB_OBJS += $(OUTPUT)util/evsel.o

LIB_OBJS += $(OUTPUT)util/exec_cmd.o

LIB_OBJS += $(OUTPUT)util/find_next_bit.o

LIB_OBJS += $(OUTPUT)util/help.o

LIB_OBJS += $(OUTPUT)util/kallsyms.o

LIB_OBJS += $(OUTPUT)util/levenshtein.o
@@ -737,6 +739,9 @@ $(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/find_next_bit.o: ../lib/util/find_next_bit.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -Wno-redundant-decls $<

tools/perf/util/include/linux/bitops.h

+1 −72
Original line number Diff line number Diff line
@@ -37,78 +37,7 @@ static inline unsigned long hweight_long(unsigned long w) 
	return sizeof(w) == 4 ? hweight32(w) : hweight64(w);

}



#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)



#include <asm-generic/bitops/__ffs.h>



typedef const unsigned long __attribute__((__may_alias__)) long_alias_t;



/*

 * Find the first set bit in a memory region.

 */

static inline unsigned long

find_first_bit(const unsigned long *addr, unsigned long size)

{

	long_alias_t *p = (long_alias_t *) addr;

	unsigned long result = 0;

	unsigned long tmp;



	while (size & ~(BITS_PER_LONG-1)) {

		if ((tmp = *(p++)))

			goto found;

		result += BITS_PER_LONG;

		size -= BITS_PER_LONG;

	}

	if (!size)

		return result;



	tmp = (*p) & (~0UL >> (BITS_PER_LONG - size));

	if (tmp == 0UL)		/* Are any bits set? */

		return result + size;	/* Nope. */

found:

	return result + __ffs(tmp);

}



/*

 * Find the next set bit in a memory region.

 */

static inline unsigned long

find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)

{

	const unsigned long *p = addr + BITOP_WORD(offset);

	unsigned long result = offset & ~(BITS_PER_LONG-1);

	unsigned long tmp;



	if (offset >= size)

		return size;

	size -= result;

	offset %= BITS_PER_LONG;

	if (offset) {

		tmp = *(p++);

		tmp &= (~0UL << offset);

		if (size < BITS_PER_LONG)

			goto found_first;

		if (tmp)

			goto found_middle;

		size -= BITS_PER_LONG;

		result += BITS_PER_LONG;

	}

	while (size & ~(BITS_PER_LONG-1)) {

		if ((tmp = *(p++)))

			goto found_middle;

		result += BITS_PER_LONG;

		size -= BITS_PER_LONG;

	}

	if (!size)

		return result;

	tmp = *p;



found_first:

	tmp &= (~0UL >> (BITS_PER_LONG - size));

	if (tmp == 0UL)		/* Are any bits set? */

		return result + size;	/* Nope. */

found_middle:

	return result + __ffs(tmp);

}

#include <asm-generic/bitops/find.h>



#endif