Skip to content

L
linux
Commit 114d5b1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy.
  [SPARC64]: Fix put_user() calls in binfmt_aout32.c
  [SPARC]: Fix EBUS use of uninitialized variable.
parents 2b3b2908 25e5566e
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 169 deletions
arch/sparc/kernel/ebus.c
View file @ 114d5b1c
...@@ -156,6 +156,8 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d ...@@ -156,6 +156,8 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d
dev->prom_node = dp; dev->prom_node = dp;
regs = of_get_property(dp, "reg", &len); regs = of_get_property(dp, "reg", &len);
if (!regs)
len = 0;
if (len % sizeof(struct linux_prom_registers)) { if (len % sizeof(struct linux_prom_registers)) {
prom_printf("UGH: proplen for %s was %d, need multiple of %d\n", prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",
dev->prom_node->name, len, dev->prom_node->name, len,
......
arch/sparc64/kernel/binfmt_aout32.c
View file @ 114d5b1c
...@@ -177,7 +177,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr ...@@ -177,7 +177,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr
get_user(c,p++); get_user(c,p++);
} while (c); } while (c);
} }
put_user(NULL,argv); put_user(0,argv);
current->mm->arg_end = current->mm->env_start = (unsigned long) p; current->mm->arg_end = current->mm->env_start = (unsigned long) p;
while (envc-->0) { while (envc-->0) {
char c; char c;
...@@ -186,7 +186,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr ...@@ -186,7 +186,7 @@ static u32 __user *create_aout32_tables(char __user *p, struct linux_binprm *bpr
get_user(c,p++); get_user(c,p++);
} while (c); } while (c);
} }
put_user(NULL,envp); put_user(0,envp);
current->mm->env_end = (unsigned long) p; current->mm->env_end = (unsigned long) p;
return sp; return sp;
} }
......
arch/sparc64/kernel/ebus.c
View file @ 114d5b1c
...@@ -375,7 +375,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de ...@@ -375,7 +375,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de
dev->num_addrs = 0; dev->num_addrs = 0;
dev->num_irqs = 0; dev->num_irqs = 0;
} else { } else {
(void) of_get_property(dp, "reg", &len); const int *regs = of_get_property(dp, "reg", &len);
if (!regs)
len = 0;
dev->num_addrs = len / sizeof(struct linux_prom_registers); dev->num_addrs = len / sizeof(struct linux_prom_registers);
for (i = 0; i < dev->num_addrs; i++) for (i = 0; i < dev->num_addrs; i++)
......
arch/sparc64/lib/NGcopy_from_user.S
View file @ 114d5b1c
/* NGcopy_from_user.S: Niagara optimized copy from userspace. /* NGcopy_from_user.S: Niagara optimized copy from userspace.
* *
* Copyright (C) 2006 David S. Miller (davem@davemloft.net) * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
*/ */
#define EX_LD(x) \ #define EX_LD(x) \
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
.section .fixup; \ .section .fixup; \
.align 4; \ .align 4; \
99: wr %g0, ASI_AIUS, %asi;\ 99: wr %g0, ASI_AIUS, %asi;\
retl; \ ret; \
mov 1, %o0; \ restore %g0, 1, %o0; \
.section __ex_table,"a";\ .section __ex_table,"a";\
.align 4; \ .align 4; \
.word 98b, 99b; \ .word 98b, 99b; \
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define LOAD(type,addr,dest) type##a [addr] ASI_AIUS, dest #define LOAD(type,addr,dest) type##a [addr] ASI_AIUS, dest
#define LOAD_TWIN(addr_reg,dest0,dest1) \ #define LOAD_TWIN(addr_reg,dest0,dest1) \
ldda [addr_reg] ASI_BLK_INIT_QUAD_LDD_AIUS, dest0 ldda [addr_reg] ASI_BLK_INIT_QUAD_LDD_AIUS, dest0
#define EX_RETVAL(x) 0 #define EX_RETVAL(x) %g0
#ifdef __KERNEL__ #ifdef __KERNEL__
#define PREAMBLE \ #define PREAMBLE \
......
arch/sparc64/lib/NGcopy_to_user.S
View file @ 114d5b1c
/* NGcopy_to_user.S: Niagara optimized copy to userspace. /* NGcopy_to_user.S: Niagara optimized copy to userspace.
* *
* Copyright (C) 2006 David S. Miller (davem@davemloft.net) * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
*/ */
#define EX_ST(x) \ #define EX_ST(x) \
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
.section .fixup; \ .section .fixup; \
.align 4; \ .align 4; \
99: wr %g0, ASI_AIUS, %asi;\ 99: wr %g0, ASI_AIUS, %asi;\
retl; \ ret; \
mov 1, %o0; \ restore %g0, 1, %o0; \
.section __ex_table,"a";\ .section __ex_table,"a";\
.align 4; \ .align 4; \
.word 98b, 99b; \ .word 98b, 99b; \
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define FUNC_NAME NGcopy_to_user #define FUNC_NAME NGcopy_to_user
#define STORE(type,src,addr) type##a src, [addr] ASI_AIUS #define STORE(type,src,addr) type##a src, [addr] ASI_AIUS
#define STORE_ASI ASI_BLK_INIT_QUAD_LDD_AIUS #define STORE_ASI ASI_BLK_INIT_QUAD_LDD_AIUS
#define EX_RETVAL(x) 0 #define EX_RETVAL(x) %g0
#ifdef __KERNEL__ #ifdef __KERNEL__
/* Writing to %asi is _expensive_ so we hardcode it. /* Writing to %asi is _expensive_ so we hardcode it.
......
arch/sparc64/lib/NGmemcpy.S
View file @ 114d5b1c
/* NGmemcpy.S: Niagara optimized memcpy. /* NGmemcpy.S: Niagara optimized memcpy.
* *
* Copyright (C) 2006 David S. Miller (davem@davemloft.net) * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
...@@ -16,6 +16,12 @@ ...@@ -16,6 +16,12 @@
wr %g0, ASI_PNF, %asi wr %g0, ASI_PNF, %asi
#endif #endif
#ifdef __sparc_v9__
#define SAVE_AMOUNT 128
#else
#define SAVE_AMOUNT 64
#endif
#ifndef STORE_ASI #ifndef STORE_ASI
#define STORE_ASI ASI_BLK_INIT_QUAD_LDD_P #define STORE_ASI ASI_BLK_INIT_QUAD_LDD_P
#endif #endif
...@@ -50,7 +56,11 @@ ...@@ -50,7 +56,11 @@
#endif #endif
#ifndef STORE_INIT #ifndef STORE_INIT
#ifndef SIMULATE_NIAGARA_ON_NON_NIAGARA
#define STORE_INIT(src,addr) stxa src, [addr] %asi #define STORE_INIT(src,addr) stxa src, [addr] %asi
#else
#define STORE_INIT(src,addr) stx src, [addr + 0x00]
#endif
#endif #endif
#ifndef FUNC_NAME #ifndef FUNC_NAME
...@@ -73,18 +83,19 @@ ...@@ -73,18 +83,19 @@
.globl FUNC_NAME .globl FUNC_NAME
.type FUNC_NAME,#function .type FUNC_NAME,#function
FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ FUNC_NAME: /* %i0=dst, %i1=src, %i2=len */
srlx %o2, 31, %g2 PREAMBLE
save %sp, -SAVE_AMOUNT, %sp
srlx %i2, 31, %g2
cmp %g2, 0 cmp %g2, 0
tne %xcc, 5 tne %xcc, 5
PREAMBLE mov %i0, %o0
mov %o0, GLOBAL_SPARE cmp %i2, 0
cmp %o2, 0
be,pn %XCC, 85f be,pn %XCC, 85f
or %o0, %o1, %o3 or %o0, %i1, %i3
cmp %o2, 16 cmp %i2, 16
blu,a,pn %XCC, 80f blu,a,pn %XCC, 80f
or %o3, %o2, %o3 or %i3, %i2, %i3
/* 2 blocks (128 bytes) is the minimum we can do the block /* 2 blocks (128 bytes) is the minimum we can do the block
* copy with. We need to ensure that we'll iterate at least * copy with. We need to ensure that we'll iterate at least
...@@ -93,31 +104,31 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ ...@@ -93,31 +104,31 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
* to (64 - 1) bytes from the length before we perform the * to (64 - 1) bytes from the length before we perform the
* block copy loop. * block copy loop.
*/ */
cmp %o2, (2 * 64) cmp %i2, (2 * 64)
blu,pt %XCC, 70f blu,pt %XCC, 70f
andcc %o3, 0x7, %g0 andcc %i3, 0x7, %g0
/* %o0: dst /* %o0: dst
* %o1: src * %i1: src
* %o2: len (known to be >= 128) * %i2: len (known to be >= 128)
* *
* The block copy loops will use %o4/%o5,%g2/%g3 as * The block copy loops will use %i4/%i5,%g2/%g3 as
* temporaries while copying the data. * temporaries while copying the data.
*/ */
LOAD(prefetch, %o1, #one_read) LOAD(prefetch, %i1, #one_read)
wr %g0, STORE_ASI, %asi wr %g0, STORE_ASI, %asi
/* Align destination on 64-byte boundary. */ /* Align destination on 64-byte boundary. */
andcc %o0, (64 - 1), %o4 andcc %o0, (64 - 1), %i4
be,pt %XCC, 2f be,pt %XCC, 2f
sub %o4, 64, %o4 sub %i4, 64, %i4
sub %g0, %o4, %o4 ! bytes to align dst sub %g0, %i4, %i4 ! bytes to align dst
sub %o2, %o4, %o2 sub %i2, %i4, %i2
1: subcc %o4, 1, %o4 1: subcc %i4, 1, %i4
EX_LD(LOAD(ldub, %o1, %g1)) EX_LD(LOAD(ldub, %i1, %g1))
EX_ST(STORE(stb, %g1, %o0)) EX_ST(STORE(stb, %g1, %o0))
add %o1, 1, %o1 add %i1, 1, %i1
bne,pt %XCC, 1b bne,pt %XCC, 1b
add %o0, 1, %o0 add %o0, 1, %o0
...@@ -136,111 +147,155 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ ...@@ -136,111 +147,155 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
* aligned store data at a time, this is easy to ensure. * aligned store data at a time, this is easy to ensure.
*/ */
2: 2:
andcc %o1, (16 - 1), %o4 andcc %i1, (16 - 1), %i4
andn %o2, (64 - 1), %g1 ! block copy loop iterator andn %i2, (64 - 1), %g1 ! block copy loop iterator
sub %o2, %g1, %o2 ! final sub-block copy bytes
be,pt %XCC, 50f be,pt %XCC, 50f
cmp %o4, 8 sub %i2, %g1, %i2 ! final sub-block copy bytes
be,a,pt %XCC, 10f
sub %o1, 0x8, %o1 cmp %i4, 8
be,pt %XCC, 10f
sub %i1, %i4, %i1
/* Neither 8-byte nor 16-byte aligned, shift and mask. */ /* Neither 8-byte nor 16-byte aligned, shift and mask. */
mov %g1, %o4 and %i4, 0x7, GLOBAL_SPARE
and %o1, 0x7, %g1 sll GLOBAL_SPARE, 3, GLOBAL_SPARE
sll %g1, 3, %g1 mov 64, %i5
mov 64, %o3 EX_LD(LOAD_TWIN(%i1, %g2, %g3))
andn %o1, 0x7, %o1 sub %i5, GLOBAL_SPARE, %i5
EX_LD(LOAD(ldx, %o1, %g2)) mov 16, %o4
sub %o3, %g1, %o3 mov 32, %o5
sllx %g2, %g1, %g2 mov 48, %o7
mov 64, %i3
bg,pn %XCC, 9f
nop
#define SWIVEL_ONE_DWORD(SRC, TMP1, TMP2, PRE_VAL, PRE_SHIFT, POST_SHIFT, DST)\ #define MIX_THREE_WORDS(WORD1, WORD2, WORD3, PRE_SHIFT, POST_SHIFT, TMP) \
EX_LD(LOAD(ldx, SRC, TMP1)); \ sllx WORD1, POST_SHIFT, WORD1; \
srlx TMP1, PRE_SHIFT, TMP2; \ srlx WORD2, PRE_SHIFT, TMP; \
or TMP2, PRE_VAL, TMP2; \ sllx WORD2, POST_SHIFT, WORD2; \
EX_ST(STORE_INIT(TMP2, DST)); \ or WORD1, TMP, WORD1; \
sllx TMP1, POST_SHIFT, PRE_VAL; srlx WORD3, PRE_SHIFT, TMP; \
or WORD2, TMP, WORD2;
1: add %o1, 0x8, %o1
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x00) 8: EX_LD(LOAD_TWIN(%i1 + %o4, %o2, %o3))
add %o1, 0x8, %o1 MIX_THREE_WORDS(%g2, %g3, %o2, %i5, GLOBAL_SPARE, %o1)
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x08) LOAD(prefetch, %i1 + %i3, #one_read)
add %o1, 0x8, %o1
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x10) EX_ST(STORE_INIT(%g2, %o0 + 0x00))
add %o1, 0x8, %o1 EX_ST(STORE_INIT(%g3, %o0 + 0x08))
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x18)
add %o1, 32, %o1 EX_LD(LOAD_TWIN(%i1 + %o5, %g2, %g3))
LOAD(prefetch, %o1, #one_read) MIX_THREE_WORDS(%o2, %o3, %g2, %i5, GLOBAL_SPARE, %o1)
sub %o1, 32 - 8, %o1
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x20) EX_ST(STORE_INIT(%o2, %o0 + 0x10))
add %o1, 8, %o1 EX_ST(STORE_INIT(%o3, %o0 + 0x18))
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x28)
add %o1, 8, %o1 EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x30) MIX_THREE_WORDS(%g2, %g3, %o2, %i5, GLOBAL_SPARE, %o1)
add %o1, 8, %o1
SWIVEL_ONE_DWORD(%o1, %g3, %o5, %g2, %o3, %g1, %o0 + 0x38) EX_ST(STORE_INIT(%g2, %o0 + 0x20))
subcc %o4, 64, %o4 EX_ST(STORE_INIT(%g3, %o0 + 0x28))
bne,pt %XCC, 1b
EX_LD(LOAD_TWIN(%i1 + %i3, %g2, %g3))
add %i1, 64, %i1
MIX_THREE_WORDS(%o2, %o3, %g2, %i5, GLOBAL_SPARE, %o1)
EX_ST(STORE_INIT(%o2, %o0 + 0x30))
EX_ST(STORE_INIT(%o3, %o0 + 0x38))
subcc %g1, 64, %g1
bne,pt %XCC, 8b
add %o0, 64, %o0 add %o0, 64, %o0
#undef SWIVEL_ONE_DWORD ba,pt %XCC, 60f
add %i1, %i4, %i1
9: EX_LD(LOAD_TWIN(%i1 + %o4, %o2, %o3))
MIX_THREE_WORDS(%g3, %o2, %o3, %i5, GLOBAL_SPARE, %o1)
LOAD(prefetch, %i1 + %i3, #one_read)
EX_ST(STORE_INIT(%g3, %o0 + 0x00))
EX_ST(STORE_INIT(%o2, %o0 + 0x08))
EX_LD(LOAD_TWIN(%i1 + %o5, %g2, %g3))
MIX_THREE_WORDS(%o3, %g2, %g3, %i5, GLOBAL_SPARE, %o1)
EX_ST(STORE_INIT(%o3, %o0 + 0x10))
EX_ST(STORE_INIT(%g2, %o0 + 0x18))
EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
MIX_THREE_WORDS(%g3, %o2, %o3, %i5, GLOBAL_SPARE, %o1)
EX_ST(STORE_INIT(%g3, %o0 + 0x20))
EX_ST(STORE_INIT(%o2, %o0 + 0x28))
EX_LD(LOAD_TWIN(%i1 + %i3, %g2, %g3))
add %i1, 64, %i1
MIX_THREE_WORDS(%o3, %g2, %g3, %i5, GLOBAL_SPARE, %o1)
EX_ST(STORE_INIT(%o3, %o0 + 0x30))
EX_ST(STORE_INIT(%g2, %o0 + 0x38))
subcc %g1, 64, %g1
bne,pt %XCC, 9b
add %o0, 64, %o0
srl %g1, 3, %g1
ba,pt %XCC, 60f ba,pt %XCC, 60f
add %o1, %g1, %o1 add %i1, %i4, %i1
10: /* Destination is 64-byte aligned, source was only 8-byte 10: /* Destination is 64-byte aligned, source was only 8-byte
* aligned but it has been subtracted by 8 and we perform * aligned but it has been subtracted by 8 and we perform
* one twin load ahead, then add 8 back into source when * one twin load ahead, then add 8 back into source when
* we finish the loop. * we finish the loop.
*/ */
EX_LD(LOAD_TWIN(%o1, %o4, %o5)) EX_LD(LOAD_TWIN(%i1, %o4, %o5))
1: add %o1, 16, %o1 mov 16, %o7
EX_LD(LOAD_TWIN(%o1, %g2, %g3)) mov 32, %g2
add %o1, 16 + 32, %o1 mov 48, %g3
LOAD(prefetch, %o1, #one_read) mov 64, %o1
sub %o1, 32, %o1 1: EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
LOAD(prefetch, %i1 + %o1, #one_read)
EX_ST(STORE_INIT(%o5, %o0 + 0x00)) ! initializes cache line EX_ST(STORE_INIT(%o5, %o0 + 0x00)) ! initializes cache line
EX_ST(STORE_INIT(%g2, %o0 + 0x08)) EX_ST(STORE_INIT(%o2, %o0 + 0x08))
EX_LD(LOAD_TWIN(%o1, %o4, %o5)) EX_LD(LOAD_TWIN(%i1 + %g2, %o4, %o5))
add %o1, 16, %o1 EX_ST(STORE_INIT(%o3, %o0 + 0x10))
EX_ST(STORE_INIT(%g3, %o0 + 0x10))
EX_ST(STORE_INIT(%o4, %o0 + 0x18)) EX_ST(STORE_INIT(%o4, %o0 + 0x18))
EX_LD(LOAD_TWIN(%o1, %g2, %g3)) EX_LD(LOAD_TWIN(%i1 + %g3, %o2, %o3))
add %o1, 16, %o1
EX_ST(STORE_INIT(%o5, %o0 + 0x20)) EX_ST(STORE_INIT(%o5, %o0 + 0x20))
EX_ST(STORE_INIT(%g2, %o0 + 0x28)) EX_ST(STORE_INIT(%o2, %o0 + 0x28))
EX_LD(LOAD_TWIN(%o1, %o4, %o5)) EX_LD(LOAD_TWIN(%i1 + %o1, %o4, %o5))
EX_ST(STORE_INIT(%g3, %o0 + 0x30)) add %i1, 64, %i1
EX_ST(STORE_INIT(%o3, %o0 + 0x30))
EX_ST(STORE_INIT(%o4, %o0 + 0x38)) EX_ST(STORE_INIT(%o4, %o0 + 0x38))
subcc %g1, 64, %g1 subcc %g1, 64, %g1
bne,pt %XCC, 1b bne,pt %XCC, 1b
add %o0, 64, %o0 add %o0, 64, %o0
ba,pt %XCC, 60f ba,pt %XCC, 60f
add %o1, 0x8, %o1 add %i1, 0x8, %i1
50: /* Destination is 64-byte aligned, and source is 16-byte 50: /* Destination is 64-byte aligned, and source is 16-byte
* aligned. * aligned.
*/ */
1: EX_LD(LOAD_TWIN(%o1, %o4, %o5)) mov 16, %o7
add %o1, 16, %o1 mov 32, %g2
EX_LD(LOAD_TWIN(%o1, %g2, %g3)) mov 48, %g3
add %o1, 16 + 32, %o1 mov 64, %o1
LOAD(prefetch, %o1, #one_read) 1: EX_LD(LOAD_TWIN(%i1 + %g0, %o4, %o5))
sub %o1, 32, %o1 EX_LD(LOAD_TWIN(%i1 + %o7, %o2, %o3))
LOAD(prefetch, %i1 + %o1, #one_read)
EX_ST(STORE_INIT(%o4, %o0 + 0x00)) ! initializes cache line EX_ST(STORE_INIT(%o4, %o0 + 0x00)) ! initializes cache line
EX_ST(STORE_INIT(%o5, %o0 + 0x08)) EX_ST(STORE_INIT(%o5, %o0 + 0x08))
EX_LD(LOAD_TWIN(%o1, %o4, %o5)) EX_LD(LOAD_TWIN(%i1 + %g2, %o4, %o5))
add %o1, 16, %o1 EX_ST(STORE_INIT(%o2, %o0 + 0x10))
EX_ST(STORE_INIT(%g2, %o0 + 0x10)) EX_ST(STORE_INIT(%o3, %o0 + 0x18))
EX_ST(STORE_INIT(%g3, %o0 + 0x18)) EX_LD(LOAD_TWIN(%i1 + %g3, %o2, %o3))
EX_LD(LOAD_TWIN(%o1, %g2, %g3)) add %i1, 64, %i1
add %o1, 16, %o1
EX_ST(STORE_INIT(%o4, %o0 + 0x20)) EX_ST(STORE_INIT(%o4, %o0 + 0x20))
EX_ST(STORE_INIT(%o5, %o0 + 0x28)) EX_ST(STORE_INIT(%o5, %o0 + 0x28))
EX_ST(STORE_INIT(%g2, %o0 + 0x30)) EX_ST(STORE_INIT(%o2, %o0 + 0x30))
EX_ST(STORE_INIT(%g3, %o0 + 0x38)) EX_ST(STORE_INIT(%o3, %o0 + 0x38))
subcc %g1, 64, %g1 subcc %g1, 64, %g1
bne,pt %XCC, 1b bne,pt %XCC, 1b
add %o0, 64, %o0 add %o0, 64, %o0
...@@ -249,47 +304,47 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ ...@@ -249,47 +304,47 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
60: 60:
membar #Sync membar #Sync
/* %o2 contains any final bytes still needed to be copied /* %i2 contains any final bytes still needed to be copied
* over. If anything is left, we copy it one byte at a time. * over. If anything is left, we copy it one byte at a time.
*/ */
RESTORE_ASI(%o3) RESTORE_ASI(%i3)
brz,pt %o2, 85f brz,pt %i2, 85f
sub %o0, %o1, %o3 sub %o0, %i1, %i3
ba,a,pt %XCC, 90f ba,a,pt %XCC, 90f
.align 64 .align 64
70: /* 16 < len <= 64 */ 70: /* 16 < len <= 64 */
bne,pn %XCC, 75f bne,pn %XCC, 75f
sub %o0, %o1, %o3 sub %o0, %i1, %i3
72: 72:
andn %o2, 0xf, %o4 andn %i2, 0xf, %i4
and %o2, 0xf, %o2 and %i2, 0xf, %i2
1: subcc %o4, 0x10, %o4 1: subcc %i4, 0x10, %i4
EX_LD(LOAD(ldx, %o1, %o5)) EX_LD(LOAD(ldx, %i1, %i5))
add %o1, 0x08, %o1 add %i1, 0x08, %i1
EX_LD(LOAD(ldx, %o1, %g1)) EX_LD(LOAD(ldx, %i1, %g1))
sub %o1, 0x08, %o1 sub %i1, 0x08, %i1
EX_ST(STORE(stx, %o5, %o1 + %o3)) EX_ST(STORE(stx, %i5, %i1 + %i3))
add %o1, 0x8, %o1 add %i1, 0x8, %i1
EX_ST(STORE(stx, %g1, %o1 + %o3)) EX_ST(STORE(stx, %g1, %i1 + %i3))
bgu,pt %XCC, 1b bgu,pt %XCC, 1b
add %o1, 0x8, %o1 add %i1, 0x8, %i1
73: andcc %o2, 0x8, %g0 73: andcc %i2, 0x8, %g0
be,pt %XCC, 1f be,pt %XCC, 1f
nop nop
sub %o2, 0x8, %o2 sub %i2, 0x8, %i2
EX_LD(LOAD(ldx, %o1, %o5)) EX_LD(LOAD(ldx, %i1, %i5))
EX_ST(STORE(stx, %o5, %o1 + %o3)) EX_ST(STORE(stx, %i5, %i1 + %i3))
add %o1, 0x8, %o1 add %i1, 0x8, %i1
1: andcc %o2, 0x4, %g0 1: andcc %i2, 0x4, %g0
be,pt %XCC, 1f be,pt %XCC, 1f
nop nop
sub %o2, 0x4, %o2 sub %i2, 0x4, %i2
EX_LD(LOAD(lduw, %o1, %o5)) EX_LD(LOAD(lduw, %i1, %i5))
EX_ST(STORE(stw, %o5, %o1 + %o3)) EX_ST(STORE(stw, %i5, %i1 + %i3))
add %o1, 0x4, %o1 add %i1, 0x4, %i1
1: cmp %o2, 0 1: cmp %i2, 0
be,pt %XCC, 85f be,pt %XCC, 85f
nop nop
ba,pt %xcc, 90f ba,pt %xcc, 90f
...@@ -300,71 +355,71 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ ...@@ -300,71 +355,71 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
sub %g1, 0x8, %g1 sub %g1, 0x8, %g1
be,pn %icc, 2f be,pn %icc, 2f
sub %g0, %g1, %g1 sub %g0, %g1, %g1
sub %o2, %g1, %o2 sub %i2, %g1, %i2
1: subcc %g1, 1, %g1 1: subcc %g1, 1, %g1
EX_LD(LOAD(ldub, %o1, %o5)) EX_LD(LOAD(ldub, %i1, %i5))
EX_ST(STORE(stb, %o5, %o1 + %o3)) EX_ST(STORE(stb, %i5, %i1 + %i3))
bgu,pt %icc, 1b bgu,pt %icc, 1b
add %o1, 1, %o1 add %i1, 1, %i1
2: add %o1, %o3, %o0 2: add %i1, %i3, %o0
andcc %o1, 0x7, %g1 andcc %i1, 0x7, %g1
bne,pt %icc, 8f bne,pt %icc, 8f
sll %g1, 3, %g1 sll %g1, 3, %g1
cmp %o2, 16 cmp %i2, 16
bgeu,pt %icc, 72b bgeu,pt %icc, 72b
nop nop
ba,a,pt %xcc, 73b ba,a,pt %xcc, 73b
8: mov 64, %o3 8: mov 64, %i3
andn %o1, 0x7, %o1 andn %i1, 0x7, %i1
EX_LD(LOAD(ldx, %o1, %g2)) EX_LD(LOAD(ldx, %i1, %g2))
sub %o3, %g1, %o3 sub %i3, %g1, %i3
andn %o2, 0x7, %o4 andn %i2, 0x7, %i4
sllx %g2, %g1, %g2 sllx %g2, %g1, %g2
1: add %o1, 0x8, %o1 1: add %i1, 0x8, %i1
EX_LD(LOAD(ldx, %o1, %g3)) EX_LD(LOAD(ldx, %i1, %g3))
subcc %o4, 0x8, %o4 subcc %i4, 0x8, %i4
srlx %g3, %o3, %o5 srlx %g3, %i3, %i5
or %o5, %g2, %o5 or %i5, %g2, %i5
EX_ST(STORE(stx, %o5, %o0)) EX_ST(STORE(stx, %i5, %o0))
add %o0, 0x8, %o0 add %o0, 0x8, %o0
bgu,pt %icc, 1b bgu,pt %icc, 1b
sllx %g3, %g1, %g2 sllx %g3, %g1, %g2
srl %g1, 3, %g1 srl %g1, 3, %g1
andcc %o2, 0x7, %o2 andcc %i2, 0x7, %i2
be,pn %icc, 85f be,pn %icc, 85f
add %o1, %g1, %o1 add %i1, %g1, %i1
ba,pt %xcc, 90f ba,pt %xcc, 90f
sub %o0, %o1, %o3 sub %o0, %i1, %i3
.align 64 .align 64
80: /* 0 < len <= 16 */ 80: /* 0 < len <= 16 */
andcc %o3, 0x3, %g0 andcc %i3, 0x3, %g0
bne,pn %XCC, 90f bne,pn %XCC, 90f
sub %o0, %o1, %o3 sub %o0, %i1, %i3
1: 1:
subcc %o2, 4, %o2 subcc %i2, 4, %i2
EX_LD(LOAD(lduw, %o1, %g1)) EX_LD(LOAD(lduw, %i1, %g1))
EX_ST(STORE(stw, %g1, %o1 + %o3)) EX_ST(STORE(stw, %g1, %i1 + %i3))
bgu,pt %XCC, 1b bgu,pt %XCC, 1b
add %o1, 4, %o1 add %i1, 4, %i1
85: retl 85: ret
mov EX_RETVAL(GLOBAL_SPARE), %o0 restore EX_RETVAL(%i0), %g0, %o0
.align 32 .align 32
90: 90:
subcc %o2, 1, %o2 subcc %i2, 1, %i2
EX_LD(LOAD(ldub, %o1, %g1)) EX_LD(LOAD(ldub, %i1, %g1))
EX_ST(STORE(stb, %g1, %o1 + %o3)) EX_ST(STORE(stb, %g1, %i1 + %i3))
bgu,pt %XCC, 90b bgu,pt %XCC, 90b
add %o1, 1, %o1 add %i1, 1, %i1
retl ret
mov EX_RETVAL(GLOBAL_SPARE), %o0 restore EX_RETVAL(%i0), %g0, %o0
.size FUNC_NAME, .-FUNC_NAME .size FUNC_NAME, .-FUNC_NAME
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7