1 --- linux-2.4.20-orig/drivers/ide/ide-cd.h 2002-12-10 17:46:28 +0900
2 +++ linux-2.4.20/drivers/ide/ide-cd.h 2003-05-16 00:59:53 +0900
7 - __u8 short slot_tablelen;
12 --- linux-2.4.20-orig/net/core/rtnetlink.c 2002-12-09 16:38:46 +0900
13 +++ linux-2.4.20/net/core/rtnetlink.c 2003-05-16 01:31:20 +0900
15 * Malformed skbs with wrong lengths of messages are discarded silently.
18 -extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
19 +__inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
22 struct nlmsghdr * nlh;
23 --- linux-2.4.20/drivers/atm/ambassador.c.orig Thu Sep 13 22:21:32 2001
24 +++ linux-2.4.20/drivers/atm/ambassador.c Wed Jun 11 08:42:37 2003
26 /********** microcode **********/
28 #ifdef AMB_NEW_MICROCODE
29 -#define UCODE(x) UCODE1(atmsar12.,x)
30 +#define UCODE(x) UCODE1(atmsar12,x)
32 -#define UCODE(x) UCODE1(atmsar11.,x)
33 +#define UCODE(x) UCODE1(atmsar11,x)
36 -#define UCODE1(x,y) UCODE2(x ## y)
37 +#define UCODE1(x,y) UCODE2(x.y)
39 static u32 __initdata ucode_start =
41 --- linux-2.4.20/include/linux/mtd/nftl.h.org Fri Jun 6 15:46:54 2003
42 +++ linux-2.4.20/include/linux/mtd/nftl.h Wed Jun 11 13:49:12 2003
44 __u16 lastEUN; /* should be suppressed */
46 __u16 LastFreeEUN; /* To speed up finding a free EUN */
47 - __u32 long nr_sects;
50 __u16 *EUNtable; /* [numvunits]: First EUN for each virtual unit */
51 __u16 *ReplUnitTable; /* [numEUNs]: ReplUnitNumber for each */
52 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/drivers/net/fealnx.c linux-2.4.20/drivers/net/fealnx.c
53 --- linux-2.4.20.old/drivers/net/fealnx.c Mon Jun 16 13:16:08 2003
54 +++ linux-2.4.20/drivers/net/fealnx.c Mon Jun 16 13:16:09 2003
59 - + dev->if_port = np->default_port;
60 + dev->if_port = np->default_port;
63 /* Reset the chip's Tx and Rx processes. */
64 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/drivers/net/irda/ma600.c linux-2.4.20/drivers/net/irda/ma600.c
65 --- linux-2.4.20.old/drivers/net/irda/ma600.c Mon Jun 16 13:16:08 2003
66 +++ linux-2.4.20/drivers/net/irda/ma600.c Mon Jun 16 13:16:09 2003
68 #undef ASSERT(expr, func)
69 #define ASSERT(expr, func) \
71 - printk( "Assertion failed! %s,%s,%s,line=%d\n",\
72 - #expr,__FILE__,__FUNCTION__,__LINE__); \
74 + printk( "Assertion failed! %s,%s,line=%d\n",\
75 + __FILE__,__FUNCTION__,__LINE__); \
79 /* convert hex value to ascii hex */
80 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/drivers/video/controlfb.c linux-2.4.20/drivers/video/controlfb.c
81 --- linux-2.4.20.old/drivers/video/controlfb.c Mon Jun 16 13:16:08 2003
82 +++ linux-2.4.20/drivers/video/controlfb.c Mon Jun 16 13:16:09 2003
86 /* control register access macro */
87 -#define CNTRL_REG(INFO,REG) (&(((INFO)->control_regs-> ## REG).r))
88 +#define CNTRL_REG(INFO,REG) (&(((INFO)->control_regs-> REG).r))
91 /******************** Prototypes for exported functions ********************/
92 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/include/asm-ppc/unistd.h linux-2.4.20/include/asm-ppc/unistd.h
93 --- linux-2.4.20.old/include/asm-ppc/unistd.h Mon Jun 16 13:16:08 2003
94 +++ linux-2.4.20/include/asm-ppc/unistd.h Mon Jun 16 13:16:09 2003
98 #define __syscall_clobbers \
99 - "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12"
100 + "r6", "r7", "r8", "r9", "r10", "r11", "r12"
102 #define _syscall0(type,name) \
104 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/drivers/scsi/aic7xxx/aic79xx_osm.c linux-2.4.20/drivers/scsi/aic7xxx/aic79xx_osm.c
105 --- linux-2.4.20.old/drivers/scsi/aic7xxx/aic79xx_osm.c Mon Jun 16 13:16:08 2003
106 +++ linux-2.4.20/drivers/scsi/aic7xxx/aic79xx_osm.c Mon Jun 16 13:26:12 2003
107 @@ -336,31 +336,31 @@
108 MODULE_LICENSE("Dual BSD/GPL");
110 MODULE_PARM(aic79xx, "s");
111 -MODULE_PARM_DESC(aic79xx, "period delimited, options string.
112 - verbose Enable verbose/diagnostic logging
113 - debug Bitmask of debug values to enable
114 - no_reset Supress initial bus resets
115 - extended Enable extended geometry on all controllers
116 - periodic_otag Send an ordered tagged transaction periodically
117 - to prevent tag starvation. This may be
118 - required by some older disk drives/RAID arrays.
119 - reverse_scan Sort PCI devices highest Bus/Slot to lowest
120 - tag_info:<tag_str> Set per-target tag depth
121 - rd_strm:<rd_strm_masks> Set per-target read streaming setting.
122 - seltime:<int> Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)
124 - Sample /etc/modules.conf line:
125 - Enable verbose logging
126 - Set tag depth on Controller 2/Target 2 to 10 tags
127 - Shorten the selection timeout to 128ms from its default of 256
129 - options aic79xx='\"verbose.tag_info:{{}.{}.{..10}}.seltime:1\"'
131 - Sample /etc/modules.conf line:
132 - Change Read Streaming for Controller's 2 and 3
134 - options aic79xx='\"rd_strm:{..0xFFF0.0xC0F0}\"'
136 +MODULE_PARM_DESC(aic79xx, "period delimited, options string."\
137 +" verbose Enable verbose/diagnostic logging"\
138 +" debug Bitmask of debug values to enable"\
139 +" no_reset Supress initial bus resets"\
140 +" extended Enable extended geometry on all controllers"\
141 +" periodic_otag Send an ordered tagged transaction periodically"\
142 +" to prevent tag starvation. This may be"\
143 +" required by some older disk drives/RAID arrays. "\
144 +" reverse_scan Sort PCI devices highest Bus/Slot to lowest"\
145 +" tag_info:<tag_str> Set per-target tag depth"\
146 +" rd_strm:<rd_strm_masks> Set per-target read streaming setting."\
147 +" seltime:<int> Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)"\
149 +" Sample /etc/modules.conf line:"\
150 +" Enable verbose logging"\
151 +" Set tag depth on Controller 2/Target 2 to 10 tags"\
152 +" Shorten the selection timeout to 128ms from its default of 256"\
154 +" options aic79xx='\"verbose.tag_info:{{}.{}.{..10}}.seltime:1\"'"\
156 +" Sample /etc/modules.conf line:"\
157 +" Change Read Streaming for Controller's 2 and 3"\
159 +" options aic79xx='\"rd_strm:{..0xFFF0.0xC0F0}\"'"
163 static void ahd_linux_handle_scsi_status(struct ahd_softc *,
164 diff -Nur --exclude='*.orig' --exclude='*.o' linux-2.4.20.old/drivers/scsi/aic7xxx/aic7xxx_osm.c linux-2.4.20/drivers/scsi/aic7xxx/aic7xxx_osm.c
165 --- linux-2.4.20.old/drivers/scsi/aic7xxx/aic7xxx_osm.c Mon Jun 16 13:16:08 2003
166 +++ linux-2.4.20/drivers/scsi/aic7xxx/aic7xxx_osm.c Mon Jun 16 13:16:09 2003
167 @@ -417,26 +417,26 @@
168 MODULE_LICENSE("Dual BSD/GPL");
170 MODULE_PARM(aic7xxx, "s");
171 -MODULE_PARM_DESC(aic7xxx, "period delimited, options string.
172 - verbose Enable verbose/diagnostic logging
173 - no_probe Disable EISA/VLB controller probing
174 - no_reset Supress initial bus resets
175 - extended Enable extended geometry on all controllers
176 - periodic_otag Send an ordered tagged transaction periodically
177 - to prevent tag starvation. This may be
178 - required by some older disk drives/RAID arrays.
179 - reverse_scan Sort PCI devices highest Bus/Slot to lowest
180 - tag_info:<tag_str> Set per-target tag depth
181 - seltime:<int> Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)
183 - Sample /etc/modules.conf line:
184 - Enable verbose logging
185 - Disable EISA/VLB probing
186 - Set tag depth on Controller 2/Target 2 to 10 tags
187 - Shorten the selection timeout to 128ms from its default of 256
189 - options aic7xxx='\"verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1\"'
191 +MODULE_PARM_DESC(aic7xxx, "period delimited, options string." \
192 +" verbose Enable verbose/diagnostic logging" \
193 +" no_probe Disable EISA/VLB controller probing" \
194 +" no_reset Supress initial bus resets" \
195 +" extended Enable extended geometry on all controllers" \
196 +" periodic_otag Send an ordered tagged transaction periodically" \
197 +" to prevent tag starvation. This may be" \
198 +" required by some older disk drives/RAID arrays." \
199 +" reverse_scan Sort PCI devices highest Bus/Slot to lowest" \
200 +" tag_info:<tag_str> Set per-target tag depth" \
201 +" seltime:<int> Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)" \
203 +" Sample /etc/modules.conf line:" \
204 +" Enable verbose logging" \
205 +" Disable EISA/VLB probing" \
206 +" Set tag depth on Controller 2/Target 2 to 10 tags" \
207 +" Shorten the selection timeout to 128ms from its default of 256" \
209 +" options aic7xxx='\"verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1\"'"
213 static void ahc_linux_handle_scsi_status(struct ahc_softc *,
214 diff -Nur --exclude='*.orig' linux-2.4.20.org/drivers/sound/cs46xx.c linux-2.4.20/drivers/sound/cs46xx.c
215 --- linux-2.4.20.org/drivers/sound/cs46xx.c Sat Aug 3 00:39:44 2002
216 +++ linux-2.4.20/drivers/sound/cs46xx.c Tue Jun 17 06:25:18 2003
225 } InitArray[] = { {0x00000040, 0x3fc0000f},
226 {0x0000004c, 0x04800000},
228 diff -Nur --exclude='*.orig' linux-2.4.20.org/fs/reiserfs/super.c linux-2.4.20/fs/reiserfs/super.c
229 --- linux-2.4.20.org/fs/reiserfs/super.c Tue Jun 17 07:17:19 2003
230 +++ linux-2.4.20/fs/reiserfs/super.c Tue Jun 17 06:44:51 2003
232 ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
233 wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
234 if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
235 - printk("reread_meta_blocks, error reading bitmap block number %d at
236 - %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
237 + printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
241 diff -Nur --exclude='*.orig' linux-2.4.20.org/net/ipv4/netfilter/ip_nat_core.c linux-2.4.20/net/ipv4/netfilter/ip_nat_core.c
242 --- linux-2.4.20.org/net/ipv4/netfilter/ip_nat_core.c Tue Jun 17 07:17:18 2003
243 +++ linux-2.4.20/net/ipv4/netfilter/ip_nat_core.c Tue Jun 17 07:05:01 2003
245 if (exp_for_packet(exp, pskb)) {
246 /* FIXME: May be true multiple times in the
248 - DEBUGP("calling nat helper (exp=%p) for
250 + DEBUGP("calling nat helper (exp=%p) for packet\n", exp);
251 ret = helper->help(ct, exp, info, ctinfo,
253 if (ret != NF_ACCEPT) {
254 diff -Nur --exclude='*.orig' --exclude='*.org' linux-2.4.20.org/drivers/net/tokenring/olympic.c linux-2.4.20/drivers/net/tokenring/olympic.c
255 --- linux-2.4.20.org/drivers/net/tokenring/olympic.c 2002-11-28 23:53:14.000000000 +0000
256 +++ linux-2.4.20/drivers/net/tokenring/olympic.c 2003-06-20 12:23:35.000000000 +0000
258 printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) );
260 printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
261 - printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
262 -%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
263 + printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =%08x\n",
264 + olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
267 writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
268 diff -Nur --exclude='*.orig' --exclude='*.org' linux-2.4.20.org/drivers/net/wan/sbni.c linux-2.4.20/drivers/net/wan/sbni.c
269 --- linux-2.4.20.org/drivers/net/wan/sbni.c 2002-11-28 23:53:14.000000000 +0000
270 +++ linux-2.4.20/drivers/net/wan/sbni.c 2003-06-20 12:47:13.000000000 +0000
271 @@ -1547,88 +1547,6 @@
273 /* -------------------------------------------------------------------------- */
278 -calc_crc32( u32 crc, u8 *p, u32 len )
280 - register u32 _crc __asm ( "ax" );
284 - "xorl %%ebx, %%ebx\n"
287 - "movl $crc32tab, %%edi\n"
293 - "movb %%al, %%bl\n"
294 - "movl (%%esi), %%edx\n"
296 - "xorb %%dl, %%bl\n"
298 - "xorl (%%edi,%%ebx,4), %%eax\n"
300 - "movb %%al, %%bl\n"
302 - "xorb %%dl, %%bl\n"
304 - "xorl (%%edi,%%ebx,4), %%eax\n"
306 - "movb %%al, %%bl\n"
308 - "xorb %%dl, %%bl\n"
309 - "movb %%dh, %%dl\n"
310 - "xorl (%%edi,%%ebx,4), %%eax\n"
312 - "movb %%al, %%bl\n"
314 - "xorb %%dl, %%bl\n"
316 - "xorl (%%edi,%%ebx,4), %%eax\n"
326 - "movb %%al, %%bl\n"
328 - "xorb (%%esi), %%bl\n"
329 - "xorl (%%edi,%%ebx,4), %%eax\n"
334 - "movb %%al, %%bl\n"
336 - "xorb 1(%%esi), %%bl\n"
337 - "xorl (%%edi,%%ebx,4), %%eax\n"
342 - "movb %%al, %%bl\n"
344 - "xorb 2(%%esi), %%bl\n"
345 - "xorl (%%edi,%%ebx,4), %%eax\n"
348 - : "a" (_crc), "g" (p), "g" (len)
349 - : "ax", "bx", "cx", "dx", "si", "di"
358 calc_crc32( u32 crc, u8 *p, u32 len )
360 @@ -1638,8 +1556,6 @@
364 -#endif /* ASM_CRC */
367 static u32 crc32tab[] __attribute__ ((aligned(8))) = {
368 0xD202EF8D, 0xA505DF1B, 0x3C0C8EA1, 0x4B0BBE37,
369 diff -Nur --exclude='*.orig' --exclude='*.org' linux-2.4.20.org/drivers/net/wan/sdla_chdlc.c linux-2.4.20/drivers/net/wan/sdla_chdlc.c
370 --- linux-2.4.20.org/drivers/net/wan/sdla_chdlc.c 2003-06-20 12:41:46.000000000 +0000
371 +++ linux-2.4.20/drivers/net/wan/sdla_chdlc.c 2003-06-20 12:41:03.000000000 +0000
375 if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
376 - printk (KERN_INFO "%s:
377 - Failed to set interrupt triggers!\n",
378 + printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
382 --- linux-2.4.20/net/decnet/dn_table.c.org Fri Dec 21 17:42:05 2001
383 +++ linux-2.4.20/net/decnet/dn_table.c Mon Jun 23 13:23:27 2003
387 if (in_interrupt() && net_ratelimit()) {
388 - printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table
391 + "DECnet: BUG! Attempt to create routing table from interrupt\n");
394 if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
395 --- linux-2.4.20/arch/i386/math-emu/poly.h~ Thu Jul 26 20:37:38 2001
396 +++ linux-2.4.20/arch/i386/math-emu/poly.h Thu Jul 10 02:09:29 2003
398 const unsigned long arg2)
401 - asm volatile ("mull %2; movl %%edx,%%eax" \
402 + asm volatile ("mull %2; movl %%edx,%%eax; " \
404 :"0" (arg1), "g" (arg2) \
407 /* Add the 12 byte Xsig x2 to Xsig dest, with no checks for overflow. */
408 static inline void add_Xsig_Xsig(Xsig *dest, const Xsig *x2)
410 - asm volatile ("movl %1,%%edi; movl %2,%%esi;
411 - movl (%%esi),%%eax; addl %%eax,(%%edi);
412 - movl 4(%%esi),%%eax; adcl %%eax,4(%%edi);
413 - movl 8(%%esi),%%eax; adcl %%eax,8(%%edi);"
414 + asm volatile ("movl %1,%%edi; movl %2,%%esi; "
415 + "movl (%%esi),%%eax; addl %%eax,(%%edi); "
416 + "movl 4(%%esi),%%eax; adcl %%eax,4(%%edi); "
417 + "movl 8(%%esi),%%eax; adcl %%eax,8(%%edi); "
418 :"=g" (*dest):"g" (dest), "g" (x2)
422 problem, but keep fingers crossed! */
423 static inline void add_two_Xsig(Xsig *dest, const Xsig *x2, long int *exp)
425 - asm volatile ("movl %2,%%ecx; movl %3,%%esi;
426 - movl (%%esi),%%eax; addl %%eax,(%%ecx);
427 - movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx);
428 - movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx);
430 - rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx)
431 - movl %4,%%ecx; incl (%%ecx)
432 - movl $1,%%eax; jmp 1f;
433 - 0: xorl %%eax,%%eax;
435 + asm volatile ("movl %2,%%ecx; movl %3,%%esi; "
436 + "movl (%%esi),%%eax; addl %%eax,(%%ecx); "
437 + "movl 4(%%esi),%%eax; adcl %%eax,4(%%ecx); "
438 + "movl 8(%%esi),%%eax; adcl %%eax,8(%%ecx); "
440 + "rcrl 8(%%ecx); rcrl 4(%%ecx); rcrl (%%ecx); "
441 + "movl %4,%%ecx; incl (%%ecx); "
442 + "movl $1,%%eax; jmp 1f; "
443 + "0: xorl %%eax,%%eax; "
445 :"=g" (*exp), "=g" (*dest)
446 :"g" (dest), "g" (x2), "g" (exp)
448 @@ -110,11 +110,11 @@
449 /* This is faster in a loop on my 386 than using the "neg" instruction. */
450 static inline void negate_Xsig(Xsig *x)
452 - asm volatile("movl %1,%%esi; "
453 - "xorl %%ecx,%%ecx; "
454 - "movl %%ecx,%%eax; subl (%%esi),%%eax; movl %%eax,(%%esi); "
455 - "movl %%ecx,%%eax; sbbl 4(%%esi),%%eax; movl %%eax,4(%%esi); "
456 - "movl %%ecx,%%eax; sbbl 8(%%esi),%%eax; movl %%eax,8(%%esi); "
457 + asm volatile("movl %1,%%esi; " \
458 + "xorl %%ecx,%%ecx; " \
459 + "movl %%ecx,%%eax; subl (%%esi),%%eax; movl %%eax,(%%esi); " \
460 + "movl %%ecx,%%eax; sbbl 4(%%esi),%%eax; movl %%eax,4(%%esi); " \
461 + "movl %%ecx,%%eax; sbbl 8(%%esi),%%eax; movl %%eax,8(%%esi); " \
462 :"=g" (*x):"g" (x):"si","ax","cx");
465 --- linux-2.4.20/include/asm-alpha/mmu_context.h~ 2000-12-29 22:07:23.000000000 +0000
466 +++ linux-2.4.20/include/asm-alpha/mmu_context.h 2003-07-15 20:08:39.000000000 +0000
468 "call_pal %2 #__reload_thread"
470 : "i"(PAL_swpctx), "r"(a0)
471 - : "$1", "$16", "$22", "$23", "$24", "$25");
472 + : "$1", "$22", "$23", "$24", "$25");
476 diff -urN linux-2.4.20/arch/alpha/lib/ev6-strncpy_from_user.S linux-2.4.20/arch/alpha/lib/ev6-strncpy_from_user.S
477 --- linux-2.4.20/arch/alpha/lib/ev6-strncpy_from_user.S 2003-07-15 22:30:41.000000000 +0000
478 +++ linux-2.4.20/arch/alpha/lib/ev6-strncpy_from_user.S 2003-07-15 22:33:29.000000000 +0000
482 #include <asm/errno.h>
483 -#include <alpha/regdef.h>
484 +#include <asm/regdef.h>
487 /* Allow an exception for an insn; exit if we get one. */
488 diff -urN linux-2.4.20/arch/alpha/lib/ev6-stxcpy.S linux-2.4.20/arch/alpha/lib/ev6-stxcpy.S
489 --- linux-2.4.20/arch/alpha/lib/ev6-stxcpy.S 2003-07-15 22:30:41.000000000 +0000
490 +++ linux-2.4.20/arch/alpha/lib/ev6-stxcpy.S 2003-07-15 22:33:29.000000000 +0000
492 * Try not to change the actual algorithm if possible for consistency.
495 -#include <alpha/regdef.h>
496 +#include <asm/regdef.h>
500 diff -urN linux-2.4.20/arch/alpha/lib/ev6-stxncpy.S linux-2.4.20/arch/alpha/lib/ev6-stxncpy.S
501 --- linux-2.4.20/arch/alpha/lib/ev6-stxncpy.S 2003-07-15 22:30:41.000000000 +0000
502 +++ linux-2.4.20/arch/alpha/lib/ev6-stxncpy.S 2003-07-15 22:33:29.000000000 +0000
504 * Try not to change the actual algorithm if possible for consistency.
507 -#include <alpha/regdef.h>
508 +#include <asm/regdef.h>
512 diff -urN linux-2.4.20/arch/alpha/lib/ev67-strchr.S linux-2.4.20/arch/alpha/lib/ev67-strchr.S
513 --- linux-2.4.20/arch/alpha/lib/ev67-strchr.S 2003-07-15 22:30:41.000000000 +0000
514 +++ linux-2.4.20/arch/alpha/lib/ev67-strchr.S 2003-07-15 22:33:29.000000000 +0000
516 * Try not to change the actual algorithm if possible for consistency.
519 -#include <alpha/regdef.h>
520 +#include <asm/regdef.h>
524 diff -urN linux-2.4.20/arch/alpha/lib/ev67-strlen_user.S linux-2.4.20/arch/alpha/lib/ev67-strlen_user.S
525 --- linux-2.4.20/arch/alpha/lib/ev67-strlen_user.S 2003-07-15 22:30:41.000000000 +0000
526 +++ linux-2.4.20/arch/alpha/lib/ev67-strlen_user.S 2003-07-15 22:33:29.000000000 +0000
528 * Try not to change the actual algorithm if possible for consistency.
531 -#include <alpha/regdef.h>
532 +#include <asm/regdef.h>
535 /* Allow an exception for an insn; exit if we get one. */
536 diff -urN linux-2.4.20/arch/alpha/lib/ev67-strrchr.S linux-2.4.20/arch/alpha/lib/ev67-strrchr.S
537 --- linux-2.4.20/arch/alpha/lib/ev67-strrchr.S 2003-07-15 22:30:41.000000000 +0000
538 +++ linux-2.4.20/arch/alpha/lib/ev67-strrchr.S 2003-07-15 22:33:29.000000000 +0000
543 -#include <alpha/regdef.h>
544 +#include <asm/regdef.h>
548 diff -urN linux-2.4.20/arch/alpha/lib/strchr.S linux-2.4.20/arch/alpha/lib/strchr.S
549 --- linux-2.4.20/arch/alpha/lib/strchr.S 2003-07-15 22:30:41.000000000 +0000
550 +++ linux-2.4.20/arch/alpha/lib/strchr.S 2003-07-15 22:33:29.000000000 +0000
552 * string, or null if it is not found.
555 -#include <alpha/regdef.h>
556 +#include <asm/regdef.h>
560 diff -urN linux-2.4.20/arch/alpha/lib/strlen_user.S linux-2.4.20/arch/alpha/lib/strlen_user.S
561 --- linux-2.4.20/arch/alpha/lib/strlen_user.S 2003-07-15 22:30:41.000000000 +0000
562 +++ linux-2.4.20/arch/alpha/lib/strlen_user.S 2003-07-15 22:33:29.000000000 +0000
564 * boundary when doing so.
567 -#include <alpha/regdef.h>
568 +#include <asm/regdef.h>
571 /* Allow an exception for an insn; exit if we get one. */
572 diff -urN linux-2.4.20/arch/alpha/lib/strncpy_from_user.S linux-2.4.20/arch/alpha/lib/strncpy_from_user.S
573 --- linux-2.4.20/arch/alpha/lib/strncpy_from_user.S 2003-07-15 22:30:41.000000000 +0000
574 +++ linux-2.4.20/arch/alpha/lib/strncpy_from_user.S 2003-07-15 22:33:29.000000000 +0000
578 #include <asm/errno.h>
579 -#include <alpha/regdef.h>
580 +#include <asm/regdef.h>
583 /* Allow an exception for an insn; exit if we get one. */
584 diff -urN linux-2.4.20/arch/alpha/lib/strrchr.S linux-2.4.20/arch/alpha/lib/strrchr.S
585 --- linux-2.4.20/arch/alpha/lib/strrchr.S 2003-07-15 22:30:41.000000000 +0000
586 +++ linux-2.4.20/arch/alpha/lib/strrchr.S 2003-07-15 22:33:29.000000000 +0000
588 * within a null-terminated string, or null if it is not found.
591 -#include <alpha/regdef.h>
592 +#include <asm/regdef.h>
596 diff -urN linux-2.4.20/arch/alpha/lib/stxcpy.S linux-2.4.20/arch/alpha/lib/stxcpy.S
597 --- linux-2.4.20/arch/alpha/lib/stxcpy.S 2003-07-15 22:30:41.000000000 +0000
598 +++ linux-2.4.20/arch/alpha/lib/stxcpy.S 2003-07-15 22:33:29.000000000 +0000
600 * Furthermore, v0, a3-a5, t11, and t12 are untouched.
603 -#include <alpha/regdef.h>
604 +#include <asm/regdef.h>
608 diff -urN linux-2.4.20/arch/alpha/lib/stxncpy.S linux-2.4.20/arch/alpha/lib/stxncpy.S
609 --- linux-2.4.20/arch/alpha/lib/stxncpy.S 2003-07-15 22:30:41.000000000 +0000
610 +++ linux-2.4.20/arch/alpha/lib/stxncpy.S 2003-07-15 22:33:29.000000000 +0000
612 * Furthermore, v0, a3-a5, t11, t12, and $at are untouched.
615 -#include <alpha/regdef.h>
616 +#include <asm/regdef.h>
620 --- /dev/null Tue May 5 22:32:27 1998
621 +++ linux-2.6.0-test1/include/asm-alpha/regdef.h Mon Jul 14 05:32:34 2003
623 +#ifndef __alpha_regdef_h__
624 +#define __alpha_regdef_h__
626 +#define v0 $0 /* function return value */
628 +#define t0 $1 /* temporary registers (caller-saved) */
637 +#define s0 $9 /* saved-registers (callee-saved registers) */
644 +#define fp s6 /* frame-pointer (s6 in frame-less procedures) */
646 +#define a0 $16 /* argument registers (caller-saved) */
653 +#define t8 $22 /* more temps (caller-saved) */
657 +#define ra $26 /* return address register */
660 +#define pv t12 /* procedure-variable register */
661 +#define AT $at /* assembler temporary */
662 +#define gp $29 /* global pointer */
663 +#define sp $30 /* stack pointer */
664 +#define zero $31 /* reads as zero, writes are noops */
666 +#endif /* __alpha_regdef_h__ */
667 --- linux-2.4.20/include/asm-alpha/xor.h.orig 2000-11-13 03:39:51.000000000 +0000
668 +++ linux-2.4.20/include/asm-alpha/xor.h 2003-07-16 11:41:27.000000000 +0000
669 @@ -32,809 +32,809 @@
670 unsigned long *, unsigned long *,
671 unsigned long *, unsigned long *);
700 - xor $0,$1,$0 # 7 cycles from $1 load
757 - xor $0,$1,$1 # 8 cycles from $0 load
758 - xor $3,$4,$4 # 6 cycles from $4 load
759 - xor $6,$7,$7 # 6 cycles from $7 load
760 - xor $21,$22,$22 # 5 cycles from $22 load
762 - xor $1,$2,$2 # 9 cycles from $2 load
763 - xor $24,$25,$25 # 5 cycles from $25 load
765 - xor $4,$5,$5 # 6 cycles from $5 load
768 - xor $7,$20,$20 # 7 cycles from $20 load
770 - xor $22,$23,$23 # 7 cycles from $23 load
773 - xor $25,$27,$27 # 7 cycles from $27 load
788 - xor $0,$1,$1 # 4 cycles from $1 load
789 - xor $3,$4,$4 # 5 cycles from $4 load
790 - xor $6,$7,$7 # 5 cycles from $7 load
792 - xor $1,$2,$2 # 4 cycles from $2 load
793 - xor $4,$5,$5 # 5 cycles from $5 load
795 - xor $7,$20,$20 # 4 cycles from $20 load
831 - xor $0,$1,$1 # 6 cycles from $1 load
833 - xor $2,$3,$3 # 6 cycles from $3 load
838 - xor $4,$5,$5 # 7 cycles from $5 load
842 - xor $21,$22,$22 # 7 cycles from $22 load
846 - xor $23,$24,$24 # 7 cycles from $24 load
853 - xor $25,$27,$27 # 8 cycles from $27 load
861 - xor $0,$1,$1 # 9 cycles from $1 load
862 - xor $2,$3,$3 # 5 cycles from $3 load
866 - xor $4,$5,$5 # 5 cycles from $5 load
877 - xor $6,$7,$7 # 8 cycles from $6 load
881 - xor $21,$22,$22 # 8 cycles from $22 load
883 - xor $23,$24,$24 # 5 cycles from $24 load
886 - xor $25,$27,$27 # 5 cycles from $27 load
888 - xor $0,$1,$1 # 5 cycles from $1 load
891 - xor $2,$3,$3 # 4 cycles from $3 load
928 - xor $0,$1,$1 # 6 cycles from $1 load
930 - xor $2,$3,$3 # 6 cycles from $3 load
935 - xor $3,$4,$4 # 7 cycles from $4 load
938 - xor $5,$6,$6 # 7 cycles from $6 load
939 - xor $7,$22,$22 # 7 cycles from $22 load
940 - xor $6,$23,$23 # 7 cycles from $23 load
945 - xor $24,$25,$25 # 8 cycles from $25 load
948 - xor $25,$27,$27 # 8 cycles from $27 load
950 - xor $28,$0,$0 # 7 cycles from $0 load
958 - xor $1,$2,$2 # 6 cycles from $2 load
960 - xor $3,$4,$4 # 4 cycles from $4 load
970 - xor $4,$5,$5 # 7 cycles from $5 load
973 - xor $6,$7,$7 # 7 cycles from $7 load
978 - xor $7,$22,$22 # 7 cycles from $22 load
980 - xor $23,$24,$24 # 6 cycles from $24 load
985 - xor $25,$27,$27 # 7 cycles from $27 load
988 - xor $27,$28,$28 # 8 cycles from $28 load
990 - xor $0,$1,$1 # 6 cycles from $1 load
998 - xor $2,$3,$3 # 9 cycles from $3 load
999 - xor $3,$4,$4 # 9 cycles from $4 load
1000 - xor $5,$6,$6 # 8 cycles from $6 load
1004 - xor $7,$22,$22 # 7 cycles from $22 load
1005 - xor $23,$24,$24 # 6 cycles from $24 load
1010 - xor $24,$25,$25 # 8 cycles from $25 load
1024 - .ent xor_alpha_prefetch_2
1025 -xor_alpha_prefetch_2:
1063 - xor $0,$1,$0 # 8 cycles from $1 load
1090 - .end xor_alpha_prefetch_2
1093 - .ent xor_alpha_prefetch_3
1094 -xor_alpha_prefetch_3:
1135 - xor $0,$1,$1 # 8 cycles from $0 load
1136 - xor $3,$4,$4 # 7 cycles from $4 load
1137 - xor $6,$7,$7 # 6 cycles from $7 load
1138 - xor $21,$22,$22 # 5 cycles from $22 load
1140 - xor $1,$2,$2 # 9 cycles from $2 load
1141 - xor $24,$25,$25 # 5 cycles from $25 load
1143 - xor $4,$5,$5 # 6 cycles from $5 load
1146 - xor $7,$20,$20 # 7 cycles from $20 load
1148 - xor $22,$23,$23 # 7 cycles from $23 load
1151 - xor $25,$27,$27 # 7 cycles from $27 load
1170 - xor $0,$1,$1 # 6 cycles from $1 load
1171 - xor $3,$4,$4 # 5 cycles from $4 load
1172 - xor $6,$7,$7 # 5 cycles from $7 load
1173 - xor $1,$2,$2 # 4 cycles from $2 load
1175 - xor $4,$5,$5 # 5 cycles from $5 load
1176 - xor $7,$20,$20 # 4 cycles from $20 load
1188 - .end xor_alpha_prefetch_3
1191 - .ent xor_alpha_prefetch_4
1192 -xor_alpha_prefetch_4:
1233 - xor $0,$1,$1 # 6 cycles from $1 load
1235 - xor $2,$3,$3 # 6 cycles from $3 load
1240 - xor $4,$5,$5 # 7 cycles from $5 load
1244 - xor $21,$22,$22 # 7 cycles from $22 load
1248 - xor $23,$24,$24 # 7 cycles from $24 load
1255 - xor $25,$27,$27 # 8 cycles from $27 load
1263 - xor $0,$1,$1 # 9 cycles from $1 load
1264 - xor $2,$3,$3 # 5 cycles from $3 load
1268 - xor $4,$5,$5 # 5 cycles from $5 load
1280 - xor $6,$7,$7 # 8 cycles from $6 load
1283 - xor $21,$22,$22 # 8 cycles from $22 load
1288 - xor $23,$24,$24 # 6 cycles from $24 load
1290 - xor $25,$27,$27 # 6 cycles from $27 load
1294 - xor $0,$1,$1 # 7 cycles from $1 load
1295 - xor $2,$3,$3 # 6 cycles from $3 load
1310 - .end xor_alpha_prefetch_4
1313 - .ent xor_alpha_prefetch_5
1314 -xor_alpha_prefetch_5:
1359 - xor $0,$1,$1 # 6 cycles from $1 load
1361 - xor $2,$3,$3 # 6 cycles from $3 load
1366 - xor $3,$4,$4 # 7 cycles from $4 load
1369 - xor $5,$6,$6 # 7 cycles from $6 load
1370 - xor $7,$22,$22 # 7 cycles from $22 load
1371 - xor $6,$23,$23 # 7 cycles from $23 load
1376 - xor $24,$25,$25 # 8 cycles from $25 load
1379 - xor $25,$27,$27 # 8 cycles from $27 load
1381 - xor $28,$0,$0 # 7 cycles from $0 load
1389 - xor $1,$2,$2 # 6 cycles from $2 load
1391 - xor $3,$4,$4 # 4 cycles from $4 load
1401 - xor $4,$5,$5 # 7 cycles from $5 load
1404 - xor $6,$7,$7 # 7 cycles from $7 load
1409 - xor $7,$22,$22 # 7 cycles from $22 load
1411 - xor $23,$24,$24 # 6 cycles from $24 load
1416 - xor $25,$27,$27 # 7 cycles from $27 load
1419 - xor $27,$28,$28 # 8 cycles from $28 load
1421 - xor $0,$1,$1 # 6 cycles from $1 load
1431 - xor $2,$3,$3 # 9 cycles from $3 load
1434 - xor $3,$4,$4 # 9 cycles from $4 load
1436 - xor $5,$6,$6 # 8 cycles from $6 load
1440 - xor $7,$22,$22 # 7 cycles from $22 load
1441 - xor $23,$24,$24 # 6 cycles from $24 load
1446 - xor $24,$25,$25 # 8 cycles from $25 load
1459 - .end xor_alpha_prefetch_5
1463 + .ent xor_alpha_2 \n\
1466 + srl $16, 6, $16 \n\
1474 + ldq $4,16($17) \n\
1475 + ldq $5,16($18) \n\
1476 + ldq $6,24($17) \n\
1477 + ldq $7,24($18) \n\
1479 + ldq $19,32($17) \n\
1480 + ldq $20,32($18) \n\
1481 + ldq $21,40($17) \n\
1482 + ldq $22,40($18) \n\
1484 + ldq $23,48($17) \n\
1485 + ldq $24,48($18) \n\
1486 + ldq $25,56($17) \n\
1487 + xor $0,$1,$0 # 7 cycles from $1 load \n\
1489 + ldq $27,56($18) \n\
1496 + stq $4,16($17) \n\
1497 + xor $19,$20,$19 \n\
1499 + stq $6,24($17) \n\
1500 + xor $21,$22,$21 \n\
1501 + stq $19,32($17) \n\
1502 + xor $23,$24,$23 \n\
1504 + stq $21,40($17) \n\
1505 + xor $25,$27,$25 \n\
1506 + stq $23,48($17) \n\
1507 + subq $16,1,$16 \n\
1509 + stq $25,56($17) \n\
1510 + addq $17,64,$17 \n\
1511 + addq $18,64,$18 \n\
1515 + .end xor_alpha_2 \n\
1518 + .ent xor_alpha_3 \n\
1521 + srl $16, 6, $16 \n\
1530 + ldq $6,16($17) \n\
1531 + ldq $7,16($18) \n\
1532 + ldq $21,24($17) \n\
1534 + ldq $22,24($18) \n\
1535 + ldq $24,32($17) \n\
1536 + ldq $25,32($18) \n\
1539 + ldq $20,16($19) \n\
1540 + ldq $23,24($19) \n\
1541 + ldq $27,32($19) \n\
1544 + xor $0,$1,$1 # 8 cycles from $0 load \n\
1545 + xor $3,$4,$4 # 6 cycles from $4 load \n\
1546 + xor $6,$7,$7 # 6 cycles from $7 load \n\
1547 + xor $21,$22,$22 # 5 cycles from $22 load \n\
1549 + xor $1,$2,$2 # 9 cycles from $2 load \n\
1550 + xor $24,$25,$25 # 5 cycles from $25 load \n\
1552 + xor $4,$5,$5 # 6 cycles from $5 load \n\
1555 + xor $7,$20,$20 # 7 cycles from $20 load \n\
1556 + stq $20,16($17) \n\
1557 + xor $22,$23,$23 # 7 cycles from $23 load \n\
1559 + stq $23,24($17) \n\
1560 + xor $25,$27,$27 # 7 cycles from $27 load \n\
1561 + stq $27,32($17) \n\
1564 + ldq $0,40($17) \n\
1565 + ldq $1,40($18) \n\
1566 + ldq $3,48($17) \n\
1567 + ldq $4,48($18) \n\
1569 + ldq $6,56($17) \n\
1570 + ldq $7,56($18) \n\
1571 + ldq $2,40($19) \n\
1572 + ldq $5,48($19) \n\
1574 + ldq $20,56($19) \n\
1575 + xor $0,$1,$1 # 4 cycles from $1 load \n\
1576 + xor $3,$4,$4 # 5 cycles from $4 load \n\
1577 + xor $6,$7,$7 # 5 cycles from $7 load \n\
1579 + xor $1,$2,$2 # 4 cycles from $2 load \n\
1580 + xor $4,$5,$5 # 5 cycles from $5 load \n\
1581 + stq $2,40($17) \n\
1582 + xor $7,$20,$20 # 4 cycles from $20 load \n\
1584 + stq $5,48($17) \n\
1585 + subq $16,1,$16 \n\
1586 + stq $20,56($17) \n\
1587 + addq $19,64,$19 \n\
1589 + addq $18,64,$18 \n\
1590 + addq $17,64,$17 \n\
1593 + .end xor_alpha_3 \n\
1596 + .ent xor_alpha_4 \n\
1599 + srl $16, 6, $16 \n\
1612 + ldq $21,16($17) \n\
1613 + ldq $22,16($18) \n\
1614 + ldq $23,16($19) \n\
1615 + ldq $24,16($20) \n\
1617 + ldq $25,24($17) \n\
1618 + xor $0,$1,$1 # 6 cycles from $1 load \n\
1619 + ldq $27,24($18) \n\
1620 + xor $2,$3,$3 # 6 cycles from $3 load \n\
1622 + ldq $0,24($19) \n\
1624 + ldq $1,24($20) \n\
1625 + xor $4,$5,$5 # 7 cycles from $5 load \n\
1629 + xor $21,$22,$22 # 7 cycles from $22 load \n\
1633 + xor $23,$24,$24 # 7 cycles from $24 load \n\
1634 + ldq $2,32($17) \n\
1635 + xor $22,$24,$24 \n\
1637 + ldq $3,32($18) \n\
1638 + ldq $4,32($19) \n\
1639 + ldq $5,32($20) \n\
1640 + xor $25,$27,$27 # 8 cycles from $27 load \n\
1642 + ldq $6,40($17) \n\
1643 + ldq $7,40($18) \n\
1644 + ldq $21,40($19) \n\
1645 + ldq $22,40($20) \n\
1647 + stq $24,16($17) \n\
1648 + xor $0,$1,$1 # 9 cycles from $1 load \n\
1649 + xor $2,$3,$3 # 5 cycles from $3 load \n\
1652 + stq $1,24($17) \n\
1653 + xor $4,$5,$5 # 5 cycles from $5 load \n\
1654 + ldq $23,48($17) \n\
1655 + ldq $24,48($18) \n\
1657 + ldq $25,48($19) \n\
1659 + ldq $27,48($20) \n\
1660 + ldq $0,56($17) \n\
1662 + ldq $1,56($18) \n\
1663 + ldq $2,56($19) \n\
1664 + xor $6,$7,$7 # 8 cycles from $6 load \n\
1665 + ldq $3,56($20) \n\
1667 + stq $5,32($17) \n\
1668 + xor $21,$22,$22 # 8 cycles from $22 load \n\
1669 + xor $7,$22,$22 \n\
1670 + xor $23,$24,$24 # 5 cycles from $24 load \n\
1672 + stq $22,40($17) \n\
1673 + xor $25,$27,$27 # 5 cycles from $27 load \n\
1674 + xor $24,$27,$27 \n\
1675 + xor $0,$1,$1 # 5 cycles from $1 load \n\
1677 + stq $27,48($17) \n\
1678 + xor $2,$3,$3 # 4 cycles from $3 load \n\
1680 + subq $16,1,$16 \n\
1682 + stq $3,56($17) \n\
1683 + addq $20,64,$20 \n\
1684 + addq $19,64,$19 \n\
1685 + addq $18,64,$18 \n\
1687 + addq $17,64,$17 \n\
1690 + .end xor_alpha_4 \n\
1693 + .ent xor_alpha_5 \n\
1696 + srl $16, 6, $16 \n\
1709 + ldq $22,8($20) \n\
1710 + ldq $23,8($21) \n\
1711 + ldq $24,16($17) \n\
1712 + ldq $25,16($18) \n\
1714 + ldq $27,16($19) \n\
1715 + xor $0,$1,$1 # 6 cycles from $1 load \n\
1716 + ldq $28,16($20) \n\
1717 + xor $2,$3,$3 # 6 cycles from $3 load \n\
1719 + ldq $0,16($21) \n\
1721 + ldq $1,24($17) \n\
1722 + xor $3,$4,$4 # 7 cycles from $4 load \n\
1725 + xor $5,$6,$6 # 7 cycles from $6 load \n\
1726 + xor $7,$22,$22 # 7 cycles from $22 load \n\
1727 + xor $6,$23,$23 # 7 cycles from $23 load \n\
1729 + ldq $2,24($18) \n\
1730 + xor $22,$23,$23 \n\
1731 + ldq $3,24($19) \n\
1732 + xor $24,$25,$25 # 8 cycles from $25 load \n\
1734 + stq $23,8($17) \n\
1735 + xor $25,$27,$27 # 8 cycles from $27 load \n\
1736 + ldq $4,24($20) \n\
1737 + xor $28,$0,$0 # 7 cycles from $0 load \n\
1739 + ldq $5,24($21) \n\
1741 + ldq $6,32($17) \n\
1742 + ldq $7,32($18) \n\
1744 + stq $0,16($17) \n\
1745 + xor $1,$2,$2 # 6 cycles from $2 load \n\
1746 + ldq $22,32($19) \n\
1747 + xor $3,$4,$4 # 4 cycles from $4 load \n\
1749 + ldq $23,32($20) \n\
1751 + ldq $24,32($21) \n\
1752 + ldq $25,40($17) \n\
1754 + ldq $27,40($18) \n\
1755 + ldq $28,40($19) \n\
1756 + ldq $0,40($20) \n\
1757 + xor $4,$5,$5 # 7 cycles from $5 load \n\
1759 + stq $5,24($17) \n\
1760 + xor $6,$7,$7 # 7 cycles from $7 load \n\
1761 + ldq $1,40($21) \n\
1762 + ldq $2,48($17) \n\
1764 + ldq $3,48($18) \n\
1765 + xor $7,$22,$22 # 7 cycles from $22 load \n\
1766 + ldq $4,48($19) \n\
1767 + xor $23,$24,$24 # 6 cycles from $24 load \n\
1769 + ldq $5,48($20) \n\
1770 + xor $22,$24,$24 \n\
1771 + ldq $6,48($21) \n\
1772 + xor $25,$27,$27 # 7 cycles from $27 load \n\
1774 + stq $24,32($17) \n\
1775 + xor $27,$28,$28 # 8 cycles from $28 load \n\
1776 + ldq $7,56($17) \n\
1777 + xor $0,$1,$1 # 6 cycles from $1 load \n\
1779 + ldq $22,56($18) \n\
1780 + ldq $23,56($19) \n\
1781 + ldq $24,56($20) \n\
1782 + ldq $25,56($21) \n\
1785 + xor $2,$3,$3 # 9 cycles from $3 load \n\
1786 + xor $3,$4,$4 # 9 cycles from $4 load \n\
1787 + xor $5,$6,$6 # 8 cycles from $6 load \n\
1789 + stq $1,40($17) \n\
1791 + xor $7,$22,$22 # 7 cycles from $22 load \n\
1792 + xor $23,$24,$24 # 6 cycles from $24 load \n\
1794 + stq $6,48($17) \n\
1795 + xor $22,$24,$24 \n\
1796 + subq $16,1,$16 \n\
1797 + xor $24,$25,$25 # 8 cycles from $25 load \n\
1799 + stq $25,56($17) \n\
1800 + addq $21,64,$21 \n\
1801 + addq $20,64,$20 \n\
1802 + addq $19,64,$19 \n\
1804 + addq $18,64,$18 \n\
1805 + addq $17,64,$17 \n\
1808 + .end xor_alpha_5 \n\
1811 + .ent xor_alpha_prefetch_2 \n\
1812 +xor_alpha_prefetch_2: \n\
1814 + srl $16, 6, $16 \n\
1816 + ldq $31, 0($17) \n\
1817 + ldq $31, 0($18) \n\
1819 + ldq $31, 64($17) \n\
1820 + ldq $31, 64($18) \n\
1822 + ldq $31, 128($17) \n\
1823 + ldq $31, 128($18) \n\
1825 + ldq $31, 192($17) \n\
1826 + ldq $31, 192($18) \n\
1834 + ldq $4,16($17) \n\
1835 + ldq $5,16($18) \n\
1836 + ldq $6,24($17) \n\
1837 + ldq $7,24($18) \n\
1839 + ldq $19,32($17) \n\
1840 + ldq $20,32($18) \n\
1841 + ldq $21,40($17) \n\
1842 + ldq $22,40($18) \n\
1844 + ldq $23,48($17) \n\
1845 + ldq $24,48($18) \n\
1846 + ldq $25,56($17) \n\
1847 + ldq $27,56($18) \n\
1849 + ldq $31,256($17) \n\
1850 + xor $0,$1,$0 # 8 cycles from $1 load \n\
1851 + ldq $31,256($18) \n\
1859 + stq $4,16($17) \n\
1860 + xor $19,$20,$19 \n\
1861 + stq $6,24($17) \n\
1862 + xor $21,$22,$21 \n\
1864 + stq $19,32($17) \n\
1865 + xor $23,$24,$23 \n\
1866 + stq $21,40($17) \n\
1867 + xor $25,$27,$25 \n\
1869 + stq $23,48($17) \n\
1870 + subq $16,1,$16 \n\
1871 + stq $25,56($17) \n\
1872 + addq $17,64,$17 \n\
1874 + addq $18,64,$18 \n\
1877 + .end xor_alpha_prefetch_2 \n\
1880 + .ent xor_alpha_prefetch_3 \n\
1881 +xor_alpha_prefetch_3: \n\
1883 + srl $16, 6, $16 \n\
1885 + ldq $31, 0($17) \n\
1886 + ldq $31, 0($18) \n\
1887 + ldq $31, 0($19) \n\
1889 + ldq $31, 64($17) \n\
1890 + ldq $31, 64($18) \n\
1891 + ldq $31, 64($19) \n\
1893 + ldq $31, 128($17) \n\
1894 + ldq $31, 128($18) \n\
1895 + ldq $31, 128($19) \n\
1897 + ldq $31, 192($17) \n\
1898 + ldq $31, 192($18) \n\
1899 + ldq $31, 192($19) \n\
1908 + ldq $6,16($17) \n\
1909 + ldq $7,16($18) \n\
1910 + ldq $21,24($17) \n\
1912 + ldq $22,24($18) \n\
1913 + ldq $24,32($17) \n\
1914 + ldq $25,32($18) \n\
1917 + ldq $20,16($19) \n\
1918 + ldq $23,24($19) \n\
1919 + ldq $27,32($19) \n\
1922 + xor $0,$1,$1 # 8 cycles from $0 load \n\
1923 + xor $3,$4,$4 # 7 cycles from $4 load \n\
1924 + xor $6,$7,$7 # 6 cycles from $7 load \n\
1925 + xor $21,$22,$22 # 5 cycles from $22 load \n\
1927 + xor $1,$2,$2 # 9 cycles from $2 load \n\
1928 + xor $24,$25,$25 # 5 cycles from $25 load \n\
1930 + xor $4,$5,$5 # 6 cycles from $5 load \n\
1933 + xor $7,$20,$20 # 7 cycles from $20 load \n\
1934 + stq $20,16($17) \n\
1935 + xor $22,$23,$23 # 7 cycles from $23 load \n\
1937 + stq $23,24($17) \n\
1938 + xor $25,$27,$27 # 7 cycles from $27 load \n\
1939 + stq $27,32($17) \n\
1942 + ldq $0,40($17) \n\
1943 + ldq $1,40($18) \n\
1944 + ldq $3,48($17) \n\
1945 + ldq $4,48($18) \n\
1947 + ldq $6,56($17) \n\
1948 + ldq $7,56($18) \n\
1949 + ldq $2,40($19) \n\
1950 + ldq $5,48($19) \n\
1952 + ldq $20,56($19) \n\
1953 + ldq $31,256($17) \n\
1954 + ldq $31,256($18) \n\
1955 + ldq $31,256($19) \n\
1957 + xor $0,$1,$1 # 6 cycles from $1 load \n\
1958 + xor $3,$4,$4 # 5 cycles from $4 load \n\
1959 + xor $6,$7,$7 # 5 cycles from $7 load \n\
1960 + xor $1,$2,$2 # 4 cycles from $2 load \n\
1962 + xor $4,$5,$5 # 5 cycles from $5 load \n\
1963 + xor $7,$20,$20 # 4 cycles from $20 load \n\
1964 + stq $2,40($17) \n\
1965 + subq $16,1,$16 \n\
1967 + stq $5,48($17) \n\
1968 + addq $19,64,$19 \n\
1969 + stq $20,56($17) \n\
1970 + addq $18,64,$18 \n\
1972 + addq $17,64,$17 \n\
1975 + .end xor_alpha_prefetch_3 \n\
1978 + .ent xor_alpha_prefetch_4 \n\
1979 +xor_alpha_prefetch_4: \n\
1981 + srl $16, 6, $16 \n\
1983 + ldq $31, 0($17) \n\
1984 + ldq $31, 0($18) \n\
1985 + ldq $31, 0($19) \n\
1986 + ldq $31, 0($20) \n\
1988 + ldq $31, 64($17) \n\
1989 + ldq $31, 64($18) \n\
1990 + ldq $31, 64($19) \n\
1991 + ldq $31, 64($20) \n\
1993 + ldq $31, 128($17) \n\
1994 + ldq $31, 128($18) \n\
1995 + ldq $31, 128($19) \n\
1996 + ldq $31, 128($20) \n\
1998 + ldq $31, 192($17) \n\
1999 + ldq $31, 192($18) \n\
2000 + ldq $31, 192($19) \n\
2001 + ldq $31, 192($20) \n\
2014 + ldq $21,16($17) \n\
2015 + ldq $22,16($18) \n\
2016 + ldq $23,16($19) \n\
2017 + ldq $24,16($20) \n\
2019 + ldq $25,24($17) \n\
2020 + xor $0,$1,$1 # 6 cycles from $1 load \n\
2021 + ldq $27,24($18) \n\
2022 + xor $2,$3,$3 # 6 cycles from $3 load \n\
2024 + ldq $0,24($19) \n\
2026 + ldq $1,24($20) \n\
2027 + xor $4,$5,$5 # 7 cycles from $5 load \n\
2031 + xor $21,$22,$22 # 7 cycles from $22 load \n\
2035 + xor $23,$24,$24 # 7 cycles from $24 load \n\
2036 + ldq $2,32($17) \n\
2037 + xor $22,$24,$24 \n\
2039 + ldq $3,32($18) \n\
2040 + ldq $4,32($19) \n\
2041 + ldq $5,32($20) \n\
2042 + xor $25,$27,$27 # 8 cycles from $27 load \n\
2044 + ldq $6,40($17) \n\
2045 + ldq $7,40($18) \n\
2046 + ldq $21,40($19) \n\
2047 + ldq $22,40($20) \n\
2049 + stq $24,16($17) \n\
2050 + xor $0,$1,$1 # 9 cycles from $1 load \n\
2051 + xor $2,$3,$3 # 5 cycles from $3 load \n\
2054 + stq $1,24($17) \n\
2055 + xor $4,$5,$5 # 5 cycles from $5 load \n\
2056 + ldq $23,48($17) \n\
2059 + ldq $24,48($18) \n\
2060 + ldq $25,48($19) \n\
2061 + ldq $27,48($20) \n\
2062 + ldq $0,56($17) \n\
2064 + ldq $1,56($18) \n\
2065 + ldq $2,56($19) \n\
2066 + ldq $3,56($20) \n\
2067 + xor $6,$7,$7 # 8 cycles from $6 load \n\
2069 + ldq $31,256($17) \n\
2070 + xor $21,$22,$22 # 8 cycles from $22 load \n\
2071 + ldq $31,256($18) \n\
2072 + xor $7,$22,$22 \n\
2074 + ldq $31,256($19) \n\
2075 + xor $23,$24,$24 # 6 cycles from $24 load \n\
2076 + ldq $31,256($20) \n\
2077 + xor $25,$27,$27 # 6 cycles from $27 load \n\
2079 + stq $5,32($17) \n\
2080 + xor $24,$27,$27 \n\
2081 + xor $0,$1,$1 # 7 cycles from $1 load \n\
2082 + xor $2,$3,$3 # 6 cycles from $3 load \n\
2084 + stq $22,40($17) \n\
2086 + stq $27,48($17) \n\
2087 + subq $16,1,$16 \n\
2089 + stq $3,56($17) \n\
2090 + addq $20,64,$20 \n\
2091 + addq $19,64,$19 \n\
2092 + addq $18,64,$18 \n\
2094 + addq $17,64,$17 \n\
2097 + .end xor_alpha_prefetch_4 \n\
2100 + .ent xor_alpha_prefetch_5 \n\
2101 +xor_alpha_prefetch_5: \n\
2103 + srl $16, 6, $16 \n\
2105 + ldq $31, 0($17) \n\
2106 + ldq $31, 0($18) \n\
2107 + ldq $31, 0($19) \n\
2108 + ldq $31, 0($20) \n\
2109 + ldq $31, 0($21) \n\
2111 + ldq $31, 64($17) \n\
2112 + ldq $31, 64($18) \n\
2113 + ldq $31, 64($19) \n\
2114 + ldq $31, 64($20) \n\
2115 + ldq $31, 64($21) \n\
2117 + ldq $31, 128($17) \n\
2118 + ldq $31, 128($18) \n\
2119 + ldq $31, 128($19) \n\
2120 + ldq $31, 128($20) \n\
2121 + ldq $31, 128($21) \n\
2123 + ldq $31, 192($17) \n\
2124 + ldq $31, 192($18) \n\
2125 + ldq $31, 192($19) \n\
2126 + ldq $31, 192($20) \n\
2127 + ldq $31, 192($21) \n\
2140 + ldq $22,8($20) \n\
2141 + ldq $23,8($21) \n\
2142 + ldq $24,16($17) \n\
2143 + ldq $25,16($18) \n\
2145 + ldq $27,16($19) \n\
2146 + xor $0,$1,$1 # 6 cycles from $1 load \n\
2147 + ldq $28,16($20) \n\
2148 + xor $2,$3,$3 # 6 cycles from $3 load \n\
2150 + ldq $0,16($21) \n\
2152 + ldq $1,24($17) \n\
2153 + xor $3,$4,$4 # 7 cycles from $4 load \n\
2156 + xor $5,$6,$6 # 7 cycles from $6 load \n\
2157 + xor $7,$22,$22 # 7 cycles from $22 load \n\
2158 + xor $6,$23,$23 # 7 cycles from $23 load \n\
2160 + ldq $2,24($18) \n\
2161 + xor $22,$23,$23 \n\
2162 + ldq $3,24($19) \n\
2163 + xor $24,$25,$25 # 8 cycles from $25 load \n\
2165 + stq $23,8($17) \n\
2166 + xor $25,$27,$27 # 8 cycles from $27 load \n\
2167 + ldq $4,24($20) \n\
2168 + xor $28,$0,$0 # 7 cycles from $0 load \n\
2170 + ldq $5,24($21) \n\
2172 + ldq $6,32($17) \n\
2173 + ldq $7,32($18) \n\
2175 + stq $0,16($17) \n\
2176 + xor $1,$2,$2 # 6 cycles from $2 load \n\
2177 + ldq $22,32($19) \n\
2178 + xor $3,$4,$4 # 4 cycles from $4 load \n\
2180 + ldq $23,32($20) \n\
2182 + ldq $24,32($21) \n\
2183 + ldq $25,40($17) \n\
2185 + ldq $27,40($18) \n\
2186 + ldq $28,40($19) \n\
2187 + ldq $0,40($20) \n\
2188 + xor $4,$5,$5 # 7 cycles from $5 load \n\
2190 + stq $5,24($17) \n\
2191 + xor $6,$7,$7 # 7 cycles from $7 load \n\
2192 + ldq $1,40($21) \n\
2193 + ldq $2,48($17) \n\
2195 + ldq $3,48($18) \n\
2196 + xor $7,$22,$22 # 7 cycles from $22 load \n\
2197 + ldq $4,48($19) \n\
2198 + xor $23,$24,$24 # 6 cycles from $24 load \n\
2200 + ldq $5,48($20) \n\
2201 + xor $22,$24,$24 \n\
2202 + ldq $6,48($21) \n\
2203 + xor $25,$27,$27 # 7 cycles from $27 load \n\
2205 + stq $24,32($17) \n\
2206 + xor $27,$28,$28 # 8 cycles from $28 load \n\
2207 + ldq $7,56($17) \n\
2208 + xor $0,$1,$1 # 6 cycles from $1 load \n\
2210 + ldq $22,56($18) \n\
2211 + ldq $23,56($19) \n\
2212 + ldq $24,56($20) \n\
2213 + ldq $25,56($21) \n\
2215 + ldq $31,256($17) \n\
2217 + ldq $31,256($18) \n\
2218 + xor $2,$3,$3 # 9 cycles from $3 load \n\
2220 + ldq $31,256($19) \n\
2221 + xor $3,$4,$4 # 9 cycles from $4 load \n\
2222 + ldq $31,256($20) \n\
2223 + xor $5,$6,$6 # 8 cycles from $6 load \n\
2225 + stq $1,40($17) \n\
2227 + xor $7,$22,$22 # 7 cycles from $22 load \n\
2228 + xor $23,$24,$24 # 6 cycles from $24 load \n\
2230 + stq $6,48($17) \n\
2231 + xor $22,$24,$24 \n\
2232 + ldq $31,256($21) \n\
2233 + xor $24,$25,$25 # 8 cycles from $25 load \n\
2235 + stq $25,56($17) \n\
2236 + subq $16,1,$16 \n\
2237 + addq $21,64,$21 \n\
2238 + addq $20,64,$20 \n\
2240 + addq $19,64,$19 \n\
2241 + addq $18,64,$18 \n\
2242 + addq $17,64,$17 \n\
2246 + .end xor_alpha_prefetch_5 \n\
2249 static struct xor_block_template xor_block_alpha = {
2251 - do_2: xor_alpha_2,
2252 - do_3: xor_alpha_3,
2253 - do_4: xor_alpha_4,
2254 - do_5: xor_alpha_5,
2256 + .do_2 = xor_alpha_2,
2257 + .do_3 = xor_alpha_3,
2258 + .do_4 = xor_alpha_4,
2259 + .do_5 = xor_alpha_5,
2262 static struct xor_block_template xor_block_alpha_prefetch = {
2263 - name: "alpha prefetch",
2264 - do_2: xor_alpha_prefetch_2,
2265 - do_3: xor_alpha_prefetch_3,
2266 - do_4: xor_alpha_prefetch_4,
2267 - do_5: xor_alpha_prefetch_5,
2268 + .name = "alpha prefetch",
2269 + .do_2 = xor_alpha_prefetch_2,
2270 + .do_3 = xor_alpha_prefetch_3,
2271 + .do_4 = xor_alpha_prefetch_4,
2272 + .do_5 = xor_alpha_prefetch_5,
2275 /* For grins, also test the generic routines. */