From: Akinobu Mita <mita@miraclelinux.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Akinobu Mita <mita@miraclelinux.com>
Subject: [patch 01/47] alpha: use config options instead of __alpha_fix__ and __alpha_cix__
Date: Tue, 14 Feb 2006 14:03:52 +0900 [thread overview]
Message-ID: <20060214050441.708881000@localhost.localdomain> (raw)
In-Reply-To: 20060214050351.252615000@localhost.localdomain
[-- Attachment #1: alpha-config-cpu-cleanup.patch --]
[-- Type: text/plain, Size: 4970 bytes --]
Use config options instead of gcc builtin definition
to tell the use of instruction set extensions (CIX and FIX).
This is introduced to tell the kbuild system the use of opmized hweight*()
routines on alpha architecture.
Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
arch/alpha/lib/ev6-memchr.S | 2 +-
arch/alpha/lib/fpreg.c | 8 ++++----
include/asm-alpha/bitops.h | 10 +++++-----
include/asm-alpha/fpu.h | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
Index: 2.6-rc/arch/alpha/lib/ev6-memchr.S
===================================================================
--- 2.6-rc.orig/arch/alpha/lib/ev6-memchr.S
+++ 2.6-rc/arch/alpha/lib/ev6-memchr.S
@@ -84,7 +84,7 @@ $last_quad:
beq $2, $not_found # U : U L U L
$found_it:
-#if defined(__alpha_fix__) && defined(__alpha_cix__)
+#ifdef CONFIG_ALPHA_EV67
/*
* Since we are guaranteed to have set one of the bits, we don't
* have to worry about coming back with a 0x40 out of cttz...
Index: 2.6-rc/arch/alpha/lib/fpreg.c
===================================================================
--- 2.6-rc.orig/arch/alpha/lib/fpreg.c
+++ 2.6-rc/arch/alpha/lib/fpreg.c
@@ -4,7 +4,7 @@
* (C) Copyright 1998 Linus Torvalds
*/
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
#define STT(reg,val) asm volatile ("ftoit $f"#reg",%0" : "=r"(val));
#else
#define STT(reg,val) asm volatile ("stt $f"#reg",%0" : "=m"(val));
@@ -53,7 +53,7 @@ alpha_read_fp_reg (unsigned long reg)
return val;
}
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
#define LDT(reg,val) asm volatile ("itoft %0,$f"#reg : : "r"(val));
#else
#define LDT(reg,val) asm volatile ("ldt $f"#reg",%0" : : "m"(val));
@@ -98,7 +98,7 @@ alpha_write_fp_reg (unsigned long reg, u
}
}
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
#define STS(reg,val) asm volatile ("ftois $f"#reg",%0" : "=r"(val));
#else
#define STS(reg,val) asm volatile ("sts $f"#reg",%0" : "=m"(val));
@@ -147,7 +147,7 @@ alpha_read_fp_reg_s (unsigned long reg)
return val;
}
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
#define LDS(reg,val) asm volatile ("itofs %0,$f"#reg : : "r"(val));
#else
#define LDS(reg,val) asm volatile ("lds $f"#reg",%0" : : "m"(val));
Index: 2.6-rc/include/asm-alpha/bitops.h
===================================================================
--- 2.6-rc.orig/include/asm-alpha/bitops.h
+++ 2.6-rc/include/asm-alpha/bitops.h
@@ -261,7 +261,7 @@ static inline unsigned long ffz_b(unsign
static inline unsigned long ffz(unsigned long word)
{
-#if defined(__alpha_cix__) && defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
/* Whee. EV67 can calculate it directly. */
return __kernel_cttz(~word);
#else
@@ -281,7 +281,7 @@ static inline unsigned long ffz(unsigned
*/
static inline unsigned long __ffs(unsigned long word)
{
-#if defined(__alpha_cix__) && defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
/* Whee. EV67 can calculate it directly. */
return __kernel_cttz(word);
#else
@@ -313,7 +313,7 @@ static inline int ffs(int word)
/*
* fls: find last bit set.
*/
-#if defined(__alpha_cix__) && defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
static inline int fls(int word)
{
return 64 - __kernel_ctlz(word & 0xffffffff);
@@ -326,7 +326,7 @@ static inline int fls(int word)
/* Compute powers of two for the given integer. */
static inline long floor_log2(unsigned long word)
{
-#if defined(__alpha_cix__) && defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
return 63 - __kernel_ctlz(word);
#else
long bit;
@@ -347,7 +347,7 @@ static inline long ceil_log2(unsigned lo
* of bits set) of a N-bit word
*/
-#if defined(__alpha_cix__) && defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) && defined(CONFIG_ALPHA_EV67)
/* Whee. EV67 can calculate it directly. */
static inline unsigned long hweight64(unsigned long w)
{
Index: 2.6-rc/include/asm-alpha/fpu.h
===================================================================
--- 2.6-rc.orig/include/asm-alpha/fpu.h
+++ 2.6-rc/include/asm-alpha/fpu.h
@@ -130,7 +130,7 @@ rdfpcr(void)
{
unsigned long tmp, ret;
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
__asm__ __volatile__ (
"ftoit $f0,%0\n\t"
"mf_fpcr $f0\n\t"
@@ -154,7 +154,7 @@ wrfpcr(unsigned long val)
{
unsigned long tmp;
-#if defined(__alpha_cix__) || defined(__alpha_fix__)
+#if defined(CONFIG_ALPHA_EV6) || defined(CONFIG_ALPHA_EV67)
__asm__ __volatile__ (
"ftoit $f0,%0\n\t"
"itoft %1,$f0\n\t"
--
next prev parent reply other threads:[~2006-02-14 5:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 5:03 [patch 00/47] generic bitops Akinobu Mita
2006-02-14 5:03 ` Akinobu Mita [this message]
2006-02-14 5:03 ` [patch 02/47] ia64: use cpu_set() instead of __set_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 03/47] parisc: add ()-pair in __ffz() macro Akinobu Mita
2006-02-14 5:03 ` [patch 04/47] cris: remove unnecessary local_irq_restore() Akinobu Mita
2006-02-14 5:03 ` [patch 05/47] use non atomic operations for minix_*_bit() and ext2_*_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 06/47] generic {,test_and_}{set,clear,change}_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 07/47] generic __{,test_and_}{set,clear,change}_bit() and test_bit() Akinobu Mita
2006-02-14 5:03 ` [patch 08/47] generic __ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 09/47] generic ffz() Akinobu Mita
2006-02-14 5:04 ` [patch 10/47] generic fls() Akinobu Mita
2006-02-14 5:04 ` [patch 11/47] generic fls64() Akinobu Mita
2006-02-14 5:04 ` [patch 12/47] generic find_{next,first}{,_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 13/47] generic sched_find_first_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 14/47] generic ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 15/47] generic hweight{64,32,16,8}() Akinobu Mita
2006-02-14 5:04 ` [patch 16/47] generic ext2_{set,clear,test,find_first_zero,find_next_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 17/47] generic ext2_{set,clear}_bit_atomic() Akinobu Mita
2006-02-14 5:04 ` [patch 18/47] generic minix_{test,set,test_and_clear,test,find_first_zero}_bit() Akinobu Mita
2006-02-14 5:04 ` [patch 19/47] alpha: use generic bitops Akinobu Mita
2006-02-14 5:04 ` [patch 20/47] arm: " Akinobu Mita
2006-02-14 5:04 ` [patch 21/47] arm26: " Akinobu Mita
2006-02-14 5:04 ` [patch 22/47] cris: " Akinobu Mita
2006-02-14 5:04 ` [patch 23/47] frv: " Akinobu Mita
2006-02-14 5:04 ` [patch 24/47] h8300: " Akinobu Mita
2006-02-14 5:04 ` [patch 25/47] i386: " Akinobu Mita
2006-02-14 5:04 ` [patch 26/47] ia64: " Akinobu Mita
2006-02-14 5:04 ` [patch 27/47] m32r: " Akinobu Mita
2006-02-14 5:04 ` [patch 28/47] m68k: " Akinobu Mita
2006-02-14 5:04 ` [patch 29/47] m68knommu: " Akinobu Mita
2006-02-14 5:04 ` [patch 30/47] mips: " Akinobu Mita
2006-02-14 5:04 ` [patch 31/47] parisc: " Akinobu Mita
2006-02-14 5:04 ` [patch 32/47] powerpc: " Akinobu Mita
2006-02-14 5:04 ` [patch 33/47] s390: " Akinobu Mita
2006-02-14 5:04 ` [patch 34/47] sh: " Akinobu Mita
2006-02-14 5:04 ` [patch 35/47] sh64: " Akinobu Mita
2006-02-14 5:04 ` [patch 36/47] sparc: " Akinobu Mita
2006-02-14 5:04 ` [patch 37/47] sparc64: " Akinobu Mita
2006-02-14 5:04 ` [patch 38/47] v850: " Akinobu Mita
2006-02-14 5:04 ` [patch 39/47] x86_64: " Akinobu Mita
2006-02-14 5:04 ` [patch 40/47] xtensa: " Akinobu Mita
2006-02-14 5:04 ` [patch 41/47] update include/asm-generic/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 42/47] make thread_info.flags an unsigned long Akinobu Mita
2006-02-14 5:04 ` [patch 43/47] ia64: make partial_page.bitmap " Akinobu Mita
2006-02-14 5:04 ` [patch 44/47] ntfs: remove generic_ffs() Akinobu Mita
2006-02-14 5:04 ` [patch 45/47] remove unused generic bitops in include/linux/bitops.h Akinobu Mita
2006-02-14 5:04 ` [patch 46/47] hweight() related cleanup Akinobu Mita
2006-02-14 5:04 ` [patch 47/47] hweight() speedup Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060214050441.708881000@localhost.localdomain \
--to=mita@miraclelinux.com \
--cc=akpm@osdl.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox